diff --git a/CHANGES b/CHANGES index 57a53083ed..4ac1774541 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,1964 @@ +2021.08.2, released November 10th, 2021 + + Important / security related fixes. + + Updated/fixed packages: asterisk, audit, bind, bitcoin, + containerd, cryptsetup, dahdi-linux, dbus-python, dfu-util, + docker-cli, docker-engine, earlyoom, edk2-platforms, exiv2, + ffmpeg, freerdp, gdb, gensio, gnupg2, go, gpsd, + gst1-plugins-bad, gst1-plugins-ugly, gst1-vaapi, gtest, + hiredis, lftp, libps1, libva, libva-utils, lightning, + log4cplus, lrzip, netdata, nodejs, olsr, openjdk, openjdk-bin, + pango, php, python3-cffi, qemu, refpolicy, rng-tools, samba4, + snort, strongswan, sunxi-mali-mainline-driver, suricata, + systemd, tor, vim, weston, wf111, wireguard-linux-compat, + xerces + + Issues resolved (http://bugs.uclibc.org): + + #14311: Cannot compile dahdi (part of Asterisk) for x86 (P1mmx) + +2021.08.1, released October 11, 2021 + + Important / security related fixes. + + gdbinit: Mark the sysroot as a "safe path" before configuring + it, so pretty printers work correctly without having to pass + -ix to gdb + + Updated/fixed packages: alsa-lib, apache, + arm-trusted-firmware, atftp, bind, botan, cog, containerd, + cryptopp, docker-cli, dash, dc3dd, docker-engine, dovecot, + environment-setup, erlang, fetchmail, ffmpeg, fio, gcc, gd, + gdb, ghostscript, gnuradio, gnutils, go, + gobject-introspection, google-breakpad, gst-omx, + gst1-devtools, gst1-interpipe, 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, gupnp, haproxy, imlib2, kodi, + kodi-pvr-octonet, kodi-visualisation-fishbmc, libcurl, + libexif, libgcrypt, libglib2, libkrb5, libressl, librsvg, + libsndfile, libssh, libvirt, libxcrypt, libyang, links, lvm2, + lynx, lxc, mc, mesa3d, micropython, minicom, mono, mosquitto, + mtr, mupdf, mv-ddr-marvell, net-tools, nginx-dav-ext, nmap, + nodejs, ntfs-3g, openjdk, openjdk-bin, openldap, openssh, + pcre2, php, php-gnupg, pipewire, postgis, python-aioconsole, + python-cbor2, python-cffi, python-cython, python-dateutil, + python-django, python-pillow, python-pip, python-texttable, + python-urllib3, python-webob, qemu, qt5location, redis, + refpolicy, ripgrep, ruby, runc, sispmctl, sox, squid, + strongswan, supervisor, swupdate, syslinux, systemd, tinycbor, + trace-cmd, uboot-tools, uclibc, udisks, uhd, vim, vsftpd, + wavemon, webkitgtk, wget, wireless-regdb, wpewebkit, + xapp_xrdb, xapp_xwd, xen, xlib_libXfont2, xlib_libXft, + xserver_xorg-server, zip + + Issues resolved (http://bugs.uclibc.org): + + #14206: Kodi: even when not enabled, forcefully selects libevdev.. + #14211: libffi-3.3.tar.gz repacked + #14221: mv-ddr-marvell fails license validation + +2021.08, released September 4th, 2021 + + Various fixes. + + Updated/fixed packages: gstreamer1-mm, netsniff-ng, nginx, + openmpi, python-pyudev, python3, qt5base, wlroots, xvisor + +2021.08-rc3, released August 31st, 2021 + + Fixes all over the tree. + + Toolchain: Disable fortify support for Microblaze as it is not + currently working. + + Defconfigs: Acmesystems aria/ariette g25: Fix build issue + after at91bootstrap bump, BeagleV: Correct kernel headers + version, PC x86-64: Bump kernel to 4.19.204 to fix build issue + with GCC 10.x. + + Updated/fixed packages: alsa-utils, at91bootstrap3, belle-sip, + bullet, c-ares, cjson, coreutils, cpio, eigen, fetchmail, gdb, + haproxy, heirloom-mailx, ipmiutil, kvm-unit-tests, libarchive, + libffi, libmodsecurity, libopenssl, libressl, libshout, + libvirt, linux-pam, lmbench, localedef, lua-lunix, mesa3d, + mpv, mtd, nodejs, nvidia-driver, openvmtools, php, polkit, + python-requests, python3-requests, rust-bin, rustc, samba4, + sdl2, snort3, ushare, xen + + Removed packages: libmcrypt, mcrypt, sentry-cli + +2021.08-rc2, released August 18th, 2021 + + Fixes all over the tree. + + Defconfigs: Acmesystems acqua a5: Bump at91bootstrap version + to fix build issue with binutils >= 2.35, Microchip sam9x60ek + mmc_dev: Add missing toolchain/system options, sama5d2-icp + mmc: Correct at91bootstrap options + + Updated/fixed packages: arm-trusted-firmware, at91bootstrap3, + azure-iot-sdk-c, bluez5_utils, bullet, busybox, cegui, efl, + erlang, ffmpeg, flatbuffers, fontconfig, gcc, gd, glibc, go, + gobject-introspection, gpsd, guile, harfbuzz, iozone, iputils, + jszip, libargtable2, libbpf, libebml, libepoxy, libesmtp, + libfuse3, libgeos, libnss, libodb-boost, libodb-mysql, + libodb-pgsql, libqmi, libqrtr-glib, libuhttpd, libuwsc, + libvirt, ltp-testsuite, luaossl, mongodb, mpd, mupdf, mutt, + network-manager, nginx-naxsi, nodejs, ogre, openzwave, + optee-os, osm2pgsql, pdbg, perl-net-ssh2, php, pipewire, + pistache, pixman, poke, polkit, poppler, postgresql, postkit, + prelink-cross, prosody, protobuf, pulseview, + python-cryptography, python-keyring, python-matplotlib, + python-pymupdf, python-pyopenssl, python-secretstorage, + python-treq, python-txtorcon, python3, qemu, qpdf, qt5base, + refpolicy, ruby, rust-bin, s390-tools, sconeserver, seatd, + shairport-sync, sox, sqlite, sylpheed, sysdig, syslog-ng, + system-config-printer, tar, terminology, tor, tpm2-tools, uhd, + unbound, usbguard, wireshark, xen, xenomai, xlib_libxshmfence, + zstd + + New packages: desktop-file-utils + + Issues resolved (http://bugs.uclibc.org): + + #13586: grub failure with BR2_OPTIMIZE_3 + #13671: openSSH server closes connection before authentication.. + +2021.08-rc1, released August 3rd, 2021 + + Numerous package updates. + + Toolchain: + + - add support for gcc 11.x, gcc 10.x is now the default, gcc + 9.x updated to 9.4.0, removed gcc 8.x support except for + PowerPC SPE + + - add support for binutils 2.37, binutils 2.36.x is now the + default, binutils 2.34 removed. + + - glibc updated to 2.33 + + - gdb enabled on NIOS II, gdbserver enabled on RISC-V. + + Bootloaders/firmware: support for building the EDK II UEFI + firmware, support for building AT91Bootstrap 4.x. + + New BR2_ENABLE_RUNTIME_DEBUG option, that controls whether + packages should be compiled with runtime debugging + information (which is different than debugging symbols). + + Many features of the bluez5_utils package have been made + optional, and default to disabled. Users of bluez5_utils are + encouraged to review their configuration. + + Many packages (over 70) updated to enable the appropriate + SELinux refpolicy module when SELinux support is enabled. + + Many packages updated to select the appropriate OpenSSL + features after many OpenSSL ciphers/features have been made + optional. + + New defconfigs: kontron_pitx_imx8m, microchip_sama5d2_icp, + qemu_aarch64_sbsa, raspberrypicm4io, raspberrypicm4io_64, + terasic_de10nano_cyclone5, uevm5432. + + New packages: alsa-plugins, apg, bmap-tools, daq3, edk2, + edk2-platforms, gumbo-parser, libbpf, libosmium, libpsl, + libqb, libtalloc, libvirt, lua-linux, lua-zlib, mupdf, + opencv4, osm2pgsql, poke, python-augeas, python-dbus-next, + python-pymupdf, rtl_433, rtl8812au-aircrack-ng, seatd, snort3, + system-config-printer, usbguard, xml-security-c, xmrig. + + Removed packages: clapack, libsoil. + + Issues resolved (http://bugs.uclibc.org): + + #13326: regarding dtc error in buildroot source code + #13661: host-python2 build fails on aarch64 + #13836: package build failure when target install set to no on + pkg-generic pkg types + #13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to + y as before + +2021.05.1, released August 10, 2021 + + Important / security related fixes. + + Toolchain: Disable PIC/PIE for Microblaze (like for NIOS II) + as it is not currently working. + + binutils: fix linker assert failure on OpenRisc, or1k build + issue with gcc < 5 + + gdb: Enable on NIOS II + + utils/scanpypi: Various improvements + + Defconfigs: stm32f469_disco: Fix kernel boot issue, Microchip + sam9x60ek mmc_dev: Add missing toolchain/system options + + Updated/fixed packages: arm-trusted-firmware, apache, audit, + avahi, bind, binutils, bird, bluez5_utils, boinc, busybox, + chrony, clamav, connman, cryptsetup, dnsmasq, docker-cli, + docker-engine, dovecot, dovecot-pigeonhole, e2fsprogs, exiv2, + fail2ban, fb-test-app, feh, fetchmail, ffmpeg, flac, fluxbox, + gawk, gcc, gcr, gdb, gdk-pixbuf, gesftpserver, glibc, go, + gptfdisk, gqrx, granite, grub2, guile, hdparm, heirloom-mailx, + htop, ibrcommon, ibrdtn, ibrdtn-tools, ibrdtnd, + intel-microcode, iodine, irqbalance, keepalived, kexec-tools, + libass, libconfig, libcurl, libfreeimage, libfuse3, libgcrypt, + libgudev, libhtp, libinput, libjson, libgtk3, libkrb5, + libloki, libmodsecurity, libndp, libnetfilter-log, + libnfnetlink, libnice, libodb, libodb-boost, libodb-mysql, + libodb-pgsql, libpcap, libqmi, libqrtr-glib, libressl, + librsvg, libtasn1, libtirpc, libuci, libxmlrpc, + linux-firmware, linuxptp, lrzsz, lvm2, mariadb, mesa3d, + mbedtls, monit, mono, mosquitto, mpd, mpg123, mpv, nbd, + netsnmp, nettle, nmap, nodejs, ntp, openntpd, openpgm, + openswan, pango, pcre2, perl-crypt-openssl-rsa, php, pixman, + postgresql, proxychains-ng, putty, python, + python-dataproperty, python-django, python-pysftp, + python-urllib3, python3, qpdf, redis, ripgrep, rsync, ruby, + samba4, sane-backends, slirp, spice, squid, suricata, tcpdump, + tftpd, thrift, tor, tpm2-tools, trinity, uboot, uboot-tools, + uclibc, vlc, wireless-regdb, wireshark, wolfssl, + xapp_fonttosfnt, xlib_libX11, xlib_libxshmfence, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13586: grub failure with BR2_OPTIMIZE_3 + #13661: host-python2 build fails on aarch64 + #13836: package build failure when target install set to no.. + #13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to.. + +2021.05, released June 6th, 2021 + + Various fixes. + + Disable PIC/PIE support for Nios2 because of glibc issues + + Defconfigs: Minnowboard max: Fix X11 and mesa3d configuration + + Updated/fixed packages: apache, beaglev-ddrinit, + beaglev-secondboot, capnproto, dc3dd, directfb, efibootmgr, + ffmpeg, gptfdisk, go, gupnp, hostapd, iftop, + intel-mediadriver, libcamera, libcutl, libesmtp, libkcapi, + libraw, lttng-tools, lvm2, mimic, mono-gtksharp3, mpv, + netperf, odb, qt5base, uclibc, uftrace, unscd, vlc, + xdriver_xf86-video-fbturbo + + New packages: python3-cffi, python3-cryptography, python3-pip, + python3-pycparser, python3-six + +2021.05-rc3, released May 31th, 2021 + + Fixes all over the tree. + + meson: Explicitly disable PIE support (b_pie) as it is handled + by the toolchain wrapper. + + Updated/fixed packages: boost, dhcp, expat, gdb, hwloc, imagemagick, + libcurl, libopenh264, llvm, lz4, mpv, nginx, paho-mqtt-c, pifmrds, + pipewire, python-bluezero, python-pillow, qemu, strace, uhd, vlc, + webkitgtk + + Issues resolved (http://bugs.uclibc.org): + + #13821: Wrong url for libnfsidmap package + +2021.05-rc2, released May 22th, 2021 + + Fixes all over the tree. + + support/scripts/gen-missing-cpe: A script to query the list of + CPE IDs for the packages enabled in the current configuration and: + + - for CPE IDs that do not have any matching entry in the CPE + database, it emits a warning + + - for CPE IDs that do have a matching entry, but not with the same + version, it generates a snippet of XML that can be used to propose + an updated version to NIST. + + CPE meta data has been added for a large number of packages + + Updated/fixed packages: assimp, binutils, bitcoin, bullet, + cutelyst, dhcp, dmalloc, docker-engine, ebtables, + environment-setup, flatcc, gcc, gd, gerbera, hostapd, + imx-gpu-viv, intel-microcode, jquery-validation, libdrm, + libgeos, libraw, libtirpc, libxml2, libxslt, live555, lmbench, + localedef, lvm2, mender, mender-grubenv, modem-manager, mutt, + opensbi, openssh, opentyrian, pipewire, postgis, postgresql, + prosody, python-bluezero, python-falcon, redis, rocksdb, + rt-tests, runc, vlc, waylandpp, webkitgtk, wireshark, + wpa_supplicant, wpewebkit, xlib_libX11, xterm + + New packages: jh71xx-tools + + Issues resolved (http://bugs.uclibc.org): + + #13781: isc dhcp-server package don't create file /usr/bin/dhcpd + #13801: toolchainfile.cmake CMAKE_BUILD_TYPE + #13806: Building host-localedef fails on fedora 34/gcc 11 + +2021.05-rc1, released May 12th, 2021 + + Fixes all over the tree and new features. + + FORTIFY_SOURCE, PIC/PIE, RELRO and SSP security hardening + options are now enabled by default. + + Dependencies: Explicitly detect and bail out if PATH contains + spaces or tabs. A number of packages fail to build in such + setups, so explicitly inform about this. + + Infrastructure: Expose CONFIG_DIR to post-build/post-image + scripts, so they can call the Buildroot Makefile in the + correct directory for both in-tree / out-of-tree builds. + + CMake infrastructure: Use CMAKE_EXE_LINKER_FLAGS rather than + CMAKE_CXX_FLAGS to link with libatomic to fix an compatibility + issue with poppler. Bump minimal host cmake version to 3.16 + (from 3.15) to fix a compatibility issue with domoticz. + + Meson: Use correct C++ host compiler (rather than C compiler) + + utils/scanpypi: Explicitly use python3 for compatibility with + packages using python3 syntax in setup.py + + support/download: Fix tarball generation (from git/svn repos) + including symlinks pointing to ./. Fix svn download + for <1.9 clients or repos using CVS-style keywords. + + support/scripts/cve.py: Use the (significantly) faster yajl2 + ijson backend for older (< 2.5) ijson versions rather than the + slow python default, speeding up pkg-stats by ~2x. + + Toolchain: Add logic to work around binutils bug 21464 + (affecting OpenRISC), bug 27597 (affecting Nios II) and drop + the now longer applicable bug 19615 / 20006 handling. + + Python{,3}: Fix byte compiling python files with short (single + character before .py) file names. + + CPE meta data has been added for a large number of packages + + New defconfigs: Acme Systems Acqua A5 (256/512MB), Beagleboard + BeagleV, Boundary devices Nitrogen8M Plus SOM, NXP i.MX 8M + Plus EVK, QEMU PPC e500mc + + New packages: beaglev-ddrinit, beaglev-secondboot, janet, + kodi-inputstream-ffmpegdirect, kodi-vfs-libarchive, + kodi-visualisation-matrix, libxcrypt, libqrtr-glib, log4qt, + mawk, perl-parse-yapp, postgis, protozero, python-flask-wtf, + python-iwlib, python-semantic-version, python-setuptools-rust, + python-toml, riscv64-elf-toolchain, siproxyd, uftrace, zfs + + Removed packages: iostat, kodi-platform, + kodi-screensaver-crystalmorph, monkey + + Issues resolved (http://bugs.uclibc.org): + + #13271: systemd-resolved: /etc/resolv.conf link broken on per-pa.. + #13516: utils/scanpypi: Failure when parsing diffoscope + #13551: 2021.02.rc2: Unicode not work on qt 5.15.2 + #13576: Issues compiling buildroot for 5x86 + #13601: Gen image :Iappropriate ioctl error + #13616: tar file from git repository generation issue + #13631: Commit 54d3d94b6e breaks packages with git download method + #13641: glibc on raspberrypi + #13646: Gen image version 14 error : no sub -section title/.. + #13651: pkg-golang cannot build when main.go is in the root + #13661: host-python2 build fails on aarch64 + #13671: openSSH server closes connection before authentication.. + #13721: c-stack.c:55:26: error: missing binary operator before .. + #13731: Readline Patch is missing Author Information + #13741: genext2fs does not allow to set perms of root node + #13751: libopenssl (static): huge drop in performance in newer .. + #13771: package htop has undeclared dependency on host python + +2021.02.4, released August 10th, 2021 + + Important / security related fixes. + + Toolchain: Disable PIC/PIE for Microblaze (like for NIOS II) + as it is not currently working. + + binutils: fix linker assert failure on OpenRisc, or1k build + issue with gcc < 5 + + gdb: Enable on NIOS II + + utils/scanpypi: Various improvements + + Defconfigs: stm32f469_disco: Fix kernel boot issue, Microchip + sam9x60ek mmc_dev: Add missing toolchain/system options + + Updated/fixed packages: apache, arm-trusted-firmware, audit, + avahi, bind, binutils, bird, bluez5_utils, boinc, busybox, + chrony, clamav, cryptsetup, cwiid, dnsmasq, docker-cli, + docker-engine, dovecot, dovecot-pigeonhole, e2fsprogs, exiv2, + fail2ban, fb-test-app, feh, fetchmail, flac, fluxbox, gawk, + gcc, gcr, gdb, gdk-pixbuf, gesftpserver, glibc, go, gptfdisk, + granite, grub2, gqrx, guile, hdparm, heirloom-mailx, + ibrcommon, ibrdtn, ibrdtn-tools, ibrdtnd, intel-microcode, + iodine, irqbalance, keepalived, libass, libconfig, libcurl, + libfreeimage, libfuse3, libgcrypt, libgtk3, libgudev, libhtp, + libjson, libkrb5, libloki, libmodsecurity, libndp, + libnetfilter-log, libnfnetlink, libnice, libodb, libodb-boost, + libodb-mysql, libodb-pgsql, libpcap, libqmi, libressl, + librsvg, libtasn1, libtirpc, libuci, libxmlrpc, + linux-firmware, linuxptp, lrzsz, ltp-testsuite, lvm2, mariadb, + mbedtls, monit, mono, mosquitto, mpd, mpg123, mpv, nbd, neard, + netsnmp, nettle, nginx-modsecurity, nmap, nodejs, ntp, + openntpd, openpgm, openswan, pango, pcre2, + perl-crypt-openssl-rsa, php, pixman, polkit, postgresql, + proxychains-ng, putty, python, python-django, + python-dataproperty, python-pysftp, python-urllib3, python3, + qpdf, redis, ripgrep, ruby, samba4, spice, slirp, suricata, + sysdig, tcpdump, tftpd, thrift, tor, tpm2-tools, trinity, + uboot, uboot-tools, uclibc, util-linux, vlc, wireless-regdb, + wireshark, wolfssl, xapp_fonttosfnt, xlib_libX11, + xlib_libxshmfence, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13586: grub failure with BR2_OPTIMIZE_3 + #13661: host-python2 build fails on aarch64 + #13836: package build failure when target install set to no.. + #13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to.. + +2021.02.3, released June 12th, 2021 + + Important / security related fixes. + + CPE meta data has been added for a large number of packages + + Updated/fixed packages: acpid, apache, apcupsd, assimp, bird, + bitcoin, blktrace, boost, capnproto, chrony, dc3dd, dhcp, + directfb, dmalloc, docker-engine, ebtables, efibootmgr, + enlightenment, enscript, environment-setup, exempi, expat, + findutils, flatcc, fluidsynth, frr, gdb, go, gptfdisk, grpc, + gst1-plugins-bad, gst1-rtsp-server, gstreamer1, gupnp, + hostapd, hwloc, i2c-tools, iftop, imagemagick, imx-gpu-viv, + intel-mediadriver, intel-microcode, jquery-validation, + keepalived, kodi, less, libcamera, libcurl, libcutl, libesmtp, + libeXosip2, libffi, libfuse, libfuse3, libgeos, libgtk2, + libgtk3, libical, libidn, libidn2, libkcapi, libldns, libmms, + libmodbus, libmspack, libnids, libopenh264, liboping, libraw, + librelp, libsamplerate, libtirpc, libusb, libuv, libxcb, + libxml2, libxslt, live555, llvm, lmbench, localedef, + lttng-tools, lvm2, lz4, mesa3d, mimic, mini-snmpd, minidlna, + minissdpd, minizip, mono-gtksharp3, mpg123, mpv, msmtp, musl, + mutt, nasm, nbd, netperf, netsurf, nginx, odb, opencv3, + openssh, opentyrian, oprofile, p7zip, paho-mqtt-c, perl, + php-imagick, pifmrds, picocom, pigz, pngquant, poco, + postgresql, prosody, proxychains-ng, pulseaudio, putty, pwgen, + python-autobahn, python-bluezero, python-engineio, + python-keyring, python-pillow, python-requests, python-tqdm, + qemu, qpdf, qt5base, redis, refpolicy, rt-tests, runc, + shellinabox, squid, strace, supervisor, synergy, taglib, + tclap, terminology, thermald, tini, tinyproxy, tinyxml2, + tpm2-tss, uclibc, udisks, uhd, unscd, vlc, waylandpp, + webkitgtk, weston, wireshark, wpa_supplicant, wpewebkit, + xlib_libdmx, xlib_libFS, xlib_libICE, xlib_libX11, + xlib_libXcursor, xlib_libXdmcp, xlib_libXext, xlib_libXfixes, + xlib_libXfont2, xlib_libXinerama, xlib_libXpm, xlib_libXres, + xlib_libXt, xlib_libXtst, xlib_libXxf86dga, xlib_libXxf86vm, + xterm + + Issues resolved (http://bugs.uclibc.org): + + #13781: isc dhcp-server package don't create file /usr/bin/dhcpd + #13801: toolchainfile.cmake CMAKE_BUILD_TYPE + #13806: Building host-localedef fails on fedora 34/gcc 11 + +2021.02.2, released May 12th, 2021 + + Important / security related fixes. + + Toolchain: Add logic to mark toolchains affected by binutils + bug 27597 (Nios II). + + support/scripts/cve.py: Use the (significantly) faster yajl2 + ijson backend for older (< 2.5) ijson versions rather than the + slow python default, speeding up pkg-stats by ~2x. + + CMake infrastructure: Use CMAKE_EXE_LINKER_FLAGS rather than + CMAKE_CXX_FLAGS to link with libatomic to fix an compatibility + issue with poppler. + + Infrastructure: Expose CONFIG_DIR to post-build/post-image + scripts, so they can call the Buildroot Makefile in the + correct directory for both in-tree / out-of-tree builds. + + Updated/fixed packages: at91bootstrap, avahi, bash, bind, + bridge-utils, boost, cegui, cifs-utils, clamav, cmake, + coremark-pro, coreutils, cryptsetup, dmalloc, dnsmasq, + docker-cli, docker-engine, domoticz, efl, exim, ffmpeg, flex, + gcc, genext2fs, go, gst1-interpipe, haproxy, hostapd, + i2c-tools, imx-vpu, kexec, kf5-kcoreaddons, kismet, libcamera, + libcurl, libdrm, libfreefare, libfuse3, libgeos, libgpiod, + libnpupnp, libopenssl, libp11, librsync, libtomcrypt, libupnp, + localedef, lvm2, lxc, m4, makedevs, mender, mesa3d, + mesa3d-headers, mkpasswd, mkpimage, modem-manager, monkey, + mpd, ncurses, nettle, network-manager, nginx, numactl, + openjdk, openjdk-bin, openldap, openvpn, php, pipewire, + python-aioconsole, python-asgiref, python-botocore, + python-django, python-dnspython, python-flup, python-httplib2, + python-markdown2, python-mbrstrdecoder, python3, quickjs, + readline, rsyslog, ruby, rust, samba4, sconeserver, snort, + sox, systemd, tar, timescaledb, tio, tor, usb_modeswitch, + wpa_supplicant, xdriver_xf86-video-ati, xen, xlib_libXaw, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13271: systemd-resolved: /etc/resolv.conf link broken on per-pa.. + #13551: 2021.02.rc2: Unicode not work on qt 5.15.2 + #13651: pkg-golang cannot build when main.go is in the root + #13661: host-python2 build fails on aarch64 + #13721: c-stack.c:55:26: error: missing binary operator before .. + #13731: Readline Patch is missing Author Information + #13741: genext2fs does not allow to set perms of root node + #13751: libopenssl (static): huge drop in performance in newer .. + #13771: package htop has undeclared dependency on host python + +2021.02.1, released April 7, 2021 + + Important / security related fixes. + + Dependencies: Explicitly detect and bail out if PATH contains + spaces or tabs. A number of packages fail to build in such + setups, so explicitly inform about this. + + utils/scanpypi: Explicitly use python3 for compatibility with + packages using python3 syntax in setup.py + + support/download: Fix tarball generation (from git/svn repos) + including symlinks pointing to ./. Fix svn download + for <1.9 clients or repos using CVS-style keywords. + + Meson: Use correct C++ host compiler (rather than C compiler) + + Toolchain: Add logic to work around binutils bug 21464, + affecting OpenRISC, and drop the now longer applicable bug + 19615 / 20006 handling. + + Python{,3}: Fix byte compiling python files with short (single + character before .py) file names. + + CPE meta data has been added for a large number of packages + + Defconfigs: Correct Beaglebone QT file system overlay + + Updated/fixed packages: alsa-utils, at91bootstrap3, + batman-adv, binutils, botan, bridge-utils, busybox, + ca-certificates, cog, coreutils, diffutils, dmidecode, + docker-cli, docker-containerd, docker-engine, efivar, + fetchmail, frr, genimage, git, gnutls, go, grub2, 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, haproxy, haserl, hwloc, + irqbalance, jasper, kexec, kexec-lite, kismet, kodi, libcurl, + libfreeglut, libgcrypt, libgeos, libglib2, libopenssl, libqmi, + libressl, libupnp, libvips, libvpx, libwebsockets, linux, + lldpd, logrotate, lttng-libust, lttng-tools, mariadb, mbedtls, + mcelog, mender, micropython, mongoose, mosquitto, mpd, + netsnmp, nodejs, openmpi, openssh, openvpn, opkg-utils, + optee-client, optee-test, perl, php, proftpd, protobuf, + python-django, python-jinja2, python-lxml, python-paramiko, + python-py, python-pygments, python-rpi-ws281x, python-urllib3, + python3, qt5webkit, qwt, rpm, samba4, sconeserver, sdl2, shim, + sqlcipher, squid, sysklogd, syslinux, sysvinit, tor, + transmission, tzdata, uboot, uclibc, upx, webkitgtk, + wireshark, wpebackend-fdo, wpewebkit, xen, zstd + + New packages: perl-parse-yapp + + Issues resolved (http://bugs.uclibc.org): + + #13516: utils/scanpypi: Failure when parsing diffoscope + #13576: Issues compiling buildroot for 5x86 + #13601: Gen image :Iappropriate ioctl error + #13616: tar file from git repository generation issue + #13641: glibc on raspberrypi + #13646: Gen image version 14 error : no sub -section title/.. + #13671: openSSH server closes connection before authentication.. + +2021.02, released March 6th, 2021 + + Various fixes. + + Toolchain: Correct Bootlin xtensa-lx60 dependencies + + Updated/fixed packages: asterisk, belle-sip, bustle, dhcpcd, + dovecot, dovecot-pigeonhole, gnuchess, gnuradio, + gst1-plugins-bad, haproxy, jasper, kismet, libebml, + libeXosip2, libgeos, libhtp, libjpeg, libopenssl, libshout, + libstrophe, mosquitto, openblas, openssh, perl, privoxy, + prosody, python-pyyaml, python3-pyyaml, quagga, redis, + rust-bin, sox, suricata, tpm2-pkcs11, uclibc-ng-test, ushare, + util-linux, wolfssl, wpa_supplicant + + Issues resolved (http://bugs.uclibc.org): + + #13501: 2021.02.rc2: Unicode not work on qt 5.15.2 + #13581: jpegsrc.v9d.tar.gz has changed hash + +2021.02-rc3, released February 27th, 2021 + + Fixes all over the tree. + + utils/scanpypi: Explicitly use python3 to ensure compatiblity + with packages having python3-only code in setup.py + + support/download: Ensure sub-second timestamp precision is + dropped when creating a tarball from a (subversion) repo, as + that is not representable in the PAX tar format + + Updated/fixed packages: babeltrace2, bind, botan, brltty, + cegui, elfutils, fakeroot, imagemagick, intel-mediasdk, + irqbalance, libglib2, libselinux, libusb, libuwsc, nodejs, + open62541, openldap, ply, python-aiohttp, python-django, + python3, qemu, readline, rust, screen, taglib, unbound, xterm + + Issues resolved (http://bugs.uclibc.org): + + #13516: utils/scanpypi: Failure when parsing diffoscope + #13541: 2021.02.rc2: irqbalance: Daemon couldn't be bound to... + #13561: Create a new user defining users-table.txt not working.. + +2021.02-rc2, released February 16th, 2021 + + Fixes all over the tree. + + Vulnerability scanning: cpedb.py: Drop CPE XML database + caching, as it did not speed up processing much and uses a lot + of additional memory. + pkg-stats: include information about ignored CVEs in JSON + output + + Fakeroot: Fix compatibility issue with glibc 2.33 + + Updated/fixed packages: can-utils, collectd, dnsmaqs, + docker-cli, docker-engine, ebtables, fakeroot, flashrom, + gdk-pixbuf, go, gst1-python, jasper, kodi, + kodi-inputstream-adaptive, lcms2, libgeos, libgpg-error, + libopenssl, mongoose, mpd, ne10, netopeer2, openblas, orc, + perl-gd, ply, postgresql, protobuf, subversion, tcpdump, + tzdate, uboot-tools, wireshark, webkitgtk, wpewebkit, xterm + + New packages: perl-extutils-pkgconfig + + Issues resolved (http://bugs.uclibc.org): + + #11706: binman (U-boot tool) cannot find libfdt "binman: No mod.. + +2021.02-rc1, released February 9th, 2021 + + Fixes all over the tree and new features. + + Toolchain: Default to binutils 2.35.2, add 2.36.1, drop + 2.33.x. Fix GCC 10.x ARC adc/sbc pattern handling, Update ARM + toolchains to 10.2-2020.11 release. + + Architectures: ARC: add support for generic HS48 processor, + PPC: drop PPC601 support, which was removed from Linux 5.10. + + Vulnerability scanning: The CVE checking logic has been + extended to match packages based on CPE (Common Platform + Enumeration) IDs for more accurate matching, and CPE + identifiers have been added for a large amount of packages. + + Download: Rework the tarball creation logic (E.G. when a + package is fetched from a git/svn repo) to no longer require a + host-tar <= 1.29. To differ between the old and the new + format, the new tarballs have gained a -br1 suffix + (--br1.tar.gz). + + SELinux support: A significant number of packages now pull in + the relevant refpolicy modules when enabled. + + New defconfigs: arrow avenger96, bananapi M1+, microchip + sam9x60ek, pine64 rock64 + + Removed defconfigs: QEMU ppc virtex-ml507 + + New packages: balena-engine, casync, coremark, coremark-pro, + datatables, datatables-buttons, datatables-fixedcolumns, + datatables-responsive, delve, frotz, gkrellm, inih, jszip, + libgeos, libiec61850, libmdbx, lualdap, neofetch, + nvidia-modprobe, open62541, perl-devel-cycle, perl-devel-size, + perl-math-int64, ply, popperjs, python-bleak, + python-defusedxml, python-pycups, python-pytest-asyncio, + python-typing-extensions, qcom-db410c-firmware, qt5coap, + qt5knx, qt5mqtt, quickjs, rcw-smarc-sal28, screenfetch, + ssdp-responder, tpm2-pkcs11, wqy-zenhei, xorcurses + + Removed packages: audiofile, boa, ipsec-tools, libupnp18, + ti-sgx-libgdbm + + Renamed rcw package to qoriq-rcw + + Issues resolved (http://bugs.uclibc.org): + + #13316: beaglebone_qt5_defconfig: PowerVR fails to start + #13416: dhcpcd start warning message: no such user dhcpcd + #13456: ccache prevents build + #13471: package/mpd/mpd.conf make use of path not created + #13506: BR2_PACKAGE_DHCPCD missing directory creation + +2020.11.4, released April 5th, 2021 + + Important / security related fixes. + + Dependencies: Explicitly detect and bail out if PATH contains + spaces or tabs. A number of packages fail to build in such + setups, so explicitly inform about this. + + utils/scanpypi: Explicitly use python3 for compatibility with + packages using python3 syntax in setup.py + + support/download: Fix tarball generation (from git/svn repos) + including symlinks pointing to ./ + + Meson: Use correct C++ host compiler (rather than C compiler) + + Updated/fixed packages: asterisk, at91bootstrap3, babeltrace2, + batman-adv, bind, ca-certificates, cegui, cog, diffutils, + docker-containerd, dovecot, dovecot-pigeonhole, efivar, + elfutils, fakeroot, git, gnuchess, gnuradio, gnutls, go, + grub2, haserl, i7z, imagemagick, intel-mediasdk, irqbalance, + jasper, kodi, libcurl, libebml, libeXosip2, libglib2, libhtp, + libjpeg, libopenssl, libqmi, libressl, libupnp, libuwsc, + libvips, lldpd, mariadb, mbedtls, mender, micropython, + mosquitto, netsnmp, nodejs, openblas, openldap, openmpi, + openssh, opkg-utils, optee-client, optee-test, perl, php, + privoxy, proftpd, prosody, protobuf, python-aiohttp, + python-django, python-lxml, python-pyyaml, python-rpi-ws281x, + python-typing-extensions, python3, quagga, qwt, redis, rpm, + sconeserver, screen, sox, sqlcipher, squid, suricata, + syslinux, sysvinit, tor, transmission, tzdata, uboot, unbound, + upx, util-linux, webkitgtk, wireshark, wolfssl, + wpebackend-fdo, wpewebkit, wpa_supplicant, zstd + + Issues resolved (http://bugs.uclibc.org): + + #13516: utils/scanpypi: Failure when parsing diffoscope + #13541: 2021.02.rc2: irqbalance: Daemon couldn't be bound to.. + #13576: Issues compiling buildroot for 5x86 + #13581: jpegsrc.v9d.tar.gz has changed hash + #13616: tar file from git repository generation issue + +2020.11.3, released February 17th, 2021 + + meson: Fix ccache detection handling when per-package builds + are used. + + Fakeroot: Fix compatibility issue with glibc 2.33 + + Updated/fixed packages: atftp, binutils, busybox, cereal, + chartjs, connman, dhcpcd, dnsmasq, docker-cli, docker-engine, + ebtables, fakeroot, flashrom, go, gst1-python, guile, + intel-mediadriver, intel-microcode, jasper, + kodi-inputstream-adaptive, lcms2, libbsd, libopenssl, + makedumpfile, memtester, mosquitto, ne10, openblas, orc, php, + postgresql, privoxy, pugixml, python-bottle, python-django, + python3, rauc, sox, stress-ng, subversion, tzdata, + uboot-tools, uclibc, webkitgtk, wireguard-linux-compat, + wireshark, wpa_supplicant, wpewebkit, xenomai, + xserver_xorg-server, xterm + + Issues resolved (http://bugs.uclibc.org): + + #11706: binman (U-boot tool) cannot find libfdt "binman: No mod.. + #13506: BR2_PACKAGE_DHCPCD missing directory creation + +2020.11.2, released January 31st, 2021 + + Important / security related fixes. + + Download: Ensure git submodules are correctly fetched if + enabled for a package with _GIT_SUBMODULES = YES and the + host variant is downloaded first. + + Toolchain: Mark CodeSourcery Aarch64 2014.11 toolchain as not + having libatomic. Bootlin PowerPC-440 FP toolchain updated for + SecurePLT fix. + + pkg-stats: Fix python 3.8+ deprecation warning. + + meson: Ensure ccache is not detected and used, as it may + conflict with the ccache handling in Buildroot. + + Updated/fixed packages: barebox, boost, brltty, dbus, + docker-containerd, dovecot, dovecot-pigeonhole, + environment-setup, firmware-imx, gcc, gerbera, glibc, + gmrender-resurrect, igd2-for-linux, kodi-pvr-zattoo, libclc, + libfuse3, libllcp, libodb-mysql, libtorrent-rasterbar, + libupnp, lpc32xxcdl, luarocks, mpd, multipath-tools, mutt, + nfs-utils, nodejs, openjpeg, openldap, opentracing-cpp, + openvpn, p11-kit, paho-mqtt-c, php, poppler, postgresql, + python3, redis, resiprocate, rpm, runc, socat, sslh, sudo, + sunxi-mali-mainline-driver, syslog-ng, systemd, tini, + tpm2-tss, trace-cmd, tzdata, uboot-tools, uhd, ushare, + util-linux, vlc, wavpack, wireguard-linux-compat, wolfssl, + xapp_xload, xorriso, zic + + Removed packages: libupnp18 + + Issues resolved (http://bugs.uclibc.org): + + #13471: package/mpd/mpd.conf make use of path not created + +2020.11.1, released December 27th, 2020 + + Important / security related fixes. + + Infrastructure: + - cmake: fix host ccache handling for CMake 3.19 + - meson: Forcibly disable binary stripping for + target builds, enable for host builds + - golang: Fix HOST / TARGET directories for per-package builds + + Defconfigs: Beaglebone Qt5: Fix ti-sgx related issues + + Updated/fixed packages: apitrace, arm-trusted-firmware, + ca-certificates, cryptopp, dhcpcd, dtv-scan-tables, + flare-engine, ghostscript, go, haproxy, imagemagick, + imx-gpu-viv, jasper, kismet, libcurl, libglib2, libhtp, + libopenssl, libressl, libuv, libuvw, lua, mbedtls, mongodb, + mutt, ncurses, netsnmp, nodejs, opencv3, openldap, opkg-utils, + paho-mqtt-c, python-crc16, python-lxml, python-pyparsing, + python-pyqt5, qt5base, rauc, shadowsocks-libev, sqlcipher, + suricata, ti-sgx-demos, tinycbor, uclibc-ng-test, unbound, + webkitgtk, wpewebkit, wireshark, x11vnc, xen, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13316: beaglebone_qt5_defconfig: PowerVR fails to start + #13416: dhcpcd start warning message: no such user dhcpcd + +2020.11, released December 2nd, 2020 + + Various fixes. + + Updated/fixed packages: bustle, docker-containerd, gnuplot, + gst1-plugins-good, jemalloc, kmsxx, libcap, libplist, + libuhttpd, libxkbcommon, lynx, mariadb, netsurf, privoxy, + s390-tools, setserial, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13276: libcap builds libcap.pc incorrectly + +2020.11-rc3, released November 28th, 2020 + + Fixes all over the tree. + + Updated/fixed packages: c-ares, cage, cdrkit, + dovecot-pigeonhole, efl, gvfs, harfbuzz, jpeg-turbo, + libcamera, libkrb5, libpam-tacplus, libxkbcommon, minidlna, + modem-manager, monkey, musl, ncurses, numactl, openntpd, + openrc, postgresql, proftpd, python-flask-cors, python-pip, + qemu, raptor, redis, slirp, spandsp, thermald, uhd, vsftpd, + webkitgtk, wireless-regdb, wlroots, wpewebkit, xen, xinetd, + xorriso + + Issues resolved (http://bugs.uclibc.org): + + #13296: host-libcap failed to build + #13331: openrc-0.42.1 compilation failure on gcc-10 + #13336: thermald-1.9.1 compilation failure with musl 1.2.1 + #13341: Mistake in /etc/init.d/S70vsftpd + +2020.11-rc2, released November 14th, 2020 + + Fixes all over the tree. + + cve-checker script dropped. Instead the pkg-stats logic has + been extended to be able to only generate stats for the + configured packages using 'make pkg-stats' + + Removed defconfigs: rock64 + + Updated/fixed packages: apparmor, asterisk, bitcoin, busybox, + cups-filters, cryptsetup, davfs2, domoticz, elf2flt, freetype, + ghostscript, glmark2, go, gst1-plugins-bad, guile, jsoncpp, + libcap, libexif, libnetfilter_conntrack, libpam-tacplus, + libsigrokdecode, linux-backports, linux-firmware, mesa3d, + modem-manager, mp4v2, oniguruma, openntpd, python3, + python-lmdb, python-m2crypto, rauc, s390-tools, slirp, + stress-ng, suricata, systemd, tcpdump, tmux, tor, webkitgtk, + wireguard-linux-compat, wpewebkit, xen + + Issues resolved (http://bugs.uclibc.org): + + #13281: Raspberry Pi 2: overlays folder missing in genimage-ra.. + #13291: BR2_DL_DIR is ignored when creating defconfig + #13306: wpewebkit build problem in 2020-11-rc1 + +2020.11-rc1, released November 4th, 2020 + + Fixes all over the tree and new features. + + Architectures: Support for IBM s390x + + Toolchain: use Secure-PLT rather than BSS-PLT for PowerPC + 32. Binutils 2.35.1 added, now defaulting to 2.34. ARC + 2020.09-release toolchain. GCC 7.x dropped. RISC-V support for + uclibc-ng. Support for Bootlin external toolchains. + + SELinux support improvements: File security contexts are now + set when the file systems are created, so there is no need to + run restorecon on first boot / read only rootfs is supported. + An optimized / stripped refpolicy SELinux policy is now + used. Packages can enable additional refpolicy modules using + _SELINUX_MODULES. + + support/scripts/cve-checker: Utility script to check for known + CVEs in just the packages enabled in a Buildroot configuration + rather than all packages, by passing the output of 'make + show-info' to it. + + Go: Modules handling. The module name must be specified using + _GOMOD. + + BR2_EXTERNAL: Support for defining skeleton and init system + packages in external trees. + + meson: Correct SDK cross-compilation.conf file when + per-package builds were used to build SDK. + + systemd: Use /run rather than /var/run for PID files in units. + + Fakeroot scripts (BR2_ROOTFS_POST_FAKEROOT_SCRIPT) are now run + after all finalization hooks (including pre-rootfs) to ensure + they can override any late configuration done by packages. + + support/script/pycompile: Rework logic to ensure .pyc files + contain absolute target paths, fixing code inspection at + runtime when executed with cwd != '/'. + + support/scripts/setlocalversion: Correct Mercurial output to + match behaviour with Git. + + support/scripts/apply-patches.sh: Use patch + --no-backup-if-mismatch, so we no longer blindly have to + remove *.orig files after patching, fixing issues with + packages containing such files. + + New defconfigs: Acer chromebook elm, Friendlyarm nanopc-t4 and + nanopi-m4, Hardkernel odroid-c2, Kontron SMARC-sAL28, NXP + imx8mqevk, Orangepi RK3399 and zero+, PCengines APU2, Pine64 + rockpro64, QEMU s390x, Raxda rockpi-n8, + + New packages: altera-stapl, asn1c, babeltrace2, cukinia, + easyframes, environment-setup, frr, graphicsmagick, htpdate, + ipcalc, libbacktrace, libblockdev, libbytesize, librelp, + libuev, makedumpfile, meson-tools, mg, mrp, multipath-tools, + netcalc, odroidc2-firmware, php-xdebug, python-aiofiles, + python-ansicolors, python-boto3, python-botocore, + python-bsdiff4, python-crayons, python-iniconfig, + python-intelhex, python-ipdb, python-jmespath, + python-m2crypto, python-opcua-asyncio, python-packaging, + python-piexif, python-pluggy, python-pytest, + python-s3transfer, python-xmodem, qprint, qt5lottie, + qt5remoteobjects, re2, redir, s390-tools, sentry-cli, + sentry-native, timescaledb, tinyhttpd, uhd, uredir, watchdog, + wayland-utils, weston-imx + + Removed packages: amd-catalyst, bellagio, gqview, libcroco, + nvidia-tegra23, opencv + + Issues resolved (http://bugs.uclibc.org): + + #11811: lsblk (util-linux) should depend on libudev if available + #11931: Bugs in support/scripts/apply-patches.sh + #12301: systemd-journal-gatewayd: config options broken + #12911: usb_modeswitch installation race condition + #13236: Can't compile linux 5.4.8 (with gcc 10 on host) + #13286: The system hangs in vmware workstation on the line.. + +2020.08.3, released December 27th, 2020 + + Important / security related fixes. + + Infrastructure: + - cmake: fix host ccache handling for CMake 3.19 + - meson: Forcibly disable binary stripping for + target builds, enable for host builds + - golang: Fix HOST / TARGET directories for per-package builds + + Defconfigs: Beaglebone Qt5: Fix ti-sgx related issues + + Updated/fixed packages: apitrace, arm-trusted-firmware, + bustle, c-ares, ca-certificates, cage, cdrkit, cryptopp, + dhcpcd, docker-containerd, dtv-scan-tables, flare-engine, + ghostscript, gvfs, haproxy, imagemagick, imx-gpu-viv, jasper, + jemalloc, jpeg-turbo, libcamera, libcap, libcurl, libglib2, + libgpiod, libkrb5, libopenssl, libplist, libressl, libuv, + libuvw, lynx, mariadb, mbedtls, minidlna, mongodb, monkey, + musl, mutt, ncurses, netsnmp, netsurf, nodejs, opencv3, + openldap, openrc, opkg-utils, paho-mqtt-c, php, privoxy, + proftpd, python-crc16, python-flask-cors, python-lxml, + python-pip, python-pyparsing, python-pyqt5, qemu, qt5base, + raptor, rauc, ruby, setserial, shadowsocks-libev, slirp, + sqlcipher, thermald, ti-sgx-demos, tinycbor, unbound, vsftpd, + wireless-regdb, wireshark, wlroots, x11vnc, xen, xinetd, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13276: libcap builds libcap.pc incorrectly + #13316: beaglebone_qt5_defconfig: PowerVR fails to start + #13336: thermald-1.9.1 compilation failure with musl 1.2.1 + #13341: Mistake in /etc/init.d/S70vsftpd + #13416: dhcpcd start warning message: no such user dhcpcd + +2020.08.2, released November 16th, 2020 + + Important / security related fixes. + + Toolchain-wrapper: Pass -fno-tree-loop-distribute-patterns to + fix kernel build on microblaze with gcc 10.x when + optimizations are enabled. + + Updated/fixed packages: apparmor, argp-standalone, asterisk, + bandwidthd, binutils, bitcoin, busybox, collectd, cryptsetup, + cups-filters, darkhttpd, davfs2, docker-cli, + docker-containerd, docker-engine, dovecot-pigeonhole, + dvb-apps, elf2flt, fastd, fbset, fbtft, freetype, gcc, + ghostscript, grpc, gst1-plugins-bad, jsoncpp, + kernel-module-imx-gpu-viv, keepalived, kmscube, libass, + libexif, libiqrf, libnetfilter_conntrack, libpam-tacplus, + libraw, linux-backports, linux-firmware, lzlib, mp4v2, + netsnmp, nginx, numactl, oniguruma, opencv3, openntpd, + patchelf, php, pistache, postgresql, python-pyqt5, qemu, + qt5base, rauc, redis, samba4, slirp, systemd, tcpdump, + tinyproxy, tmux, tor, waf, webkitgtk, wine, + wireguard-linux-compat, wireshark, wpewebkit, xen, xorriso, + xvisor, zeromq, zxing-cpp + + Issues resolved (http://bugs.uclibc.org): + + #11931: Bugs in support/scripts/apply-patches.sh + +2020.08.1, released October 12th, 2020 + + Important / security related fixes. + + Fixes for various compilation issues with GCC 10.x. + + meson: Correct SDK cross-compilation.conf file when + per-package builds were used to build SDK. + + systemd: Use /run rather than /var/run for PID files in units. + + Toolchain: use Secure-PLT rather than BSS-PLT for PowerPC 32. + + Fakeroot scripts (BR2_ROOTFS_POST_FAKEROOT_SCRIPT) are now run + after all finalization hooks (including pre-rootfs) to ensure + they can override any late configuration done by packages. + + support/script/pycompile: Rework logic to ensure .pyc files + contain absolute target paths, fixing code inspection at + runtime when executed with cwd != '/'. + + support/scripts/setlocalversion: Correct Mercurial output to + match behaviour with Git. + + support/scripts/apply-patches.sh: Use patch + --no-backup-if-mismatch, so we no longer blindly have to + remove *.orig files after patching, fixing issues with + packages containing such files. + + fs/jffs2: Now correctly handles xattrs + + Updated/fixed packages: acpica, afboot-stm32, alsa-utils, + apparmor, bandwidthd, barebox, bash, bison, brotli, + cifs-utils, cups, dhcpcd, dhcpdump, docker-cli, docker-engine, + ecryptfs-utils, efl, fail2ban, fbterm, ffmpeg, fontconfig, + freetype, gcc, gdb, ghostscript, gnupg2, gnutls, go, gqview, + gst1-plugins-base, gst1-plugins-ugly, ipmitool, jbig2dec, + kexec, lcdproc, libcamera, libhtp, libnetconf2, libraw, + libssh, libxml2, libxml-parser-perl, libzip, linux-headers, + live555, localedef, ltp-testsuite, lua, matchbox, memcached, + memtester, mesa3d, meson, minidlna, mongodb, mongrel2, motion, + mraa, mtd, musepack, neardal, netatalk, netperf, netsniff-ng, + nginx, nodejs, nss-pam-ldapd, open-plc-utils, openswan, + opentyrian, openvmtools, php, postgresql, python, + python-aenum, python-cycler, python-engineio, python-fire, + python-pymodbus, python-scapy, python-semver, + python-sentry-sdk, python-socketio, python-texttable, + python-tinyrpc, python-txtorcon, python3, qt5base, quagga, + read-edid, redis, rsh-redone, runc, samba4, socketcand, + strace, supertux, suricata, systemd, ti-utils, trinity, + uclibc, usb_modeswitch, vlc, vsftpd, wampcc, + wayland-protocols, wireguard-linux-compat, wireshark, wlroots, + wolfssl, w_scan, xerces, xfsprogs, xdriver-xf86-video-ati, + xserver_xorg-server, ympd, zeromq, zlib-ng, zstd + + Issues resolved (http://bugs.uclibc.org): + + #12911: usb_modeswitch installation race condition + #13236: Can't compile linux 5.4.8 (with gcc 10 on host) + +2020.08, released September 1st, 2020 + + Various fixes. + + Updated/fixed packages: am33x-cm3, avahi, bluez-tools, + busybox, chocolate-doom, collectd, dhcp, docker-cli, domoticz, + gobject-introspection, graphite2, haproxy, ibm-sw-tpm2, + imagemagick, libeXosip2, libressl, lxc, mbedtls, menu-cache, + mongodb, mosquitto, nvidia-driver, paho-mqtt-c, pixz, + postgresql, python-django, rtty, squid, stress-ng, systemd, + trousers, uclibc, wireshark, wolfssl, zbar + +2020.08-rc3, released August 28th, 2020 + + Fixes all over the tree. + + Infrastructure: Ensure RPATH entries that may be needed for + dlopen() are not dropped by patchelf. + + Toolchain: Drop old GCC 6 based external Sourcery AMD64 + toolchain. + + Updated/fixed packages: assimp, davfs2, dillo, glibc, + gnuradio, hostapd, ibm-sw-tpm2, ipmitool, json-c, libroxml, + linux, mender, netopeer2, openal, openjpeg, python-matplotlib, + ripgrep, shadowsocks-libev, trousers, xlib_libX11, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13141: Target-finalize fail with "depmod: ERROR: Bad version passed" + +2020.08-rc2, released August 24th, 2020 + + Fixes all over the tree, including a number of fixes for + compilation with GCC-10. + + Toolchain: Disallow building uClibc-ng for RISC-V 64-bit, + because of issues with a missing __riscv_flush_icache() + implementation. + + Defconfigs: CI20: Use mainline Linux and U-boot. Update + Microchip sama5d27_wlsom1_ek_mmc_dev to use bluez5-utils + instead of (the removed) legacy bluez-utils + + Updated/fixed packages: 18xx-ti-utils, aircrack-ng, apache, + atest, bandwidthd, bellagio, bind, bird, bluez-alsa, boost, + c-periphery, capnproto, chrony, collectd, cpio, cvs, + dieharder, domoticz, dovecot, dovecot-pigeonhole, drbd-utils, + dump1090, efl, elixir, f2fs-tools, feh, fluidsynth, fping, + gdbm, gdk-pixbuf, ghostscript, gst1-plugins-bad, + gstreamer1-editing-services, htop, ibm-sw-tpm2, ifplugd, + iftop, igd2-for-linux, ima-evm-utils, iprutils, iputils, + keepalived, kmsxx, libabseil-cpp, libcamera, libcurl, + libfuse3, libnss, librtlsdr, libubox, libunwind, live555, + lttng-tools, luabitop, mender-artifact, minizip, + mjpg-streamer, mpd, mpv, mtd, ncftp, open-lldp, openal, + opencv, opencv3, openfpgaloader, optee-os, owfs, php, + pistache, prosody, pulseview, python-decorator, + python-gunicorn, python-rpi-gpio, python-spidev, + python3-decorator, python3-mako, python3-pyselftools, qt5, + qt5webengine, rauc, redis, ripgrep, rtl8188eu, rtl8821au, + setools, smstools3, supertux, tftpd, tpm2-abrmd, + wpa_supplicant, xen, xlib_libX11, xserver_xorg-server + + New packages: python3-cython, python3-pycryptodomex + + Issues resolved (http://bugs.uclibc.org): + + #12876: nodejs fails to build when host-icu has been built before + #13111: python-gunicorn: missing dependency on python-setuptools + #13121: wpa_supplicant fails to build without libopenssl enabled + #13146: raspberrypi3_defconfig: "Inappropriate ioctl for device".. + #13156: package live555 new license + #13166: python-rpi-gpio: does not work against aarch64, unint.. + +2020.08-rc1, released August 6th, 2020 + + Toolchain: + + - GCC 10.x added, GCC 9.x is the default + - binutils 2.34 added, binutils 2.33 is the default, binutils + 2.31 removed + - glibc updated to 2.31 + - ARC toolchain components updated to 2020.03-release. + - Enable uClibc-ng usage for RISC-V 64-bit + + Infrastructure: + + - qmake-package was fixed to be compatible with + BR2_PER_PACKAGE_DIRECTORIES + - complete rewrite of the Gitlab CI Yaml configuration file, + now generated directly by the Gitlab CI pipeline itselfs + + Misc: + + - cargo and cargo-bin packages removed, as cargo is now part + of Rust itself + + Filesystem: ubinize configuration files can now use + BINARIES_DIR to refer to the $(O)/images directory. + + New packages: bitwise, earlyoom, fuse-overlayfs, gloox, + kodi-pvr-octonet, kodi-pvr-zattoo, libabseil-cpp, libcutl, + libnids, libnpupnp, libodb, libodb-boost, libodb-mysql, + libodb-pgsql, mbpfan, netopeer2, odb, parprouted, + python-colorzero, python-gpiozero, python-pybind, python-yatl, + python3-decorator, qt5quicktimeline, resiprocate, ttyd, + unclutter-xfixes, urandom-scripts, + + New defconfigs: bananapi_m2_zero, freescale_imx8mnevk, + globalscale_espressobin, imx6ullevk, + microchip_sama5d27_wlsom1_ek, rock_pi_4, rock_pi_n10 + + Removed packages: cargo, cargo-bin, + kodi-peripheral-steamcontroller + + Issues resolved (http://bugs.uclibc.org): + + #12941: Python GObject fails to build when using BR2_PER_PACKAGE_DIRECTORIES + #12946: Grub: Decompressor is too big. + #12986: Mtools: Error converting to codepage 850 + #13001: openjdk-bin replaces libfreetype.so from host-freetype + #13011: Incorrect selection of gcc version + #13021: Minor code error when building granite-0.4.1 + #13026: rpi-firmware: must not rename start files + #13046: Optimize for fast -Ofast is not compliant + #13081: host-e2fsprogs attempts to create udev rules.d on build host if not exists + #13101: BR audit2allow support + +2020.05.3, released October 12th, 2020 + + Important / security related fixes. + + meson: Correct SDK cross-compilation.conf file when + per-package builds were used to build SDK. + + systemd: Use /run rather than /var/run for PID files in units. + + Toolchain: use Secure-PLT rather than BSS-PLT for PowerPC 32. + + Fakeroot scripts (BR2_ROOTFS_POST_FAKEROOT_SCRIPT) are now run + after all finalization hooks (including pre-rootfs) to ensure + they can override any late configuration done by packages. + + support/script/pycompile: Rework logic to ensure .pyc files + contain absolute target paths, fixing code inspection at + runtime when executed with cwd != '/'. + + support/scripts/setlocalversion: Correct Mercurial output to + match behaviour with Git. + + support/scripts/apply-patches.sh: Use patch + --no-backup-if-mismatch, so we no longer blindly have to + remove *.orig files after patching, fixing issues with + packages containing such files. + + Updated/fixed packages: alsa-utils, apparmor, avahi, + bandwidthd, barebox, bash, bison, brotli, busybox, cifs-utils, + cryptsetup, cups, dhcpcd, dhcpdump, docker-cli, docker-engine, + ecryptfs-utils, efl, fail2ban, freetype, gcc, gdb, + ghostscript, gnutls, go, graphite2, gst1-plugins-base, + gst1-plugins-ugly, imagemagick, ipmitool, jbig2dec, libhtp, + libraw, libssh, libxml2, libxml-parser-perl, linux-headers, + localedef, lua, mbedtls, memcached, mesa3d, meson, minidlna, + mongodb, nginx, nodejs, nss-pam-ldapd, openvmtools, + paho-mqtt-c, php, postgresql, python, python-aenum, + python-django, python-engineio, python-fire, python-pymodbus, + python-scapy, python-semver, python-sentry-sdk, + python-socketio, python-texttable, python-tinyrpc, + python-txtorcon, python3, qt5base, rsh-redone, runc, samba4, + strace, supertux, suricata, systemd, uclibc, usb_modeswitch, + vlc, vsftpd, wayland-protocols, wireguard-linux-compat, + wireshark, wlroots, wolfssl, xserver_xorg-server, ympd, + zeromq, zstd + + Issues resolved (http://bugs.uclibc.org): + + #12911: usb_modeswitch installation race condition + #13251: cryptsetup does not work on branch 2020.02 following.. + +2020.05.2, released August 29th, 2020 + + Important / security related fixes. + + Infrastructure: Ensure RPATH entries that may be needed for + dlopen() are not dropped by patchelf. + + BR_VERSION_FULL/setlocalversion (used by make print-version + and /etc/os-release): Properly handle local git tags + + Updated/fixed packages: apache, assimp, at91bootstrap3, bind, + boost, busybox, capnproto, cegui, chrony, collectd, cpio, + cryptsetup, cups, cvs, dbus, docker-engine, domoticz, dovecot, + dovecot-pigeonhole, dropbear, efl, elixir, f2fs-tools, ffmpeg, + gd, gdk-pixbuf, ghostscript, glibc, gnuradio, grub2, + gst1-plugins-bad, gstreamer1-editing-services, hostapd, + ibm-sw-tpm2, iputils, jasper, json-c, libcurl, libressl, + libwebsockets, linux, live555, mesa3d, mongodb, mosquitto, + mpv, nodejs, opencv, opencv3, openfpgaloader, openjpeg, + patchelf, perl, php, postgresql, prosody, python-django, + python-gunicorn, python-matplotlib, ripgrep, rtl8188eu, + rtl8821au, ruby, shadowsocks-libev, squid, systemd, + tpm2-abrmd, tpm2-tools, trousers, uboot, webkitgtk, wireshark, + wolfssl, wpa_supplicant, wpewebkit, xen, xlib_libX11, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #12876: nodejs fails to build when host-icu has been built before + #13111: python-gunicorn: missing dependency on python-setuptools + #13121: wpa_supplicant fails to build without libopenssl enabled + #13141: Target-finalize fail with "depmod: ERROR: Bad version passed" + #13156: package live555 new license + +2020.05.1, released July 25th, 2020 + + Important / security related fixes. + + Toolchain: + - Make external toolchain version check also work for + toolchains configured with --with-gcc-major-version-only + + - Do not handle SOURCE_DATE_EPOCH in toolchain wrapper if the + compiler supports it, fixing an issue with precompiled + headers + + - Ensure debug libs from external toolchains are not installed + into target if debugging is disabled + + Download: + - Correct reproducibility issue in handling of git submodules + for older git versions. + + - Fix file locking over NFS + + fs: Ensure cpio archive element order is reproducible + + Br2-external: Fix error reporting for invalid br2-external trees + + Per-package: + - Fix an issue with python3 sysconfig data not getting + correctly expanded + + - Fix per-package building for packages using the qmake + infrastructure + + Updated/fixed packages: a10disp, asterisk, bind, brltty, + cdrkit, clamav, cryptodev-linux, dbus, docker-cli, + docker-engine, dvb-apps, e2fsprogs, exim, exiv2, freerdp, gdb, + gdk-pixbuf, gerbera, gnutls, go, granite, grub2, gssdp, + gst1-plugins-good, gst1-plugins-ugly, gupnp, intel-microcode, + iproute2, irrlicht, iwd, jq, kodi, libcamera, libcec, + libconfuse, libcurl, libevdev, libhttpserver, libmicrohttpd, + libnss, libressl, libvncserver, libxml2, libxmlrpc, lxc, + mbedtls, mediastreamer, mesa3d, meson, minizip, mongodb, + mtools, mutt, nano, network-manager, nghttp2, ngircd, nodejs, + ntp, open-plc-utils, open2300, openjdk-bin, openssh, + oracle-mysql, paho-mqtt-c, pango, php, poco, prosody, putty, + python-greenlet, python-urllib3, python-validators, python3, + readline, redis, rpi-firmware, rtl8821au, samba4, sdl2, + sqlite, squid, strace, sunxi-mali-mainline-driver, syslog-ng, + systemd, tcpreplay, tinydtls, upmpdcli, upx, vlc, webkitgtk, + wireguard-linux-compat, wireshark, wpebackend-fdo, wpewebkit, + x11vnc, znc, zstd + + Issues resolved (http://bugs.uclibc.org): + + #12941: Python GObject fails to build when using BR2_PER_PACKAGE_.. + #12946: Grub: Decompressor is too big. + #12986: Mtools: Error converting to codepage 850 + #13001: openjdk-bin replaces libfreetype.so from host-freetype + #13011: Incorrect selection of gcc version + #13021: Minor code error when building granite-0.4.1 + #13026: rpi-firmware: must not rename start files + #13031: nodejs: RangeError at new ArrayBuffer() + #13046: Optimize for fast -Ofast is not compliant + +2020.05, released June 1st, 2020 + + Various fixes. + + Updated/fixed packages: arm-trusted-firmware, gcc, mp4v2, fmc, + fmlib, glib-networking, libusb-compat, linux, qt5webengine, + sysrepo, wampcc, xen + +2020.05-rc3, released May 29th, 2020 + + Fixes all over the tree. + + Infrastructure: Support checking download hashes for packages + coming from Subversion. + + Defconfigs: Increase boot partition size to 64MB for Freescale + boards to allow space for bigger kernels. + + Updated/fixed packages: audit, bind, dovecot, efl, erlang, + ffmpeg, fio, gerbera, gnupg, leveldb, lrzip, ltrace, matio, + mesa3d, mp4v2, prosody, qemu, qt5declarative, speexdsp, + systemd, tremor, uboot-tools, unbound, wireshark + + Removed packages: wiringpi + + Issues resolved (http://bugs.uclibc.org): + + #12361: Init system (systemd) kills login on Raspberry Pi Zero + #12686: recipe for target 'install_dev' failed (libcrypto.so..) + +2020.05-rc2, released May 22nd 2020 + + Fixes all over the tree. + + U-Boot: Support building with Python 3.x instead of Python + 2.x. Since U-Boot 2020.01, various U-Boot build scripts use + Python 3.x instead of Python 2.x, so add an option to pull in + host-python3 rather than host-python. Also fix a number of + defconfigs to use this new option. + + Updated/fixed packages: apparmor, binutils, bison, brltty, + c-icap, cegui, checkpolicy, clamav, crda, cvs, docker-cli, + docker-engine, domoticz, elf2flt, exfatprogs, fakeroot, + ffmpeg, freerdp, gcc, glibc, gnuconfig, irrlicht, kmod, + libexif, libpam-tacplus, libssh2, libv4l, libvncserver, + localedef, lrzip, mariadb, matchbox, mbuffer, mesa3d, + mesa3d-headers, meson, netsniff-ng, openldap, openocd, + optee-os, p7zip, paho-mqtt-c, php, piglit, pigz, + python-argon2-cffi, python-attrs, python-future, + python-markdown, python-pycryptodomex, python-pyqt5, qt5base, + rpi-firmware, rustc, squashfs, squid, stella, suricata, + systemd, uacme, uclibc, util-linux, vboot-utils + + New packages: python3-pyelftools + + Removed packages: ezxml, mtdev2tuio, python-pycrypto + + Issues resolved (http://bugs.uclibc.org): + + #10551: PowerPC SPE and Musl + #12256: package tar is outdated (1.29 is 3 years old) + #12271: python-iptables runtime dependencies + #12321: host-generic-package: PKG_DL_OPTS not used for host package + #12391: CMake-based host package fails to include output/host/include + #12431: ethernet no detected on nanopi neo 2 + #12521: RISCV RV32IA selected, RV64GC output + #12586: avahi failure + #12596: host-e2fsprogs: tune2fs incompatibility on older glibc.. + #12611: ntp hash is not matching with upstream 4.2.8p13 + #12626: PHP missing header files within 2020.02 + #12631: glibc support Power-PC SPE + #12656: bison fails to relocate with relocate-sdk.sh + #12661: cups problems in buildroot + #12686: recipe for target 'install_dev' failed (libcrypto.so:.. + #12691: host-rust build fails + #12761: Buildroot fails when building GCNano binaries for the STM.. + #12786: Systemd spawns two getty processes when the getty port.. + #12806: There are multiple issues in buildroot that faults cups.. + #12826: nodejs-12.16.1: error: 'uv_sleep' was not declared in.. + #12831: RPI-firmware package: DTB-overlay dependency + #12836: libunwind: package does not show up in menuconfig for.. + #12841: util-linux/sfdisk 2.35.1 fails on sector-size header + #12866: should we be disabling bash executable path caching? + #12886: GMP built in wrong order (?) + #12891: QEMU, libvirt-bin, qemu-kvm Package Support required + #12901: GStreamer doesn't build on 2020-05 rc1 with GObject.. + #12906: qt PrefixPath is wrong on 2020.05-rc1 + #12921: nodejs-12.16.1: error: overriding 'virtual icu_65::.. + +2020.05-rc1, released May 7th 2020 + + Addition of support for gobject-introspection: both the + gobject-introspection package itself, but also introspection + support was enabled in a number of other packages. + + Support for Qt 5.6 was dropped as its support was dropped + upstream, only one version of Qt is supported at the moment: + Qt 5.14.2. + + Addition of support for the apparmor Linux security module, by + adding the necessary user-space packages. + + Addition of a qmake package infrastructure, now used by most + Qt-related packages. + + The Luarocks package infrastructure has been extended to + support build host packages. + + The package infrastructure was improved to allow each package + to indicate the Linux kernel configuration options it needs. + + Addition of support for generating filesystem images using the + EROFS filesystem. + + The logic that calculates the list of files installed by each + package was reworked to be compatible with the top-level + parallel build functionality. + + Addition of a package for a pre-compiled ARM32 bare-metal + toolchain, which can be used to build ARM32 code in ARM64 + configurations, such as firmware/bootloader code. + + The Qemu defconfigs are now boot-tested in Qemu as part of the + Gitlab continuous integration. + + Toolchain: gcc 9.x bumped to 9.3.0, gcc 8.x bumped to 8.4.0, + gdb bumped to 8.3.1. + + New packages: apcupsd, apparmor, arm-gnu-a-toolchain, bearssl, + belle-sip, belr, cage, chartjs, erofs-utils, exfatprogs, + gobject-introspection, ibm-sw-tpm2, imx-seco, jbig2dec, + libapparmor, libiberty, libfuse3, libtextstyle, libudfread, + libuhttpd, libuwsc, lua-lyaml, matio, mbuffer, netdata, + openfpgaloader, perl-i18n, perl-locale-maketext-lexicon, + perl-lwp-protocol-https, + perl-mojolicious-plugin-authorization, + perl-mojolicious-plugin-cspheader, + perl-mojolicious-plugin-i18n, + perl-mojolicious-plugin-securityheader, perl-mozilla-ca, + perl-path-class, pistache, pkcs11-helper, prelink-cross, + python-argon2-cffi, python-canopen, python-cbor2, + python-filelock, python-flatbuffers, python-greenlet, + python-modbus-tk, python-pyalsa, python-pysftp, python-regex, + python-snappy, rtty, tinyproxy, udev-gentoo-scripts, unbound, + vuejs, wlroots. + + New defconfigs: freescale_imx6ullevk, freescale_imx8qmmek, + nanopi_neo4, nanopi_r1, nitrogen8mm, nitrogen8mn, olpc_xo1, + olpc_xo175, roc_rk3399_pc, stm32mp157a_dk1, zynq_qmtech + + Issues resolved (http://bugs.uclibc.org): + + #10386: Add an option to put all compiled executables that + show up on target/ in staging/ as well + #11866: iniramfs file system fails to boot using Grub on EFI x86_64 + #12666: Doesn't pick up a custom bash profile + #12696: Uboot 2020.01 Problem loading Linux kernel on Nano PI NEO + #12701: [patch] wpa_supplicant must depend on openssl + #12711: host-localedef 2.30-20 fails to compile on fedora 32 (gcc 10.0.1) + #12716: bio.h not found + #12726: systemctl preset-all failed for ctrl-alt-del.target + #12731: rtl8188eu not buildung for banana pi M1 (glib, systemd, 4.18.12) + #12746: "sysdig" package description points to + http://sysdig.org, which bounces to malware site + #12751: OpenJdk package installation issues on target + #12796: Update OpenSSL to Version 1.1.1g to patch CVE-2020-1967 + #12811: bootstrap stuck and no login prompt + +2020.02.12, released April 5, 2021 + + Important / security related fixes. + + Dependencies: Explicitly detect and bail out if PATH contains + spaces or tabs. A number of packages fail to build in such + setups, so explicitly inform about this. + + utils/scanpypi: Explicitly use python3 for compatibility with + packages using python3 syntax in setup.py + + support/download: Fix tarball generation (from git/svn repos) + including symlinks pointing to ./ + + Meson: Use correct C++ host compiler (rather than C compiler) + + Updated/fixed packages: asterisk, batman-adv, bind, + ca-certificates, docker-containerd, dovecot, + dovecot-pigeonhole, diffutils, efivar, git, gnuchess, gnutls, + grub2, fakeroot, haserl, imagemagick, irqbalance, jasper, + kodi, libcurl, libebml, libglib2, libjpeg, libopenssl, + libupnp, libvips, lldpd, mariadb, mbedtls, mosquitto, nodejs, + netsnmp, nettle, openldap, openmpi, openssh, opkg-utils, perl, + php, privoxy, prosody, protobuf, python-aiohttp, + python-django, python-lxml, python-pyyaml, python-rpi-ws281x, + python3, redis, rpm, sconeserver, screen, sox, sqlcipher, + squid, sysvinit, tor, transmission, tzdata, uboot, upx, + util-linux, wireshark, wolfssl, wpa_supplicant, zstd + + Issues resolved (http://bugs.uclibc.org): + + #13516: utils/scanpypi: Failure when parsing diffoscope + #13541: 2021.02.rc2: irqbalance: Daemon couldn't be bound to.. + #13576: Issues compiling buildroot for 5x86 + #13581: jpegsrc.v9d.tar.gz has changed hash + #13616: tar file from git repository generation issue + +2020.02.11, released February 17, 2021 + + Important / security related fixes. + + meson: Fix ccache detection handling when per-package builds + are used. + + Fakeroot: Fix compatibility issue with glibc 2.33 + + Updated/fixed packages: atftp, busybox, cereal, connman, + dhcpcd, dnsmasq, docker-cli, docker-engine, fakeroot, + intel-mediadriver, intel-microcode, jasper, + kodi-inputstream-adaptive, libbsd, libopenssl, linux-headers, + mosquitto, orc, php, postgresql, privoxy, pugixml, + python-bottle, python-django, python3, rauc, sox, subversion, + tzdata, wireguard-linux-compat, wpa_supplicant, xenomai, xterm + + Issues resolved (http://bugs.uclibc.org): + + #13506: BR2_PACKAGE_DHCPCD missing directory creation + +2020.02.10, released January 31st, 2021 + + Important / security related fixes. + + Download: Ensure git submodules are correctly fetched if + enabled for a package with _GIT_SUBMODULES = YES and the + host variant is downloaded first. + + Toolchain: Mark CodeSourcery Aarch64 2014.11 toolchain as not + having libatomic. + + pkg-stats: Fix python 3.8+ deprecation warning. + + meson: Ensure ccache is not detected and used, as it may + conflict with the ccache handling in Buildroot. + + New packages: libnpupnp + + Updated/fixed packages: bctoolbox, brltty, dbus, dovecot, + dovecot-pigeonhole, gcc, gerbera, gmrender-resurrect, gst-omx, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-rtsp-server, gst1-vaapi, + gst1-validate, gstreamer1, gstreamer1-editing-services, + igd2-for-linux, libclc, libllcp, libtorrent-rasterbar, + libupnp, libupnpp, lpc32xxcdl, luarocks, mpd, nfs-utils, + nodejs, openjpeg, openldap, opentracing-cpp, openvpn, p11-kit, + paho-mqtt-c, php, poppler, postgresql, python3, runc, sudo, + syslog-ng, systemd, tini, trace-cmd, tzdata, ushare, vlc, + wavpack, wireguard-linux-compat, wolfssl, xapp_xload, xorriso, + zic + + Removed packages: libupnp18 + + Issues resolved (http://bugs.uclibc.org): + + #13471: package/mpd/mpd.conf make use of path not created + +2020.02.9, released December 27th, 2020 + + Important / security related fixes. + + Infrastructure: + - cmake: fix host ccache handling for CMake 3.19 + - meson: Forcibly disable binary stripping for + target builds, enable for host builds + - golang: Fix HOST / TARGET directories for per-package builds + + Defconfigs: Beaglebone Qt5: Fix ti-sgx related issues + + Updated/fixed packages: apitrace, arm-trusted-firmware, + bustle, c-ares, ca-certificates, cdrkit, cryptopp, dhcpcd, + docker-containerd, dtv-scan-tables, flare-engine, ghostscript, + haproxy, imagemagick, imx-gpu-viv, jasper, jemalloc, + jpeg-turbo, libcap, libcurl, libglib2, libgpiod, libkrb5, + libopenssl, libplist, libressl, libuv, libuvw, lynx, mariadb, + mbedtls, minidlna, monkey, musl, mutt, ncurses, netsnmp, + nodejs, opencv3, openldap, openrc, opkg-utils, paho-mqtt-c, + php, privoxy, proftpd, python-crc16, python-flask-cors, + python-lxml, python-pip, python-pyparsing, python-pyqt5, qemu, + qt5base, raptor, rauc, ruby, setserial, shadowsocks-libev, + slirp, sqlcipher, ti-sgx-demos, tinycbor, vsftpd, + wireless-regdb, wireshark, x11vnc, xen, xinetd, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13276: libcap builds libcap.pc incorrectly + #13316: beaglebone_qt5_defconfig: PowerVR fails to start + #13341: Mistake in /etc/init.d/S70vsftpd + +2020.02.8, released November 16th, 2020 + + Important / security related fixes. + + Updated/fixed packages: angularjs, argp-standalone, asterisk, + bandwidthd, bitcoin, busybox, cryptsetup, darkhttpd, davfs2, + docker-cli, docker-containerd, docker-engine, + dovecot-pigeonhole, fastd, fbset, fbtft, freetype, gcc, + ghostscript, gnuradio, grpc, gst1-plugins-bad, jsoncpp, + keepalived, libass, libexif, libiqrf, libpam-tacplus, libraw, + linux-backports, linux-firmware, lzlib, netsnmp, nginx, + oniguruma, opencv3, openntpd, patchelf, php, postgresql, + python-pyqt5, qt5base, rauc, redis, samba4, slirp, systemd, + tcpdump, tmux, tor, webkitgtk, wireguard-linux-compat, + wireshark, wpewebkit, xen, xorriso, zeromq, zxing-cpp + + Issues resolved (http://bugs.uclibc.org): + + #11931: Bugs in support/scripts/apply-patches.sh + +2020.02.7, released October 12th, 2020 + + Important / security related fixes. + + meson: Correct SDK cross-compilation.conf file when + per-package builds were used to build SDK. + + systemd: Use /run rather than /var/run for PID files in units. + + Toolchain: use Secure-PLT rather than BSS-PLT for PowerPC 32. + + support/script/pycompile: Rework logic to ensure .pyc files + contain absolute target paths, fixing code inspection at + runtime when executed with cwd != '/'. + + support/scripts/setlocalversion: Correct Mercurial output to + match behaviour with Git. + + support/scripts/apply-patches.sh: Use patch + --no-backup-if-mismatch, so we no longer blindly have to + remove *.orig files after patching, fixing issues with + packages containing such files. + + Updated/fixed packages: bandwidthd, barebox, bash, bison, + brotli, cifs-utils, cryptsetup, dhcpcd, dhcpdump, docker-cli, + docker-engine, ecryptfs-utils, efl, fail2ban, freetype, gcc, + gdb, ghostscript, gnutls, go, gst1-plugins-base, + gst1-plugins-ugly, ipmitool, libhtp, libraw, libssh, libxml2, + libxml-parser-perl, localedef, lua, memcached, mesa3d, meson, + minidlna, nginx, nodejs, nss-pam-ldapd, openvmtools, php, + postgresql, python, python-aenum, python-autobahn, + python-engineio, python-fire, python-pymodbus, python-scapy, + python-semver, python-sentry-sdk, python-socketio, + python-texttable, python-tinyrpc, python-txtorcon, python3, + qt5base, runc, samba4, strace, supertux, suricata, systemd, + vlc, wayland-protocols, wireguard-linux-compat, wireshark, + xserver_xorg-server, zeromq, zstd + + Issues resolved (http://bugs.uclibc.org): + + #12911: usb_modeswitch installation race condition + #13251: cryptsetup does not work on branch 2020.02 following.. + +2020.02.6, released September 5th, 2020 + + Important / security related fixes. + + Fix a 2020.02.5 build regression in busybox when systemd (and + not less) are enabled because of missing infrastructure. + + Updated/fixed packages: alsa-utils, avahi, busybox, cups, + docker-cli, graphite2, imagemagick, libeXosip2, mbedtls, + nvidia-driver, paho-mqtt-c, python-django, systemd, uclibc, + usb_modeswitch, wolfssl + + Issues resolved (http://bugs.uclibc.org): + + #12911: usb_modeswitch installation race condition + +2020.02.5, released August 29th, 2020 + + Important / security related fixes. + + Infrastructure: Ensure RPATH entries that may be needed for + dlopen() are not dropped by patchelf. + + BR_VERSION_FULL/setlocalversion (used by make print-version + and /etc/os-release): Properly handle local git tags + + Updated/fixed packages: apache, at91bootstrap3, bind, boost, + busybox, capnproto, chrony, collectd, cpio, cryptsetup, cups, + cvs, dbus, docker-engine, domoticz, dovecot, + dovecot-pigeonhole, dropbear, efl, elixir, f2fs-tools, ffmpeg, + gd, gdk-pixbuf, ghostscript, glibc, grub2, gst1-plugins-bad, + hostapd, iputils, jasper, json-c, libcurl, libwebsockets, + linux, live555, mesa3d, mosquitto, mpv, nodejs, opencv, + opencv3, openjpeg, patchelf, perl, php, postgresql, + python-django, python-gunicorn, python-matplotlib, ripgrep, + rtl8188eu, rtl8821au, ruby, shadowsocks-libev, squid, + tpm2-abrmd, tpm2-tools, trousers, uacme, webkitgtk, wireshark, + wolfssl, wpa_supplicant, wpewebkit, xen, xlib_libX11, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #12876: nodejs fails to build when host-icu has been built before + #13111: python-gunicorn: missing dependency on python-setuptools + #13121: wpa_supplicant fails to build without libopenssl enabled + #13141: Target-finalize fail with "depmod: ERROR: Bad version passed" + #13156: package live555 new license + +2020.02.4, released July 26th, 2020 + + Important / security related fixes. + + Toolchain: + - Make external toolchain version check also work for + toolchains configured with --with-gcc-major-version-only + + - Do not handle SOURCE_DATE_EPOCH in toolchain wrapper if the + compiler supports it, fixing an issue with precompiled + headers + + - Ensure debug libs from external toolchains are not installed + into target if debugging is disabled + + Download: + - Correct reproducibility issue in handling of git submodules + for older git versions. + + - Fix file locking over NFS + + fs: Ensure cpio archive element order is reproducible + + Br2-external: Fix error reporting for invalid br2-external trees + + Per-package: + - Fix an issue with python3 sysconfig data not getting + correctly expanded + + - Fix per-package building for packages using the qmake + infrastructure + + Updated/fixed packages: a10disp, asterisk, bind, cdrkit, + checkpolicy, clamav, dbus, docker-cli, docker-engine, + dvb-apps, e2fsprogs, exim, exiv2, freerdp, gnutls, go, grub2, + gssdp, gst1-plugins-good, gst1-plugins-ugly, gupnp, + intel-microcode, iproute2, irrlicht, iwd, jq, kodi, libcamera, + libconfuse, libcurl, libglib2, libhttpserver, libmicrohttpd, + libopenssl, libvncserver, libxml2, libxmlrpc, lxc, mbedtls, + mesa3d, meson, mongodb, mtools, mutt, nghttp2, ngircd, nodejs, + ntp, open-plc-utils, open2300, openjdk-bin, openssh, + oracle-mysql, paho-mqtt-c, pcre, php, poco, prosody, putty, + python-twisted, python-urllib3, python-validators, python3, + qt5xmlpatterns, redis, rpi-firmware, rtl8821au, samba4, sdl2, + sqlite, squid, syslog-ng, systemd, tcpreplay, tinydtls, + upmpdcli, upx, vlc, webkitgtk, wireguard-linux-compat, + wireshark, wpebackend-fdo, wpewebkit, zstd + + Issues resolved (http://bugs.uclibc.org): + + #12941: Python GObject fails to build when using BR2_PER_PACKAGE_.. + #12946: Grub: Decompressor is too big. + #12986: Mtools: Error converting to codepage 850 + #13001: openjdk-bin replaces libfreetype.so from host-freetype + #13011: Incorrect selection of gcc version + #13026: rpi-firmware: must not rename start files + #13031: nodejs: RangeError at new ArrayBuffer() + #13046: Optimize for fast -Ofast is not compliant + +2020.02.3, released June 3rd, 2020 + + Important / security related fixes. + + Fix various build issues of host packages on hosts using GCC + 10. + + Updated/fixed packages: arm-trusted-firmware, audit, bind, + binutils, bison, clamav, crda, dovecot, dtc, efl, elf2flt, + erlang, fakeroot, ffmpeg, fmc, fmlib, freerdp, gcc, git, + glib-networking, gnupg, leveldb, libexif, libssh2, + libusb-compat, linux-headers, lrzip, ltrace, mariadb, mesa3d, + mp4v2, openldap, openocd, perl, php, prosody, + python-pycryptodomex, python-pyqt5, qemu, rpi-firmware, rustc, + speexdsp, sysrepo, systemd, tremor, vboot-utils, wireshark, + xen + + Removed packages: python-pycrypto + + Issues resolved (http://bugs.uclibc.org): + + #12361: Init system (systemd) kills login on Raspberry Pi Zero + #12656: bison fails to relocate with relocate-sdk.sh + #12671: leveldb won't detect that snappy is present (static.. + #12691: host-rust build fails + #12831: RPI-firmware package: DTB-overlay dependency + +2020.02.2, released May 12th, 2020 + + Important / security related fixes. + + Musl: Disallow on PPC64 cores without AltiVec support + (E.G. e5500). + + fs/cpio: Correctly handle booting with 'console=' + + release: Ensure temporary .br2-external.* files are not + included in the release tarball + + Defconfigs: Fix various mistyped config options, or config + options where the dependencies were no longer met. + + Updated/fixed packages: apache, azure-iot-sdk-c, binutils, + boinc, c-ares, cvs, docker-cli, docker-containerd, + docker-engine, domoticz, e2fsprogs, efl, evtest, exim, ffmpeg, + freerdp, gcc, gflags, glibc, gnuconfig, haproxy, imx-gpu-2d, + irrlicht, jpeg kodi-pvr-vuplus, libarchive, libcoap, + libfpm-extra, libglib2, libhtp, libid3tag, libinput, libmad, + libopenssl, libsepol, libssh, libv4l, libvncserver, libwpe, + localedef, mariadb, matchbox, mbedtls, mc, mesa3d-headers, + meson, midori, msgpack, netsnmp, nginx, ogre, openjdk, + openldap, openvpn, p7zip, paho-mqtt-c, php, polkit, python, + python-attrs, python-crossbar, python-dpkt, python-flask, + python-future, python-iptables, python-jedi, python-markdown2, + python3, qemu, qpdf, qt5, samba4, squashfs, squid, strongswan, + suricata, tzdata, util-linux, vlc, wget, webkitgtk, + wireguard-linux-compat, wireshark, wpebackend-fdo, wpewebkit, + zic + + Issues resolved (http://bugs.uclibc.org): + + #11866: initramfs file system fails to boot using Grub on EFI x86_64 + #12271: python-iptables runtime dependencies + #12726: systemctl preset-all failed for ctrl-alt-del.target + #12751: OpenJdk package installation issues on target + #12796: Update OpenSSL to Version 1.1.1g to patch CVE-2020-1967 + #12811: bootstrap stuck and no login prompt + #12841: util-linux/sfdisk 2.35.1 fails on sector-size header + +2020.02.1, released April 10th, 2020 + + Important / security related fixes. + + core: Also fixup /lib references in libtool .la files, similar + to how it is done for /usr/*. + + Various fixes for builds with per-package target/host + directories. + + toolchain: Fix kernel headers validation check for external + toolchains. Fix make 4.3+ compatibility in external toolchain + logic. + + fs/initramfs: fix show-info so it also shows the usual + rootfs-related variables. + + Updated/fixed packages: arm-trusted-firmware, barebox-aux, + bluez5_utils, bubblewrap, busybox, civetweb, cog, collectd, + ffmpeg, gcc, gnutls, gssdp, gvfs, haproxy, hiredis, hostapd, + kmscube, kodi-screensaver-rsxs, libical, libinput, libexif, + libopenssl, libsndfile, linux, linux-tools, llvm, localedef, + mcrypt, mesa3d, meson, monit, nftables, ntp, opencv3, + oprofile, php, pinentry, polkit, pure-ftpd, python-pyyaml, + qt5, quagga, radvd, rcw, redis, rocksdb, samba4, screen, + sdbusplus, swupdate, sysdig, sysklogd, syslinux, syslog-ng, + tor, tslib, uacme, util-linux, vala, vlc, + wireguard-linux-compat, wireguard-tools, wireshark, + wpa_supplicant, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #12711: host-localedef 2.30-20 fails to compile on fedora 32 + #12746: "sysdig" package description points to http://sysdig.org, .. + 2020.02, released March 8th, 2020 Various fixes. @@ -154,6 +2115,31 @@ #12536: Linux-Headers extracting failure #12546: Ninja 1.10 build Error +2019.11.3, released April 10th, 2020 + + Important / security related fixes. + + core: Fix compatibility with make 4.3+. Also fixup /lib + references in libtool .la files, similar to how it is done for + /usr/*. + + toolchain: Fix kernel headers validation check for external + toolchains. + + fs/initramfs: fix show-info so it also shows the usual + rootfs-related variables. + + Updated/fixed packages: barebox-aux, bluez5_utils, busybox, + civetweb, cog, collectd, ffmpeg, gcc, gnutls, gssdp, gvfs, haproxy, + hiredis, hostapd, kmscube, libical, libopenssl, libsndfile, + linux-tools, llvm, monit, ntp, php, pure-ftpd, radvd, redis, + samba4, screen, sysdig, syslinux, syslog-ng, tor, uacme, + util-linux, vala, vlc, wpa_supplicant, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #12746: "sysdig" package description points to http://sysdig.org, .. + 2019.11.2, released March 16th, 2020 Important / security related fixes. @@ -901,6 +2887,27 @@ #11761: Building custom kernel 5.1-rc3 or later breaks on objtool #11816: Only selected coreutils binaries are installed +2019.02.11, released April 9th, 2020 + + Important / security related fixes. + + core: Fix compatibility with make 4.3+. Also fixup /lib + references in libtool .la files, similar to how it is done for + /usr/*. + + toolchain: Fix kernel headers validation check for external + toolchains. + + Updated/fixed packages: barebox-aux, bluez5_utils, busybox, + civetweb, collectd, ffmpeg, gcc, gnutls, gvfs, haproxy, + hiredis, kmscube, libical, libopenssl, libsndfile, + linux-tools, ntp, php, pure-ftpd, screen, sysdig, tor, + util-linux, vala, vlc, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #12746: "sysdig" package description points to http://sysdig.org, .. + 2019.02.10, released March 16th, 2020 Important / security related fixes. diff --git a/Config.in b/Config.in index 48fd36ff98..3db2c8dcab 100644 --- a/Config.in +++ b/Config.in @@ -80,6 +80,11 @@ config BR2_HOSTARCH_NEEDS_IA32_COMPILER config BR2_NEEDS_HOST_UTF8_LOCALE bool +# Hidden boolean selected by packages that need the host to have +# support for building gcc plugins +config BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT + bool + source "arch/Config.in" menu "Build options" @@ -407,6 +412,19 @@ config BR2_DEBUG_3 endchoice endif +config BR2_ENABLE_RUNTIME_DEBUG + bool "build packages with runtime debugging info" + help + Some packages may have runtime assertions, extra traces, and + similar runtime elements that can help debugging. However, + these elements may negatively influence performance so should + normally not be enabled on production systems. + + Enable this option to enable such runtime debugging. + + Note: disabling this option is not a guarantee that all + packages effectively removed these runtime debugging elements. + config BR2_STRIP_strip bool "strip target binaries" default y @@ -516,13 +534,14 @@ config BR2_OPTIMIZE_S This is the default. config BR2_OPTIMIZE_FAST - bool "optimize for fast" + bool "optimize for fast (may break packages!)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 help Optimize for fast. Disregard strict standards compliance. -Ofast enables all -O3 optimizations. It also enables optimizations that are not valid for all - standard-compliant programs. It turns on -ffast-math and the + standard-compliant programs, so be careful, as it may break + some packages. It turns on -ffast-math and the Fortran-specific -fstack-arrays, unless -fmax-stack-var-size is specified, and -fno-protect-parens. @@ -707,8 +726,18 @@ endmenu comment "Security Hardening Options" +config BR2_PIC_PIE_ARCH_SUPPORTS + bool + default y + # Microblaze glibc toolchains don't work with PIC/PIE enabled + depends on !BR2_microblaze + # Nios2 toolchains produce non working binaries with -fPIC + depends on !BR2_nios2 + config BR2_PIC_PIE bool "Build code with PIC/PIE" + default y + depends on BR2_PIC_PIE_ARCH_SUPPORTS depends on BR2_SHARED_LIBS depends on BR2_TOOLCHAIN_SUPPORTS_PIE help @@ -716,12 +745,15 @@ config BR2_PIC_PIE Position-Independent Executables (PIE). comment "PIC/PIE needs a toolchain w/ PIE" + depends on BR2_PIC_PIE_ARCH_SUPPORTS depends on BR2_SHARED_LIBS depends on !BR2_TOOLCHAIN_SUPPORTS_PIE choice bool "Stack Smashing Protection" default BR2_SSP_ALL if BR2_ENABLE_SSP # legacy + default BR2_SSP_STRONG if BR2_TOOLCHAIN_HAS_SSP_STRONG + default BR2_SSP_REGULAR depends on BR2_TOOLCHAIN_HAS_SSP help Enable stack smashing protection support using GCC's @@ -783,6 +815,8 @@ comment "Stack Smashing Protection needs a toolchain w/ SSP" choice bool "RELRO Protection" + default BR2_RELRO_FULL if BR2_TOOLCHAIN_SUPPORTS_PIE + default BR2_RELRO_PARTIAL depends on BR2_SHARED_LIBS help Enable a link-time protection know as RELRO (RELocation Read @@ -802,6 +836,7 @@ config BR2_RELRO_PARTIAL config BR2_RELRO_FULL bool "Full" + depends on BR2_PIC_PIE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_PIE select BR2_PIC_PIE help @@ -810,6 +845,7 @@ config BR2_RELRO_FULL program loading, i.e every time an executable is started. comment "RELRO Full needs a toolchain w/ PIE" + depends on BR2_PIC_PIE_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_SUPPORTS_PIE endchoice @@ -817,8 +853,16 @@ endchoice comment "RELocation Read Only (RELRO) needs shared libraries" depends on !BR2_SHARED_LIBS +config BR2_FORTIFY_SOURCE_ARCH_SUPPORTS + bool + default y + # Microblaze glibc toolchains don't work with Fortify Source enabled + depends on !BR2_microblaze + choice bool "Buffer-overflow Detection (FORTIFY_SOURCE)" + default BR2_FORTIFY_SOURCE_1 + depends on BR2_FORTIFY_SOURCE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC depends on !BR2_OPTIMIZE_0 help @@ -859,6 +903,7 @@ config BR2_FORTIFY_SOURCE_2 endchoice comment "Fortify Source needs a glibc toolchain and optimization" + depends on BR2_FORTIFY_SOURCE_ARCH_SUPPORTS depends on (!BR2_TOOLCHAIN_USES_GLIBC || BR2_OPTIMIZE_0) endmenu diff --git a/Config.in.legacy b/Config.in.legacy index caf31d4be3..0bfa0b46f9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,8 +144,607 @@ endif ############################################################################### +comment "Legacy options removed in 2021.08" + +config BR2_OPENJDK_VERSION_LTS + bool "OpenJDK LTS version was renamed to OpenJDK 11" + select BR2_LEGACY + select BR2_PACKAGE_OPENJDK_VERSION_11 + help + The LTS version option was renamed to OpenJDK 11 to make it + clear what LTS version is. + +config BR2_OPENJDK_VERSION_LATEST + bool "OpenJDK latest version (16.x) was removed" + select BR2_LEGACY + select BR2_PACKAGE_OPENJDK_VERSION_17 + help + OpenJDK 16.x is no longer mainted, so the option has been + removed. Use OpenJDK 17.x instead. + +config BR2_PACKAGE_GNURADIO_PAGER + bool "gnuradio gr-flex support removed" + select BR2_LEGACY + help + gr-flex has been removed from gnuradio since version 3.8.0.0. + +config BR2_PACKAGE_LIBMCRYPT + bool "libmcrypt package was removed" + select BR2_LEGACY + help + This package has been removed as "the last update to libmcrypt + was in 2007, despite years of unmerged patches. These facts + have led security experts to declare mcrypt abandonware and + discourage its use in new development" (extract from + https://en.wikipedia.org/wiki/Mcrypt). + +config BR2_PACKAGE_MCRYPT + bool "mcrypt package was removed" + select BR2_LEGACY + help + This package has been removed as "the last update to libmcrypt + was in 2007, despite years of unmerged patches. These facts + have led security experts to declare mcrypt abandonware and + discourage its use in new development" (extract from + https://en.wikipedia.org/wiki/Mcrypt). + +config BR2_PACKAGE_PHP_EXT_MCRYPT + bool "PHP mcrypt extension removed" + select BR2_LEGACY + help + mcrypt has been removed from php since version 7.2.0. + +config BR2_BINUTILS_VERSION_2_34_X + bool "binutils 2.34 has been removed" + select BR2_LEGACY + help + binutils 2.34 has been removed, use a newer version. + +config BR2_PACKAGE_LIBSOIL + bool "libsoil package removed" + select BR2_LEGACY + help + The libsoil package was removed. All packages needing + libsoil removed the dependency. + +config BR2_PACKAGE_CLAPACK + bool "cblas/clapack package removed" + select BR2_LEGACY + select BR2_PACKAGE_LAPACK if BR2_PACKAGE_LAPACK_ARCH_SUPPORTS && BR2_TOOLCHAIN_HAS_FORTRAN + help + The clapack package was removed. LAPACK no longer generates a + C version. Use lapack instead. This does require a Fortran + compiler however. + +config BR2_PACKAGE_SPIDERMONKEY + bool "spidermonkey package removed" + select BR2_LEGACY + help + The spidermonkey package was removed. The only package that + depended on spidermonkey was polkit. The spidermonkey + dependency is replaced with duktape. + +config BR2_PACKAGE_KODI_LIBVA + bool "kodi option to add libva support removed" + select BR2_LEGACY + help + Kodi still has support for libva if the package is enabled but + the kodi-specific dependencies limiting libva support to non- + OPENGLES platforms were removed including this option. + +config BR2_PACKAGE_PYTHON_COHERENCE + bool "python-coherence package removed" + select BR2_LEGACY + help + This package has been removed as it can't be built anymore due + to python-twisted being now incompatible with python 2. + +config BR2_PACKAGE_PHP_EXT_XMLRPC + bool "PHP XMLRPC extension removed" + select BR2_LEGACY + help + The XMLRPC php extension was removed. + See: https://wiki.php.net/rfc/unbundle_xmlprc + +config BR2_GCC_VERSION_8_X + bool "gcc 8.x support removed" + select BR2_LEGACY + help + Support for gcc version 8.x has been removed. The current + default version (10.x or later) has been selected instead. + +comment "Legacy options removed in 2021.05" + +config BR2_PACKAGE_UDISKS_LVM2 + bool "udisks lvm2 support removed" + select BR2_LEGACY + help + The lvm2 support was removed because udisks < 2.7.0 still + depends on lvm2 application library, which was removed + in lvm2. + +config BR2_PACKAGE_LVM2_APP_LIBRARY + bool "lvm2 application library removed" + select BR2_LEGACY + help + The lvm2 application library was removed upstream. + +config BR2_PACKAGE_LVM2_LVMETAD + bool "lvm2 lvmetad removed" + select BR2_LEGACY + help + The lvm2 lvmetad was removed upstream. + +config BR2_PACKAGE_MONKEY + bool "monkey package removed" + select BR2_LEGACY + help + This package has been removed as it has not seen any release + since 2016 and because TLS is broken on master. + +config BR2_PACKAGE_DOCKER_CONTAINERD + bool "docker-containerd package was renamed to containerd" + select BR2_LEGACY + select BR2_PACKAGE_CONTAINERD + help + The containerd project is now independent from Docker. + The package was renamed to containerd accordingly. + +config BR2_PACKAGE_IOSTAT + bool "iostat package removed" + select BR2_LEGACY + help + This package has been removed, use sysstat instead. + +config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE + bool "sconeserver http::sconesite::image removed" + select BR2_LEGACY + help + Sconeserver cannot be built with ImageMagick - it uses the + "transofrm" function which is removed from public API. + +config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV + bool "KDrive/TinyX evdev input driver removed" + select BR2_LEGACY + help + The evdev input driver in KDrive was removed. + +config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD + bool "KDrive/TinyX kbd input driver removed" + select BR2_LEGACY + help + The kbd input driver in KDrive was removed. + +config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE + bool "KDrive/TinyX mouse input driver removed" + select BR2_LEGACY + help + The mouse input driver in KDrive was removed. + +config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC + bool "mesa OSMesa (classic) option removed" + select BR2_LEGACY + select BR2_PACKAGE_MESA3D_OSMESA_GALLIUM + help + The OSMesa "classic" library option was removed upstream. + Only the Gallium-based implementation remains. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST + bool "mesa DRI swrast driver removed" + select BR2_LEGACY + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST + help + The DRI swrast driver was removed upstream. + Only the Gallium-based implementation remains. + +config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH + bool "kodi-screensaver-crystalmorph removed" + select BR2_LEGACY + help + The package received its last updates in 2017, is not part + of the official Kodi github repo and its build is broken + with Kodi 19.x, so it was removed. + +comment "Legacy options removed in 2021.02" + +config BR2_PACKAGE_MPD_AUDIOFILE + bool "mpd audiofile support removed" + select BR2_LEGACY + help + The audiofile support was removed from mpd as audiofile is + affected by multiple CVEs and is not maintained anymore (no + release since 2013). + +config BR2_PACKAGE_AUDIOFILE + bool "audiofile package removed" + select BR2_LEGACY + help + The audiofile package was removed as it is affected by + multiple CVEs and is not maintained anymore (no release since + 2013). + +config BR2_BINUTILS_VERSION_2_33_X + bool "binutils 2.33.x has been removed" + select BR2_LEGACY + help + binutils 2.33.x has been removed, use a newer version. + +config BR2_PACKAGE_LIBUPNP18 + bool "libupnp18 package removed" + select BR2_LEGACY + select BR2_PACKAGE_LIBUPNP + help + Version 1.8.x of libupnp (i.e. libupnp18) has been removed + because it will never be fixed against CallStranger a.k.a. + CVE-2020-12695. The libupnp package (which has been updated to + version 1.14.x) has been selected instead. + +config BR2_PACKAGE_BOA + bool "boa package removed" + select BR2_LEGACY + help + The boa package was removed as it is affected by multiple + CVEs and is not maintained anymore (no release since 2005). + +config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA + bool "imx sdma firmware is provided by firmware-imx" + select BR2_LEGACY + select BR2_PACKAGE_FREESCALE_IMX + select BR2_PACKAGE_FIRMWARE_IMX + help + linux-firmware provide the same firmware as firmware-imx. + We prefer using firmware-imx as the only provider. + +config BR2_GDB_VERSION_8_2 + bool "gdb 8.2.x has been removed" + select BR2_LEGACY + help + gdb 8.2 support has been removed, you can use a newer + version such as 8.3 or more recent. + +config BR2_PACKAGE_HOST_RCW + bool "rcw package was renamed to qoriq-rcw" + select BR2_PACKAGE_HOST_QORIQ_RCW + select BR2_LEGACY + help + The rcw package was specific to the QorIQ platform, so it has + been renamed to qoriq-rcw, to leave room for other *-rcw + packages for other platforms. + +config BR2_KERNEL_HEADERS_5_9 + bool "kernel headers version 5.9.x are no longer supported" + select BR2_LEGACY + help + Version 5.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_5_8 + bool "kernel headers version 5.8.x are no longer supported" + select BR2_LEGACY + help + Version 5.8.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_powerpc_601 + bool "PowerPC 601 support removed" + select BR2_LEGACY + help + The support for the PowerPC 601 processors has been removed. + +config BR2_PACKAGE_TI_SGX_LIBGBM + bool "ti-sgx-libgbm support removed" + select BR2_LEGACY + help + TI has merged the ti-sgx-libgbm package with the ti-sgx-um + package + +config BR2_PACKAGE_IPSEC_TOOLS + bool "ipsec-tools package was removed" + select BR2_LEGACY + help + This package has been removed as it has security issues and + has been abandoned since 2014. + +comment "Legacy options removed in 2020.11" + +config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED + bool "compile with fixed serial port speed" + select BR2_LEGACY + help + Since gpsd 3.20, GPSD_FIXED_PORT_SPEED is replaced + by runtime option --speed. + +config BR2_PACKAGE_GPSD_RECONFIGURE + bool "allow gpsd to change device settings" + select BR2_LEGACY + help + Since gpsd 3.21, GPSD_RECONFIGURE is replaced + by runtime option --passive. + +config BR2_PACKAGE_GPSD_CONTROLSEND + bool "allow gpsctl/gpsmon to change device settings" + select BR2_LEGACY + help + Option removed in gpsd 3.21 + +config BR2_PACKAGE_OPENCV + bool "opencv package was removed" + select BR2_LEGACY + help + This package has been removed, use opencv3 instead. + +config BR2_PACKAGE_LIBCROCO + bool "libcroco package was removed" + select BR2_LEGACY + help + This package has been removed as it is affected by several + security issues such as CVE-2020-12825 which will never be + fixed as libcroco has been archived. + +config BR2_PACKAGE_BELLAGIO + bool "bellagio package was removed" + select BR2_LEGACY + help + This package has been removed as it is not maintained anymore + (no release since 2011). + +config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY + bool "systemd-journal-gatewayd now in systemd-journal-remote" + select BR2_LEGACY + select BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE + help + All system journal remote programs are now enabled using + BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE. + +config BR2_TARGET_UBOOT_BOOT_SCRIPT + bool "u-boot script generation was moved" + select BR2_LEGACY + select BR2_PACKAGE_HOST_UBOOT_TOOLS + select BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT + help + Migrated U-Boot script generation to uboot-tools + +# Note: BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE is still referenced from +# package/uboot-tools/Config.in +config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE + string "The uboot script source string has been renamed" + depends on BR2_TARGET_UBOOT_BOOT_SCRIPT + help + Migrated U-Boot script generation to uboot-tools. + New option is named + BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE + +config BR2_TARGET_UBOOT_ENVIMAGE + bool "u-boot env generation was moved" + select BR2_LEGACY + select BR2_PACKAGE_HOST_UBOOT_TOOLS + select BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE + help + Migrated U-Boot env generation to uboot-tools + +# Note: BR2_TARGET_UBOOT_ENVIMAGE_SOURCE is still referenced from +# package/uboot-tools/Config.in +config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE + string "The uboot env image source string has been renamed" + depends on BR2_TARGET_UBOOT_ENVIMAGE + help + Migrated U-Boot env generation to uboot-tools. + New option is named + BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE + +# Note: BR2_TARGET_UBOOT_ENVIMAGE_SIZE is still referenced from +# package/uboot-tools/Config.in +config BR2_TARGET_UBOOT_ENVIMAGE_SIZE + string "The uboot env image size string has been renamed" + depends on BR2_TARGET_UBOOT_ENVIMAGE + help + Migrated U-Boot env generation to uboot-tools. + New option is named BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE + +config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT + bool "u-boot env generation was moved" + depends on BR2_TARGET_UBOOT_ENVIMAGE + select BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_REDUNDANT + help + Migrated U-Boot env generation to uboot-tools + +config BR2_PACKAGE_KISMET_CLIENT + bool "kismet client support was removed" + select BR2_LEGACY + help + Kismet client support was removed since version 2019-04-R1. + +config BR2_PACKAGE_KISMET_DRONE + bool "kismet drone support was removed" + select BR2_LEGACY + help + Kismet drone support was removed since version 2019-04-R1. + +config BR2_GCC_VERSION_7_X + bool "gcc 7.x support removed" + select BR2_LEGACY + help + Support for gcc version 7.x has been removed. The current + default version (9.x or later) has been selected instead. + +config BR2_PACKAGE_GST1_VALIDATE + bool "gst1-validate was moved to gst1-devtools" + select BR2_PACKAGE_GST1_DEVTOOLS + select BR2_LEGACY + help + This package has been removed, use gst1-devtools instead. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF + bool "gst1-plugins-bad yadif plugin was removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE + help + This plugin was removed with gst1-plugins-bad-1.18.0, the + same functionality has moved to gst1-plugins-good + deinterlace plugin (method=yadif). + +config BR2_PACKAGE_GQVIEW + bool "gqview package was removed" + select BR2_LEGACY + help + This package has been removed as it is not maintained anymore + (no release since 2006). + +config BR2_PACKAGE_WESTON_IMX + bool "weston-imx package was removed" + select BR2_LEGACY + help + This package has been removed, use weston instead. + +config BR2_KERNEL_HEADERS_5_7 + bool "kernel headers version 5.7.x are no longer supported" + select BR2_LEGACY + help + Version 5.7.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_TINYHTTPD + bool "tinyhttpd package removed" + select BR2_LEGACY + help + The tinyhttpd package was removed as it is affected by + CVE-2002-1819 and is not maintained anymore (no release since + 2001). + +config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX + bool "X.org Enable AIGLX Extension" + select BR2_LEGACY + help + AIGLX Extension was removed in X.org X server version 1.19.0 + +config BR2_PACKAGE_AMD_CATALYST + bool "amd-catalyst" + select BR2_LEGACY + help + Current X.org server is incompatible with this driver. + +config BR2_PACKAGE_NVIDIA_TEGRA23 + bool "nvidia-tegra23 package removed" + select BR2_LEGACY + help + Current X.org server is incompatible with this driver. + +config BR2_GDB_VERSION_8_1 + bool "gdb 8.1.x has been removed" + select BR2_LEGACY + help + The 8.1.x version of gdb has been removed. Use a newer + version instead. + +comment "Legacy options removed in 2020.08" + +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 + bool "toolchain-external-codesourcery-amd64 removed" + select BR2_LEGACY + help + The CodeSourcery toolchain for AMD64, in version 2016.11 was + dropped, due to it using a too old gcc 6.2.0 compiler which + caused issues compiling a number of recent packages + (e.g. Boost). CodeSourcery has stopped making newer versions + of this toolchain publicly available, so it was not possible + to update it. + +config BR2_KERNEL_HEADERS_5_6 + bool "kernel headers version 5.6.x are no longer supported" + select BR2_LEGACY + help + Version 5.6.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_5_5 + bool "kernel headers version 5.5.x are no longer supported" + select BR2_LEGACY + help + Version 5.5.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_BINUTILS_VERSION_2_31_X + bool "binutils version 2.31.1 support removed" + select BR2_LEGACY + help + Support for binutils version 2.31.1 has been removed. The + current default version (2.33.1 or later) has been selected + instead. + +config BR2_PACKAGE_KODI_PERIPHERAL_STEAMCONTROLLER + bool "kodi-peripheral-steamcontroller package was removed" + select BR2_LEGACY + help + This package is broken. + comment "Legacy options removed in 2020.05" +config BR2_PACKAGE_WIRINGPI + bool "wiringpi package removed" + select BR2_LEGACY + help + The author of wiringpi has deprecated the package, and + completely removed the git tree that was serving the + sources, with this message: + Please look for alternatives for wiringPi + +config BR2_PACKAGE_PYTHON_PYCRYPTO + bool "python-pycrypto package removed" + select BR2_LEGACY + help + This package has been removed, use python-pycryptodomex + instead. + +config BR2_PACKAGE_MTDEV2TUIO + bool "mtdev2tuio package removed" + select BR2_LEGACY + help + The mtdev2tuio package was removed as it breaks the builds + every now and then and is not maintained upstream. + +config BR2_PACKAGE_EZXML + bool "ezxml package removed" + select BR2_LEGACY + help + The ezXML package was removed as it is affected by several + CVEs and is not maintained anymore (no release since 2006). + +config BR2_PACKAGE_COLLECTD_LVM + bool "lvm support in collectd was removed" + select BR2_LEGACY + help + collectd removed LVM plugin, liblvm2app has been deprecated + +config BR2_PACKAGE_PYTHON_PYASN + bool "duplicate python-pyasn1 package removed" + select BR2_LEGACY + select BR2_PACKAGE_PYTHON_PYASN1 + help + This package was a duplicate of python-pyasn1. + +config BR2_PACKAGE_PYTHON_PYASN_MODULES + bool "duplicate python-pyasn1-modules package removed" + select BR2_LEGACY + select BR2_PACKAGE_PYTHON_PYASN1_MODULES + help + This package was a duplicate of python-pyasn1-modules. + +config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174 + bool "duplicate QCA6174 firmware symbol removed" + select BR2_LEGACY + select BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174 + help + This config symbol duplicates existing symbol for QCA6174 + firmware. + +config BR2_PACKAGE_QT5CANVAS3D + bool "qt5canvas3d was removed" + select BR2_LEGACY + help + This Qt5 module was removed by the upstream Qt project since + Qt 5.13, so the corresponding Buildroot package was removed + as well. + config BR2_PACKAGE_KODI_LIBTHEORA bool "libtheora support in Kodi was removed" select BR2_LEGACY @@ -775,12 +1374,6 @@ config BR2_PACKAGE_PYTHON_PYQT The python-pyqt package was removed. Consider python-pyqt5 instead. -config BR2_PACKAGE_GNURADIO_QTGUI - bool "gnuradio gr-qtgui option removed" - select BR2_LEGACY - help - The gr-qtgui option was removed. - config BR2_PACKAGE_LUACRYPTO bool "luacrypto package removed" select BR2_LEGACY @@ -985,13 +1578,6 @@ config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT BR2_PACKAGE_DOCKER_CLI_STATIC, following the package split of docker-engine and docker-cli. -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 - bool "Modular X.org server was updated to version 1.20.0" - select BR2_LEGACY - select BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 - help - Modular X.org server was updated to version 1.20.0 - config BR2_PACKAGE_XPROTO_APPLEWMPROTO bool "xproto-applewmproto package replaced by xorgproto" select BR2_LEGACY @@ -3681,1134 +4267,6 @@ config BR2_TARGET_UBOOT_NETWORK help U-Boot's custom network settings options have been removed. -############################################################################### -comment "Legacy options removed in 2015.05" - -config BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_512_16K - bool "jffs2 16kB erasesize NAND flash option renamed" - select BR2_LEGACY - select BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_16K - help - The JFFS2 NAND flash options now longer include the page - size. - -config BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K - bool "jffs2 128kB erasesize NAND flash option renamed" - select BR2_LEGACY - select BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K - help - The JFFS2 NAND flash options now longer include the page - size. - -config BR2_PACKAGE_MONO_20 - bool "2.0/3.5 .Net Runtime" - select BR2_LEGACY - help - This option no longer exists, all versions of the .Net - runtime are now installed. - -config BR2_PACKAGE_MONO_40 - bool "4.0 .Net Runtime" - select BR2_LEGACY - help - This option no longer exists, all versions of the .Net - runtime are now installed. - -config BR2_PACKAGE_MONO_45 - bool "4.5 .Net Runtime" - select BR2_LEGACY - help - This option no longer exists, all versions of the .Net - runtime are now installed. - -config BR2_CIVETWEB_WITH_LUA - bool "civetweb lua option renamed" - select BR2_LEGACY - select BR2_PACKAGE_CIVETWEB_WITH_LUA - help - civetweb's lua option has been renamed to - BR2_PACKAGE_CIVETWEB_WITH_LUA to be aligned with how other - packages name options. - -config BR2_PACKAGE_TIFF_TIFF2PDF - bool "tiff utility-specific option removed" - select BR2_LEGACY - select BR2_PACKAGE_TIFF_UTILITIES - help - utility-specific options have been removed in favour of - the new option BR2_PACKAGE_TIFF_UTILITIES. - -config BR2_PACKAGE_TIFF_TIFFCP - bool "tiff utility-specific option removed" - select BR2_LEGACY - select BR2_PACKAGE_TIFF_UTILITIES - help - utility-specific options have been removed in favour of - the new option BR2_PACKAGE_TIFF_UTILITIES. - -config BR2_LINUX_KERNEL_EXT_RTAI_PATCH - bool "RTAI patch file path has been removed" - select BR2_LEGACY - help - This option has never worked, so it has been removed. - -config BR2_TARGET_GENERIC_PASSWD_DES - bool "Encoding passwords with DES has been removed" - select BR2_LEGACY - help - Paswords can now only be encoded with either of md5, sha256 or - sha512. The default is md5, which is stronger that DES (but - still pretty weak). - -config BR2_PACKAGE_GTK2_THEME_HICOLOR - bool "hicolor (default theme) is a duplicate" - select BR2_LEGACY - select BR2_PACKAGE_HICOLOR_ICON_THEME - help - The option was just a duplicate of hicolor icon theme. - -config BR2_PACKAGE_VALGRIND_PTRCHECK - bool "valgrind's PTRCheck was renamed to SGCheck" - select BR2_LEGACY - select BR2_PACKAGE_VALGRIND_SGCHECK - help - PTRCheck was renamed to SGCheck in valgrind - -############################################################################### -comment "Legacy options removed in 2015.02" - -config BR2_PACKAGE_LIBGC - bool "libgc package removed" - select BR2_LEGACY - select BR2_PACKAGE_BDWGC - help - libgc has been removed because we have the same package under - a different name, bdwgc. - -config BR2_PACKAGE_WDCTL - bool "util-linux' wdctl option has been renamed" - select BR2_LEGACY - select BR2_PACKAGE_UTIL_LINUX_WDCTL - help - util-linux' wdctl option has been renamed to - BR2_PACKAGE_UTIL_LINUX_WDCTL to be aligned with how the other - options are named. - -config BR2_PACKAGE_UTIL_LINUX_ARCH - bool "util-linux' arch option has been removed" - select BR2_LEGACY - help - util-linux' arch was dropped in util-linux 2.23, in favor of - the coreutils version. - -config BR2_PACKAGE_UTIL_LINUX_DDATE - bool "util-linux' ddate option has been removed" - select BR2_LEGACY - help - util-linux' ddate was dropped in util-linux 2.23. - -config BR2_PACKAGE_RPM_BZIP2_PAYLOADS - bool "rpm's bzip2 payloads option has been removed" - select BR2_LEGACY - select BR2_PACKAGE_BZIP2 - help - The bzip2 payloads option rely entirely on the dependant - package bzip2. So, you need to select it to enable this - feature. - -config BR2_PACKAGE_RPM_XZ_PAYLOADS - bool "rpm's xz payloads option has been removed" - select BR2_LEGACY - select BR2_PACKAGE_XZ - help - The xz payloads option rely entirely on the dependant package - xz. So, you need to select it to enable this feature. - -config BR2_PACKAGE_M4 - bool "m4 target package removed" - select BR2_LEGACY - help - The m4 target package has been removed, it's been - deprecated for some time now. - -config BR2_PACKAGE_FLEX_BINARY - bool "flex binary in target option removed" - select BR2_LEGACY - help - The flex binary in the target option has been removed. - It's been deprecated for some time now and is essentially a - development tool which isn't very useful in the target. - -config BR2_PACKAGE_BISON - bool "bison target package removed" - select BR2_LEGACY - help - The bison target package has been removed, it's been - deprecated for some time now and is essentially a development - tool which isn't very useful in the target. - -config BR2_PACKAGE_GOB2 - bool "gob2 target package removed" - select BR2_LEGACY - help - The gob2 target package has been removed, it's been - deprecated for some time now and was essentially useless - without a target toolchain. - -config BR2_PACKAGE_DISTCC - bool "distcc target package removed" - select BR2_LEGACY - help - The distcc target package has been removed, it's been - deprecated for some time now and was essentially useless - without a target toolchain. - -config BR2_PACKAGE_HASERL_VERSION_0_8_X - bool "haserl 0.8.x version removed" - select BR2_LEGACY - help - The 0.8.x version option for haserl has been removed since it - has been deprecated for some time now. - You should be able to use the 0.9.x version without issues. - -config BR2_PACKAGE_STRONGSWAN_TOOLS - bool "strongswan option has been removed" - select BR2_LEGACY - select BR2_PACKAGE_STRONGSWAN_PKI - select BR2_PACKAGE_STRONGSWAN_SCEP - help - The tools option has been removed upstream and the different - tools have been split between the pki and scep options, with - others deprecated. - -config BR2_PACKAGE_XBMC_ADDON_XVDR - bool "xbmc-addon-xvdr removed" - select BR2_LEGACY - help - According to the github project page: - https://github.com/pipelka/xbmc-addon-xvdr - this package is discontinued. - -config BR2_PACKAGE_XBMC_PVR_ADDONS - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_PVR_ADDONS - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_ALSA_LIB - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_ALSA_LIB - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_AVAHI - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_AVAHI - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_DBUS - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_DBUS - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBBLURAY - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBBLURAY - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_GOOM - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_GOOM - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_RSXS - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_RSXS - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBCEC - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBCEC - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBMICROHTTPD - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBMICROHTTPD - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBNFS - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBNFS - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_RTMPDUMP - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_RTMPDUMP - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBSHAIRPLAY - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBSHAIRPLAY - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBSMBCLIENT - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBSMBCLIENT - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBTHEORA - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBTHEORA - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBUSB - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBUSB - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBVA - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBVA - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_WAVPACK - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_WAVPACK - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PREFER_STATIC_LIB - bool "static library option renamed" - select BR2_LEGACY - help - The BR2_PREFER_STATIC_LIB was renamed to BR2_STATIC_LIBS. It - highlights the fact that the option no longer "prefers" - static libraries, but "enforces" static libraries (i.e - shared libraries are completely unused). - - Take care of updating the type of libraries you want under the - "Build options" menu. - -############################################################################### -comment "Legacy options removed in 2014.11" - -config BR2_x86_generic - bool "x86 generic variant has been removed" - select BR2_LEGACY - help - The generic x86 CPU variant has been removed. Use another - CPU variant instead. - -config BR2_GCC_VERSION_4_4_X - bool "gcc 4.4.x has been removed" - select BR2_LEGACY - help - The 4.4.x version of gcc has been removed. Use a newer - version instead. - -config BR2_sparc_sparchfleon - bool "sparchfleon CPU has been removed" - select BR2_LEGACY - help - The sparchfleon CPU was only supported in a patched gcc 4.4 - version. Its support has been removed in favor of the leon3 - CPU starting from gcc 4.8.x. - -config BR2_sparc_sparchfleonv8 - bool "sparchfleonv8 CPU has been removed" - select BR2_LEGACY - help - The sparchfleonv8 CPU was only supported in a patched gcc - 4.4 version. Its support has been removed in favor of the - leon3 CPU starting from gcc 4.8.x. - -config BR2_sparc_sparcsfleon - bool "sparcsfleon CPU has been removed" - select BR2_LEGACY - help - The sparcsfleon CPU was only supported in a patched gcc 4.4 - version. Its support has been removed in favor of the leon3 - CPU starting from gcc 4.8.x. - -config BR2_sparc_sparcsfleonv8 - bool "sparcsfleonv8 CPU has been removed" - select BR2_LEGACY - help - The sparcsfleonv8 CPU was only supported in a patched gcc - 4.4 version. Its support has been removed in favor of the - leon3 CPU starting from gcc 4.8.x. - -config BR2_PACKAGE_XLIB_LIBPCIACCESS - bool "xlib-libpciaccess option has been renamed" - depends on BR2_PACKAGE_XORG7 - select BR2_LEGACY - select BR2_PACKAGE_LIBPCIACCESS - help - libpciaccess neither depends on X11 nor Xlib. Thus the - package has been renamed BR2_PACKAGE_LIBPCIACCESS - -config BR2_PACKAGE_LINUX_FIRMWARE_XC5000 - bool "Xceive xc5000 option has been renamed" - select BR2_LEGACY - select BR2_PACKAGE_LINUX_FIRMWARE_XCx000 - help - The Xceive xc5000 option now also handles older firmwares from - Xceive (the xc4000 series), as well as new firmwares (the - xc5000c) from Cresta, who bought Xceive. - -config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4 - bool "Chelsio T4 option has been renamed" - select BR2_LEGACY - select BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4 - help - The Chelsio T4 option BR2_PACKAGE_LINUX_FIRMWARE_CXGB4 - has been renamed to BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4 - to better account for the fact that a T5 variant exists. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 - bool "BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 has been renamed" - select BR2_LEGACY - help - The option BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 was - renamed to BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7. You must - select it in: - Target packages -> Hardware handling -> - Firmware -> linux-firmware -> WiFi firmware -> - iwlwifi 3160/726x revision to use (revision 7) - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 - bool "BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 has been renamed" - select BR2_LEGACY - help - The option BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 was - renamed to BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8. You must - select it in: - Target packages -> Hardware handling -> - Firmware -> linux-firmware -> WiFi firmware -> - iwlwifi 3160/726x revision to use (revision 8) - -############################################################################### -comment "Legacy options removed in 2014.08" - -config BR2_PACKAGE_LIBELF - bool "libelf has been removed" - select BR2_PACKAGE_ELFUTILS - select BR2_LEGACY - help - The libelf package provided an old version of the libelf - library and is deprecated. The libelf library is now provided - by the elfutils package. - -config BR2_KERNEL_HEADERS_3_8 - bool "kernel headers version 3.8.x are no longer supported" - select BR2_LEGACY - help - Version 3.8.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_PACKAGE_GETTEXT_TOOLS - bool "support for gettext-tools on target has been removed" - select BR2_LEGACY - help - The option to install the gettext utilities on the target - has been removed. This is not necessary as Buildroot is not - designed to provide a full development environment on the - target. gettext tools should be used on the build machine - instead. - -config BR2_PACKAGE_PROCPS - bool "procps has been replaced by procps-ng" - select BR2_PACKAGE_PROCPS_NG - select BR2_LEGACY - help - The procps package has been replaced by the equivalent - procps-ng. - -config BR2_BINUTILS_VERSION_2_20_1 - bool "binutils 2.20.1 has been removed" - select BR2_LEGACY - help - The 2.20.1 version of binutils has been removed. Use a newer - version instead. - -config BR2_BINUTILS_VERSION_2_21 - bool "binutils 2.21 has been removed" - select BR2_LEGACY - help - The 2.21 version of binutils has been removed. Use a newer - version instead. - -config BR2_BINUTILS_VERSION_2_23_1 - bool "binutils 2.23.1 has been removed" - select BR2_LEGACY - help - The 2.23.1 version of binutils has been removed. Use a newer - version instead. - -config BR2_UCLIBC_VERSION_0_9_32 - bool "uclibc 0.9.32 has been removed" - select BR2_LEGACY - help - The 0.9.32 version of uClibc has been removed. Use a newer - version instead. - -config BR2_GCC_VERSION_4_3_X - bool "gcc 4.3.x has been removed" - select BR2_LEGACY - help - The 4.3.x version of gcc has been removed. Use a newer - version instead. - -config BR2_GCC_VERSION_4_6_X - bool "gcc 4.6.x has been removed" - select BR2_LEGACY - help - The 4.6.x version of gcc has been removed. Use a newer - version instead. - -config BR2_GDB_VERSION_7_4 - bool "gdb 7.4 has been removed" - select BR2_LEGACY - help - The 7.4 version of gdb has been removed. Use a newer version - instead. - -config BR2_GDB_VERSION_7_5 - bool "gdb 7.5 has been removed" - select BR2_LEGACY - help - The 7.5 version of gdb has been removed. Use a newer version - instead. - -config BR2_BUSYBOX_VERSION_1_19_X - bool "busybox version selection has been removed" - select BR2_LEGACY - help - The possibility of selecting the Busybox version has been - removed. Use the latest version provided by the Busybox - package instead. - -config BR2_BUSYBOX_VERSION_1_20_X - bool "busybox version selection has been removed" - select BR2_LEGACY - help - The possibility of selecting the Busybox version has been - removed. Use the latest version provided by the Busybox - package instead. - -config BR2_BUSYBOX_VERSION_1_21_X - bool "busybox version selection has been removed" - select BR2_LEGACY - help - The possibility of selecting the Busybox version has been - removed. Use the latest version provided by the Busybox - package instead. - -config BR2_PACKAGE_LIBV4L_DECODE_TM6000 - bool "decode_tm6000" - select BR2_PACKAGE_LIBV4L_UTILS - select BR2_LEGACY - help - This libv4l option has been deprecated and replaced by a - single option to build all the libv4l utilities. - -config BR2_PACKAGE_LIBV4L_IR_KEYTABLE - bool "ir-keytable" - select BR2_PACKAGE_LIBV4L_UTILS - select BR2_LEGACY - help - This libv4l option has been deprecated and replaced by a - single option to build all the libv4l utilities. - -config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE - bool "v4l2-compliance" - select BR2_PACKAGE_LIBV4L_UTILS - select BR2_LEGACY - help - This libv4l option has been deprecated and replaced by a - single option to build all the libv4l utilities. - -config BR2_PACKAGE_LIBV4L_V4L2_CTL - bool "v4l2-ctl" - select BR2_PACKAGE_LIBV4L_UTILS - select BR2_LEGACY - help - This libv4l option has been deprecated and replaced by a - single option to build all the libv4l utilities. - -config BR2_PACKAGE_LIBV4L_V4L2_DBG - bool "v4l2-dbg" - select BR2_PACKAGE_LIBV4L_UTILS - select BR2_LEGACY - help - This libv4l option has been deprecated and replaced by a - single option to build all the libv4l utilities. - -############################################################################### -comment "Legacy options removed in 2014.05" - -config BR2_PACKAGE_EVTEST_CAPTURE - bool "evtest-capture support removed (dropped since evtest 1.31)" - select BR2_LEGACY - help - Support for evtest-capture has been removed (dropped from - evtest package since version 1.31), use evemu package - instead. - -config BR2_KERNEL_HEADERS_3_6 - bool "kernel headers version 3.6.x are no longer supported" - select BR2_LEGACY - help - Version 3.6.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_KERNEL_HEADERS_3_7 - bool "kernel headers version 3.7.x are no longer supported" - select BR2_LEGACY - help - Version 3.7.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_PACKAGE_VALA - bool "vala target package has been removed" - select BR2_LEGACY - help - The 'vala' target package has been removed since it has been - deprecated for more than four buildroot releases. - Note: the host vala package still exists. - -config BR2_TARGET_TZ_ZONELIST - default BR2_PACKAGE_TZDATA_ZONELIST if BR2_PACKAGE_TZDATA_ZONELIST != "" - -config BR2_PACKAGE_TZDATA_ZONELIST - string "tzdata: the timezone list option has been renamed" - help - The option BR2_PACKAGE_TZDATA_ZONELIST has been renamed to - BR2_TARGET_TZ_ZONELIST, and moved to the "System - configuration" menu. You'll need to select BR2_TARGET_TZ_INFO. - -config BR2_PACKAGE_TZDATA_ZONELIST_WRAP - bool - default y if BR2_PACKAGE_TZDATA_ZONELIST != "" - select BR2_LEGACY - -config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE - bool "Lua command-line editing none has been renamed" - select BR2_LEGACY - help - The BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE option has been - renamed to BR2_PACKAGE_LUA_EDITING_NONE. You will have to - select it in the corresponding choice. - -config BR2_PACKAGE_LUA_INTERPRETER_READLINE - bool "Lua command-line editing using readline has been renamed" - select BR2_LEGACY - help - The BR2_PACKAGE_LUA_INTERPRETER_READLINE option has been - renamed to BR2_PACKAGE_LUA_READLINE. You will have to select - it in the corresponding choice. - -config BR2_PACKAGE_LUA_INTERPRETER_LINENOISE - bool "Lua command-line editing using linenoise has been renamed" - select BR2_LEGACY - help - The BR2_PACKAGE_LUA_INTERPRETER_LINENOISE option has been - renamed to BR2_PACKAGE_LUA_LINENOISE. You will have to select - it in the corresponding choice. - -config BR2_PACKAGE_DVB_APPS_UTILS - bool "dvb-apps utilities now built by default" - select BR2_LEGACY - help - The dvb-apps utilities are now always built when the dvb-apps - package is selected. - -config BR2_KERNEL_HEADERS_SNAP - bool "Local Linux snapshot support removed" - select BR2_LEGACY - help - Support for using a custom snapshot to install the Linux - kernel headers has been removed. - -config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV - bool "/dev management by udev removed" - select BR2_LEGACY - help - The 'udev' package has been converted to a virtual package. - The providers for this feature are: 'eudev', 'systemd'. - - Therefore, if you are not using 'systemd' as init system, you - must choose 'Dynamic using eudev' in the '/dev management' - menu to get the same behaviour as in your old configuration. - - If you are using 'systemd', its internal implementation of - 'udev' will be used automatically. - - You must also check the packages depending on 'udev' are still - selected. - -config BR2_PACKAGE_UDEV - bool "udev is now a virtual package" - select BR2_LEGACY - select BR2_PACKAGE_HAS_UDEV - help - The 'udev' package has been converted to a virtual package. - The providers for this feature are: 'eudev', 'systemd'. - - Your old configuration refers to packages depending on 'udev', - either for build or at runtime. - - Check that a 'udev' provider is selected. If you are not using - 'systemd' as init system, 'eudev' should be selected, which is - the case if '/dev management' is set to 'Dynamic using eudev'. - - If you are using 'systemd', its internal implementation of - 'udev' is used. - -config BR2_PACKAGE_UDEV_RULES_GEN - bool "udev rules generation handled by provider" - select BR2_LEGACY - select BR2_PACKAGE_EUDEV if !BR2_INIT_SYSTEMD - select BR2_PACKAGE_EUDEV_RULES_GEN if !BR2_INIT_SYSTEMD - help - The 'udev' package has been converted to a virtual package. - The providers for this feature are: 'eudev', 'systemd'. - - If you are not using 'systemd' as init system, udev rules - generation will be handled by 'eudev'. Check that - '/dev management' is set to 'Dynamic using eudev' to get - the same behaviour as in your old configuration. - - If you are using 'systemd', it internal implementation of - 'udev' will generate the rules. - -config BR2_PACKAGE_UDEV_ALL_EXTRAS - bool "udev extras removed" - select BR2_LEGACY - help - The 'udev' package has been converted to a virtual package. - The providers for this feature are: 'eudev', 'systemd'. - - The option to enable the extra features of 'udev' (gudev, ...) - has been removed. These features are automatically enabled in - the 'udev' providers if the dependencies are selected. For - example, selecting 'libglib2' will trigger the build of gudev. - -config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS - bool "xlib-libpthread-stubs option has been renamed" - depends on BR2_PACKAGE_XORG7 - select BR2_LEGACY - select BR2_PACKAGE_LIBPTHREAD_STUBS - help - The pthread stubs neither depend on X11 nor Xlib. Thus the - package has been renamed BR2_PACKAGE_LIBPTHREAD_STUBS - -############################################################################### -comment "Legacy options removed in 2014.02" - -config BR2_sh2 - bool "sh2 support removed" - select BR2_LEGACY - help - Due to an inexistent user base and generally poor Linux - support, the support for the SH2 architecture was removed. - -config BR2_sh3 - bool "sh3 support removed" - select BR2_LEGACY - help - Due to an inexistent user base and generally poor Linux - support, the support for the SH3 architecture was removed. - -config BR2_sh3eb - bool "sh3eb support removed" - select BR2_LEGACY - help - Due to an inexistent user base and generally poor Linux - support, the support for the SH3eb architecture was removed. - -config BR2_KERNEL_HEADERS_3_1 - bool "kernel headers version 3.1.x are no longer supported" - select BR2_LEGACY - help - Version 3.1.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_KERNEL_HEADERS_3_3 - bool "kernel headers version 3.3.x are no longer supported" - select BR2_LEGACY - help - Version 3.3.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_KERNEL_HEADERS_3_5 - bool "kernel headers version 3.5.x are no longer supported" - select BR2_LEGACY - help - Version 3.5.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_GDB_VERSION_7_2 - bool "gdb 7.2.x is no longer supported" - select BR2_GDB_VERSION_7_6 - select BR2_LEGACY - help - Version 7.2.x of gdb has been deprecated for more than four - buildroot releases and is now removed. As an alternative, gdb - 7.5.x has been automatically selected in your configuration. - -config BR2_GDB_VERSION_7_3 - bool "gdb 7.3.x is no longer supported" - select BR2_GDB_VERSION_7_6 - select BR2_LEGACY - help - Version 7.3.x of gdb has been deprecated for more than four - buildroot releases and is now removed. As an alternative, gdb - 7.5.x has been automatically selected in your configuration. - -config BR2_PACKAGE_CCACHE - bool "ccache target package has been removed" - select BR2_LEGACY - help - The 'ccache' target package has been removed since it has been - deprecated for more than four buildroot releases. - Note: using ccache for speeding up builds is still supported. - -config BR2_HAVE_DOCUMENTATION - bool "support for documentation on target has been removed" - select BR2_LEGACY - help - Support for documentation on target has been removed since it - has been deprecated for more than four buildroot releases. - -config BR2_PACKAGE_AUTOMAKE - bool "automake target package has been removed" - select BR2_LEGACY - help - The 'automake' target package has been removed since it has - been deprecated for more than four buildroot releases. - Note: the host automake still exists. - -config BR2_PACKAGE_AUTOCONF - bool "autoconf target package has been removed" - select BR2_LEGACY - help - The 'autoconf' target package has been removed since it has - been deprecated for more than four buildroot releases. - Note: the host autoconf still exists. - -config BR2_PACKAGE_XSTROKE - bool "xstroke has been removed" - select BR2_LEGACY - help - The 'xstroke' package has been removed since it has been - deprecated for more than four buildroot releases. - -config BR2_PACKAGE_LZMA - bool "lzma target package has been removed" - select BR2_LEGACY - help - The 'lzma' target package has been removed since it has been - deprecated for more than four buildroot releases. - Note: generating lzma-compressed rootfs images is still - supported. - -config BR2_PACKAGE_TTCP - bool "ttcp has been removed" - select BR2_LEGACY - help - The 'ttcp' package has been removed since it has been - deprecated for more than four buildroot releases. - -config BR2_PACKAGE_LIBNFC_LLCP - bool "libnfc-llcp has been replaced by libllcp" - select BR2_LEGACY - select BR2_PACKAGE_LIBLLCP - help - The 'libnfc-llcp' package has been removed since upstream - renamed to 'libllcp'. We have added a new package for - 'libllcp' and bumped the version at the same time. - -config BR2_PACKAGE_MYSQL_CLIENT - bool "MySQL client renamed to MySQL" - select BR2_LEGACY - select BR2_PACKAGE_MYSQL - help - The option has been renamed BR2_PACKAGE_MYSQL - -config BR2_PACKAGE_SQUASHFS3 - bool "squashfs3 has been removed" - select BR2_LEGACY - select BR2_PACKAGE_SQUASHFS - help - The 'squashfs3' package has been removed since it has been - deprecated for more than four buildroot releases. Package - 'squashfs' (4) has been selected automatically as replacement. - -config BR2_TARGET_ROOTFS_SQUASHFS3 - bool "squashfs3 rootfs support has been removed" - select BR2_LEGACY - help - Together with the removal of the squashfs3 package, support - for squashfs3 root filesystems has been removed too. Squashfs - root filesystems will automatically use squashfs4 now. - -config BR2_PACKAGE_NETKITBASE - bool "netkitbase has been removed" - select BR2_LEGACY - help - The 'netkitbase' package has been removed since it has been - deprecated since 2012.11. This package provided 'inetd' - which is replaced by 'xinet' and 'ping' which is replaced by - 'busybox' or 'fping'. - -config BR2_PACKAGE_NETKITTELNET - bool "netkittelnet has been removed" - select BR2_LEGACY - help - The 'netkittelnet' package has been removed since it has - been deprecated since 2012.11. 'busybox' provides a telnet - client and should be used instead. - -config BR2_PACKAGE_LUASQL - bool "luasql has been replaced by luasql-sqlite3" - select BR2_PACKAGE_LUASQL_SQLITE3 - select BR2_LEGACY - help - The option has been renamed BR2_PACKAGE_LUASQL_SQLITE3. - -config BR2_PACKAGE_LUACJSON - bool "luacjson has been replaced by lua-cjson" - select BR2_PACKAGE_LUA_CJSON - select BR2_LEGACY - help - The option has been renamed BR2_PACKAGE_LUA_CJSON. - -############################################################################### -comment "Legacy options removed in 2013.11" - -config BR2_PACKAGE_LVM2_DMSETUP_ONLY - bool "lvm2's 'dmsetup only' option removed" - select BR2_LEGACY - help - The BR2_PACKAGE_LVM2_DMSETUP_ONLY was a negative option, which - led to problems with other packages that need the full lvm2 - suite. Therefore, the option has been replaced with the - positive BR2_PACKAGE_LVM2_STANDARD_INSTALL option. - -# Note: BR2_PACKAGE_LVM2_DMSETUP_ONLY is still referenced in package/lvm2/Config.in -# in order to automatically propagate old configs - -config BR2_PACKAGE_QT_JAVASCRIPTCORE - bool "qt javascriptcore option removed" - select BR2_LEGACY - help - The BR2_PACKAGE_QT_JAVASCRIPTCORE option was available to - force the activation or disabling of the JIT compiler in the - Qt Javascript interpreter. However, the JIT compiler is not - available for all architectures, so forcing its activation - does not always work. Moreover, Qt knows by itself for which - architectures JIT support is possible, and will - automatically enable it if possible. - - Therefore, this option was in fact useless, and causing - build problems when enabled on architectures for which the - JIT support was not available. It has been removed, and - there is no replacement: Qt will enable JIT at compile time - when possible. - -config BR2_PACKAGE_MODULE_INIT_TOOLS - bool "module-init-tools replaced by kmod" - select BR2_PACKAGE_KMOD - select BR2_PACKAGE_KMOD_TOOLS - select BR2_LEGACY - help - The 'module-init-tools' package has been removed, since it - has been depracated upstream and replaced by 'kmod'. - -config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL - string "u-boot: the git repository URL option has been renamed" - help - The option BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL has - been renamed to BR2_TARGET_UBOOT_CUSTOM_REPO_URL. - -config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL_WRAP - bool - default y if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" - select BR2_LEGACY - -# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL is still referenced from -# boot/uboot/Config.in - -config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION - string "u-boot: the git repository version option has been renamed" - help - The option BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION has - been renamed to BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION. - -config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION_WRAP - bool - default y if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" - select BR2_LEGACY - -# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION is still referenced from -# boot/uboot/Config.in - -config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL - string "linux: the git repository URL option has been renamed" - help - The option BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL has - been renamed to - BR2_LINUX_KERNEL_CUSTOM_REPO_URL. - -config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL_WRAP - bool - default y if BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL != "" - select BR2_LEGACY - -# Note: BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL is still referenced from -# linux/Config.in - -config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION - string "linux: the git repository version option has been renamed" - help - The option BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION has - been renamed to - BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION. - -config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION_WRAP - bool - default y if BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION != "" - select BR2_LEGACY - -# Note: BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION is still referenced from -# linux/Config.in - -############################################################################### -comment "Legacy options removed in 2013.08" - -config BR2_ARM_OABI - bool "ARM OABI support has been removed" - select BR2_LEGACY - help - The support for the ARM OABI was deprecated since a while, - and has been removed completely from Buildroot. It is also - deprecated in upstream gcc, since gcc 4.7. People should - switch to EABI instead, which should not be a problem as - long as you don't have pre-built OABI binaries in your - system that you can't recompile. - -config BR2_PACKAGE_DOSFSTOOLS_DOSFSCK - bool "dosfstools dosfsck renamed to fsck.fat" - select BR2_LEGACY - select BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT - help - dosfsck was renamed upstream to fsck.fat for consistency. - -config BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL - bool "dosfstools dosfslabel renamed to fatlabel" - select BR2_LEGACY - select BR2_PACKAGE_DOSFSTOOLS_FATLABEL - help - doslabel was renamed upstream to fatlabel for consistency. - -config BR2_PACKAGE_DOSFSTOOLS_MKDOSFS - bool "dosfstools mkdosfs renamed to mkfs.fat" - select BR2_LEGACY - select BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT - help - mkdosfs was renamed upstream to mkfs.fat for consistency. - -config BR2_ELF2FLT - bool "the elf2flt option has been renamed" - select BR2_LEGACY - help - The BR2_ELF2FLT option has been renamed to - BR2_PACKAGE_HOST_ELF2FLT due to the conversion of elf2flt to - the package infrastructure. - -config BR2_VFP_FLOAT - bool "the ARM VFP floating point option has been renamed" - select BR2_LEGACY - help - Due to a major refactoring of the floating-point handling of - the ARM architecture support, the BR2_VFP_FLOAT option has - been replaced with a choice of options that allows to select - between various VFP versions/capabilities. - -config BR2_PACKAGE_GCC_TARGET - bool "gcc on the target filesystem has been removed" - select BR2_LEGACY - help - The support for gcc in the target filesystem was deprecated - since a while, and has been removed completely from Buildroot. - See Buildroot's documentation for more explanations. - -config BR2_HAVE_DEVFILES - bool "development files in target filesystem has been removed" - select BR2_LEGACY - help - The installation of the development files in the target - filesystem was deprecated since a while, and has been removed - completely from Buildroot. - See Buildroot's documentation for more explanations. - endmenu endif # !SKIP_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index bf209b45d6..33ceaa05dd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -26,78 +26,19 @@ # infrastructure, and will be CC'ed on all patches that add or # modify packages that use this infrastructure. -N: Adam Duskett -F: package/audit/ -F: package/busybox/ -F: package/checkpolicy/ -F: package/cppdb/ -F: package/gobject-introspection/ -F: package/gstreamer1/gstreamer1/ -F: package/gstreamer1/gstreamer1-mm/ -F: package/gstreamer1/gst1-plugins-bad/ -F: package/gstreamer1/gst1-plugins-base/ -F: package/gstreamer1/gst1-plugins-good/ -F: package/gstreamer1/gst1-plugins-ugly/ -F: package/gstreamer1/gst1-python/ -F: package/gstreamer1/gst1-vaapi/ -F: package/imx-usb-loader/ -F: package/janus-gateway/ -F: package/json-for-modern-cpp/ -F: package/libcpprestsdk/ -F: package/libressl/ -F: package/libselinux/ -F: package/libsemanage/ -F: package/libsepol/ -F: package/libwebsockets/ -F: package/mender-grubenv/ -F: package/nginx-naxsi/ -F: package/openjdk/ -F: package/openjdk-bin/ -F: package/php/ -F: package/policycoreutils/ -F: package/prelink-cross/ -F: package/polkit/ -F: package/python3/ -F: package/python-aioredis/ -F: package/python-asgiref/ -F: package/python-channels/ -F: package/python-channels-redis/ -F: package/python-daphne/ -F: package/python-django-enumfields/ -F: package/python-flask-sqlalchemy/ -F: package/python-gitdb2/ -F: package/python-gobject/ -F: package/python-lockfile/ -F: package/python-mutagen/ -F: package/python-nested-dict/ -F: package/python-pbr/ -F: package/python-pip/ -F: package/python-psycopg2/ -F: package/python-smmap2/ -F: package/python-sqlalchemy/ -F: package/python-sqlparse/ -F: package/python-visitor/ -F: package/restorecond/ -F: package/refpolicy/ -F: package/selinux-python/ -F: package/semodule-utils/ -F: package/setools/ -F: package/sngrep/ -F: package/spidermonkey/ -F: package/systemd/ -F: support/testing/tests/package/test_gst1_python.py -F: support/testing/tests/package/test_python_gobject.py - N: Adam Heinrich F: package/jack1/ N: Adrian Perez de Castro F: package/brotli/ F: package/bubblewrap/ +F: package/cage/ F: package/cog/ F: package/libepoxy/ +F: package/libpsl/ F: package/libwpe/ F: package/webkitgtk/ +F: package/wlroots/ F: package/woff2/ F: package/wpebackend-fdo/ F: package/wpewebkit/ @@ -107,6 +48,10 @@ N: Adrien Gallouët F: package/bird/ F: package/glorytun/ +N: Alejandro González +F: package/qprint/ +F: package/watchdog/ + N: Aleksander Morgado F: package/libmbim/ F: package/libqmi/ @@ -126,8 +71,19 @@ F: package/odhcp6c/ N: Alexander Dahl F: package/fastd/ F: package/libuecc/ +F: package/siproxd/ F: package/putty/ +N: Alexander Egorenkov +F: package/makedumpfile/ +F: package/multipath-tools/ + +N: Alexander Egorenkov +F: arch/Config.in.s390x +F: board/qemu/s390x/ +F: configs/qemu_s390x_defconfig +F: package/s390-tools/ + N: Alexander Kurz F: package/minimodem/ @@ -168,15 +124,15 @@ F: package/python-docopt/ N: Anders Darander F: package/ktap/ -N: André Hentschel -F: board/freescale/imx8qxpmek/ -F: configs/freescale_imx8qxpmek_defconfig -F: package/freescale-imx/imx-sc-firmware/ +N: André Zwing F: package/libkrb5/ F: package/openal/ F: package/p7zip/ F: package/wine/ +N: Andreas Klinger +F: package/ply/ + N: Andrey Smirnov F: package/python-backports-shutil-get-terminal-size/ F: package/python-decorator/ @@ -193,23 +149,39 @@ N: Andrey Yurovsky F: package/rauc/ N: Angelo Compagnucci +F: package/apparmor/ F: package/corkscrew/ +F: package/cups/ +F: package/cups-filters/ F: package/fail2ban/ +F: package/grep/ +F: package/htpdate/ F: package/i2c-tools/ +F: package/jq/ +F: package/libapparmor/ +F: package/libb64/ F: package/mender/ F: package/mender-artifact/ F: package/mono/ F: package/mono-gtksharp3/ F: package/monolite/ +F: package/openjpeg/ F: package/python-can/ F: package/python-pillow/ F: package/python-pydal/ F: package/python-spidev/ F: package/python-web2py/ +F: package/qt5/qt5coap/ +F: package/qt5/qt5knx/ +F: package/qt5/qt5mqtt/ +F: package/sam-ba/ F: package/sshguard/ F: package/sunwait/ F: package/sysdig/ +N: Andy Shevchenko +F: package/fb-test-app/ + N: Anisse Astier F: package/go/ F: package/nghttp2/ @@ -218,8 +190,13 @@ F: package/pkg-golang.mk N: Anthony Viallard F: package/gnuplot/ -N: Antoine Ténart -F: package/wf111/ +N: Antoine Tenart +F: package/libselinux/ +F: package/refpolicy/ +F: support/testing/tests/core/test_selinux/ +F: support/testing/tests/core/test_selinux.py +F: support/testing/tests/init/test_systemd_selinux/ +F: support/testing/tests/init/test_systemd_selinux.py N: Antony Pavlov F: package/lsscsi/ @@ -252,17 +229,15 @@ F: package/python-bottle/ F: package/sqlcipher/ F: package/stress/ -N: Arthur Courtel -F: board/raspberrypi/genimage-raspberrypi4-64.cfg -F: configs/raspberrypi4_64_defconfig - N: Asaf Kahlon F: package/collectd/ +F: package/libfuse3/ F: package/libuv/ F: package/python* F: package/snmpclitools/ F: package/spdlog/ F: package/uftp/ +F: package/uftrace/ F: package/uvw/ F: package/zeromq/ @@ -279,11 +254,17 @@ F: package/luasec/ F: package/lua-ev/ F: package/orbit/ +N: Attila Wagner +F: package/python-canopen/ + N: Bartosz Bilas F: board/stmicroelectronics/stm32mp157a-dk1/ F: configs/stm32mp157a_dk1_defconfig +F: package/cegui/ +F: package/log4qt/ F: package/python-esptool/ F: package/python-pyaes/ +F: package/ttyd/ F: package/qt5/qt5scxml/ F: package/qt5/qt5webview/ @@ -309,7 +290,6 @@ F: package/ebtables/ F: package/i2c-tools/ F: package/libcurl/ F: package/libpcap/ -F: package/openipmi/ F: package/socat/ F: package/strace/ F: package/tcpdump/ @@ -326,9 +306,11 @@ N: Bernd Kuhls F: package/alsa-lib/ F: package/alsa-utils/ F: package/apache/ +F: package/apg/ F: package/apr/ F: package/apr-util/ F: package/bcg729/ +F: package/bitcoin/ F: package/bluez-tools/ F: package/boinc/ F: package/clamav/ @@ -347,10 +329,16 @@ F: package/freetype/ F: package/fstrcmp/ F: package/ghostscript/ F: package/giflib/ +F: package/gkrellm/ F: package/gli/ F: package/glmark2/ F: package/gpsd/ +F: package/gptfdisk/ F: package/hdparm/ +F: package/inih/ +F: package/intel-gmmlib/ +F: package/intel-mediadriver/ +F: package/intel-mediasdk/ F: package/jsoncpp/ F: package/kodi* F: package/lame/ @@ -393,7 +381,6 @@ F: package/libpng/ F: package/libsidplay2/ F: package/libsilk/ F: package/libsndfile/ -F: package/libsoil/ F: package/libsoundtouch/ F: package/libsquish/ F: package/libudfread/ @@ -431,6 +418,7 @@ 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/ @@ -469,6 +457,7 @@ F: package/waylandpp/ F: package/x11r7/ F: package/x264/ F: package/x265/ +F: package/xmrig/ F: package/ytree/ F: package/znc/ F: support/testing/tests/package/test_perl_html_parser.py @@ -477,14 +466,15 @@ N: Biagio Montaruli F: board/acmesystems/ F: configs/acmesystems_* -N: Bimal Jacob -F: package/nginx-upload/ +N: Bilal Wasim +F: board/chromebook/elm/ +F: configs/chromebook_elm_defconfig N: Bogdan Radulescu F: package/iftop/ F: package/ncdu/ -N: Brandon Maier +N: Brandon Maier F: package/vmtouch/ N: Brock Williams @@ -494,34 +484,6 @@ N: Carlo Caione F: package/jailhouse/ F: package/sunxi-boards/ -N: Carlos Santos -F: package/busybox/ -F: package/cups/ -F: package/cups-filters/ -F: package/gtest/ -F: package/initscripts/ -F: package/intel-microcode/ -F: package/libpam-radius-auth/ -F: package/libpam-tacplus/ -F: package/liburiparser/ -F: package/modem-manager/ -F: package/pamtester/ -F: package/pcm-tools/ -F: package/perl-file-util/ -F: package/skeleton-custom/ -F: package/skeleton-init-common/ -F: package/skeleton-init-none/ -F: package/skeleton-init-systemd/ -F: package/skeleton-init-sysv/ -F: package/skeleton/ -F: package/sysvinit/ -F: package/udev-gentoo-scripts/ -F: package/util-linux/ -F: package/tpm2-abrmd/ -F: package/tpm2-tools/ -F: package/tpm2-totp/ -F: package/tpm2-tss/ - N: Carsten Schoenert F: package/dvbsnoop/ F: package/libdvbsi/ @@ -531,17 +493,12 @@ F: package/libsvg-cairo/ N: Cédric Chépied F: package/znc/ -N: Chakra Divi -F: board/friendlyarm/nanopi-m1 -F: board/friendlyarm/nanopi-m1-plus -F: board/olimex/a13_olinuxino -F: board/orangepi/orangepi-plus -F: configs/nanopi_m1_defconfig -F: configs/nanopi_m1_plus_defconfig -F: configs/olimex_a13_olinuxino_defconfig -F: configs/orangepi_plus_defconfig +N: Charles Hardin +F: package/alsa-plugins/ N: Chris Packham +F: package/coremark/ +F: package/coremark-pro/ F: package/gstreamer1/gst1-shark/ F: package/micropython/ F: package/micropython-lib/ @@ -551,22 +508,22 @@ N: Christian Kellermann F: package/python-pylibftdi/ N: Christian Stewart -F: linux/linux-ext-aufs.mk -F: package/aufs/ -F: package/aufs-util/ F: package/batman-adv/ +F: package/containerd/ +F: package/delve/ F: package/docker-cli/ -F: package/docker-containerd/ F: package/docker-engine/ F: package/docker-proxy/ +F: package/fuse-overlayfs/ F: package/go/ +F: package/mbpfan/ F: package/mosh/ F: package/pkg-golang.mk F: package/rtl8821au/ F: package/runc/ F: package/tini/ -N: Christophe Priouzeau +N: Christophe Priouzeau F: board/stmicroelectronics/stm32f429-disco/ F: board/stmicroelectronics/stm32f469-disco/ F: configs/stm32f429_disco_defconfig @@ -611,7 +568,7 @@ F: package/perl-sys-mmap/ F: package/perl-time-parsedate/ F: package/perl-x10/ -N: Clayton Shotwell +N: Clayton Shotwell F: package/audit/ F: package/checkpolicy/ F: package/cpio/ @@ -635,6 +592,12 @@ N: Cyril Bur F: arch/Config.in.powerpc F: package/kvm-unit-tests +N: Dagg Stompler +F: board/hardkernel/odroidc2/ +F: configs/odroidc2_defconfig +F: package/meson-tools/ +F: package/odroidc2-firmware/ + N: Daniel J. Leach F: package/dacapo/ @@ -652,6 +615,10 @@ F: package/redis/ N: Daniel Sangue F: package/libftdi1/ +N: Danilo Bargen +F: board/pcengines/apu2/ +F: configs/pcengines_apu2_defconfig + N: Danomi Manchego F: package/cjson/ F: package/jq/ @@ -679,8 +646,9 @@ F: package/openldap/ N: David du Colombier <0intro@gmail.com> F: package/x264/ -N: David Graziano -F: package/libcsv/ +N: David GOUARIN +F: package/librelp/ +F: package/libtalloc/ N: David Lechner F: board/lego/ev3/ @@ -689,7 +657,9 @@ F: linux/linux-ext-ev3dev-linux-drivers.mk F: package/brickd/ F: package/ev3dev-linux-drivers/ -N: Davide Viti +N: Davide Viti +F: board/friendlyarm/nanopi-r1/ +F: configs/friendlyarm_nanopi_r1_defconfig F: package/flann/ F: package/python-paho-mqtt/ F: package/qhull/ @@ -698,6 +668,31 @@ F: package/tcllib/ N: Denis Bodor F: package/libstrophe/ +N: Derrick Lyndon Pallas +F: package/ipcalc/ + +N: Dick Olsson +F: board/aarch64-efi/ +F: board/pc/ +F: board/qemu/aarch64-sbsa/ +F: boot/arm-trusted-firmware/ +F: boot/edk2/ +F: configs/qemu_aarch64_sbsa_defconfig +F: package/bearssl/ +F: package/bitcoin/ +F: package/edk2-platforms/ +F: package/execline/ +F: package/mdevd/ +F: package/s6-dns/ +F: package/s6-linux-init/ +F: package/s6-linux-utils/ +F: package/s6-networking/ +F: package/s6-portable-utils/ +F: package/s6-rc/ +F: package/s6/ +F: package/skalibs/ +F: support/testing/tests/boot/test_edk2.py + N: Dimitrios Siganos F: package/wireless-regdb/ @@ -705,7 +700,7 @@ N: Dominik Faessler F: package/logsurfer/ F: package/python-id3/ -N: Doug Kehn +N: Doug Kehn F: package/nss-pam-ldapd/ F: package/sp-oops-extract/ F: package/unscd/ @@ -713,6 +708,11 @@ F: package/unscd/ N: Dushara Jayasinghe F: package/prosody/ +N: Edgar Bonet +F: board/acmesystems/acqua-a5/ +F: configs/acmesystems_acqua_a5_256mb_defconfig +F: configs/acmesystems_acqua_a5_512mb_defconfig + N: Eloi Bail F: package/bayer2rgb-neon/ F: package/gstreamer1/gst1-plugins-bayer2rgb-neon/ @@ -720,8 +720,6 @@ F: package/gstreamer1/gst1-plugins-bayer2rgb-neon/ N: Eric Le Bihan F: docs/manual/adding-packages-meson.txt F: package/adwaita-icon-theme/ -F: package/cargo-bin/ -F: package/cargo/ F: package/darkhttpd/ F: package/eudev/ F: package/execline/ @@ -808,9 +806,11 @@ F: configs/imx6-sabre* F: configs/imx6slevk_defconfig F: configs/imx6sx-sdb_defconfig F: configs/imx6ulevk_defconfig +F: configs/imx6ullevk_defconfig F: configs/imx6ulpico_defconfig F: configs/imx7d-sdb_defconfig F: configs/imx7dpico_defconfig +F: configs/imx8mqevk_defconfig F: configs/mx25pdk_defconfig F: configs/mx51evk_defconfig F: configs/mx53loco_defconfig @@ -841,6 +841,7 @@ F: package/belle-sip/ F: package/belr/ F: package/boinc/ F: package/cairo/ +F: package/daq3/ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ @@ -876,6 +877,7 @@ F: package/libmatroska/ F: package/libmpdclient/ F: package/libnetfilter_conntrack/ F: package/libnetfilter_queue/ +F: package/libnpupnp/ F: package/liboping/ F: package/libpfm4/ F: package/libraw/ @@ -886,7 +888,6 @@ F: package/librsync/ F: package/libsoup/ F: package/libsoxr/ F: package/libupnp/ -F: package/libupnp18/ F: package/libv4l/ F: package/libxslt/ F: package/mbedtls/ @@ -897,14 +898,19 @@ F: package/motion/ F: package/mutt/ F: package/ncmpc/ F: package/oniguruma/ +F: package/opencv4/ F: package/oprofile/ F: package/pcmanfm/ +F: package/perl-extutils-pkgconfig/ F: package/python-backcall/ F: package/python-jedi/ F: package/python-parso/ +F: package/python-yatl/ F: package/rocksdb/ +F: package/rtl_433/ F: package/rygel/ F: package/safeclib/ +F: package/snort3/ F: package/suricata/ F: package/tinycbor/ F: package/tinydtls/ @@ -918,6 +924,10 @@ F: configs/freescale_imx6ullevk_defconfig N: Falco Hyfing F: package/python-pymodbus/ +N: Filip Skoneczny +F: board/sinovoip/m1-plus +F: configs/bananapi_m1_plus_defconfig + N: Floris Bos F: package/ipmitool/ F: package/odhcploc/ @@ -939,6 +949,7 @@ F: package/copas/ F: package/coxpcall/ F: package/dado/ F: package/ficl/ +F: package/janet/ F: package/libtomcrypt/ F: package/libtommath/ F: package/libwpe/ @@ -955,6 +966,7 @@ F: package/netsurf/ F: package/perl* F: package/pkg-perl.mk F: package/pkg-luarocks.mk +F: package/quickjs/ F: package/rings/ F: package/tekui/ F: package/wpebackend-fdo/ @@ -963,6 +975,7 @@ F: package/wsapi/ F: package/wsapi-fcgi/ F: package/wsapi-xavante/ F: package/xavante/ +F: support/testing/tests/package/test_lua* F: utils/scancpan N: Frank Hunleth @@ -1017,6 +1030,7 @@ N: Gilles Talis F: board/freescale/imx8mmevk/ F: configs/freescale_imx8mmevk_defconfig F: package/cctz/ +F: package/faad2/ F: package/fdk-aac/ F: package/httping/ F: package/iozone/ @@ -1025,19 +1039,33 @@ F: package/libeXosip2/ F: package/libolm/ F: package/libosip2/ F: package/ocrad/ +F: package/opusfile/ F: package/restclient-cpp/ F: package/tesseract-ocr/ F: package/webp/ F: package/xapian/ N: Giulio Benetti +F: board/olimex/a* +F: configs/amarula_vyasa_rk3288_defconfig +F: configs/asus_tinker_rk3288_defconfig +F: configs/olimex_a* F: package/at/ +F: package/binutils/ +F: package/erlang-jiffy/ +F: package/gcc/ +F: package/harfbuzz/ +F: package/libfuse3/ F: package/libnspr/ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ +F: package/python-uvloop/ F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/trace-cmd/ +F: package/udisks/ +F: toolchain/ N: Gregory Dymarek F: package/ding-libs/ @@ -1052,6 +1080,7 @@ N: Grzegorz Blach F: fs/f2fs/ F: package/bluez5_utils-headers/ F: package/f2fs-tools/ +F: package/graphicsmagick/ F: package/pigpio/ F: package/python-aioblescan/ F: package/python-bluezero/ @@ -1066,14 +1095,12 @@ F: package/python-redis/ F: package/python-rpi-ws281x/ F: package/python-wtforms/ -N: Guillaume Gardet -F: package/c-icap/ -F: package/c-icap-modules/ -F: package/sdl2/ - N: Guillaume William Brs +F: package/libnids/ +F: package/libxcrypt/ F: package/liquid-dsp/ F: package/pixiewps/ +F: package/python-pybind/ F: package/reaver/ N: Guo Ren @@ -1083,23 +1110,37 @@ F: board/qemu/csky F: configs/csky_* F: configs/qemu_csky* +N: Gustavo Heinz +F: package/python-m2crypto/ + N: Gustavo Pimentel F: configs/arm_juno_defconfig F: board/arm/juno/ N: Gwenhael Goavec-Merou +F: board/terasic/de10nano_cyclone5/ +F: configs/terasic_de10nano_cyclone5_defconfig F: package/gnuradio/ F: package/gqrx/ F: package/gr-osmosdr/ +F: package/librtlsdr/ F: package/libusbgx/ +F: package/matio/ F: package/python-cheetah/ F: package/python-markdown/ F: package/python-remi/ F: package/python-sip/ +F: package/uhd/ N: Heiko Thiery +F: board/kontron/pitx-imx8m/ +F: configs/kontron_pitx_imx8m_defconfig +F: package/altera-stapl/ +F: package/ipmitool/ F: package/libnetconf2/ F: package/libyang/ +F: package/linuxptp/ +F: package/netopeer2/ F: package/sysrepo/ N: Henrique Camargo @@ -1110,6 +1151,10 @@ F: package/gauche/ F: package/gmrender-resurrect/ F: package/squeezelite/ +N: Horatiu Vultur +F: package/easyframes/ +F: package/mrp/ + N: Ian Haylock F: package/python-rpi-gpio/ @@ -1124,6 +1169,7 @@ F: package/exempi/ N: Ismael Luceno F: package/axel/ +F: package/mawk/ N: Jagan Teki F: board/amarula/ @@ -1165,6 +1211,8 @@ F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig N: James Hilliard +F: package/apcupsd/ +F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ @@ -1186,21 +1234,25 @@ F: package/python-aiojobs/ F: package/python-aiorwlock/ F: package/python-aiosignal/ F: package/python-aiozipkin/ +F: package/python-argon2-cffi/ F: package/python-async-lru/ F: package/python-async-timeout/ F: package/python-brotli/ +F: package/python-cbor2/ F: package/python-cchardet/ F: package/python-flatbuffers/ F: package/python-frozenlist/ +F: package/python-greenlet/ F: package/python-janus/ F: package/python-logstash/ F: package/python-multidict/ F: package/python-pycares/ +F: package/python-snappy/ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-yarl/ -N: James Knight +N: James Knight F: package/atkmm/ F: package/cairomm/ F: package/google-material-design-icons/ @@ -1228,15 +1280,8 @@ F: package/sysrepo/ N: Jan Pedersen F: package/zip/ -N: Jan Viktorin -F: package/python-pexpect/ -F: package/python-ptyprocess/ -F: package/zynq-boot-bin/ - N: Jared Bents -F: package/davici/ -F: package/python-filelock/ -F: package/python-pysftp/ +F: package/libvirt/ N: Jarkko Sakkinen F: package/quota/ @@ -1278,10 +1323,24 @@ F: package/libuhttpd/ F: package/libuwsc/ F: package/rtty/ +N: Joachim Wiberg +F: configs/globalscale_espressobin_defconfig +F: board/globalscale/espressobin/ +F: package/libite/ +F: package/libuev/ +F: package/mg/ +F: package/mrouted/ +F: package/netcalc/ +F: package/ssdp-responder/ +F: package/sysklogd/ + N: Joao Pinto F: board/synopsys/vdk/ F: configs/snps_aarch64_vdk_defconfig +N: Jochen Baltes +F: package/altera-stapl + N: Joel Carlson F: package/c-capnproto/ F: package/capnproto/ @@ -1371,27 +1430,39 @@ F: package/libuio/ F: package/netsniff-ng/ F: package/rabbitmq-c/ +N: José Luis Salvador Rufo +F: package/zfs/ +F: support/testing/tests/package/test_zfs.py + N: Joseph Kogut F: package/at-spi2-atk/ F: package/at-spi2-core/ F: package/clang/ +F: package/earlyoom/ F: package/gconf/ F: package/libnss/ F: package/lld/ F: package/llvm/ F: package/python-cython/ +F: package/python-pycups/ F: package/python-raven/ F: package/python-schedule/ F: package/python-sentry-sdk/ F: package/python-websockets/ F: package/python-xlib/ +F: package/sentry-native/ +F: package/unclutter-xfixes/ N: Joshua Henderson F: package/qt5/qt5wayland/ N: Jugurtha BELKALEM +F: package/python-aiofiles/ +F: package/python-crayons/ F: package/python-cycler/ F: package/python-matplotlib/ +F: package/python-opcua-asyncio/ +F: package/python-piexif/ N: Juha Rantanen F: package/acsccid/ @@ -1423,15 +1494,18 @@ F: board/technologic/ts7680/ F: configs/ts7680_defconfig F: package/paho-mqtt-c -N: Julien Olivain +N: Julien Olivain +F: board/qmtech/zynq/ F: board/technexion/imx8mmpico/ F: board/technexion/imx8mpico/ F: configs/imx8mmpico_defconfig F: configs/imx8mpico_defconfig +F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ +F: package/python-pyalsa/ N: Julien Viard de Galbert F: package/dieharder/ @@ -1440,6 +1514,12 @@ F: package/easy-rsa/ N: Justin Maggard F: package/dtach/ +N: Kamel Bouhara +F: package/libodb-boost/ +F: package/libodb-mysql/ +F: package/libqb/ +F: package/usbguard/ + N: Karoly Kasza F: package/irqbalance/ F: package/openvmtools/ @@ -1452,6 +1532,9 @@ F: package/ramsmp/ N: Kieran Bingham F: package/libcamera/ +N: Klaus Heinrich Kiwi +F: package/wqy-zenhei/ + N: Koen Martens F: package/capnproto/ F: package/linuxconsoletools/ @@ -1474,6 +1557,9 @@ N: Leon Anavi F: board/olimex/a10_olinuxino F: configs/olimex_a10_olinuxino_lime_defconfig +N: Leonid Yuriev +F: package/libmdbx/ + N: Lionel Flandrin F: package/python-babel/ F: package/python-daemonize/ @@ -1491,7 +1577,6 @@ F: configs/bananapi_m2_ultra_defconfig F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig F: package/ti-sgx-demos/ -F: package/ti-sgx-libgbm/ F: package/ti-sgx-km/ F: package/ti-sgx-um/ @@ -1532,10 +1617,17 @@ F: support/legal-info/ N: Lucas De Marchi F: package/fswebcam/ +N: Lubomir Rintel +F: board/olpc/ +F: configs/olpc_xo1_defconfig +F: configs/olpc_xo175_defconfig + N: Ludovic Desroches F: board/atmel/ +F: board/microchip/ F: configs/at91* F: configs/atmel_* +F: configs/microchip_* F: package/fb-test-app/ F: package/python-json-schema-validator/ F: package/python-keyring/ @@ -1554,9 +1646,6 @@ F: package/mpv/ F: package/rpi-firmware/ F: package/rpi-userland/ -N: Mamatha Inamdar -F: package/nvme/ - N: Manuel Vögele F: package/python-pyqt5/ F: package/python-requests-toolbelt/ @@ -1568,7 +1657,9 @@ F: package/ecryptfs-utils/ N: Marcin Niestroj F: board/grinn/ +F: board/orangepi/orangepi-zero-plus/ F: configs/grinn_* +F: configs/orangepi_zero_plus_defconfig F: package/argparse/ F: package/dt-utils/ F: package/easydbus/ @@ -1577,9 +1668,26 @@ F: package/lua-stdlib/ F: package/luaossl/ F: package/murata-cyw-fw/ F: package/netdata/ +F: package/python-ansicolors/ +F: package/python-bleak/ +F: package/python-dbus-next/ +F: package/python-iniconfig/ +F: package/python-intelhex/ +F: package/python-packaging/ +F: package/python-pluggy/ +F: package/python-pytest/ +F: package/python-pytest-asyncio/ +F: package/python-typing-extensions/ +F: package/python-xmodem/ F: package/rs485conf/ F: package/turbolua/ +F: support/testing/tests/package/sample_python_dbus_next.py +F: support/testing/tests/package/sample_python_pytest.py +F: support/testing/tests/package/sample_python_pytest_asyncio.py F: support/testing/tests/package/test_netdata.py +F: support/testing/tests/package/test_python_dbus_next.py +F: support/testing/tests/package/test_python_pytest.py +F: support/testing/tests/package/test_python_pytest_asyncio.py N: Marcus Folkesson F: package/libostree/ @@ -1591,6 +1699,8 @@ F: utils/config F: utils/diffconfig N: Marek Belisko +F: board/friendlyarm/nanopi-neo4/ +F: configs/friendlyarm_nanopi_neo4_defconfig F: package/libatasmart/ F: package/polkit/ F: package/sg3_utils/ @@ -1640,7 +1750,7 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ -N: Matt Weber +N: Matt Weber F: board/freescale/p* F: board/freescale/t* F: board/qemu/ppc64-e5500/ @@ -1658,6 +1768,7 @@ F: package/cgroupfs-mount/ F: package/crda/ F: package/cunit/ F: package/dacapo/ +F: package/davici/ F: package/dnsmasq/ F: package/dosfstools/ F: package/eigen/ @@ -1687,6 +1798,7 @@ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/libssh2/ +F: package/libtalloc/ F: package/libqmi/ F: package/lighttpd/ F: package/logrotate/ @@ -1707,17 +1819,20 @@ F: package/protobuf-c/ F: package/protobuf/ F: package/python-bunch/ F: package/python-colorama/ +F: package/python-filelock/ F: package/python-flask-cors/ F: package/python-iptables/ F: package/python-ipy/ +F: package/python-iwlib/ F: package/python-posix-ipc/ F: package/python-pycairo/ F: package/python-pypcap/ F: package/python-pyrex/ +F: package/python-pysftp/ F: package/python-tinyrpc/ F: package/python-txdbus/ +F: package/qoriq-rcw/ F: package/raptor/ -F: package/rcw/ F: package/rng-tools/ F: package/rsyslog/ F: package/setools/ @@ -1730,6 +1845,7 @@ F: package/valijson/ F: package/wpa_supplicant/ F: package/wireless_tools/ F: package/xen/ +F: package/xml-security-c/ F: support/testing/tests/package/br2-external/openjdk/ F: support/testing/tests/package/test_openjdk.py F: support/testing/tests/package/test_opkg/ @@ -1745,7 +1861,6 @@ F: package/python-crossbar/ F: package/python-lmdb/ F: package/python-mistune/ F: package/python-netaddr/ -F: package/python-pyasn-modules/ F: package/python-pygments/ F: package/python-pynacl/ F: package/python-pytrie/ @@ -1760,38 +1875,12 @@ F: package/python-wsaccel/ N: Max Filippov F: arch/Config.in.xtensa -N: Maxime Hadjinlian -F: package/babeld/ -F: package/dante/ -F: package/faifa/ -F: package/initscripts/ -F: package/intel-microcode/ -F: package/iucode-tool/ -F: package/jasper/ -F: package/kodi/ -F: package/libass/ -F: package/libbluray/ -F: package/libcdio/ -F: package/libcofi/ -F: package/libenca/ -F: package/libmodplug/ -F: package/libnfs/ -F: package/libplist/ -F: package/libshairplay/ -F: package/linux-zigbee/ -F: package/netcat-openbsd/ -F: package/open-plc-utils/ -F: package/rpi-firmware/ -F: package/rpi-userland/ -F: package/rtmpdump/ -F: package/skeleton/ -F: package/systemd/ -F: package/systemd-bootchart/ -F: package/tinyalsa/ -F: package/tinyxml/ - -N: Maxime Ripard -F: package/kmsxx/ +N: Maxim Kochetkov +F: package/libosmium/ +F: package/osm2pgsql/ +F: package/postgis/ +F: package/protozero/ +F: package/timescaledb/ N: Michael Durrant F: board/arcturus/ @@ -1802,6 +1891,13 @@ N: Michael Fischer F: package/gnuplot/ F: package/sdl2/ +N: Michael Nosthoff +F: package/grpc/ +F: package/gtest/ +F: package/libabseil-cpp/ +F: package/protobuf/ +F: package/re2/ + N: Michael Rommel F: package/knock/ F: package/python-crc16/ @@ -1815,7 +1911,10 @@ F: package/jasper/ F: package/libstrophe/ N: Michael Walle +F: board/kontron/smarc-sal28/ +F: configs/kontron_smarc_sal28_defconfig F: package/libavl/ +F: package/rcw-smarc-sal28/ N: Michał Łyszczek F: board/altera/socrates_cyclone5/ @@ -1830,6 +1929,9 @@ N: Michel Stempin F: board/licheepi/ F: configs/licheepi_zero_defconfig +N: Mike Frampton +F: package/qcom-db410c-firmware/ + N: Mike Harmony F: board/sinovoip/m2-plus/ F: configs/bananapi_m2_plus_defconfig @@ -1840,15 +1942,14 @@ F: package/libfribidi/ N: Min Xu F: package/shadowsocks-libev/ -N: Mirza Krak -F: package/mender/ -F: package/mender-artifact/ +N: Mircea Gliga +F: package/mbuffer/ N: Murat Demirten F: package/jpeg-turbo/ F: package/libgeotiff/ -N: Mylène Josserand +N: Mylène Josserand F: package/rtl8723bu/ N: Nathaniel Roach @@ -1867,13 +1968,20 @@ N: Nicholas Sielicki F: board/intel/galileo/ F: configs/galileo_defconfig +N: Nicolas Carrier +F: package/bmap-tools/ +F: package/php-xdebug/ +F: package/python-augeas/ +F: support/testing/tests/package/sample_bmap_tools.sh +F: support/testing/tests/package/sample_python_augeas.py +F: support/testing/tests/package/test_bmap_tools.py +F: support/testing/tests/package/test_python_augeas.py + N: Nicolas Cavallari F: package/libgit2/ -N: Nicolas Serafini +N: Nicolas Serafini F: package/exiv2/ -F: package/nvidia-tegra23/nvidia-tegra23-binaries/ -F: package/nvidia-tegra23/nvidia-tegra23-codecs/ F: package/ofono/ N: Nikolay Dimitrov @@ -1888,6 +1996,7 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange +F: package/systemd/ F: package/tcf-agent/ N: Nylon Chen @@ -1922,9 +2031,6 @@ F: package/openjpeg/ N: Olivier Singla F: package/shellinabox/ -N: Paresh Chaudhary -F: package/checksec/ - N: Parnell Springmeyer F: package/scrypt/ @@ -1953,6 +2059,7 @@ N: Pedro Aguilar F: package/libunistring/ N: Peter Korsgaard +F: board/arrow/avenger96/ F: board/beagleboneai/ F: board/minnowboard/ F: board/librecomputer/lafrite/ @@ -1962,6 +2069,7 @@ F: board/orangepi/ F: board/pandaboard/ F: board/roseapplepi/ F: boot/shim/ +F: configs/avenger96_defconfig F: configs/beagleboneai_defconfig F: configs/lafrite_defconfig F: configs/minnowboard_max-graphical_defconfig @@ -2023,17 +2131,24 @@ F: package/dillo/ F: package/edid-decode/ F: package/ell/ F: package/ghostscript-fonts/ +F: package/gstreamer1/gst1-devtools/ F: package/gstreamer1/gst1-interpipe/ -F: package/gstreamer1/gst1-validate/ F: package/gstreamer1/gstreamer1-editing-services/ F: package/iwd/ F: package/libevdev/ +F: package/libuev/ F: package/log4cplus/ F: package/postgresql/ +F: package/python-colorzero/ +F: package/python-flask-wtf/ +F: package/python-gpiozero/ F: package/qt5/ F: package/quotatool/ F: package/racehound/ -F: package/wiringpi/ +F: package/redir/ +F: package/rtl8812au-aircrack-ng/ +F: package/uredir/ +F: package/wayland-utils/ N: Peter Thompson F: package/sdl2_gfx/ @@ -2047,10 +2162,12 @@ N: Petr Vorel F: package/ima-evm-utils/ F: package/iproute2/ F: package/iputils/ +F: package/libqrtr-glib/ F: package/libtirpc/ F: package/linux-backports/ F: package/ltp-testsuite/ F: package/nfs-utils/ +F: package/rpcbind/ F: support/kconfig/ N: Phil Eichinger @@ -2063,6 +2180,7 @@ N: Philipp Richter F: package/libtorrent-rasterbar/ N: Philippe Proulx +F: package/babeltrace2/ F: package/lttng-babeltrace/ F: package/lttng-libust/ F: package/lttng-modules/ @@ -2070,6 +2188,9 @@ F: package/lttng-tools/ F: package/python-ipython/ F: package/liburcu/ +N: Philippe Reynes +F: package/ibm-sw-tpm2/ + N: Pierre Crokaert F: board/hardkernel/odroidxu4/ F: configs/odroidxu4_defconfig @@ -2080,7 +2201,7 @@ F: package/kf5/ N: Pierre Floury F: package/trace-cmd/ -N: Pierre-Jean Texier +N: Pierre-Jean Texier F: package/fping/ F: package/genimage/ F: package/haveged/ @@ -2092,6 +2213,7 @@ F: package/libxml2/ F: package/mongoose/ F: package/mxml/ F: package/numactl/ +F: package/python-modbus-tk/ F: package/python-periphery/ F: package/raspi-gpio/ F: package/sbc/ @@ -2120,26 +2242,29 @@ F: package/gupnp-av/ F: package/let-me-create/ F: package/nanomsg/ -N: Rahul Jain -F: package/uhttpd/ -F: package/ustream-ssl/ +N: Ramon Fried +F: package/bitwise/ + +N: Raphaël Mélotte +F: package/gumbo-parser/ +F: package/jbig2dec/ +F: package/mupdf/ +F: package/python-boto3/ +F: package/python-botocore/ +F: package/python-jmespath/ +F: package/python-pymupdf/ +F: package/python-s3transfer/ N: Refik Tuzakli F: package/freescale-imx/ F: package/paho-mqtt-cpp/ -N: Raphaël Mélotte -F: package/jbig2dec/ - N: Rémi Rérolle F: package/libfreeimage/ N: Renaud Aubin F: package/libhttpparser/ -N: Rhys Williams -F: package/lirc-tools/ - N: Ricardo Martincoski F: package/atop/ F: package/thermald/ @@ -2191,8 +2316,10 @@ F: package/glibc/ F: package/irrlicht/ F: package/liblinear/ F: package/lensfun/ +F: package/libbpf/ F: package/libclc/ F: package/libgta/ +F: package/libiec61850/ F: package/libspatialindex/ F: package/linux-syscall-support/ F: package/llvm/ @@ -2205,6 +2332,7 @@ F: package/ogre/ F: package/openpowerlink/ F: package/physfs/ F: package/piglit/ +F: package/qemu/ F: package/solarus/ F: package/stress-ng/ F: package/supertux/ @@ -2216,26 +2344,24 @@ F: package/waffle/ F: package/xenomai/ F: package/zziplib/ F: support/testing/tests/package/test_glxinfo.py +F: support/testing/tests/package/test_openssh.py F: toolchain/ N: Roman Gorbenkov F: package/davfs2/ -N: Ryan Barnett +N: Ryan Barnett F: package/atftp/ +F: package/c-periphery/ F: package/miraclecast/ -F: package/python-pyasn/ -F: package/python-pycrypto/ +F: package/opkg/ +F: package/opkg-utils/ F: package/python-pysnmp/ F: package/python-pysnmp-mibs/ F: package/python-tornado/ +F: package/resiprocate/ F: package/websocketpp/ -N: Ryan Coe -F: package/inadyn/ -F: package/libite/ -F: package/mariadb/ - N: Ryan Wilkins F: package/biosdevname/ @@ -2245,11 +2371,9 @@ F: package/lrzip/ N: Samuel Martin F: package/armadillo/ F: package/canfestival/ -F: package/clapack/ F: package/cwiid/ F: package/flite/ F: package/nginx/ -F: package/opencv/ F: package/opencv3/ F: package/openobex/ F: package/pkg-cmake.mk @@ -2262,13 +2386,9 @@ F: support/misc/toolchainfile.cmake.in N: Sam Voss F: package/ripgrep/ -N: Santosh Multhalli +N: Santosh Multhalli F: package/valijson/ -N: Scott Fan -F: package/libssh/ -F: package/x11r7/xdriver_xf86-video-fbturbo/ - N: Sébastien Szymanski F: package/mmc-utils/ F: package/python-flask-jsonrpc/ @@ -2283,19 +2403,14 @@ F: package/mpir/ N: Sergey Matyukevich F: boot/arm-trusted-firmware/ -F: boot/binaries-marvell/ -F: boot/mv-ddr-marvell/ F: board/linksprite/pcduino F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ -F: board/solidrun/macchiatobin F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig -F: configs/solidrun_macchiatobin_mainline_defconfig -F: configs/solidrun_macchiatobin_marvell_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ @@ -2306,6 +2421,8 @@ N: Sergio Prado F: board/toradex/apalis-imx6/ F: configs/toradex_apalis_imx6_defconfig F: package/aoetools/ +F: package/asn1c/ +F: package/azure-iot-sdk-c/ F: package/curlpp/ F: package/daq/ F: package/libgdiplus/ @@ -2318,6 +2435,9 @@ F: package/tunctl/ F: package/ubus/ F: package/wolfssl/ +N: Shyam Saini +F: package/cukinia/ + N: Simon Dawson F: boot/at91bootstrap3/ F: package/cppzmq/ @@ -2372,11 +2492,14 @@ F: package/libscrypt/ N: Stephan Hoffmann F: package/cache-calibrator/ F: package/gtest/ -F: package/mtdev/ -F: package/mtdev2tuio/ - -N: Stephan Hoffmann F: package/libhttpserver/ +F: package/mtdev/ + +N: Stephane Viau +F: board/freescale/imx8mnevk/ +F: board/freescale/imx8mpevk/ +F: configs/freescale_imx8mnevk_defconfig +F: configs/freescale_imx8mpevk_defconfig N: Steve Calfee F: package/python-pymysql/ @@ -2401,7 +2524,21 @@ F: package/powertop/ N: Suniel Mahesh F: board/firefly/ +F: board/friendlyarm/nanopc-t4 +F: board/friendlyarm/nanopi-m4 +F: board/orangepi/orangepi-rk3399 +F: board/pine64/rockpro64 +F: board/radxa/rockpi-4 +F: board/radxa/rockpi-n8 +F: board/radxa/rockpi-n10 +F: configs/friendlyarm_nanopc_t4_defconfig +F: configs/friendlyarm_nanopi_m4_defconfig +F: configs/orangepi_rk3399_defconfig F: configs/roc_pc_rk3399_defconfig +F: configs/rock_pi_4_defconfig +F: configs/rock_pi_n8_defconfig +F: configs/rock_pi_n10_defconfig +F: configs/rockpro64_defconfig F: package/arm-gnu-a-toolchain/ N: Sven Haardiek @@ -2427,22 +2564,27 @@ N: Thomas Claveirole F: package/fcgiwrap/ F: package/openlayers/ -N: Thomas Davis -F: package/civetweb/ - N: Thomas De Schampheleire F: docs/manual/ F: package/cereal/ F: package/chartjs/ +F: package/datatables/ +F: package/datatables-buttons/ +F: package/datatables-fixedcolumns/ +F: package/datatables-responsive/ +F: package/jszip/ F: package/libtelnet/ F: package/opkg-utils/ F: package/perl-convert-asn1/ F: package/perl-crypt-blowfish/ F: package/perl-crypt-cbc/ F: package/perl-crypt-openssl-aes/ +F: package/perl-devel-cycle/ +F: package/perl-devel-size/ F: package/perl-i18n/ F: package/perl-locale-maketext-lexicon/ F: package/perl-lwp-protocol-https/ +F: package/perl-math-int64/ F: package/perl-math-prime-util/ F: package/perl-mime-base64-urlsafe/ F: package/perl-mojolicious-plugin-authentication/ @@ -2456,6 +2598,7 @@ F: package/perl-net-ssh2/ F: package/perl-net-telnet/ F: package/perl-path-class/ F: package/pigz/ +F: package/popperjs/ F: package/xenomai/ F: support/scripts/size-stats F: support/testing/tests/package/test_perl_lwp_protocol_https.py @@ -2464,17 +2607,24 @@ F: toolchain/ N: Thomas Huth F: package/ascii-invaders/ +F: package/frotz/ +F: package/xorcurses/ N: Thomas Petazzoni F: arch/Config.in.arm +F: board/beaglev/ F: board/stmicroelectronics/stm32mp157c-dk2/ +F: boot/beaglev-ddrinit/ +F: boot/beaglev-secondboot/ F: boot/boot-wrapper-aarch64/ F: boot/grub2/ F: boot/gummiboot/ +F: configs/beaglev_defconfig F: configs/stm32mp157c_dk2_defconfig F: package/android-tools/ F: package/b43-firmware/ F: package/b43-fwcutter/ +F: package/bmap-tools/ F: package/c-periphery/ F: package/cdrkit/ F: package/cifs-utils/ @@ -2492,6 +2642,7 @@ F: package/heirloom-mailx/ F: package/hiawatha/ F: package/igh-ethercat/ F: package/intltool/ +F: package/jh71xx-tools/ F: package/libcap/ F: package/libffi/ F: package/libsha1/ @@ -2511,9 +2662,11 @@ F: package/pkg-autotools.mk F: package/pkg-generic.mk F: package/python/ F: package/python3/ +F: package/python-augeas/ F: package/python-mad/ F: package/python-serial/ F: package/qextserialport/ +F: package/riscv64-elf-toolchain/ F: package/rpcbind/ F: package/rt-tests/ F: package/rtc-tools/ @@ -2523,21 +2676,21 @@ F: package/squashfs/ F: package/wayland/ F: package/weston/ F: support/testing/tests/boot/test_syslinux.py +F: support/testing/tests/package/sample_python_augeas.py +F: support/testing/tests/package/test_python_augeas.py F: toolchain/ N: Timo Ketola F: package/fbgrab/ -N: Titouan Christophe +N: Titouan Christophe F: package/avro-c/ F: package/mosquitto/ F: package/python-avro/ F: package/redis/ F: package/waf/ F: support/testing/tests/package/test_crudini.py - -N: Trent Piepho -F: package/libp11/ +F: support/testing/tests/package/test_redis.py N: Tudor Holton F: package/openjdk/ @@ -2548,6 +2701,7 @@ F: package/tstools/ N: Vadim Kochan F: package/brcm-patchram-plus/ +F: package/frr/ F: package/gettext-tiny/ F: package/tinyssh/ @@ -2568,6 +2722,9 @@ F: package/nss-myhostname/ F: package/utp_com/ N: Vincent Stehlé +F: board/bananapi/bananapi-m2-zero/ +F: configs/bananapi_m2_zero_defconfig +F: configs/uevm5432_defconfig F: package/i7z/ F: package/msr-tools/ F: package/pixz/ @@ -2587,6 +2744,8 @@ N: Wade Berrier F: package/ngrep/ N: Waldemar Brodkorb +F: package/mksh/ +F: package/ruby/ F: package/uclibc/ F: package/uclibc-ng-test/ @@ -2609,9 +2768,14 @@ F: package/python-pyusb/ N: Wojciech Niziński F: package/fwup/ +N: Yair Ben Avraham +F: package/casync/ +F: package/gloox/ +F: package/tpm2-pkcs11/ + N: Yann E. MORIN F: board/friendlyarm/nanopi-neo/ -F: configs/nanopi_neo_defconfig +F: configs/friendlyarm_nanopi_neo_defconfig F: fs/squashfs/ F: package/asterisk/ F: package/cegui/ diff --git a/Makefile b/Makefile index ae29b042ec..beacab0661 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2020.05-git +export BR2_VERSION := 2021.08.2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1583701800 +BR2_VERSION_EPOCH = 1636546000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -113,13 +113,19 @@ DATE := $(shell date +%Y%m%d) # Compute the full local version string so packages can use it as-is # Need to export it, so it can be got from environment in children (eg. mconf) -export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion) + +BR2_LOCALVERSION := $(shell $(TOPDIR)/support/scripts/setlocalversion) +ifeq ($(BR2_LOCALVERSION),) +export BR2_VERSION_FULL := $(BR2_VERSION) +else +export BR2_VERSION_FULL := $(BR2_LOCALVERSION) +endif # List of targets and target patterns for which .config doesn't need to be read in noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \ defconfig %_defconfig allyesconfig allnoconfig alldefconfig syncconfig release \ randpackageconfig allyespackageconfig allnopackageconfig \ - print-version olddefconfig distclean manual manual-% check-package + print-version olddefconfig distclean manual manual-% check-package check-flake8 # Some global targets do not trigger a build, but are used to collect # metadata, or do various checks. When such targets are triggered, @@ -223,6 +229,8 @@ LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings LEGAL_REPORT = $(LEGAL_INFO_DIR)/README +CPE_UPDATES_DIR = $(BASE_DIR)/cpe-updates + BR2_CONFIG = $(CONFIG_DIR)/.config # Pull in the user's configuration file @@ -439,6 +447,7 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ -e s/riscv.*/riscv/ \ -e s/sh.*/sh/ \ + -e s/s390x/s390/ \ -e s/microblazeel/microblaze/) ZCAT := $(call qstrip,$(BR2_ZCAT)) @@ -457,12 +466,12 @@ endif ifneq ($(HOST_DIR),$(BASE_DIR)/host) HOST_DIR_SYMLINK = $(BASE_DIR)/host -$(HOST_DIR_SYMLINK): $(BASE_DIR) +$(HOST_DIR_SYMLINK): | $(BASE_DIR) ln -snf $(HOST_DIR) $(HOST_DIR_SYMLINK) endif STAGING_DIR_SYMLINK = $(BASE_DIR)/staging -$(STAGING_DIR_SYMLINK): $(BASE_DIR) +$(STAGING_DIR_SYMLINK): | $(BASE_DIR) ln -snf $(STAGING_DIR) $(STAGING_DIR_SYMLINK) # Quotes are needed for spaces and all in the original PATH content. @@ -654,32 +663,17 @@ endef TARGET_FINALIZE_HOOKS += TOOLCHAIN_ECLIPSE_REGISTER endif -# Generate locale data. Basically, we call the localedef program -# (built by the host-localedef package) for each locale. The input -# data comes preferably from the toolchain, or if the toolchain does -# not have them (Linaro toolchains), we use the ones available on the -# host machine. +# Generate locale data. ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) GLIBC_GENERATE_LOCALES = $(call qstrip,$(BR2_GENERATE_LOCALE)) ifneq ($(GLIBC_GENERATE_LOCALES),) PACKAGES += host-localedef define GENERATE_GLIBC_LOCALES - $(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/ - $(Q)for locale in $(GLIBC_GENERATE_LOCALES) ; do \ - inputfile=`echo $${locale} | cut -f1 -d'.'` ; \ - charmap=`echo $${locale} | cut -f2 -d'.' -s` ; \ - if test -z "$${charmap}" ; then \ - charmap="UTF-8" ; \ - fi ; \ - echo "Generating locale $${inputfile}.$${charmap}" ; \ - I18NPATH=$(STAGING_DIR)/usr/share/i18n:/usr/share/i18n \ - $(HOST_DIR)/bin/localedef \ - --prefix=$(TARGET_DIR) \ - --$(call LOWERCASE,$(BR2_ENDIAN))-endian \ - -i $${inputfile} -f $${charmap} \ - $${locale} ; \ - done + $(MAKE) -f support/misc/gen-glibc-locales.mk \ + ENDIAN=$(call LOWERCASE,$(BR2_ENDIAN)) \ + LOCALES="$(GLIBC_GENERATE_LOCALES)" \ + Q=$(Q) endef TARGET_FINALIZE_HOOKS += GENERATE_GLIBC_LOCALES endif @@ -695,8 +689,7 @@ LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST)) # in the whitelist file. If it doesn't, kill it. # Finally, specifically for X11, regenerate locale.dir from the whitelist. define PURGE_LOCALES - rm -f $(LOCALE_WHITELIST) - for i in $(LOCALE_NOPURGE) locale-archive; do echo $$i >> $(LOCALE_WHITELIST); done + printf '%s\n' $(LOCALE_NOPURGE) locale-archive > $(LOCALE_WHITELIST) for dir in $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/lib/locale); \ do \ @@ -757,6 +750,7 @@ ifneq ($(BR2_PACKAGE_GDB),y) endif ifneq ($(BR2_PACKAGE_BASH),y) rm -rf $(TARGET_DIR)/usr/share/bash-completion + rm -rf $(TARGET_DIR)/etc/bash_completion.d endif ifneq ($(BR2_PACKAGE_ZSH),y) rm -rf $(TARGET_DIR)/usr/share/zsh @@ -766,6 +760,9 @@ endif rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc rm -rf $(TARGET_DIR)/usr/share/gtk-doc rmdir $(TARGET_DIR)/usr/share 2>/dev/null || true +ifneq ($(BR2_ENABLE_DEBUG):$(BR2_STRIP_strip),y:) + rm -rf $(TARGET_DIR)/lib/debug $(TARGET_DIR)/usr/lib/debug +endif $(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true $(STRIP_FIND_SPECIAL_LIBS_CMD) | xargs -0 -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) 2>/dev/null || true @@ -790,9 +787,9 @@ endif # counterparts are appropriately setup as symlinks ones to the others. ifeq ($(BR2_ROOTFS_MERGED_USR),y) - @$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ - $(call MESSAGE,"Sanity check in overlay $(d)"); \ - not_merged_dirs="$$(support/scripts/check-merged-usr.sh $(d))"; \ + $(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ + @$(call MESSAGE,"Sanity check in overlay $(d)")$(sep) \ + $(Q)not_merged_dirs="$$(support/scripts/check-merged-usr.sh $(d))"; \ test -n "$$not_merged_dirs" && { \ echo "ERROR: The overlay in $(d) is not" \ "using a merged /usr for the following directories:" \ @@ -802,20 +799,20 @@ ifeq ($(BR2_ROOTFS_MERGED_USR),y) endif # merged /usr - @$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ - $(call MESSAGE,"Copying overlay $(d)"); \ - $(call SYSTEM_RSYNC,$(d),$(TARGET_DIR))$(sep)) + $(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ + @$(call MESSAGE,"Copying overlay $(d)")$(sep) \ + $(Q)$(call SYSTEM_RSYNC,$(d),$(TARGET_DIR))$(sep)) - $(if $(TARGET_DIR_FILES_LISTS), \ + $(Q)$(if $(TARGET_DIR_FILES_LISTS), \ cat $(TARGET_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list.txt - $(if $(HOST_DIR_FILES_LISTS), \ + $(Q)$(if $(HOST_DIR_FILES_LISTS), \ cat $(HOST_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list-host.txt - $(if $(STAGING_DIR_FILES_LISTS), \ + $(Q)$(if $(STAGING_DIR_FILES_LISTS), \ cat $(STAGING_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list-staging.txt - @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ - $(call MESSAGE,"Executing post-build script $(s)"); \ - $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) + $(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ + @$(call MESSAGE,"Executing post-build script $(s)")$(sep) \ + $(Q)$(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) touch $(TARGET_DIR)/usr @@ -927,6 +924,22 @@ show-info: ) \ ) +.PHONY: pkg-stats +pkg-stats: + @cd "$(CONFIG_DIR)" ; \ + $(TOPDIR)/support/scripts/pkg-stats -c \ + --json $(O)/pkg-stats.json \ + --html $(O)/pkg-stats.html \ + --nvd-path $(DL_DIR)/buildroot-nvd + +.PHONY: missing-cpe +missing-cpe: + $(Q)mkdir -p $(CPE_UPDATES_DIR) + $(Q)cd "$(CONFIG_DIR)" ; \ + $(TOPDIR)/support/scripts/gen-missing-cpe \ + --nvd-path $(DL_DIR)/buildroot-nvd \ + --output $(CPE_UPDATES_DIR) + else # ifeq ($(BR2_HAVE_DOT_CONFIG),y) # Some subdirectories are also package names. To avoid that "make linux" @@ -1017,7 +1030,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< \ --savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \ $(CONFIG_CONFIG_IN) - @$(SED) '/BR2_DEFCONFIG=/d' $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) + @$(SED) '/^BR2_DEFCONFIG=/d' $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) .PHONY: defconfig savedefconfig update-defconfig @@ -1061,7 +1074,8 @@ printvars: clean: rm -rf $(BASE_TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \ $(BUILD_DIR) $(BASE_DIR)/staging \ - $(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) + $(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) $(CPE_UPDATES_DIR) \ + $(O)/pkg-stats.* .PHONY: distclean distclean: clean @@ -1122,6 +1136,7 @@ help: @echo ' -dirclean - Remove build directory' @echo ' -reconfigure - Restart the build from the configure step' @echo ' -rebuild - Restart the build from the build step' + @echo ' -reinstall - Restart the build from the install step' $(foreach p,$(HELP_PACKAGES), \ @echo $(sep) \ @echo '$($(p)_NAME):' $(sep) \ @@ -1144,6 +1159,8 @@ help: @echo ' external-deps - list external packages used' @echo ' legal-info - generate info about license compliance' @echo ' show-info - generate info about packages, as a JSON blurb' + @echo ' pkg-stats - generate info about packages as JSON and HTML' + @echo ' missing-cpe - generate XML snippets for missing CPE identifiers' @echo ' printvars - dump internal variables selected with VARS=...' @echo @echo ' make V=0|1 - 0 => quiet build (default), 1 => verbose build' @@ -1190,7 +1207,7 @@ release: OUT = buildroot-$(BR2_VERSION) release: git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar $(MAKE) O=$(OUT) manual-html manual-text manual-pdf - $(MAKE) O=$(OUT) clean + $(MAKE) O=$(OUT) distclean tar rf $(OUT).tar $(OUT) gzip -9 -c < $(OUT).tar > $(OUT).tar.gz bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2 @@ -1199,14 +1216,17 @@ release: print-version: @echo $(BR2_VERSION_FULL) +check-flake8: + $(Q)git ls-tree -r --name-only HEAD \ + | xargs file \ + | grep 'Python script' \ + | cut -d':' -f1 \ + | xargs -- python3 -m flake8 --statistics + check-package: find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) \ -exec ./utils/check-package {} + -.PHONY: .gitlab-ci.yml -.gitlab-ci.yml: .gitlab-ci.yml.in - ./support/scripts/generate-gitlab-ci-yml $< > $@ - include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/README.md b/README.md index b190846178..88fe6ee116 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,7 @@ -# - -# This is an old version of shredos, looking for the latest & greatest? then you want [ShredOS.x86_64](https://github.com/PartialVolume/shredos.x86_64/) -

- + Logo

@@ -26,7 +22,7 @@ | ShredOS Version | Nwipe Version | Number of Downloads | .img for USB Flash | .iso for CD-R/DVD-R | | ---------| ---------|---------|------------|-------------| -| Latest x86_64 64 bit version | v0.32.003 | [![](https://img.shields.io/github/downloads/PartialVolume/shredos.2020.02/latest/total.svg "Latest x86_64 64 bit version")](https://github.com/PartialVolume/shredos.2020.02/releases/latest) | [.img 64bit](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2020.05.017_x86-64_0.32.003/shredos-2020.05.017_x86-64_0.32.003_20211111.img) | [.iso 64bit](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2020.05.017_x86-64_0.32.003/shredos-2020.05.017_x86-64_0.32.003_20211112.iso) | +| Latest x86_64 64 bit version | v0.32.003 | [![](https://img.shields.io/github/downloads/PartialVolume/shredos.x86_64/latest/total.svg "Latest x86_64 64 bit version")](https://github.com/PartialVolume/shredos.2020.02/releases/latest) | [.img 64bit](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2020.05.017_x86-64_0.32.003/shredos-2020.05.017_x86-64_0.32.003_20211111.img) | [.iso 64bit](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2020.05.017_x86-64_0.32.003/shredos-2020.05.017_x86-64_0.32.003_20211112.iso) | | Latest i686 32 bit version | v0.30.001 | [![](https://img.shields.io/github/downloads/PartialVolume/shredos.i686/latest/total.svg "Latest i686 32 bit version")](https://github.com/PartialVolume/shredos.i686/releases/latest) | [.img 32bit](https://github.com/PartialVolume/shredos.i686/releases/download/v2020.02.008_i686-0.30.001/shredos-2020.05.008_i686_0.30.001_20210127.img) | Not available yet | Note: The .img files for burning to USB flash drives support both bios/UEFI booting. The .iso image currently supports legacy bios booting only and not UEFI, however, a bios/UEFI version of the .iso is in development and will be released shortly. diff --git a/arch/Config.in b/arch/Config.in index 94bd2150ca..1853e26bb4 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -219,6 +219,15 @@ config BR2_riscv https://riscv.org/ https://en.wikipedia.org/wiki/RISC-V +config BR2_s390x + bool "s390x" + select BR2_ARCH_IS_64 + select BR2_ARCH_HAS_MMU_MANDATORY + help + s390x is a big-endian architecture made by IBM. + http://www.ibm.com/ + http://en.wikipedia.org/wiki/IBM_System/390 + config BR2_sh bool "SuperH" select BR2_ARCH_HAS_MMU_OPTIONAL @@ -308,6 +317,14 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_9 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_ARCH_NEEDS_GCC_AT_LEAST_10 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 + +config BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_10 + # The following string values are defined by the individual # Config.in.$ARCH files config BR2_ARCH @@ -453,6 +470,10 @@ if BR2_riscv source "arch/Config.in.riscv" endif +if BR2_s390x +source "arch/Config.in.s390x" +endif + if BR2_sh source "arch/Config.in.sh" endif diff --git a/arch/Config.in.arc b/arch/Config.in.arc index fdfafda31c..f7a6d920b5 100644 --- a/arch/Config.in.arc +++ b/arch/Config.in.arc @@ -39,9 +39,14 @@ config BR2_archs38_full config BR2_archs4x_rel31 bool "ARC HS48 rel 31" + help + Build for HS48 release 3.1 + +config BR2_archs4x + bool "ARC HS48" help Latest release of HS48 processor - - Dual- and quad multiply and MC oprations + - Dual and Quad multiply and MAC operations - Double-precision FPU endchoice @@ -49,7 +54,9 @@ endchoice # Choice of atomic instructions presence config BR2_ARC_ATOMIC_EXT bool "Atomic extension (LLOCK/SCOND instructions)" - default y if BR2_arc770d || BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 + default y if BR2_arc770d + default y if BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full + default y if BR2_archs4x_rel31 || BR2_archs4x config BR2_ARCH default "arc" if BR2_arcle @@ -70,10 +77,12 @@ config BR2_GCC_TARGET_CPU default "hs38" if BR2_archs38_64mpy default "hs38_linux" if BR2_archs38_full default "hs4x_rel31" if BR2_archs4x_rel31 + default "hs4x" if BR2_archs4x config BR2_READELF_ARCH_NAME default "ARCompact" if BR2_arc750d || BR2_arc770d - default "ARCv2" if BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 + default "ARCv2" if BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full + default "ARCv2" if BR2_archs4x_rel31 || BR2_archs4x choice prompt "MMU Page Size" @@ -93,7 +102,7 @@ choice config BR2_ARC_PAGE_SIZE_4K bool "4KB" - depends on BR2_arc770d || BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 + depends on !BR2_arc750d config BR2_ARC_PAGE_SIZE_8K bool "8KB" @@ -103,7 +112,7 @@ config BR2_ARC_PAGE_SIZE_8K config BR2_ARC_PAGE_SIZE_16K bool "16KB" - depends on BR2_arc770d || BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 + depends on !BR2_arc750d endchoice diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc index 56c4b526ec..ba56c9c721 100644 --- a/arch/Config.in.powerpc +++ b/arch/Config.in.powerpc @@ -44,9 +44,6 @@ config BR2_powerpc_476fp config BR2_powerpc_505 bool "505" depends on !BR2_ARCH_IS_64 -config BR2_powerpc_601 - bool "601" - depends on !BR2_ARCH_IS_64 config BR2_powerpc_602 bool "602" depends on !BR2_ARCH_IS_64 @@ -176,7 +173,6 @@ config BR2_GCC_TARGET_CPU default "476" if BR2_powerpc_476 default "476fp" if BR2_powerpc_476fp default "505" if BR2_powerpc_505 - default "601" if BR2_powerpc_601 default "602" if BR2_powerpc_602 default "603" if BR2_powerpc_603 default "603e" if BR2_powerpc_603e diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index eb655adbca..7aae3cafb7 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -1,6 +1,8 @@ # i386/x86_64 cpu features config BR2_X86_CPU_HAS_MMX bool +config BR2_X86_CPU_HAS_3DNOW + bool config BR2_X86_CPU_HAS_SSE bool config BR2_X86_CPU_HAS_SSE2 @@ -155,15 +157,18 @@ config BR2_x86_k6_2 bool "k6-2" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_athlon bool "athlon" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_athlon_4 bool "athlon-4" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_opteron bool "opteron" select BR2_X86_CPU_HAS_MMX @@ -209,6 +214,7 @@ config BR2_x86_c3 bool "Via/Cyrix C3 (Samuel/Ezra cores)" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_c32 bool "Via C3-2 (Nehemiah cores)" depends on !BR2_x86_64 diff --git a/board/aarch64-efi/genimage-efi.cfg b/board/aarch64-efi/genimage-efi.cfg index f93ab9d64f..34cca1d64e 100644 --- a/board/aarch64-efi/genimage-efi.cfg +++ b/board/aarch64-efi/genimage-efi.cfg @@ -14,17 +14,19 @@ image efi-part.vfat { } image disk.img { - hdimage { + gpt = true } partition boot { - partition-type = 0xEF image = "efi-part.vfat" + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + offset = 32768 + bootable = true } partition root { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext2" } } diff --git a/board/aarch64-efi/grub.cfg b/board/aarch64-efi/grub.cfg index ab88da91b9..d99e19c4cd 100644 --- a/board/aarch64-efi/grub.cfg +++ b/board/aarch64-efi/grub.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /Image root=/dev/vda2 rootwait console=ttyAMA0 + linux /Image root=PARTLABEL=root rootwait } diff --git a/board/aarch64-efi/readme.txt b/board/aarch64-efi/readme.txt index 65a6345b6c..164993eea4 100644 --- a/board/aarch64-efi/readme.txt +++ b/board/aarch64-efi/readme.txt @@ -1,6 +1,10 @@ The aarch64_efi_defconfig allows to build a minimal Linux system that -can boot on all AArch64 servers providing an EFI firmware and ACPI. +can boot on all AArch64 servers providing an EFI firmware. + +This includes all Arm EBBR[1] compliant systems, and all Arm SystemReady[2] +compliant systems for example. + Building and booting ==================== @@ -32,3 +36,18 @@ Note that needs to point to a valid aarch64 UEFI firmware image for qemu. It may be provided by your distribution as a edk2-aarch64 or AAVMF package, in path such as /usr/share/edk2/aarch64/QEMU_EFI.fd . + +U-Boot based qemu firmware +========================== + +A qemu firmware with support for UEFI based on U-Boot can be built following +the instructions in [3], with qemu_arm64_defconfig. + +This should give you a nor_flash.bin, which you can use with qemu as an +alternative to QEMU_EFI.fd. You will also need to change the machine +specification to "-M virt,secure" on qemu command line, to enable TrustZone +support, and you will need to increase the memory with "-m 1024". + +[1]: https://github.com/ARM-software/ebbr +[2]: https://developer.arm.com/architectures/system-architectures/arm-systemready +[3]: https://github.com/glikely/u-boot-tfa-build diff --git a/board/acmesystems/aria-g25/genimage.cfg b/board/acmesystems/aria-g25/genimage.cfg index b40ad9edf3..fd7b9557c6 100644 --- a/board/acmesystems/aria-g25/genimage.cfg +++ b/board/acmesystems/aria-g25/genimage.cfg @@ -11,7 +11,7 @@ image boot.vfat { } file boot.bin { - image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.13.bin" + image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.10.3.bin" } } size = 16M diff --git a/board/acmesystems/arietta-g25/genimage.cfg b/board/acmesystems/arietta-g25/genimage.cfg index 7c3112dd56..9ab8a6aff5 100644 --- a/board/acmesystems/arietta-g25/genimage.cfg +++ b/board/acmesystems/arietta-g25/genimage.cfg @@ -11,7 +11,7 @@ image boot.vfat { } file boot.bin { - image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.13.bin" + image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.10.3.bin" } } size = 16M diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt index 1dedf68cba..b5106f015e 100644 --- a/board/arm/foundation-v8/readme.txt +++ b/board/arm/foundation-v8/readme.txt @@ -3,17 +3,18 @@ ARM software simulator of the AArch64 architecture. First, one has to download the AArch64 software simulator from: - https://silver.arm.com/download/download.tm?pv=2663527 + https://silver.arm.com/download/download.tm?pv=4807186 Then, use the arm_foundationv8_defconfig configuration to build your Buildroot system. Finally, boot your system with: - ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-4.7/Foundation_Platform \ + ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \ --image output/images/linux-system.axf \ --block-device output/images/rootfs.ext2 \ - --network=nat + --network=nat \ + --cores 4 You can get network access from within the simulated environment by requesting an IP address using DHCP (run the command 'udhcpc'). diff --git a/board/atmel/readme.txt b/board/atmel/readme.txt index 4f90e4b4cc..a29d027214 100644 --- a/board/atmel/readme.txt +++ b/board/atmel/readme.txt @@ -1,6 +1,6 @@ -This document explains how to set up a basic Buildroot system on various -Atmel boards. Additional details can also be found on the Linux4SAM website: -http://www.at91.com/linux4sam/bin/view/Linux4SAM/ +This document explains how to set up a basic Buildroot system on +various Atmel/Microchip boards. Additional details can also be found +on the Linux4SAM website: http://www.linux4sam.org This guide covers the following configurations: - at91sam9g45m10ek_defconfig @@ -19,6 +19,12 @@ This guide covers the following configurations: - atmel_sama5d4_xplained_mmc_dev_defconfig - atmel_sama5d2_xplained_mmc_defconfig - atmel_sama5d2_xplained_mmc_dev_defconfig + - microchip_sama5d27_wlsom1_ek_mmc_defconfig + - microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig + - microchip_sam9x60ek_mmc_defconfig + - microchip_sam9x60ek_mmc_dev_defconfig + - microchip_sama5d2_icp_mmc_defconfig + - microchip_sama5d2_icp_mmc_dev_defconfig These configurations will use AT91Bootstrap, u-boot and a linux kernel from the git trees maintained by Atmel. @@ -29,23 +35,23 @@ tests the features of the SoC: - FFMPEG to record video from the ISI/ISC - I2C, SPI, CAN, etc. tools - modetest for LCD screens, HDMI -- Wilc1000 firmware for the Atmel Wireless sdio module +- Wilc1000/Wilc3000 firmware for the Atmel Wireless sdio module - SSH for convenience - GDB/GDB server for debug Configuring and building Buildroot ================================== -For most configurations listed above, the Buildroot configuration -assumes the system will be flashed on NAND. In this case, after -building Buildroot, follow the instructions in the "Flashing the NAND -using SAM-BA" section below. - -For the Xplained boards, an alternative Buildroot configuration is +For the Xplained/Evaluation Kit boards, the Buildroot configuration is provided to boot from an SD card. Those configurations are labeled as 'mmc'. In this case, after building Buildroot, follow the instructions in the "Preparing the SD card" section. +For the other configurations listed above, the Buildroot configuration +assumes the system will be flashed on NAND. In this case, after +building Buildroot, follow the instructions in the "Flashing the NAND +using SAM-BA" section below. + To configure and build Buildroot, run: make _defconfig @@ -144,10 +150,10 @@ lost. To copy the image on the SD card: dd if=output/images/sdcard.img of=/dev/mmcblk0 -Insert your SD card in your Xplained board, and enjoy. The default -U-Boot environment will load properly the kernel and Device Tree blob -from the first partition of the SD card, so everything works -automatically. +Insert your SD card in your Xplained/Evaluation Kit board, and +enjoy. The default U-Boot environment will load properly the kernel +and Device Tree blob from the first partition of the SD card, so +everything works automatically. By default a 16MB FAT partition is created. It contains at91bootstrap, u-boot, the kernel image and all dtb variants for your board. The dtb diff --git a/board/beaglebone/readme.txt b/board/beaglebone/readme.txt index e6647dad2a..231e977a89 100644 --- a/board/beaglebone/readme.txt +++ b/board/beaglebone/readme.txt @@ -7,7 +7,7 @@ Description This configuration will build a complete image for the beaglebone and the TI AM335x-EVM, the board type is identified by the on-board EEPROM. The configuration is based on the -ti-processor-sdk-02.00.00.00. Device tree blobs for beaglebone +ti-processor-sdk-06.01.00.08. Device tree blobs for beaglebone variants and the evm-sk are built too. For Qt5 support support use the beaglebone_qt5_defconfig. @@ -43,10 +43,20 @@ output/images/ To copy the image file to the sdcard use dd: $ dd if=output/images/sdcard.img of=/dev/XXX + +Running Qt5 hellowindow opengl demo: +=================== +# export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json +# export QT_QPA_PLATFORM=eglfs +# export QT_QPA_EGLFS_INTEGRATION=none +# /usr/lib/qt/examples/opengl/hellowindow/hellowindow + + Tested hardware =============== am335x-evm (rev. 1.1A) beagleboneblack (rev. A5A) beaglebone (rev. A6) +2020, Adam Duskett 2016, Lothar Felten diff --git a/board/boundarydevices/common/boot.cmd b/board/boundarydevices/common/boot.cmd index dbc3b3c373..2f2bd8d045 100644 --- a/board/boundarydevices/common/boot.cmd +++ b/board/boundarydevices/common/boot.cmd @@ -1,17 +1,20 @@ setenv bootargs '' -setenv initrd_high 0xffffffff m4='' kernelimage=zImage bootcommand=bootz a_base=0x10000000 -if itest.s x51 == "x${imx_cpu}" ; then + +#grab 1st 2/3 characters of string +setexpr cpu2 sub "^(..?).*" "\\1" "${imx_cpu}" +setexpr cpu3 sub "^(..?.?).*" "\\1" "${imx_cpu}" +if itest.s x51 == "x${cpu2}" ; then a_base=0x90000000 -elif itest.s x53 == "x${imx_cpu}"; then +elif itest.s x53 == "x${cpu2}"; then a_base=0x70000000 -elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then +elif itest.s x6SX == "x${cpu3}" || itest.s x6U == "x${cpu2}" || itest.s x7D == "x${cpu2}"; then a_base=0x80000000 -elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then +elif itest.s x8M == "x${cpu2}"; then a_base=0x40000000 kernelimage=Image bootcommand=booti @@ -24,8 +27,7 @@ fi setexpr a_script ${a_base} + 0x00800000 setexpr a_zImage ${a_base} + 0x00800000 setexpr a_fdt ${a_base} + 0x03000000 -setexpr a_ramdisk ${a_base} + 0x03800000 -setexpr a_initrd ${a_base} + 0x03a00000 +setexpr a_initrd ${a_base} + 0x03100000 setexpr a_reset_cause_marker ${a_base} + 0x80 setexpr a_reset_cause ${a_base} + 0x84 @@ -35,30 +37,32 @@ if itest.s "x" == "x${board}" ; then fi if itest.s "x" == "x${fdt_file}" ; then - if itest.s x6SOLO == "x${imx_cpu}" ; then + if itest.s x51 == "x${cpu2}" ; then + fdt_file=imx51-${board}${m4}.dtb; + elif itest.s x53 == "x${cpu2}" ; then + fdt_file=imx53-${board}${m4}.dtb; + elif itest.s x6DL == "x${cpu3}" || itest.s x6SO == "x${cpu3}" ; then fdt_file=imx6dl-${board}.dtb; - elif itest.s x6DL == "x${imx_cpu}" ; then - fdt_file=imx6dl-${board}.dtb; - elif itest.s x6QP == "x${imx_cpu}" ; then + elif itest.s x6QP == "x${cpu3}" ; then fdt_file=imx6qp-${board}.dtb; - elif itest.s x6SX == "x${imx_cpu}" ; then + elif itest.s x6SX == "x${cpu3}" ; then fdt_file=imx6sx-${board}${m4}.dtb; - elif itest.s x6ULL == "x${imx_cpu}" ; then + elif itest.s x6UL == "x${cpu3}" ; then fdt_file=imx6ull-${board}.dtb; - elif itest.s x7D == "x${imx_cpu}" ; then + elif itest.s x7D == "x${cpu2}" ; then fdt_file=imx7d-${board}${m4}.dtb; - elif itest.s x8MQ == "x${imx_cpu}" ; then - fdt_file=imx8mq-${board}${m4}.dtb; - elif itest.s x8MM == "x${imx_cpu}" ; then + elif itest.s x8MM == "x${cpu3}" ; then fdt_file=imx8mm-${board}${m4}.dtb; - elif itest.s x8MMQ == "x${imx_cpu}" ; then - fdt_file=imx8mm-${board}${m4}.dtb; - elif itest.s x8MNano == "x${imx_cpu}" ; then + elif itest.s x8MN == "x${cpu3}" ; then fdt_file=imx8mn-${board}${m4}.dtb; - elif itest.s x51 == "x${imx_cpu}" ; then - fdt_file=imx51-${board}.dtb; - elif itest.s x53 == "x${imx_cpu}" ; then - fdt_file=imx53-${board}.dtb; + elif itest.s x8MP == "x${cpu3}" ; then + if itest *0x30360800 == 0x00824310 ; then + fdt_file=imx8mp-a0-${board}${m4}.dtb; + else + fdt_file=imx8mp-${board}${m4}.dtb; + fi + elif itest.s x8MQ == "x${cpu3}" ; then + fdt_file=imx8mq-${board}${m4}.dtb; else fdt_file=imx6q-${board}.dtb; fi @@ -71,11 +75,20 @@ fi if load ${devtype} ${devnum}:${distro_bootpart} ${a_script} uEnv.txt ; then env import -t ${a_script} ${filesize} fi -setenv bootargs ${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc cpu=${imx_cpu} board=${board} + +if itest.s x${console} != x ; then + setenv bootargs ${bootargs} console=${console},115200 +fi +if itest.s "x" == "x$vmalloc" ; then + vmalloc=400M +fi +if itest.s x${consoleblank} == x ; then + consoleblank=0 +fi +setenv bootargs ${bootargs} vmalloc=${vmalloc} consoleblank=${consoleblank} rootwait fixrtc cpu=${imx_cpu} board=${board} uboot_release=${uboot_release} if load ${devtype} ${devnum}:${distro_bootpart} ${a_fdt} ${prefix}${fdt_file} ; then fdt addr ${a_fdt} - setenv fdt_high 0xffffffff else echo "!!!! Error loading ${prefix}${fdt_file}"; exit; diff --git a/board/boundarydevices/common/readme.txt b/board/boundarydevices/common/readme.txt index 0022628d82..d3169b08f5 100644 --- a/board/boundarydevices/common/readme.txt +++ b/board/boundarydevices/common/readme.txt @@ -27,6 +27,13 @@ Here is the list of targeted platforms per defconfig: - Nitrogen8MMini - Nitrogen8MMini_SOM +- nitrogen8mn_defconfig + - Nitrogen8MNano + - Nitrogen8MNano_SOM + +- nitrogen8mp_defconfig + - Nitrogen8MPlus_SOM + To install, simply copy the image to your storage (SD, eMMC, USB): $ sudo dd if=output/images/sdcard.img of=/dev/sdX @@ -36,3 +43,9 @@ Where 'sdX' is the device node of the uSD partition. To upgrade u-boot, cancel autoboot and type: > run upgradeu + +See Boundary Devices's buildroot-external-boundary project +for additional and advanced defconfigs using Qt5, gstreamer, +NXP proprietary packages with demo applications: + +https://github.com/boundarydevices/buildroot-external-boundary diff --git a/board/boundarydevices/common/upgrade.cmd b/board/boundarydevices/common/upgrade.cmd index ce32d77b5b..a26bacd9aa 100644 --- a/board/boundarydevices/common/upgrade.cmd +++ b/board/boundarydevices/common/upgrade.cmd @@ -9,18 +9,24 @@ qspi_offset=0x0 a_base=0x12000000 block_size=0x200 -if itest.s x51 == "x${imx_cpu}"; then +#grab 1st 2/3 characters of string +setexpr cpu2 sub "^(..?).*" "\\1" "${imx_cpu}" +setexpr cpu3 sub "^(..?.?).*" "\\1" "${imx_cpu}" +if itest.s x51 == "x${cpu2}"; then a_base=0x92000000 -elif itest.s x53 == "x${imx_cpu}"; then +elif itest.s x53 == "x${cpu2}"; then a_base=0x72000000 -elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then +elif itest.s x6SX == "x${cpu3}" || itest.s x6U == "x${cpu2}" || itest.s x7D == "x${cpu2}"; then a_base=0x82000000 -elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}"; then +elif itest.s x8M == "x${cpu2}"; then a_base=0x42000000 offset=0x8400 -elif itest.s x8MNano == "x${imx_cpu}"; then - a_base=0x42000000 - offset=0x8000 + if itest.s x8MN == "x${cpu3}" || itest.s x8MP == "x${cpu3}"; then + offset=0x8000 + if itest ${env_part} != 0 ; then + offset=0x0 + fi + fi fi qspi_match=1 @@ -30,7 +36,10 @@ setexpr a_uImage1 ${a_qspi1} + 0x400 setexpr a_uImage2 ${a_qspi2} + 0x400 setexpr a_script ${a_base} -setenv stdout serial,vga +if itest.s "x${vidconsole}" == "x" ; then + vidconsole=vga +fi +setenv stdout serial,${vidconsole} if itest.s "x${sfname}" == "x" ; then # U-Boot resides in (e)MMC diff --git a/board/freescale/common/imx/genimage.cfg.template b/board/freescale/common/imx/genimage.cfg.template index 2a7036a7df..61b09bde9f 100644 --- a/board/freescale/common/imx/genimage.cfg.template +++ b/board/freescale/common/imx/genimage.cfg.template @@ -9,6 +9,7 @@ image boot.vfat { vfat { + label = "boot" files = { %FILES% } diff --git a/board/freescale/common/imx/genimage.cfg.template_imx8 b/board/freescale/common/imx/genimage.cfg.template_imx8 index bd5f6cdc73..5689205083 100644 --- a/board/freescale/common/imx/genimage.cfg.template_imx8 +++ b/board/freescale/common/imx/genimage.cfg.template_imx8 @@ -9,11 +9,12 @@ image boot.vfat { vfat { + label = "boot" files = { %FILES% } } - size = 32M + size = 64M } image sdcard.img { diff --git a/board/freescale/common/imx/genimage.cfg.template_spl b/board/freescale/common/imx/genimage.cfg.template_spl index d2d810777b..3b0667c383 100644 --- a/board/freescale/common/imx/genimage.cfg.template_spl +++ b/board/freescale/common/imx/genimage.cfg.template_spl @@ -9,6 +9,7 @@ image boot.vfat { vfat { + label = "boot" files = { %FILES% } diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index 45c648e360..56f65e3126 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -9,19 +9,33 @@ main () fi if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + rm -f ${BINARIES_DIR}/u-boot.its + + ${HOST_DIR}/bin/mkimage_imx8 -v v2 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x912000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" ${BR2_CONFIG}; then + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00970000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + rm -f ${BINARIES_DIR}/u-boot.its + + ${HOST_DIR}/bin/mkimage_imx8 -v v2 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x920000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin else ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index 138ea7b123..3bb482debd 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -38,11 +38,17 @@ genimage_type() echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_no_boot_part_spl" + else + echo "genimage.cfg.template_no_boot_part" fi elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_spl" diff --git a/board/freescale/common/mxs/genimage.cfg.template b/board/freescale/common/mxs/genimage.cfg.template index e094fb7f2c..c9da452821 100644 --- a/board/freescale/common/mxs/genimage.cfg.template +++ b/board/freescale/common/mxs/genimage.cfg.template @@ -8,6 +8,7 @@ image boot.vfat { vfat { + label = "boot" files = { %FILES% } diff --git a/board/freescale/imx6ullevk/readme.txt b/board/freescale/imx6ullevk/readme.txt index e0c0c392a8..77acec2615 100644 --- a/board/freescale/imx6ullevk/readme.txt +++ b/board/freescale/imx6ullevk/readme.txt @@ -9,8 +9,18 @@ Build First, configure Buildroot for your i.MX6ULL EVK board: +In order to to do so there are two supported options: + make freescale_imx6ullevk_defconfig +if you plan to use NXP provided U-Boot and kernel. + +or + + make imx6ullevk_defconfig + +if you plan to use mainline U-Boot and mainline kernel. + Build all components: make diff --git a/board/freescale/imx8mqevk/readme.txt b/board/freescale/imx8mqevk/readme.txt index e60eba4cb6..61fb2bc80b 100644 --- a/board/freescale/imx8mqevk/readme.txt +++ b/board/freescale/imx8mqevk/readme.txt @@ -10,8 +10,14 @@ Build First, configure Buildroot for the i.MX8MQ EVK board: +If you want to use the NXP kernel: + make freescale_imx8mqevk_defconfig +Or if you want to use a mainline kernel: + + make imx8mqevk_defconfig + Build all components: make diff --git a/board/friendlyarm/nanopi-m1-plus/readme.txt b/board/friendlyarm/nanopi-m1-plus/readme.txt index 3e16c8afad..0327dec80e 100644 --- a/board/friendlyarm/nanopi-m1-plus/readme.txt +++ b/board/friendlyarm/nanopi-m1-plus/readme.txt @@ -12,7 +12,7 @@ How to build it Configure Buildroot: - $ make nanopi_m1_plus_defconfig + $ make friendlyarm_nanopi_m1_plus_defconfig Compile everything and build the SD card image: diff --git a/board/friendlyarm/nanopi-m1/readme.txt b/board/friendlyarm/nanopi-m1/readme.txt index 8b10e4b7ce..6a34c4239d 100644 --- a/board/friendlyarm/nanopi-m1/readme.txt +++ b/board/friendlyarm/nanopi-m1/readme.txt @@ -12,7 +12,7 @@ How to build it Configure Buildroot: - $ make nanopi_m1_defconfig + $ make friendlyarm_nanopi_m1_defconfig Compile everything and build the SD card image: diff --git a/board/friendlyarm/nanopi-neo/readme.txt b/board/friendlyarm/nanopi-neo/readme.txt index 539df541d8..84fb9cc484 100644 --- a/board/friendlyarm/nanopi-neo/readme.txt +++ b/board/friendlyarm/nanopi-neo/readme.txt @@ -24,7 +24,7 @@ yet upstream, but are being actively worked on. How to build ============ - $ make nanopi_neo_defconfig + $ make friendlyarm_nanopi_neo_defconfig $ make Note: you will need access to the internet to download the required diff --git a/board/hardkernel/odroidc2/genimage.cfg b/board/hardkernel/odroidc2/genimage.cfg index 15f97d4457..f49c1deaf3 100644 --- a/board/hardkernel/odroidc2/genimage.cfg +++ b/board/hardkernel/odroidc2/genimage.cfg @@ -1,27 +1,38 @@ image boot.vfat { vfat { files = { - "boot.ini", "Image", - "meson64_odroidc2.dtb" + "meson-gxbb-odroidc2.dtb", + "boot.scr" } } - size = 32M + size = 64M } image sdcard.img { hdimage { } - partition vfat { + partition bl1 { + in-partition-table = "no" + image = "bl1.bin.hardkernel" + offset = 0 + } + + partition u-boot { + in-partition-table = "no" + image = "uboot-odc2.img" + offset = 49664 + } + + partition boot { partition-type = 0xC + bootable = "true" image = "boot.vfat" - offset = 1048576 } partition rootfs { partition-type = 0x83 image = "rootfs.ext4" - size = 512M } } diff --git a/board/hardkernel/odroidc2/post-image.sh b/board/hardkernel/odroidc2/post-image.sh index aaf12c1e79..eb6fd4f09a 100755 --- a/board/hardkernel/odroidc2/post-image.sh +++ b/board/hardkernel/odroidc2/post-image.sh @@ -1,19 +1,21 @@ #!/bin/sh BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" -cp ${BOARD_DIR}/boot.ini ${BINARIES_DIR}/ +${HOST_DIR}/bin/fip_create \ + --bl30 ${BINARIES_DIR}/bl30.bin \ + --bl301 ${BINARIES_DIR}/bl301.bin \ + --bl31 ${BINARIES_DIR}/bl31.bin \ + --bl33 ${BINARIES_DIR}/u-boot.bin \ + ${BINARIES_DIR}/fip.bin -rm -rf "${GENIMAGE_TMP}" +${HOST_DIR}/bin/fip_create --dump ${BINARIES_DIR}/fip.bin -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" +cat ${BINARIES_DIR}/bl2.package ${BINARIES_DIR}/fip.bin \ + > ${BINARIES_DIR}/boot_new.bin -dd if=${BINARIES_DIR}/u-boot.bin of=${BINARIES_DIR}/sdcard.img bs=1 count=442 conv=sync,notrunc -dd if=${BINARIES_DIR}/u-boot.bin of=${BINARIES_DIR}/sdcard.img bs=512 skip=1 seek=1 conv=fsync,notrunc +${HOST_DIR}/bin/amlbootsig ${BINARIES_DIR}/boot_new.bin ${BINARIES_DIR}/u-boot.img + +dd if=${BINARIES_DIR}/u-boot.img of=${BINARIES_DIR}/uboot-odc2.img bs=512 skip=96 + +support/scripts/genimage.sh -c ${BOARD_DIR}/genimage.cfg diff --git a/board/hardkernel/odroidc2/readme.txt b/board/hardkernel/odroidc2/readme.txt index b44aa67f5a..24847827af 100644 --- a/board/hardkernel/odroidc2/readme.txt +++ b/board/hardkernel/odroidc2/readme.txt @@ -27,17 +27,28 @@ Result of the build After building, you should obtain this tree: output/images/ - +-- Image - +-- boot.ini [1] + +-- bl1.bin.hardkernel + +-- bl2.package + +-- bl301.bin + +-- bl30.bin + +-- bl31.bin + +-- boot_new.bin + +-- boot.scr [1] +-- boot.vfat - +-- meson64_odroidc2.dtb + +-- fip.bin + +-- Image [2] + +-- meson-gxbb-odroidc2.dtb +-- rootfs.ext2 +-- rootfs.ext4 +-- rootfs.tar +-- sdcard.img - `-- u-boot.bin + +-- u-boot.bin + +-- u-boot.img + +-- uboot-odc2.img [3] [1] This is the ODROID-C2 configuration file used in u-boot. +[2] This is the ODROID-C2 kernel image file which will be booted. +[3] This is the ODROID-C2 signed u-boot image which will be used. How to write the SD card or eMMC ================================ diff --git a/board/minnowboard/genimage.cfg b/board/minnowboard/genimage.cfg index 6cf7874307..c5b07179b4 100644 --- a/board/minnowboard/genimage.cfg +++ b/board/minnowboard/genimage.cfg @@ -19,15 +19,16 @@ image efi-part.vfat { # * the efi-partition created above image sdcard.img { hdimage { + gpt = true } partition boot { - partition-type = 0xEF + partition-type-uuid = U image = "efi-part.vfat" } partition rootfs { - partition-type = 0x83 + partition-type-uuid = L image = "rootfs.ext4" size = 512M } diff --git a/board/minnowboard/grub.cfg b/board/minnowboard/grub.cfg index 3d6feb7023..1f75f4d7ca 100644 --- a/board/minnowboard/grub.cfg +++ b/board/minnowboard/grub.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /bzImage root=/dev/mmcblk2p2 rootwait console=tty0 console=ttyS0,115200 + linux /bzImage root=PARTLABEL=rootfs rootwait console=tty0 console=ttyS0,115200 net.ifnames=0 } diff --git a/board/minnowboard/linux.config b/board/minnowboard/linux.config index 27077dbcda..928e353c1c 100644 --- a/board/minnowboard/linux.config +++ b/board/minnowboard/linux.config @@ -14,6 +14,7 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y +CONFIG_PCI=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_SG=y CONFIG_ATA=y diff --git a/board/nexbox/a95x/boot.txt b/board/nexbox/a95x/boot.txt index f388ba814a..eef1c8ca55 100644 --- a/board/nexbox/a95x/boot.txt +++ b/board/nexbox/a95x/boot.txt @@ -1,4 +1,4 @@ -setenv bootargs console=ttyAML0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait +setenv bootargs console=ttyAML0,115200 earlyprintk root=PARTUUID=feedc0de-02 rootwait fatload mmc 0:1 0x01080000 uImage diff --git a/board/nexbox/a95x/genimage.cfg b/board/nexbox/a95x/genimage.cfg index 74e2d3a6f9..63b96107c9 100644 --- a/board/nexbox/a95x/genimage.cfg +++ b/board/nexbox/a95x/genimage.cfg @@ -12,6 +12,8 @@ image boot.vfat { image sdcard.img { hdimage { + # for root=PARTUUID support + disk-signature = 0xfeedc0de } partition boot { diff --git a/board/orangepi/orangepi-pc-plus/boot.cmd b/board/orangepi/orangepi-pc-plus/boot.cmd index 0c75c862e0..c91f77942f 100644 --- a/board/orangepi/orangepi-pc-plus/boot.cmd +++ b/board/orangepi/orangepi-pc-plus/boot.cmd @@ -1,6 +1,6 @@ setenv fdt_high ffffffff -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg index 9ffa1a21ae..b4fcc827ec 100644 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ b/board/orangepi/orangepi-pc-plus/genimage.cfg @@ -13,13 +13,17 @@ image boot.vfat { image sdcard.img { hdimage { + # for root=PARTLABEL support + gpt = true + # default GPT location conflicts with bootloaders, move it after + gpt-location = 1M } partition u-boot { in-partition-table = "no" image = "u-boot-sunxi-with-spl.bin" offset = 8192 - size = 1040384 # 1MB - 8192 + size = 1056768 # 1MB - 8K + 16K(GPT) } partition boot { @@ -28,6 +32,8 @@ image sdcard.img { image = "boot.vfat" } + # 'rootfs' will be used as the partition label, used + # with root=PARTLABEL=rootfs kernel command line partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/orangepi/orangepi-pc/linux.fragment b/board/orangepi/orangepi-pc/linux.fragment index 581b715bd5..b1dda162bb 100644 --- a/board/orangepi/orangepi-pc/linux.fragment +++ b/board/orangepi/orangepi-pc/linux.fragment @@ -1,5 +1,3 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_REGULATOR_SY8106A=y -CONFIG_DRM_SUN8I_DW_HDMI=y CONFIG_SUN8I_DE2_CCU=y -CONFIG_SND_SUN8I_CODEC_ANALOG=y diff --git a/board/orangepi/orangepi-r1/boot.cmd b/board/orangepi/orangepi-r1/boot.cmd index e927b01e82..50745f7e5e 100644 --- a/board/orangepi/orangepi-r1/boot.cmd +++ b/board/orangepi/orangepi-r1/boot.cmd @@ -1,6 +1,6 @@ setenv fdt_high ffffffff -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-r1.dtb diff --git a/board/orangepi/orangepi-r1/genimage.cfg b/board/orangepi/orangepi-r1/genimage.cfg index 01e2c0adc4..edda03b3ef 100644 --- a/board/orangepi/orangepi-r1/genimage.cfg +++ b/board/orangepi/orangepi-r1/genimage.cfg @@ -13,13 +13,17 @@ image boot.vfat { image sdcard.img { hdimage { + # for root=PARTLABEL support + gpt = true + # default GPT location conflicts with spl, move it after + gpt-location = 1M } partition u-boot { in-partition-table = "no" image = "u-boot-sunxi-with-spl.bin" offset = 8192 - size = 1040384 # 1MB - 8192 + size = 1056768 # 1MB - 8192 + 16384 (GPT) } partition boot { @@ -28,6 +32,8 @@ image sdcard.img { image = "boot.vfat" } + # 'rootfs' will be used as the partition label, used + # with root=PARTLABEL=rootfs kernel command line partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd index 4772a9be31..aa5162004b 100644 --- a/board/orangepi/orangepi-zero-plus2/boot.cmd +++ b/board/orangepi/orangepi-zero-plus2/boot.cmd @@ -1,4 +1,4 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait fatload mmc 0 $kernel_addr_r Image fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg index 8091edad6f..255acdbecb 100644 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg @@ -11,19 +11,17 @@ image boot.vfat { image sdcard.img { hdimage { + # for root=PARTLABEL support + gpt = true + # default GPT location conflicts with bootloaders, move it after + gpt-location = 1M } partition spl { in-partition-table = "no" - image = "sunxi-spl.bin" + image = "u-boot-sunxi-with-spl.bin" offset = 8192 - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40K + size = 1056768 # 1MB - 8K + 16K(GPT) } partition boot { @@ -32,8 +30,11 @@ image sdcard.img { image = "boot.vfat" } + # 'rootfs' will be used as the partition label, used + # with root=PARTLABEL=rootfs kernel command line partition rootfs { partition-type = 0x83 image = "rootfs.ext4" + size = 256M } } diff --git a/board/pc/genimage-efi.cfg b/board/pc/genimage-efi.cfg index ea15ae5cfb..ec7e85b06c 100644 --- a/board/pc/genimage-efi.cfg +++ b/board/pc/genimage-efi.cfg @@ -10,7 +10,8 @@ image efi-part.vfat { image = "bzImage" } } - size = 16777216 + # 16MB - 32KB + size = 16744448 } image disk.img { @@ -22,7 +23,6 @@ image disk.img { image = "efi-part.vfat" partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b offset = 32768 - size = 16777216 bootable = true } @@ -30,6 +30,5 @@ image disk.img { partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a partition-uuid = UUID_TMP image = "rootfs.ext2" - offset = 16809984 } } diff --git a/board/qemu/aarch64-virt/linux.config b/board/qemu/aarch64-virt/linux.config index c9f2708ad5..02e0812ffd 100644 --- a/board/qemu/aarch64-virt/linux.config +++ b/board/qemu/aarch64-virt/linux.config @@ -5,13 +5,15 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_TASKSTATS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_PROFILING=y +CONFIG_ARCH_VEXPRESS=y +CONFIG_COMPAT=y +CONFIG_FW_CFG_SYSFS=y +CONFIG_FW_CFG_SYSFS_CMDLINE=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_BLK_DEV_BSGLIB=y -CONFIG_ARCH_VEXPRESS=y -CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_BINFMT_MISC=y -CONFIG_COMPAT=y +CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=y @@ -23,6 +25,8 @@ CONFIG_IP_ADVANCED_ROUTER=y CONFIG_BRIDGE=m CONFIG_NET_SCHED=y CONFIG_VSOCKETS=y +CONFIG_PCI=y +CONFIG_PCI_HOST_GENERIC=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y @@ -38,17 +42,25 @@ CONFIG_DUMMY=y CONFIG_MACVLAN=y CONFIG_VIRTIO_NET=y CONFIG_NLMON=y -CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_VIRTIO_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS=y +CONFIG_DRM=y +CONFIG_DRM_VIRTIO_GPU=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PL031=y +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_MAILBOX=y CONFIG_PL320_MBOX=y +CONFIG_ARM_SMMU_V3=y CONFIG_EXT4_FS=y +CONFIG_FUSE_FS=y +CONFIG_VIRTIO_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y diff --git a/board/qemu/aarch64-virt/readme.txt b/board/qemu/aarch64-virt/readme.txt index f868905d91..db35a3a7a8 100644 --- a/board/qemu/aarch64-virt/readme.txt +++ b/board/qemu/aarch64-virt/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-aarch64 -M virt -cpu cortex-a53 -nographic -smp 1 -kernel output/images/Image -append "rootwait root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 + qemu-system-aarch64 -M virt -cpu cortex-a53 -nographic -smp 1 -kernel output/images/Image -append "rootwait root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 # qemu_aarch64_virt_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch b/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch index a2c0962f85..956ae5f5f5 100644 --- a/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch +++ b/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch @@ -1,4 +1,4 @@ -From 4ac4324dcdaf237aa34545b3795acb2e5c42d10e Mon Sep 17 00:00:00 2001 +From 525dd2f3cf4a94837ce6b71d793acb90c25a5654 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 1 Feb 2019 11:36:20 +0100 Subject: [PATCH] arm-versatile-nommu: Linux patch @@ -21,10 +21,10 @@ Signed-off-by: Romain Naour create mode 100644 arch/arm/mach-versatile/Makefile.boot diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index e8cd55a5b04c..fc2dbff70394 100644 +index 002e0cf025f5..c71299b6f91f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -353,6 +353,17 @@ config ARM_SINGLE_ARMV7M +@@ -343,6 +343,17 @@ config ARM_SINGLE_ARMV7M select SPARSE_IRQ select USE_OF @@ -43,10 +43,10 @@ index e8cd55a5b04c..fc2dbff70394 100644 bool "EBSA-110" select ARCH_USES_GETTIMEOFFSET diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug -index f6fcb8a79889..92fc637d3db8 100644 +index 8986a91a6f31..69cb6404e8ce 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug -@@ -1843,7 +1843,8 @@ config DEBUG_UNCOMPRESS +@@ -1943,7 +1943,8 @@ config DEBUG_UNCOMPRESS config UNCOMPRESS_INCLUDE string default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ @@ -57,10 +57,10 @@ index f6fcb8a79889..92fc637d3db8 100644 config EARLY_PRINTK diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h -index 9b7c328fb207..b1fe9c8b5c3e 100644 +index 92282558caf7..90bd9c069ffc 100644 --- a/arch/arm/include/asm/mach/map.h +++ b/arch/arm/include/asm/mach/map.h -@@ -62,6 +62,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys, +@@ -59,6 +59,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys, #else #define iotable_init(map,num) do { } while (0) #define vm_reserve_area_early(a,s,c) do { } while (0) @@ -69,7 +69,7 @@ index 9b7c328fb207..b1fe9c8b5c3e 100644 #endif diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig -index f5c275434d6c..06ad999d5978 100644 +index d88e7725bf99..d38b90157f13 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig @@ -1,7 +1,8 @@ @@ -93,10 +93,10 @@ index 000000000000..eacfc3f5c33e +# Patch waits for application at +# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c -index 3c8d39c12909..8cfa05a37295 100644 +index 02ba68abe533..835b51bc597b 100644 --- a/arch/arm/mach-versatile/versatile_dt.c +++ b/arch/arm/mach-versatile/versatile_dt.c -@@ -37,7 +37,11 @@ +@@ -22,7 +22,11 @@ #include /* macro to get at MMIO space when running virtually */ @@ -109,5 +109,5 @@ index 3c8d39c12909..8cfa05a37295 100644 /* -- -2.14.5 +2.17.1 diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt index f3a9e1ab47..223bd55c01 100644 --- a/board/qemu/arm-versatile/readme.txt +++ b/board/qemu/arm-versatile/readme.txt @@ -1,12 +1,10 @@ Run the emulation with: - qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user + qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user # qemu_arm_versatile_defconfig Or for the noMMU emulation: - qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 + qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 # qemu_arm_versatile_nommu_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/arm-vexpress-tz/post-build.sh b/board/qemu/arm-vexpress-tz/post-build.sh index 7ead69a99a..97cc53791c 100755 --- a/board/qemu/arm-vexpress-tz/post-build.sh +++ b/board/qemu/arm-vexpress-tz/post-build.sh @@ -3,8 +3,7 @@ set -u set -e -# Rename boot images for the dear TF-A -ln -sf u-boot.bin ${BINARIES_DIR}/bl33.bin -ln -sf tee-header_v2.bin ${BINARIES_DIR}/bl32.bin -ln -sf tee-pager_v2.bin ${BINARIES_DIR}/bl32_extra1.bin -ln -sf tee-pageable_v2.bin ${BINARIES_DIR}/bl32_extra2.bin +# Create flash.bin TF-A FIP image from bl1.bin and fip.bin +cd "$BINARIES_DIR" +dd if=bl1.bin of=flash.bin bs=4096 +dd if=fip.bin of=flash.bin seek=64 bs=4096 conv=notrunc diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt index 35ff018aec..7e62e943a6 100644 --- a/board/qemu/arm-vexpress-tz/readme.txt +++ b/board/qemu/arm-vexpress-tz/readme.txt @@ -6,11 +6,10 @@ builds of the QEMU host ARM target emulator. make qemu_arm_vexpress_tz_defconfig make -The BIOS used in the QEMU host is the ARM Trusted Firmware-A (TF-A). TF-A -uses QEMU semihosting file access to access boot image files. The -QEMU platform is quite specific for that in TF-A and one needs to -run the emulation from the image directory for TF-A to boot the -secure and non-secure worlds. +The BIOS used in the QEMU host is the ARM Trusted Firmware-A (TF-A). +In our configuration, U-Boot uses QEMU semihosting file access to load the +kernel and rootfs image files. For this reason the emulation needs to be run +from the image directory: cd output/images && ../host/bin/qemu-system-arm \ -machine virt -machine secure=on -cpu cortex-a15 \ @@ -18,7 +17,7 @@ secure and non-secure worlds. -serial stdio \ -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ -semihosting-config enable,target=native \ - -bios bl1.bin + -bios flash.bin # qemu_arm_vexpress_tz_defconfig The boot stage traces (if any) followed by the login prompt will appear in the terminal that started QEMU. @@ -29,8 +28,6 @@ number of cores. Note: "-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic" brings network support that is used i.e. in OP-TEE regression tests. -Tested with QEMU 2.12.0, and 3.1.0. - -- Boot Details -- @@ -66,7 +63,7 @@ consoles over telnet connections: -serial telnet:127.0.0.1:1236,server \ -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ -semihosting-config enable,target=native \ - -bios bl1.bin + -bios flash.bin QEMU is now waiting for the telnet connection. From another shell, open a telnet connection on the port for the U-boot and Linux consoles: @@ -95,7 +92,7 @@ From a first shell: -serial stdio \ -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ -semihosting-config enable,target=native \ - -bios bl1.bin \ + -bios flash.bin \ -S From a second shell: @@ -111,7 +108,7 @@ From this GDB console, connect to the target, load the OP-TEE core symbols, set a breakpoint to its entry point (__text_start) and start emulation: (gdb) target remote 127.0.0.1:1234 - (gdb) symbol-file ./output/build/optee-os-/out/arm/core/tee.elf + (gdb) symbol-file ./output/build/optee-os-/out/core/tee.elf (gdb) hbreak __text_start Hardware assisted breakpoint 1 at 0xe100000: file core/arch/arm/kernel/generic_entry_a32.S, line 246. (gdb) cont diff --git a/board/qemu/arm-vexpress-tz/u-boot.config b/board/qemu/arm-vexpress-tz/u-boot.config index fd74bf1fe7..48b1d06fdb 100644 --- a/board/qemu/arm-vexpress-tz/u-boot.config +++ b/board/qemu/arm-vexpress-tz/u-boot.config @@ -1,7 +1,8 @@ CONFIG_SYS_TEXT_BASE=0x60000000 -CONFIG_BOOTCOMMAND="fdt addr ${fdt_addr} && fdt resize 1000 && smhload zImage ${kernel_addr_r} && smhload rootfs.cpio.gz ${ramdisk_addr_r} ramdisk_addr_end && setenv bootargs console=ttyAMA0,115200 earlyprintk=serial,ttyAMA0,115200 && fdt chosen ${ramdisk_addr_r} ${ramdisk_addr_end} && bootz ${kernel_addr_r} - ${fdt_addr}" +CONFIG_BOOTCOMMAND="smhload zImage ${kernel_addr_r} && smhload rootfs.cpio.uboot ${ramdisk_addr_r} && setenv bootargs console=ttyAMA0,115200 earlyprintk=serial,ttyAMA0,115200 && bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr}" CONFIG_SEMIHOSTING=y # Drop flash accesses CONFIG_ENV_IS_IN_FLASH=n CONFIG_MTD=n CONFIG_MTD_NOR_FLASH=n +CONFIG_ENV_IS_NOWHERE=y diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt index 7f7b43a3b3..8d1bb72f83 100644 --- a/board/qemu/arm-vexpress/readme.txt +++ b/board/qemu/arm-vexpress/readme.txt @@ -1,11 +1,9 @@ Run the emulation with: - qemu-system-arm -M vexpress-a9 -smp 1 -m 256 -kernel output/images/zImage -dtb output/images/vexpress-v2p-ca9.dtb -drive file=output/images/rootfs.ext2,if=sd,format=raw -append "console=ttyAMA0,115200 rootwait root=/dev/mmcblk0" -serial stdio -net nic,model=lan9118 -net user + qemu-system-arm -M vexpress-a9 -smp 1 -m 256 -kernel output/images/zImage -dtb output/images/vexpress-v2p-ca9.dtb -drive file=output/images/rootfs.ext2,if=sd,format=raw -append "console=ttyAMA0,115200 rootwait root=/dev/mmcblk0" -serial stdio -net nic,model=lan9118 -net user # qemu_arm_vexpress_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. If you want to emulate more cores change "-smp 1" to "-smp 2" for dual-core or even "smp -4" for a quad-core configuration. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/csky/readme.txt b/board/qemu/csky/readme.txt index 89d68aafb8..5e4cb1871c 100644 --- a/board/qemu/csky/readme.txt +++ b/board/qemu/csky/readme.txt @@ -1,12 +1,15 @@ Run with qemu: For ck860 smp: - qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux + qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux # qemu_csky860_virt_defconfig -For ck810/ck807: - qemu-system-cskyv2 -M virt -nographic -kernel vmlinux +For ck807: + qemu-system-cskyv2 -M virt -nographic -kernel vmlinux # qemu_csky807_virt_defconfig + +For ck810: + qemu-system-cskyv2 -M virt -nographic -kernel vmlinux # qemu_csky810_virt_defconfig For ck610: - qemu-system-cskyv1 -M virt -nographic -kernel vmlinux + qemu-system-cskyv1 -M virt -nographic -kernel vmlinux # qemu_csky610_virt_defconfig The login prompt will appear in the terminal that started Qemu. Username is root and no password. diff --git a/board/qemu/m68k-mcf5208/readme.txt b/board/qemu/m68k-mcf5208/readme.txt index d1c9086805..79bf7146a2 100644 --- a/board/qemu/m68k-mcf5208/readme.txt +++ b/board/qemu/m68k-mcf5208/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-m68k -M mcf5208evb -cpu m5208 -kernel output/images/vmlinux -nographic + qemu-system-m68k -M mcf5208evb -cpu m5208 -kernel output/images/vmlinux -nographic # qemu_m68k_mcf5208_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/m68k-q800/readme.txt b/board/qemu/m68k-q800/readme.txt index b516bacdff..f1db57d52b 100644 --- a/board/qemu/m68k-q800/readme.txt +++ b/board/qemu/m68k-q800/readme.txt @@ -1,8 +1,5 @@ Run the emulation with: - qemu-system-m68k -M q800 -kernel output/images/vmlinux -nographic -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0" + qemu-system-m68k -M q800 -kernel output/images/vmlinux -nographic -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0" # qemu_m68k_q800_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.11.0 from https://github.com/vivier/qemu-m68k -You need following branch: q800-v2.11.0 diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt index 4f52baff1f..7bb986422c 100644 --- a/board/qemu/microblazebe-mmu/readme.txt +++ b/board/qemu/microblazebe-mmu/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-microblaze -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio + qemu-system-microblaze -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio # qemu_microblazebe_mmu_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt index 0b0f330a5e..20fa0072ed 100644 --- a/board/qemu/microblazeel-mmu/readme.txt +++ b/board/qemu/microblazeel-mmu/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-microblazeel -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio + qemu-system-microblazeel -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio # qemu_microblazeel_mmu_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/mips32r2-malta/readme.txt b/board/qemu/mips32r2-malta/readme.txt index 9ff3c4b810..db1db65b1e 100644 --- a/board/qemu/mips32r2-malta/readme.txt +++ b/board/qemu/mips32r2-malta/readme.txt @@ -1,9 +1,7 @@ Run the emulation with: - qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user + qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user # qemu_mips32r2_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. No keyboard support has been enabled. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/mips32r2el-malta/readme.txt b/board/qemu/mips32r2el-malta/readme.txt index 745bfea608..4dc0e64e02 100644 --- a/board/qemu/mips32r2el-malta/readme.txt +++ b/board/qemu/mips32r2el-malta/readme.txt @@ -1,9 +1,7 @@ Run the emulation with: - qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user + qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user # qemu_mips32r2el_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. No keyboard support has been enabled. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/mips32r6-malta/readme.txt b/board/qemu/mips32r6-malta/readme.txt index 6a026b2165..9ad4959f09 100644 --- a/board/qemu/mips32r6-malta/readme.txt +++ b/board/qemu/mips32r6-malta/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: -qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic + qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic # qemu_mips32r6_malta_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/mips32r6el-malta/readme.txt b/board/qemu/mips32r6el-malta/readme.txt index f69fd21af1..96c9dc88bf 100644 --- a/board/qemu/mips32r6el-malta/readme.txt +++ b/board/qemu/mips32r6el-malta/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: -qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user -nographic + qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user -nographic # qemu_mips32r6el_malta_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt index ea3a92541e..7432dac1a1 100644 --- a/board/qemu/mips64-malta/readme.txt +++ b/board/qemu/mips64-malta/readme.txt @@ -1,8 +1,6 @@ Run the emulation with: - qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" + qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" # qemu_mips64_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/mips64el-malta/readme.txt b/board/qemu/mips64el-malta/readme.txt index 144da93839..f67ac91ac4 100644 --- a/board/qemu/mips64el-malta/readme.txt +++ b/board/qemu/mips64el-malta/readme.txt @@ -1,8 +1,6 @@ Run the emulation with: - qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" + qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" # qemu_mips64el_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/mips64r6-malta/readme.txt b/board/qemu/mips64r6-malta/readme.txt index cfa16fd863..252a543192 100644 --- a/board/qemu/mips64r6-malta/readme.txt +++ b/board/qemu/mips64r6-malta/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic + qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic # qemu_mips64r6_malta_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/mips64r6el-malta/readme.txt b/board/qemu/mips64r6el-malta/readme.txt index 61a6ceb5f4..e9d02e772a 100644 --- a/board/qemu/mips64r6el-malta/readme.txt +++ b/board/qemu/mips64r6el-malta/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic + qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic # qemu_mips64r6el_malta_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/nios2-10m50/linux.fragment b/board/qemu/nios2-10m50/linux.fragment index 76c864f5c3..c7647cee8a 100644 --- a/board/qemu/nios2-10m50/linux.fragment +++ b/board/qemu/nios2-10m50/linux.fragment @@ -1,3 +1,3 @@ # Embed the DTB in the kernel image CONFIG_NIOS2_DTB_SOURCE_BOOL=y -CONFIG_NIOS2_DTB_SOURCE="arch/nios2/boot/dts/10m50_devboard.dts" +CONFIG_NIOS2_DTB_SOURCE="10m50_devboard.dts" diff --git a/board/qemu/nios2-10m50/readme.txt b/board/qemu/nios2-10m50/readme.txt index 44cbcb08a2..f8f8f3b3a5 100644 --- a/board/qemu/nios2-10m50/readme.txt +++ b/board/qemu/nios2-10m50/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-nios2 -kernel output/images/vmlinux -nographic + qemu-system-nios2 -kernel output/images/vmlinux -nographic # qemu_nios2_10m50_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0. diff --git a/board/qemu/or1k/readme.txt b/board/qemu/or1k/readme.txt index df6b467e82..2ea797440a 100644 --- a/board/qemu/or1k/readme.txt +++ b/board/qemu/or1k/readme.txt @@ -1,9 +1,7 @@ Run the emulation with: - qemu-system-or1k -kernel output/images/vmlinux -nographic + qemu-system-or1k -kernel output/images/vmlinux -nographic # qemu_or1k_defconfig The login prompt will appear in the terminal that started Qemu. Ethernet support is not working, yet. - -Tested with QEMU 2.12.0. diff --git a/board/qemu/ppc-g3beige/readme.txt b/board/qemu/ppc-g3beige/readme.txt index 608814ee3b..e6c9c2016e 100644 --- a/board/qemu/ppc-g3beige/readme.txt +++ b/board/qemu/ppc-g3beige/readme.txt @@ -1,8 +1,6 @@ Run the emulation with: - qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 rootwait root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user + qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 rootwait root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user # qemu_ppc_g3beige_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/ppc-mac99/readme.txt b/board/qemu/ppc-mac99/readme.txt index a8a18db5b9..fb94a7837d 100644 --- a/board/qemu/ppc-mac99/readme.txt +++ b/board/qemu/ppc-mac99/readme.txt @@ -1,5 +1,3 @@ Run the emulation with: - qemu-system-ppc -nographic -vga none -M mac99 -cpu g4 -m 1G -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -net nic,model=sungem -net user -append "root=/dev/sda" - -Tested with QEMU 3.1.0 + qemu-system-ppc -nographic -vga none -M mac99 -cpu g4 -m 1G -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -net nic,model=sungem -net user -append "root=/dev/sda" # qemu_ppc_mac99_defconfig diff --git a/board/qemu/ppc-mpc8544ds/readme.txt b/board/qemu/ppc-mpc8544ds/readme.txt index 172aad5626..d34d64c336 100644 --- a/board/qemu/ppc-mpc8544ds/readme.txt +++ b/board/qemu/ppc-mpc8544ds/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-ppc -M mpc8544ds -kernel output/images/vmlinux -serial stdio -net nic,model=e1000 -net user + qemu-system-ppc -M mpc8544ds -kernel output/images/vmlinux -serial stdio -net nic,model=e1000 -net user # qemu_ppc_mpc8544ds_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/ppc64-e5500/readme.txt b/board/qemu/ppc64-e5500/readme.txt index 8080766984..61d51f7f4d 100644 --- a/board/qemu/ppc64-e5500/readme.txt +++ b/board/qemu/ppc64-e5500/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 rootwait root=/dev/vda" -serial mon:stdio -nographic + qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 rootwait root=/dev/vda" -serial mon:stdio -nographic # qemu_ppc64_e5500_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/ppc64-pseries/readme.txt b/board/qemu/ppc64-pseries/readme.txt index 6a3e96a2e5..cbd3c6ca2b 100644 --- a/board/qemu/ppc64-pseries/readme.txt +++ b/board/qemu/ppc64-pseries/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses + qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses # qemu_ppc64_pseries_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/ppc64le-pseries/readme.txt b/board/qemu/ppc64le-pseries/readme.txt index 2728675df2..8ee72ea6cf 100644 --- a/board/qemu/ppc64le-pseries/readme.txt +++ b/board/qemu/ppc64le-pseries/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: -qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses +qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses # qemu_ppc64le_pseries_defconfig The login prompt will appear in the terminal window. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/riscv32-virt/readme.txt b/board/qemu/riscv32-virt/readme.txt index 5d7c1988d2..32b4333512 100644 --- a/board/qemu/riscv32-virt/readme.txt +++ b/board/qemu/riscv32-virt/readme.txt @@ -1,7 +1,5 @@ Run Linux in emulation with: - qemu-system-riscv32 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80400000 -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + qemu-system-riscv32 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv32_virt_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 3.1 diff --git a/board/qemu/riscv64-virt/readme.txt b/board/qemu/riscv64-virt/readme.txt index c075cc464d..747a9ea674 100644 --- a/board/qemu/riscv64-virt/readme.txt +++ b/board/qemu/riscv64-virt/readme.txt @@ -1,7 +1,5 @@ Run Linux in emulation with: - qemu-system-riscv64 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80200000 -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + qemu-system-riscv64 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 3.1 diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt index dd80953b97..b0799e47a8 100644 --- a/board/qemu/sh4-r2d/readme.txt +++ b/board/qemu/sh4-r2d/readme.txt @@ -1,8 +1,6 @@ Run the emulation with: - qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user + qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/sh4eb-r2d/readme.txt b/board/qemu/sh4eb-r2d/readme.txt index e71a9bce90..9f3dd8b20b 100644 --- a/board/qemu/sh4eb-r2d/readme.txt +++ b/board/qemu/sh4eb-r2d/readme.txt @@ -1,8 +1,6 @@ Run the emulation with: - qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user + qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4eb_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt index 33833c2d33..d624b82d9f 100644 --- a/board/qemu/sparc-ss10/readme.txt +++ b/board/qemu/sparc-ss10/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user + qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user # qemu_sparc_ss10_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/sparc64-sun4u/readme.txt b/board/qemu/sparc64-sun4u/readme.txt index f2e6e81a86..17d8cbdf9b 100644 --- a/board/qemu/sparc64-sun4u/readme.txt +++ b/board/qemu/sparc64-sun4u/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-sparc64 -M sun4u -kernel output/images/vmlinux -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -drive file=output/images/rootfs.ext2,format=raw -net nic,model=e1000 -net user + qemu-system-sparc64 -M sun4u -kernel output/images/vmlinux -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -drive file=output/images/rootfs.ext2,format=raw -net nic,model=e1000 -net user # qemu_sparc64_sun4u_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/x86/linux.config b/board/qemu/x86/linux.config index 79f7537d80..a4da99ff43 100644 --- a/board/qemu/x86/linux.config +++ b/board/qemu/x86/linux.config @@ -10,6 +10,7 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y # CONFIG_WIRELESS is not set +CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt index 3bbafecf91..a1f232e2e4 100644 --- a/board/qemu/x86/readme.txt +++ b/board/qemu/x86/readme.txt @@ -1,9 +1,7 @@ Run the emulation with: - qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user + qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user # qemu_x86_defconfig Optionally add -smp N to emulate a SMP system with N CPUs. The login prompt will appear in the graphical window. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/x86_64/linux.config b/board/qemu/x86_64/linux.config index 5fa33d4424..e1d2ce01b0 100644 --- a/board/qemu/x86_64/linux.config +++ b/board/qemu/x86_64/linux.config @@ -10,6 +10,7 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y # CONFIG_WIRELESS is not set +CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt index 93ac22a947..2b2ae3be20 100644 --- a/board/qemu/x86_64/readme.txt +++ b/board/qemu/x86_64/readme.txt @@ -1,9 +1,7 @@ Run the emulation with: - qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user + qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user # qemu_x86_64_defconfig Optionally add -smp N to emulate a SMP system with N CPUs. The login prompt will appear in the graphical window. - -Tested with QEMU 2.12.0 diff --git a/board/qemu/xtensa-lx60/readme.txt b/board/qemu/xtensa-lx60/readme.txt index 4287e1f09e..6f0e2710c0 100644 --- a/board/qemu/xtensa-lx60/readme.txt +++ b/board/qemu/xtensa-lx60/readme.txt @@ -1,7 +1,7 @@ Run the emulation with: - qemu-system-xtensa -M lx60 -cpu dc233c -monitor null -nographic -kernel output/images/Image.elf + qemu-system-xtensa -M lx60 -cpu dc233c -monitor null -nographic -kernel output/images/Image.elf # qemu_xtensa_lx60_defconfig + + qemu-system-xtensa -M lx60 -cpu dc233c -monitor null -nographic -kernel output/images/Image.elf # qemu_xtensa_lx60_nommu_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/board/raspberrypi/genimage-raspberrypi4-64.cfg b/board/raspberrypi/genimage-raspberrypi4-64.cfg index 3c480e98f0..854e0c7e31 100644 --- a/board/raspberrypi/genimage-raspberrypi4-64.cfg +++ b/board/raspberrypi/genimage-raspberrypi4-64.cfg @@ -4,8 +4,8 @@ image boot.vfat { "bcm2711-rpi-4-b.dtb", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", - "rpi-firmware/fixup4.dat", - "rpi-firmware/start4.elf", + "rpi-firmware/fixup.dat", + "rpi-firmware/start.elf", "rpi-firmware/overlays", "Image" } diff --git a/board/raspberrypi/genimage-raspberrypi4.cfg b/board/raspberrypi/genimage-raspberrypi4.cfg index 4e4742f3ef..60e1f23bcc 100644 --- a/board/raspberrypi/genimage-raspberrypi4.cfg +++ b/board/raspberrypi/genimage-raspberrypi4.cfg @@ -4,8 +4,8 @@ image boot.vfat { "bcm2711-rpi-4-b.dtb", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", - "rpi-firmware/fixup4.dat", - "rpi-firmware/start4.elf", + "rpi-firmware/fixup.dat", + "rpi-firmware/start.elf", "rpi-firmware/overlays", "zImage" } diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh index 9dbd98ef9b..a6728c686e 100755 --- a/board/raspberrypi/post-image.sh +++ b/board/raspberrypi/post-image.sh @@ -16,7 +16,7 @@ do cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt" # fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console -dtoverlay=miniuart-bt +dtoverlay=miniuart-bt,krnbt=on __EOF__ fi ;; diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 8b3de6d251..62cb248633 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -9,6 +9,7 @@ These instructions apply to all models of the Raspberry Pi: - the model B2 (aka Raspberry Pi 2) - the model B3 (aka Raspberry Pi 3). - the model B4 (aka Raspberry Pi 4). + - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). How to build it =============== @@ -35,10 +36,26 @@ For model 3 B and B+: $ make raspberrypi3_defconfig +or for model 3 B and B+ (64 bit): + + $ make raspberrypi3_64_defconfig + For model 4 B: $ make raspberrypi4_defconfig +or for model 4 B (64 bit): + + $ make raspberrypi4_64_defconfig + +For model CM4 (on IO Board): + + $ make raspberrypicm4io_defconfig + +or for CM4 (on IO Board - 64 bit): + + $ make raspberrypicm4io_64_defconfig + Build the rootfs ---------------- @@ -63,6 +80,7 @@ After building, you should obtain this tree: +-- bcm2710-rpi-3-b.dtb [1] +-- bcm2710-rpi-3-b-plus.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] + +-- bcm2711-rpi-cm4.dtb [1] +-- boot.vfat +-- rootfs.ext4 +-- rpi-firmware/ @@ -97,3 +115,31 @@ Insert the SDcard into your Raspberry Pi, and power it up. Your new system should come up now and start two consoles: one on the serial port on the P1 header, one on the HDMI output where you can login using a USB keyboard. + +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: + +- 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 +- power up CM4/IO Board (lsusb command should show a '0a5c:2711 Broadcom Corp. + BCM2711 Boot' device) +- run 'sudo ./host/bin/rpiboot', output should look like the following: + Waiting for BCM2835/6/7/2711... + Loading embedded: bootcode4.bin + Sending bootcode.bin + Successful read 4 bytes + Waiting for BCM2835/6/7/2711... + Loading embedded: bootcode4.bin + Second stage boot server + Loading embedded: start4.elf + File read: start4.elf + Second stage boot server done + +- a USB mass storage device should show up (the CM4 eMMC memory), proceed + as described above to copy sdcard.img to it +- power down CM4/IO Board +- remove jumper on IO Board header J2 to re-enable eMMC boot +- power up CM4/IO Board diff --git a/board/roseapplepi/genimage.cfg b/board/roseapplepi/genimage.cfg index 4d40e65bba..f4a353e823 100644 --- a/board/roseapplepi/genimage.cfg +++ b/board/roseapplepi/genimage.cfg @@ -7,10 +7,10 @@ image boot.vfat { "uImage" } file kernel.dtb { - image = "actduino_bubble_gum_sdboot_linux.dtb" + image = "owl-s500-roseapplepi.dtb" } } - size = 10M + size = 128M } image sdcard.img { @@ -34,10 +34,4 @@ image sdcard.img { bootable = "true" image = "boot.vfat" } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } } diff --git a/board/roseapplepi/uEnv.txt b/board/roseapplepi/uEnv.txt old mode 100755 new mode 100644 index f9646e498e..2b9de727b4 --- a/board/roseapplepi/uEnv.txt +++ b/board/roseapplepi/uEnv.txt @@ -1,3 +1,3 @@ # no ramdisk ramdisk_addr_r=- -bootargs=clk_ignore_unused root=/dev/mmcblk0p2 +bootargs=console=ttyOWL2,115200 diff --git a/board/shredos/bootx64.efi b/board/shredos/bootx64.efi index c2d8188c91..c58a2037bf 100755 Binary files a/board/shredos/bootx64.efi and b/board/shredos/bootx64.efi differ diff --git a/board/shredos/fsoverlay/etc/inittab b/board/shredos/fsoverlay/etc/inittab index d1b897b9a0..d2887d1642 100644 --- a/board/shredos/fsoverlay/etc/inittab +++ b/board/shredos/fsoverlay/etc/inittab @@ -10,6 +10,7 @@ si2::sysinit:/bin/mkdir -p /dev/pts si3::sysinit:/bin/mkdir -p /dev/shm si4::sysinit:/bin/mount -a si5::sysinit:/bin/hostname -F /etc/hostname +si6::sysinit:/usr/bin/nwipe_process_disable rcS:12345:wait:/etc/init.d/rcS sole::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL diff --git a/board/shredos/fsoverlay/usr/bin/shredos_net.sh b/board/shredos/fsoverlay/usr/bin/shredos_net.sh index 80a598a3b6..62cf97e208 100755 --- a/board/shredos/fsoverlay/usr/bin/shredos_net.sh +++ b/board/shredos/fsoverlay/usr/bin/shredos_net.sh @@ -5,7 +5,7 @@ # with those devices set up as DHCP hot plug. We then monitor the link # state (whether the ethernet cable is connected). # -version=1.0-211023-2337 +version=1.1-211123-1901 # # Forcefully shutdown all network interfaces if any are up ifdown -f -a @@ -29,8 +29,8 @@ active_device="none" # Populate /etc/network/interfaces with each network device if ethernet or wifi for device in $net_devices do - # We're only interested in ethernet (enxxxx) and wifi (wlxxxx) devices - if [[ $device == en* ]]; + # We are only interested in ethernet enxxxx or ethxx devices + if [[ "$device" == en* ]] || [[ "$device" == et* ]] then echo "auto $device" >> /etc/network/interfaces echo "iface $device inet dhcp" >> /etc/network/interfaces @@ -40,8 +40,8 @@ done # Check for existing active ethernet devices and set active_device variable for device in $net_devices do - # We're only interested in ethernet (enxxxx) devices - if [[ $device == en* ]]; + # We're only interested in ethernet enxxxx or ethxx devices + if [[ "$device" == en* ]] || [[ "$device" == et* ]] then # initial creation of device operstate and status variables for # each network device, indirectly referenced so you won't see @@ -94,8 +94,8 @@ do for device in $net_devices do - # We're only interested in ethernet (enxxxx) devices - if [[ $device == en* ]]; + # We're only interested in ethernet enxxxx or ethxx devices + if [[ "$device" == en* ]] || [[ "$device" == eth* ]] then # and we are only interested in one device being active at any one time diff --git a/board/shredos/genimage.cfg b/board/shredos/genimage.cfg index a7d5568030..8bbb208a2d 100644 --- a/board/shredos/genimage.cfg +++ b/board/shredos/genimage.cfg @@ -10,7 +10,7 @@ image boot.vfat { file autorun.inf { image = 'autorun.inf' } } - size = 55000000 + size = 60000000 } image shredos.img { diff --git a/board/shredos/kernel-5.6-defconfig.config b/board/shredos/kernel-5.6-defconfig.config index 6f1ea2093e..952dc3d0bf 100644 --- a/board/shredos/kernel-5.6-defconfig.config +++ b/board/shredos/kernel-5.6-defconfig.config @@ -609,13 +609,64 @@ CONFIG_DRM=y CONFIG_DRM_UDL=y CONFIG_DRM_AST=y CONFIG_FIRMWARE_EDID=y -CONFIG_FB_TILEBLITTING=y +CONFIG_FB_CIRRUS=y +CONFIG_FB_PM2=y +CONFIG_FB_PM2_FIFO_DISCONNECT=y +CONFIG_FB_CYBER2000=y +CONFIG_FB_ARC=y +CONFIG_FB_ASILIANT=y +CONFIG_FB_IMSTT=y CONFIG_FB_VGA16=y CONFIG_FB_UVESA=y CONFIG_FB_VESA=y CONFIG_FB_EFI=y -# CONFIG_XEN_FBDEV_FRONTEND is not set +CONFIG_FB_N411=y +CONFIG_FB_HGA=y +CONFIG_FB_OPENCORES=y +CONFIG_FB_S1D13XXX=y +CONFIG_FB_NVIDIA=y +CONFIG_FB_NVIDIA_I2C=y +CONFIG_FB_RIVA=y +CONFIG_FB_RIVA_I2C=y +CONFIG_FB_I740=y +CONFIG_FB_LE80578=y +CONFIG_FB_MATROX=y +CONFIG_FB_MATROX_MILLENIUM=y +CONFIG_FB_MATROX_MYSTIQUE=y +CONFIG_FB_MATROX_G=y +CONFIG_FB_MATROX_I2C=y +CONFIG_FB_MATROX_MAVEN=y +CONFIG_FB_RADEON=y +CONFIG_FB_ATY128=y +CONFIG_FB_ATY=y +CONFIG_FB_ATY_CT=y +CONFIG_FB_ATY_GENERIC_LCD=y +CONFIG_FB_ATY_GX=y +CONFIG_FB_S3=y +CONFIG_FB_SAVAGE=y +CONFIG_FB_SAVAGE_I2C=y +CONFIG_FB_SAVAGE_ACCEL=y +CONFIG_FB_SIS=y +CONFIG_FB_SIS_300=y +CONFIG_FB_SIS_315=y +CONFIG_FB_VIA=y +CONFIG_FB_NEOMAGIC=y +CONFIG_FB_KYRO=y +CONFIG_FB_3DFX=y +CONFIG_FB_3DFX_ACCEL=y +CONFIG_FB_VOODOO1=y +CONFIG_FB_VT8623=y +CONFIG_FB_TRIDENT=y +CONFIG_FB_ARK=y +CONFIG_FB_PM3=y +CONFIG_FB_CARMINE=y +CONFIG_FB_SMSCUFX=y +CONFIG_FB_UDL=y +CONFIG_FB_IBM_GXT4500=y +CONFIG_FB_METRONOME=y +CONFIG_FB_MB862XX=y CONFIG_FB_SIMPLE=y +CONFIG_FB_SM712=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_L4F00242T03=y CONFIG_LCD_LMS283GF05=y @@ -628,7 +679,6 @@ CONFIG_LCD_AMS369FG06=y CONFIG_LCD_LMS501KF03=y CONFIG_LCD_HX8357=y CONFIG_LCD_OTM3225A=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=y CONFIG_BACKLIGHT_DA903X=y CONFIG_BACKLIGHT_DA9052=y diff --git a/board/shredos/version.txt b/board/shredos/version.txt index 0c2402780c..84f7fea848 100644 --- a/board/shredos/version.txt +++ b/board/shredos/version.txt @@ -1 +1 @@ -2020.05.018_x86-64_0.32.014 +2021.08.2_20_x86-64_0.32.014 diff --git a/board/sifive/hifive-unleashed/linux.config.fragment b/board/sifive/hifive-unleashed/linux.config.fragment index f4f384088a..385a961dd4 100644 --- a/board/sifive/hifive-unleashed/linux.config.fragment +++ b/board/sifive/hifive-unleashed/linux.config.fragment @@ -1,16 +1,10 @@ CONFIG_HZ_100=y -CONFIG_CMDLINE="earlycon=sbi root=/dev/mmcblk0p2 rootwait" -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_SERIAL_SIFIVE=y -CONFIG_SERIAL_SIFIVE_CONSOLE=y -CONFIG_SPI=y -CONFIG_SPI_SIFIVE=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SIFIVE=y -CONFIG_MMC=y -CONFIG_MMC_SPI=y -CONFIG_CLK_U54_PRCI=y -CONFIG_CLK_GEMGXL_MGMT=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_MTD=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_SPI_NOR=y CONFIG_PWM=y CONFIG_PWM_SIFIVE=y diff --git a/board/sifive/hifive-unleashed/readme.txt b/board/sifive/hifive-unleashed/readme.txt index 8d3fa6357f..3263913e9c 100644 --- a/board/sifive/hifive-unleashed/readme.txt +++ b/board/sifive/hifive-unleashed/readme.txt @@ -28,30 +28,41 @@ Result of the build Once the build has finished you will have the following files: output/images/ + +-- boot.scr + +-- fw_dynamic.bin + +-- fw_dynamic.elf +-- fw_jump.bin +-- fw_jump.elf - +-- fw_payload.bin - +-- fw_payload.elf + +-- hifive-unleashed-a00.dtb +-- Image + +-- rootfs.cpio +-- rootfs.ext2 +-- rootfs.ext4 +-- rootfs.tar +-- sdcard.img + +-- u-boot.bin + +-- u-boot.itb + +-- u-boot-spl.bin Creating a bootable SD card with genimage ========================================= -Buildroot builds a SD card image for you. All you need to do is dd the -image to your SD card, which can be done with the following command: +By default Buildroot builds a SD card image for you. All you need to do +is dd the image to your SD card, which can be done with the following +command on your development host: - $ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 bs=4096 + $ sudo dd if=output/images/sdcard.img of=/dev/sdb bs=4096 + +The above example command assumes the SD card is accessed via a USB card +reader and shows up as /dev/sdb on the host. Adjust it accordingly per +your actual setup. Booting the SD card on the board ================================ Make sure that the all DIP switches are set to the off position for -default boot mode (MSEL mode = 1111), insert the SD card and power +default boot mode (MSEL mode = 1011), insert the SD card and power up the board. Connect the USB cable and open minicom (/dev/ttyUSB1, 115200, 8N1). @@ -60,16 +71,45 @@ See the 'SiFive HiFive Unleashed Getting Started Guide' for more details (https://www.sifive.com/documentation). You will get a warning reported by fdisk when you examine the SD card. -This is because the genimage.cfg file doesn't specify the SD card size -(as people will naturally have different sized cards), so the +This is because the genimage_sdcard.cfg file doesn't specify the SD card +size (as people will naturally have different sized cards), so the secondary GPT header is placed after the rootfs rather than at the end of the disk where it is expected to be. You will see something like this at boot time: -[ 2.318722] GPT:Primary header thinks Alt. header is not at the end of the disk. -[ 2.325390] GPT:190496 != 122142719 -[ 2.328843] GPT:Alternate GPT header not at the end of the disk. -[ 2.334824] GPT:190496 != 122142719 -[ 2.338302] GPT: Use GNU Parted to correct GPT errors. -[ 2.343456] mmcblk0: p1 p2 +[ 0.989458] mmc0: host does not support reading read-only switch, assuming write-enable +[ 0.996772] mmc0: new SDHC card on SPI +[ 1.001634] mmcblk0: mmc0:0000 SD8GB 7.28 GiB +[ 1.038079] GPT:Primary header thinks Alt. header is not at the end of the disk. +[ 1.044759] GPT:52389 != 15264767 +[ 1.048051] GPT:Alternate GPT header not at the end of the disk. +[ 1.054015] GPT:52389 != 15264767 +[ 1.057323] GPT: Use GNU Parted to correct GPT errors. +[ 1.062479] mmcblk0: p1 p2 p3 + + +Creating a bootable SPI flash with genimage +=========================================== + +Adjust Buildroot configuration by: + + $ make menuconfig + +Change "System configuration" -> "Extra arguments passed to custom scripts" +value to "-c board/sifive/hifive-unleashed/genimage_spi-nor.cfg", save the +configuration and build. This creates a output/images/spi-nor.img that can +be programmed to the on-board SPI flash. + +Boot the board from the SD card prepared above, stop the U-Boot auto boot, +and type the following commands to program the whole SPI flash: + + => tftp 82000000 output/images/spi-nor.img + => sf probe + => sf update 82000000 0 2000000 + +Booting the SPI flash on the board +================================== + +Make sure that the all DIP switches are set to the off position for +default boot mode (MSEL mode = 0110) to boot from SPI flash. diff --git a/board/solidrun/macchiatobin/readme.txt b/board/solidrun/macchiatobin/readme.txt index dc5d6c794d..7412951aab 100644 --- a/board/solidrun/macchiatobin/readme.txt +++ b/board/solidrun/macchiatobin/readme.txt @@ -12,32 +12,14 @@ through the serial console. How to build ============ -There are two build options: mainline support and vendor support. +Default configuration provides the following BSP versions: + - Linux v5.6.3 (mainline) + - U-Boot v2020.01 (mainline) + - ATF v1.5-18.12.2 (Marvell) -For the mainline BSP, we use: - - Linux v4.19.2 - - U-Boot v2018.11 +To build images run the following commands: -For the vendor BSP, we use the sources available from Marvell Github -page at https://github.com/MarvellEmbeddedProcessors, which uses: - - Linux v4.4.120 - - U-Boot v2018.03 - -At the moment mainline support for the board is a work in -progress. Mainline kernel 4.19 enables eth2 in 1Gb (RJ45 connector J5), -copper 10Gb interfaces, and automatic configuration of select SFP -modules on the SFP cages. The vendor BSP enables more hardware features -out of the box, but lacks support for SFP detection and automatic -configuration. - -To use the mainline BSP run the following commands: - - $ make solidrun_macchiatobin_mainline_defconfig - $ make - -To use the vendor BSP run the following commands: - - $ make solidrun_macchiatobin_marvell_defconfig + $ make solidrun_macchiatobin_defconfig $ make How to write the SD card @@ -74,13 +56,15 @@ Insert the micro SDcard in the MacchiatoBin board and power it up. The serial console is accessible at the micro-USB Type-B connector marked CON9. The serial line settings are 115200 8N1. -Note: the following text only applies to the vendor BSP from -solidrun_macchiatobin_marvell_defconfig. +U-Boot environment +================== -By default Marvell provided U-Boot will load its environment from the -SPI flash. On the first boot SPI flash may be empty or it may contain a -legacy environment that prevents proper boot. Then the following -commands can be used to boot the board: +By default current configuration provides U-Boot that keeps environment +in SD/eMMC. However, if needed, u-boot-fragment.config can be tweaked +so that U-Boot will keep environment in SPI flash. On the first boot +SPI flash may be empty or it may contain a stale environment that +prevents proper boot. Then the following commands can be used +to boot the board: => ext4load mmc 1:1 0x01700000 /boot/uEnv-example.txt => env import -t 0x01700000 $filesize diff --git a/board/stmicroelectronics/stm32f469-disco/flash.sh b/board/stmicroelectronics/stm32f469-disco/flash.sh index 0ec0beb2de..984d2b2599 100755 --- a/board/stmicroelectronics/stm32f469-disco/flash.sh +++ b/board/stmicroelectronics/stm32f469-disco/flash.sh @@ -13,8 +13,6 @@ ${OUTPUT_DIR}/host/bin/openocd -f board/stm32f469discovery.cfg \ -c "reset init" \ -c "flash probe 0" \ -c "flash info 0" \ - -c "flash write_image erase ${OUTPUT_DIR}/images/stm32f469i-disco.bin 0x08000000" \ - -c "flash write_image erase ${OUTPUT_DIR}/images/stm32f469-disco.dtb 0x08004000" \ - -c "flash write_image erase ${OUTPUT_DIR}/images/xipImage 0x08008000" \ + -c "flash write_image erase ${OUTPUT_DIR}/images/u-boot.bin 0x08000000" \ -c "reset run" \ -c "shutdown" diff --git a/board/stmicroelectronics/stm32f469-disco/readme.txt b/board/stmicroelectronics/stm32f469-disco/readme.txt index 888bff08a1..c1e1d30e69 100644 --- a/board/stmicroelectronics/stm32f469-disco/readme.txt +++ b/board/stmicroelectronics/stm32f469-disco/readme.txt @@ -15,5 +15,17 @@ Flashing ./board/stmicroelectronics/stm32f469-disco/flash.sh output/ -It will flash the minimal bootloader, the Device Tree Blob, and the -kernel image which includes the root filesystem as initramfs. +It will flash the U-boot bootloader. + +Creating SD card +---------------- + +Buildroot prepares an"sdcard.img" image in the output/images/ directory, +ready to be dumped on a SD card. Launch the following command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout and its content, see the +definition in board/stmicroelectronics/stm32f469-disco/genimage.cfg. diff --git a/board/synopsys/hsdk/linux.fragment b/board/synopsys/hsdk/linux.fragment index 45d6c69af5..aaca08e015 100644 --- a/board/synopsys/hsdk/linux.fragment +++ b/board/synopsys/hsdk/linux.fragment @@ -1,2 +1,3 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_ARC_UBOOT_SUPPORT=y +CONFIG_USB=y diff --git a/board/udoo/mx6qdl/readme.txt b/board/udoo/mx6qdl/readme.txt index cf1a610421..a7ca98cc8a 100644 --- a/board/udoo/mx6qdl/readme.txt +++ b/board/udoo/mx6qdl/readme.txt @@ -14,4 +14,4 @@ directory, ready to be dumped on a micro SD card: dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in -board/udoo/mx6qdl/genimage.cfg. +board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl. diff --git a/board/udoo/neo/readme.txt b/board/udoo/neo/readme.txt index f037ad484a..94ebcc12f2 100644 --- a/board/udoo/neo/readme.txt +++ b/board/udoo/neo/readme.txt @@ -13,4 +13,4 @@ directory, ready to be dumped on an SD card: dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in -board/udoo/neo/genimage.cfg. +board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl. diff --git a/boot/Config.in b/boot/Config.in index b3adbfc8bc..ff98a49796 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -6,8 +6,11 @@ source "boot/at91bootstrap3/Config.in" source "boot/at91dataflashboot/Config.in" source "boot/arm-trusted-firmware/Config.in" source "boot/barebox/Config.in" +source "boot/beaglev-ddrinit/Config.in" +source "boot/beaglev-secondboot/Config.in" source "boot/binaries-marvell/Config.in" source "boot/boot-wrapper-aarch64/Config.in" +source "boot/edk2/Config.in" source "boot/grub2/Config.in" source "boot/gummiboot/Config.in" source "boot/lpc32xxcdl/Config.in" diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index b1ca5d7ea1..9e171f414f 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -1,7 +1,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE bool "ARM Trusted Firmware (ATF)" depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A) && \ - BR2_TARGET_UBOOT + (BR2_TARGET_UBOOT || BR2_TARGET_EDK2) help Enable this option if you want to build the ATF for your ARM based embedded device. @@ -15,7 +15,7 @@ choice Select the specific ATF version you want to use config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - bool "v1.4" + bool "v2.5" config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION bool "Custom version" @@ -43,7 +43,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string - default "v1.4" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "v2.5" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT @@ -135,6 +135,19 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE endif +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 + bool "Use EDK2 as BL33" + depends on BR2_TARGET_EDK2 + help + This option allows to embed EDK2 as the BL33 part of + the ARM Trusted Firmware. It ensures that the EDK2 package + gets built before ATF, and that the appropriate BL33 + variable pointing to the EDK2 is passed when building ATF. + + Do not choose this option if you intend to build ATF and EDK2 + for the 'qemu_sbsa' platform. In this case, due to the EDK2 + build system, the dependency between ATF and EDK is reversed. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS string "Additional ATF make targets" help @@ -175,4 +188,28 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN Select this option if your ATF board configuration requires an ARM32 bare metal toolchain to be available. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP + bool "Build with SSP" + default y + depends on BR2_TOOLCHAIN_HAS_SSP + depends on !BR2_SSP_NONE + help + Say 'y' here if you want to build ATF with SSP. + + Your board must have SSP support in ATF: it must have an + implementation for plat_get_stack_protector_canary(). + + If you say 'y', the SSP level will be the level selected + by the global SSP setting. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL + string + # While newer versions of TF-A support "none" as + # ENABLE_STACK_PROTECTOR value, older versions (e.g 2.0) only + # supported "0" to disable SSP. + default "0" if !BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP + default "default" if BR2_SSP_REGULAR + default "strong" if BR2_SSP_STRONG + default "all" if BR2_SSP_ALL + endif diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 394071865e..80402ec374 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6dae02acd85278394bfad6e2683e186e5332a711e4491ac4632ad6480f6e5494 arm-trusted-firmware-v1.4.tar.gz -sha256 487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164 license.rst +sha256 d12a824afcc5cb90d005f9820f3274f1319cef1bb282e40a6a190b75900206d3 arm-trusted-firmware-v2.5.tar.gz +sha256 0171b0795501ee90634fbc4a7835e2fb215d9423daf1cf5b0d0682adde12c597 docs/license.rst diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 2e8a7c1a23..5e6a59a010 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -18,9 +18,11 @@ else # Handle stable official ATF versions ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION)) # The licensing of custom or from-git versions is unknown. -# This is valid only for the official v1.4. +# This is valid only for the latest (i.e. known) version. +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause -ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst +ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst +endif endif ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) @@ -51,6 +53,10 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) +ARM_TRUSTED_FIRMWARE_MAKE_ENV += \ + $(TARGET_MAKE_ENV) \ + ENABLE_STACK_PROTECTOR=$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL)) + ifeq ($(BR2_ARM_CPU_ARMV7A),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=7 else ifeq ($(BR2_ARM_CPU_ARMV8A),y) @@ -77,6 +83,15 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee endif endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2 +# Since the flash device name vary between platforms, we use the variable +# provided by the EDK2 package for this. Using this variable here is OK +# as it will expand after all dependencies are resolved, inside _BUILD_CMDS. +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ + BL33=$(BINARIES_DIR)/$(call qstrip,$(BR2_TARGET_EDK2_FD_NAME).fd) +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y) ARM_TRUSTED_FIRMWARE_UBOOT_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE)) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_UBOOT_BIN) @@ -152,7 +167,8 @@ ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \ define ARM_TRUSTED_FIRMWARE_BUILD_CMDS $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ + $(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \ + $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ $(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS) $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_BUILD) endef diff --git a/boot/at91bootstrap/at91bootstrap.hash b/boot/at91bootstrap/at91bootstrap.hash index b1f963b825..d9f8db8897 100644 --- a/boot/at91bootstrap/at91bootstrap.hash +++ b/boot/at91bootstrap/at91bootstrap.hash @@ -1,2 +1,3 @@ # locally computed sha256 d66192a274247f4baa39fa932eadf903d7add55641d89d30402f967c4f2282a5 AT91Bootstrap1.16.zip +sha256 6a3ac5dfcf19e6bac1b1109d30d72818768a3855e2594b84fe2b012b5fe0e77b include/sdramc.h diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk index c68b56b6ec..1a084756fd 100644 --- a/boot/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -7,6 +7,8 @@ AT91BOOTSTRAP_VERSION = 1.16 AT91BOOTSTRAP_SITE = ftp://www.at91.com/pub/at91bootstrap AT91BOOTSTRAP_SOURCE = AT91Bootstrap$(AT91BOOTSTRAP_VERSION).zip +AT91BOOTSTRAP_LICENSE = BSD-Source-Code +AT91BOOTSTRAP_LICENSE_FILES = include/sdramc.h AT91BOOTSTRAP_BOARD = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD)) AT91BOOTSTRAP_MEMORY = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY)) diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index faab7635da..650d3a23c8 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -1,6 +1,6 @@ config BR2_TARGET_AT91BOOTSTRAP3 - bool "AT91 Bootstrap 3" - depends on BR2_arm926t || BR2_cortex_a5 + bool "AT91 Bootstrap 3+" + depends on BR2_arm926t || BR2_cortex_a5 || BR2_cortex_a7 help AT91Bootstrap is a first level bootloader for the Atmel AT91 devices. It integrates algorithms for: @@ -16,10 +16,13 @@ if BR2_TARGET_AT91BOOTSTRAP3 choice - prompt "AT91 Bootstrap 3 version" + prompt "AT91 Bootstrap 3+ version" config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION - bool "3.9.0" + bool "4.0.0" + +config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X + bool "3.10.3" config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT bool "Custom Git repository" @@ -51,7 +54,8 @@ endif config BR2_TARGET_AT91BOOTSTRAP3_VERSION string - default "v3.9.0" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + default "v4.0.0" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + default "v3.10.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \ if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL @@ -96,4 +100,12 @@ config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE help Path to the at91bootstrap3 configuration file +config BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3 + bool "needs host-python3" + help + Enable this option if the at91bootstrap build process needs + Python 3.x to be available on the host. This is needed in + some at91bootstrap configurations to use NAND/PMECC Python + scripts. + endif # BR2_TARGET_AT91BOOTSTRAP3 diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash index 9f6c95ab08..e611f163c9 100644 --- a/boot/at91bootstrap3/at91bootstrap3.hash +++ b/boot/at91bootstrap3/at91bootstrap3.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 e23e6df23b79ca81e412cb73a1f48bd95df8d46c7d52a1d073c2ed9d4f3a1a71 at91bootstrap3-v3.9.0.tar.gz -sha256 732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e main.c +sha256 b6ae5bcaacc5a949f400182e036ae053049638444a3ba8b1dd154ec5f7898d8e at91bootstrap3-v3.10.3.tar.gz +sha256 08c5b95df28be7f2e0439fb2b77fe27524f97c499850641e4540c07ea0b2c25d at91bootstrap3-v4.0.0.tar.gz +sha256 5a3809b1c2ba13b7242572322951311c584419f1f8516f665d6c06f0668d78de LICENSES/MIT.txt diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk index 5cf865c681..1e2a3a44b0 100644 --- a/boot/at91bootstrap3/at91bootstrap3.mk +++ b/boot/at91bootstrap3/at91bootstrap3.mk @@ -19,14 +19,23 @@ else AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VERSION)) endif -AT91BOOTSTRAP3_LICENSE = Atmel License ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION),y) -AT91BOOTSTRAP3_LICENSE_FILES = main.c +AT91BOOTSTRAP3_LICENSE = MIT +AT91BOOTSTRAP3_LICENSE_FILES = LICENSES/MIT.txt +else ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X),y) +AT91BOOTSTRAP3_LICENSE = Atmel License endif +AT91BOOTSTRAP3_CPE_ID_VENDOR = linux4sam +AT91BOOTSTRAP3_CPE_ID_PRODUCT = at91bootstrap + AT91BOOTSTRAP3_INSTALL_IMAGES = YES AT91BOOTSTRAP3_INSTALL_TARGET = NO +ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3),y) +AT91BOOTSTRAP3_DEPENDENCIES += host-python3 +endif + AT91BOOTSTRAP3_CUSTOM_PATCH_DIR = \ $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR)) @@ -45,7 +54,7 @@ define AT91BOOTSTRAP3_BUILD_CMDS endef define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS - cp $(@D)/binaries/*.bin $(BINARIES_DIR) + cp $(wildcard $(@D)/build/binaries/*.bin $(@D)/binaries/*.bin) $(BINARIES_DIR) endef ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG),y) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 78fb26272b..af4c1f816c 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2020.03.0" + bool "2021.07.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2020.03.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2021.07.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 8a953847f7..a82edef63b 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ -# From https://www.barebox.org/download/barebox-2020.03.0.tar.bz2.md5 -md5 9e93df6dadb898d91d9f3811456a94bd barebox-2020.03.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2021.07.0.tar.bz2.md5 +md5 df3651a395e1420c2818dd464c63069d barebox-2021.07.0.tar.bz2 # Locally calculated -sha256 625b031d1fe99bdd3bf95f79c8ecfcf67101bc2500ec4816e034bf989f16d1c2 barebox-2020.03.0.tar.bz2 +sha256 ce5d9d8953a2e3c21f1e6a72b1499962170bb41c4750ce8129ef44bf7860992d barebox-2021.07.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 1efe5665de..8f02f9f9e1 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -28,7 +28,7 @@ $(1)_SITE_METHOD = git # Override the default value of _SOURCE to 'barebox-*' so that it is not # downloaded a second time for barebox-aux; also alows avoiding the hash # check: -$(1)_SOURCE = barebox-$$($(1)_VERSION).tar.gz +$(1)_SOURCE = barebox-$$($(1)_VERSION)$$(BR_FMT_VERSION_git).tar.gz else # Handle stable official Barebox versions $(1)_SOURCE = barebox-$$($(1)_VERSION).tar.bz2 @@ -88,13 +88,6 @@ $(1)_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY) -ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) -define $(1)_BUILD_BAREBOXENV_CMDS - $$(TARGET_CC) $$(TARGET_CFLAGS) $$(TARGET_LDFLAGS) -o $$(@D)/bareboxenv \ - $$(@D)/scripts/bareboxenv.c -endef -endif - ifeq ($$(BR2_TARGET_$(1)_CUSTOM_ENV),y) $(1)_ENV_NAME = $$(notdir $$(call qstrip,\ $$(BR2_TARGET_$(1)_CUSTOM_ENV_PATH))) @@ -109,12 +102,23 @@ endef endif ifneq ($$($(1)_CUSTOM_EMBEDDED_ENV_PATH),) -define $(1)_KCONFIG_FIXUP_CMDS - $$(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_ENVIRONMENT,$$(@D)/.config) - $$(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENVIRONMENT_PATH,"$$($(1)_CUSTOM_EMBEDDED_ENV_PATH)",$$(@D)/.config) +define $(1)_KCONFIG_FIXUP_CUSTOM_EMBEDDED_ENV_PATH + $$(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_ENVIRONMENT) + $$(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENVIRONMENT_PATH,"$$($(1)_CUSTOM_EMBEDDED_ENV_PATH)") endef endif +define $(1)_KCONFIG_FIXUP_BAREBOXENV + $$(if $$(BR2_TARGET_$(1)_BAREBOXENV),\ + $$(call KCONFIG_ENABLE_OPT,CONFIG_BAREBOXENV_TARGET),\ + $$(call KCONFIG_DISABLE_OPT,CONFIG_BAREBOXENV_TARGET)) +endef + +define $(1)_KCONFIG_FIXUP_CMDS + $$($(1)_KCONFIG_FIXUP_CUSTOM_EMBEDDED_ENV_PATH) + $$($(1)_KCONFIG_FIXUP_BAREBOXENV) +endef + define $(1)_BUILD_CMDS $$($(1)_BUILD_BAREBOXENV_CMDS) $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) @@ -134,9 +138,14 @@ define $(1)_INSTALL_IMAGES_CMDS $$($(1)_INSTALL_CUSTOM_ENV) endef +# Starting with barebox v2020.09.0, the kconfig used calls the +# cross-compiler to check its capabilities. So we need the +# toolchain before we can call the configurators. +$(1)_KCONFIG_DEPENDENCIES += toolchain + ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) define $(1)_INSTALL_TARGET_CMDS - cp $$(@D)/bareboxenv $$(TARGET_DIR)/usr/bin + cp $$(@D)/scripts/bareboxenv-target $$(TARGET_DIR)/usr/bin/bareboxenv endef endif diff --git a/boot/barebox/barebox/barebox.mk b/boot/barebox/barebox/barebox.mk index 39afb0fccb..6a5a80de34 100644 --- a/boot/barebox/barebox/barebox.mk +++ b/boot/barebox/barebox/barebox.mk @@ -4,10 +4,5 @@ # ################################################################################ -define BAREBOX_HELP_CMDS - @echo ' barebox-menuconfig - Run barebox menuconfig' - @echo ' barebox-savedefconfig - Run barebox savedefconfig' -endef - # Instantiate the barebox package $(eval $(barebox-package)) diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 117e113984..3a1af9b02c 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOT_WRAPPER_AARCH64_VERSION = fd74c8cbd0e17483d2299208cad9742bee605ca7 +BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index a202525d71..52e9199ae9 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -13,11 +13,49 @@ GRUB2_DEPENDENCIES = host-bison host-flex host-grub2 HOST_GRUB2_DEPENDENCIES = host-bison host-flex GRUB2_INSTALL_IMAGES = YES +# 0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch and 2021/03/02 +# security fixes (patches 0029-0149) +define GRUB2_AVOID_AUTORECONF + $(Q)touch $(@D)/Makefile.util.am + $(Q)touch $(@D)/aclocal.m4 + $(Q)touch $(@D)/Makefile.in + $(Q)touch $(@D)/configure +endef +GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF +HOST_GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF + +# 0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch +GRUB2_IGNORE_CVES += CVE-2020-10713 +# 0005-calloc-Use-calloc-at-most-places.patch +GRUB2_IGNORE_CVES += CVE-2020-14308 +# 0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch +GRUB2_IGNORE_CVES += CVE-2020-14309 CVE-2020-14310 CVE-2020-14311 +# 0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch +GRUB2_IGNORE_CVES += CVE-2020-15706 +# 0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch +GRUB2_IGNORE_CVES += CVE-2020-15707 +# 2021/03/02 security fixes - patches 0029-0149 +GRUB2_IGNORE_CVES += CVE-2020-25632 CVE-2020-25647 CVE-2020-27749 \ + CVE-2020-27779 CVE-2021-3418 CVE-2021-20225 CVE-2021-20233 +# 0039-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch +GRUB2_IGNORE_CVES += CVE-2020-14372 +# CVE-2019-14865 is about a flaw in the grub2-set-bootflag tool, which +# doesn't exist upstream, but is added by the Redhat/Fedora +# packaging. Not applicable to Buildroot. +GRUB2_IGNORE_CVES += CVE-2019-14865 +# CVE-2020-15705 is related to a flaw in the use of the +# grub_linuxefi_secure_validate(), which was added by Debian/Ubuntu +# patches. The issue doesn't affect upstream Grub, and +# grub_linuxefi_secure_validate() is not implemented in the grub2 +# version available in Buildroot. +GRUB2_IGNORE_CVES += CVE-2020-15705 + ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y) GRUB2_INSTALL_TARGET = YES else GRUB2_INSTALL_TARGET = NO endif +GRUB2_CPE_ID_VENDOR = gnu GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES)) GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG)) @@ -80,9 +118,11 @@ HOST_GRUB2_CONF_ENV = \ GRUB2_CONF_ENV = \ CPP="$(TARGET_CC) -E" \ TARGET_CC="$(TARGET_CC)" \ - TARGET_CFLAGS="$(TARGET_CFLAGS)" \ - TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -fno-stack-protector" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS) -Os" \ + TARGET_CFLAGS="$(TARGET_CFLAGS) -Os" \ + CPPFLAGS="$(TARGET_CPPFLAGS) -Os -fno-stack-protector" \ + TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -Os -fno-stack-protector" \ + TARGET_LDFLAGS="$(TARGET_LDFLAGS) -Os" \ TARGET_NM="$(TARGET_NM)" \ TARGET_OBJCOPY="$(TARGET_OBJCOPY)" \ TARGET_STRIP="$(TARGET_CROSS)strip" diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk index 30afed050b..9f5cd27f50 100644 --- a/boot/lpc32xxcdl/lpc32xxcdl.mk +++ b/boot/lpc32xxcdl/lpc32xxcdl.mk @@ -4,9 +4,9 @@ # ################################################################################ -LPC32XXCDL_VERSION = lpc32xx_cdl_v2.11 -LPC32XXCDL_SITE = http://git.lpcware.com/lpc3xxx_cdl.git -LPC32XXCDL_SITE_METHOD = git +LPC32XXCDL_VERSION = 2.11 +LPC32XXCDL_SOURCE = lpc32xx_cdl-v$(LPC32XXCDL_VERSION).zip +LPC32XXCDL_SITE = https://community.nxp.com/pwmxy87654/attachments/pwmxy87654/lpcware-archive/61/2 LPC32XXCDL_INSTALL_TARGET = NO LPC32XXCDL_INSTALL_IMAGES = YES @@ -45,13 +45,14 @@ LPC32XXCDL_BOARD_STARTUP_DIR = \ # Source files are with dos newlines, which our patch infrastructure doesn't # handle. Work around it by converting the affected files to unix newlines # before patching -define LPC32XXCDL_DOS2UNIX_FOR_PATCH +define LPC32XXCDL_EXTRACT_CMDS + unzip $(LPC32XXCDL_DL_DIR)/$(LPC32XXCDL_SOURCE) -d $(@D) + mv $(@D)/lpc3xxx_cdl/* $(@D) + rmdir $(@D)/lpc3xxx_cdl/ sed -n 's|^[+-]\{3\} [^/]\+\([^ \t]*\)\(.*\)|$(@D)\1|p' \ boot/lpc32xxcdl/*.patch| sort -u | xargs $(SED) 's/\x0D$$//' endef -LPC32XXCDL_POST_EXTRACT_HOOKS += LPC32XXCDL_DOS2UNIX_FOR_PATCH - define LPC32XXCDL_BUILD_CMDS $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D) $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER) diff --git a/boot/mv-ddr-marvell/mv-ddr-marvell.hash b/boot/mv-ddr-marvell/mv-ddr-marvell.hash index ec2fe6ed37..5bfae8af45 100644 --- a/boot/mv-ddr-marvell/mv-ddr-marvell.hash +++ b/boot/mv-ddr-marvell/mv-ddr-marvell.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 39dcc8baccb82cbc746d8f82ce7f673e1b1236e8aee0d09e7ab12c27eeb6ecda mv-ddr-marvell-618dadd1491eb2f7b2fd74313c04f7accddae475.tar.gz -sha256 69208236fc322026920b92d1d839ebdc521ca65379bfdb3368a24945e794fc78 ddr3_init.c +sha256 bfab74a625d65238c569b9df282b55c0fc9a1e2d3decedcf194d44774df2ede4 mv-ddr-marvell-305d923e6bc4236cd3b902f6679b0aef9e5fa52d.tar.gz +sha256 48bb930b6fbc3f5db72e29c849b096df3868e4a6d2bdc0e2dd3365c768241cd5 ddr3_init.c diff --git a/boot/mv-ddr-marvell/mv-ddr-marvell.mk b/boot/mv-ddr-marvell/mv-ddr-marvell.mk index a4e0c0467d..442b6aed53 100644 --- a/boot/mv-ddr-marvell/mv-ddr-marvell.mk +++ b/boot/mv-ddr-marvell/mv-ddr-marvell.mk @@ -4,8 +4,8 @@ # ################################################################################ -# This is the commit for mv_ddr-armada-18.12.0 -MV_DDR_MARVELL_VERSION = 618dadd1491eb2f7b2fd74313c04f7accddae475 +# This is the latest commit on mv-ddr-devel as of 20201207 +MV_DDR_MARVELL_VERSION = 305d923e6bc4236cd3b902f6679b0aef9e5fa52d MV_DDR_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,mv-ddr-marvell,$(MV_DDR_MARVELL_VERSION)) MV_DDR_MARVELL_LICENSE = GPL-2.0+ or LGPL-2.1 with freertos-exception-2.0, BSD-3-Clause, Marvell Commercial MV_DDR_MARVELL_LICENSE_FILES = ddr3_init.c diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in index b9b0ace8af..f1443498d9 100644 --- a/boot/opensbi/Config.in +++ b/boot/opensbi/Config.in @@ -13,6 +13,57 @@ config BR2_TARGET_OPENSBI https://github.com/riscv/opensbi.git if BR2_TARGET_OPENSBI +choice + prompt "OpenSBI Version" + help + Select the specific OpenSBI version you want to use + +config BR2_TARGET_OPENSBI_LATEST_VERSION + bool "0.9" + +config BR2_TARGET_OPENSBI_CUSTOM_VERSION + bool "Custom version" + help + This option allows to use a specific official versions + +config BR2_TARGET_OPENSBI_CUSTOM_TARBALL + bool "Custom tarball" + +config BR2_TARGET_OPENSBI_CUSTOM_GIT + bool "Custom Git repository" + +endchoice + +config BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE + string "OpenSBI version" + depends on BR2_TARGET_OPENSBI_CUSTOM_VERSION + +config BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION + string "URL of custom OpenSBI tarball" + depends on BR2_TARGET_OPENSBI_CUSTOM_TARBALL + +if BR2_TARGET_OPENSBI_CUSTOM_GIT + +config BR2_TARGET_OPENSBI_CUSTOM_REPO_URL + string "URL of custom repository" + +config BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION + string "Custom repository version" + help + Revision to use in the typical format used by Git. E.G. a + sha id, a tag, branch, .. + +endif + +config BR2_TARGET_OPENSBI_VERSION + string + default "0.9" if BR2_TARGET_OPENSBI_LATEST_VERSION + default BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE \ + if BR2_TARGET_OPENSBI_CUSTOM_VERSION + default "custom" if BR2_TARGET_OPENSBI_CUSTOM_TARBALL + default BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION \ + if BR2_TARGET_OPENSBI_CUSTOM_GIT + config BR2_TARGET_OPENSBI_PLAT string "OpenSBI Platform" default "" @@ -23,12 +74,49 @@ config BR2_TARGET_OPENSBI_PLAT the platform specific static library libplatsbi.a and firmware examples are built. +config BR2_TARGET_OPENSBI_INSTALL_DYNAMIC_IMG + bool "Install fw_dynamic image" + default y if BR2_TARGET_OPENSBI_PLAT != "" + help + This installs the fw_dynamic image. + +config BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG + bool "Install fw_jump image" + default y if BR2_TARGET_OPENSBI_PLAT != "" + help + This installs the fw_jump image. + +config BR2_TARGET_OPENSBI_INSTALL_PAYLOAD_IMG + bool "Install fw_payload image" + help + This option enables the installation of the fw_paylaod + image. + config BR2_TARGET_OPENSBI_LINUX_PAYLOAD bool "Include Linux as OpenSBI Payload" depends on BR2_TARGET_OPENSBI_PLAT != "" depends on BR2_LINUX_KERNEL depends on BR2_LINUX_KERNEL_IMAGE + select BR2_TARGET_OPENSBI_INSTALL_PAYLOAD_IMG help Build OpenSBI with the Linux kernel as a Payload. +config BR2_TARGET_OPENSBI_UBOOT_PAYLOAD + bool "Include U-Boot as OpenSBI Payload" + depends on BR2_TARGET_OPENSBI_PLAT != "" + depends on BR2_TARGET_UBOOT + select BR2_TARGET_OPENSBI_INSTALL_PAYLOAD_IMG + help + Build OpenSBI with the U-Boot as a Payload. + +config BR2_TARGET_OPENSBI_FW_FDT_PATH + bool "Include U-Boot DTB in OpenSBI Payload" + depends on BR2_TARGET_OPENSBI_UBOOT_PAYLOAD + select BR2_TARGET_UBOOT_FORMAT_DTB + help + Build OpenSBI with FW_FDT_PATH set to + $(BINARIES_DIR)/u-boot.dtb. Note that CONFIG_OF_SEPARATE + must be set in the U-Boot configuration for this file to be + produced. + endif diff --git a/boot/opensbi/opensbi.hash b/boot/opensbi/opensbi.hash index 6e69d512dd..3b6d97c42d 100644 --- a/boot/opensbi/opensbi.hash +++ b/boot/opensbi/opensbi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 46a93afd5465eba094ddba40015e754bf09f9e80e0702c00013d6bdb3ecd0a72 opensbi-0.6.tar.gz -sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD +sha256 60f995cb3cd03e3cf5e649194d3395d0fe67499fd960a36cf7058a4efde686f0 opensbi-0.9.tar.gz +sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk index 00e3b05dd0..8e055633a8 100644 --- a/boot/opensbi/opensbi.mk +++ b/boot/opensbi/opensbi.mk @@ -4,13 +4,32 @@ # ################################################################################ -OPENSBI_VERSION = 0.6 +OPENSBI_VERSION = $(call qstrip,$(BR2_TARGET_OPENSBI_VERSION)) + +ifeq ($(OPENSBI_VERSION),custom) +# Handle custom OpenSBI tarballs as specified by the configuration +OPENSBI_TARBALL = $(call qstrip,$(BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION)) +OPENSBI_SITE = $(patsubst %/,%,$(dir $(OPENSBI_TARBALL))) +OPENSBI_SOURCE = $(notdir $(OPENSBI_TARBALL)) +else ifeq ($(BR2_TARGET_OPENSBI_CUSTOM_GIT),y) +OPENSBI_SITE = $(call qstrip,$(BR2_TARGET_OPENSBI_CUSTOM_REPO_URL)) +OPENSBI_SITE_METHOD = git +else +# Handle official OpenSBI versions OPENSBI_SITE = $(call github,riscv,opensbi,v$(OPENSBI_VERSION)) +endif + OPENSBI_LICENSE = BSD-2-Clause +ifeq ($(BR2_TARGET_OPENSBI_LATEST_VERSION),y) OPENSBI_LICENSE_FILES = COPYING.BSD +endif OPENSBI_INSTALL_TARGET = NO OPENSBI_INSTALL_STAGING = YES +ifeq ($(BR2_TARGET_OPENSBI)$(BR2_TARGET_OPENSBI_LATEST_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(OPENSBI_SOURCE) +endif + OPENSBI_MAKE_ENV = \ CROSS_COMPILE=$(TARGET_CROSS) @@ -24,16 +43,31 @@ OPENSBI_DEPENDENCIES += linux OPENSBI_MAKE_ENV += FW_PAYLOAD_PATH="$(BINARIES_DIR)/Image" endif +ifeq ($(BR2_TARGET_OPENSBI_UBOOT_PAYLOAD),y) +OPENSBI_DEPENDENCIES += uboot +OPENSBI_MAKE_ENV += FW_PAYLOAD_PATH="$(BINARIES_DIR)/u-boot.bin" +ifeq ($(BR2_TARGET_OPENSBI_FW_FDT_PATH),y) +OPENSBI_MAKE_ENV += FW_FDT_PATH="$(BINARIES_DIR)/u-boot.dtb" +endif +endif + define OPENSBI_BUILD_CMDS $(TARGET_MAKE_ENV) $(OPENSBI_MAKE_ENV) $(MAKE) -C $(@D) endef -ifneq ($(OPENSBI_PLAT),) +ifeq ($(BR2_TARGET_OPENSBI_INSTALL_DYNAMIC_IMG),y) OPENSBI_INSTALL_IMAGES = YES -OPENSBI_FW_IMAGES += jump dynamic -ifeq ($(BR2_TARGET_OPENSBI_LINUX_PAYLOAD),y) -OPENSBI_FW_IMAGES += payload +OPENSBI_FW_IMAGES += dynamic endif + +ifeq ($(BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG),y) +OPENSBI_INSTALL_IMAGES = YES +OPENSBI_FW_IMAGES += jump +endif + +ifeq ($(BR2_TARGET_OPENSBI_INSTALL_PAYLOAD_IMG),y) +OPENSBI_INSTALL_IMAGES = YES +OPENSBI_FW_IMAGES += payload endif define OPENSBI_INSTALL_IMAGES_CMDS diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 669bbda924..4679fd2fde 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.7.0" + bool "3.13.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,7 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.7.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.13.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index dc0fbecce7..3803a69797 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.7.0.tar.gz -sha256 ff378f22b8e7dacf933a2d34eb5c1bdcafe74bdda692e4dbc2969301f6a81d43 optee-os-3.7.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.13.0/optee-os-3.13.0.tar.gz +sha256 c6629ba54f62a2624299f7d17cf6df2dadc902e6a862c62f85d1b6da6c909c3f optee-os-3.13.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index acdb25b479..03ce08ffb2 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,7 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python-pycrypto host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python3-pycryptodomex host-python3-pyelftools # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit @@ -32,7 +32,8 @@ OPTEE_OS_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE_core="$(TARGET_CROSS)" \ CROSS_COMPILE_ta_arm64="$(TARGET_CROSS)" \ - CROSS_COMPILE_ta_arm32="$(TARGET_CROSS)" + CROSS_COMPILE_ta_arm32="$(TARGET_CROSS)" \ + PYTHON3="$(HOST_DIR)/bin/python3" ifeq ($(BR2_aarch64),y) OPTEE_OS_MAKE_OPTS += \ diff --git a/boot/shim/Config.in b/boot/shim/Config.in index ea6650f54c..2f74d6f332 100644 --- a/boot/shim/Config.in +++ b/boot/shim/Config.in @@ -1,9 +1,7 @@ config BR2_TARGET_SHIM bool "shim" + # it includes gnu-efi depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS - # ARM32 build currently broken - depends on !BR2_ARM_CPU_HAS_ARM - select BR2_PACKAGE_GNU_EFI help Boot loader to chain-load signed boot loaders under Secure Boot. diff --git a/boot/shim/shim.hash b/boot/shim/shim.hash index 318390f80b..15c763abca 100644 --- a/boot/shim/shim.hash +++ b/boot/shim/shim.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 279d19cc95b9974ea2379401a6a0653d949c3fa3d61f0c4bd6a7b9e840bdc425 shim-15.tar.gz +sha256 8344473dd10569588b8238a4656b8fab226714eea9f5363f8c410aa8a5090297 shim-15.4.tar.bz2 sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index ba5bc51957..0a6d1527aa 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -4,21 +4,19 @@ # ################################################################################ -SHIM_VERSION = 15 -SHIM_SITE = $(call github,rhboot,shim,$(SHIM_VERSION)) +SHIM_VERSION = 15.4 +SHIM_SITE = https://github.com/rhboot/shim/releases/download/$(SHIM_VERSION) +SHIM_SOURCE = shim-$(SHIM_VERSION).tar.bz2 SHIM_LICENSE = BSD-2-Clause SHIM_LICENSE_FILES = COPYRIGHT -SHIM_DEPENDENCIES = gnu-efi +SHIM_CPE_ID_VENDOR = redhat SHIM_INSTALL_TARGET = NO SHIM_INSTALL_IMAGES = YES SHIM_MAKE_OPTS = \ ARCH="$(GNU_EFI_PLATFORM)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - DASHJ="-j$(PARALLEL_JOBS)" \ - EFI_INCLUDE="$(STAGING_DIR)/usr/include/efi" \ - EFI_PATH="$(STAGING_DIR)/usr/lib" \ - LIBDIR="$(STAGING_DIR)/usr/lib" + DASHJ="-j$(PARALLEL_JOBS)" define SHIM_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(SHIM_MAKE_OPTS) diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in index 339a97f0e4..c95dac1804 100644 --- a/boot/syslinux/Config.in +++ b/boot/syslinux/Config.in @@ -35,7 +35,6 @@ config BR2_TARGET_SYSLINUX_PXELINUX config BR2_TARGET_SYSLINUX_MBR bool "install mbr" - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615 select BR2_TARGET_SYSLINUX_LEGACY_BIOS help Install the legacy-BIOS 'mbr' image, to boot off a diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index 67bc69254e..0643f85a99 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -14,7 +14,12 @@ SYSLINUX_LICENSE_FILES = COPYING SYSLINUX_INSTALL_IMAGES = YES # host-util-linux needed to provide libuuid when building host tools -SYSLINUX_DEPENDENCIES = host-nasm host-upx util-linux host-util-linux +SYSLINUX_DEPENDENCIES = \ + host-nasm \ + host-python3 \ + host-upx \ + host-util-linux \ + util-linux ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y) SYSLINUX_TARGET += bios @@ -59,6 +64,7 @@ define SYSLINUX_BUILD_CMDS CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ + PYTHON=$(HOST_DIR)/bin/python3 \ $(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET) endef diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index ffc441d670..0854fb13cc 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2020.01" + bool "2021.07" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -74,13 +74,9 @@ if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG || BR2_TARGET_UBOOT config BR2_TARGET_UBOOT_CUSTOM_REPO_URL string "URL of custom repository" - default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \ - if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" # legacy config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION string "Custom repository version" - default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \ - if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" # legacy help Revision to use in the typical format used by Git/Mercurial/Subversion E.G. a sha id, a tag, branch, .. @@ -89,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2020.01" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2021.07" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL @@ -147,14 +143,45 @@ config BR2_TARGET_UBOOT_NEEDS_DTC Select this option if your U-Boot board configuration requires the Device Tree compiler to be available. +config BR2_TARGET_UBOOT_NEEDS_PYTHON + bool + +choice + bool "U-Boot needs host Python" + +config BR2_TARGET_UBOOT_NEEDS_PYTHON_NONE + bool "no" + depends on !BR2_TARGET_UBOOT_NEEDS_PYTHON + help + Select this option if U-Boot does not need any + host python to build. + +config BR2_TARGET_UBOOT_NEEDS_PYTHON2 + bool "python 2.x" + help + Select this option if U-Boot needs a host Python 2.x + interpreter. This is the case for some U-Boot + configurations, prior to U-Boot 2020.01. + +config BR2_TARGET_UBOOT_NEEDS_PYTHON3 + bool "python 3.x" + help + Select this option if U-Boot needs a host Python 3.x + interpreter. This is the case for some U-Boot + configurations, after U-Boot 2020.01. + +endchoice + config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT bool "U-Boot needs pylibfdt" + select BR2_TARGET_UBOOT_NEEDS_PYTHON help Select this option if your U-Boot board configuration requires the Python libfdt library to be available. config BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS bool "U-Boot needs pyelftools" + select BR2_TARGET_UBOOT_NEEDS_PYTHON help Select this option if your U-Boot board configuration requires the Python pyelftools library to be available. @@ -202,6 +229,16 @@ config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF endchoice +config BR2_TARGET_UBOOT_NEEDS_OPENSBI + bool "U-Boot needs OpenSBI" + depends on BR2_TARGET_OPENSBI + help + Some RISC-V platforms (such as SiFive HiFive Unleashed) + encapsulate the OpenSBI firmware image inside U-Boot. + This option makes sure OpenSBI gets built prior to U-Boot, + and that the OpenSBI variable pointing to OpenSBI binary, + is passed during the Buildroot build. + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS @@ -215,50 +252,37 @@ config BR2_TARGET_UBOOT_FORMAT_BIN bool "u-boot.bin" default y +config BR2_TARGET_UBOOT_FORMAT_DTB + bool "u-boot.dtb" + config BR2_TARGET_UBOOT_FORMAT_DTB_BIN bool "u-boot-dtb.bin" -config BR2_TARGET_UBOOT_FORMAT_DTB_IMG - bool "u-boot-dtb.img" - -config BR2_TARGET_UBOOT_FORMAT_DTB_IMX - bool "u-boot-dtb.imx" - -config BR2_TARGET_UBOOT_FORMAT_IMG - bool "u-boot.img" - -config BR2_TARGET_UBOOT_FORMAT_ITB - bool "u-boot.itb" - -config BR2_TARGET_UBOOT_FORMAT_IMX - bool "u-boot.imx" - config BR2_TARGET_UBOOT_FORMAT_NAND_BIN bool "u-boot-nand.bin" -config BR2_TARGET_UBOOT_FORMAT_KWB - bool "u-boot.kwb (Marvell)" - depends on BR2_arm - config BR2_TARGET_UBOOT_FORMAT_ELF bool "u-boot.elf" -config BR2_TARGET_UBOOT_FORMAT_SB - bool "u-boot.sb (Freescale i.MX28)" +config BR2_TARGET_UBOOT_FORMAT_IMG + bool "u-boot.img" + +config BR2_TARGET_UBOOT_FORMAT_DTB_IMG + bool "u-boot-dtb.img" + +config BR2_TARGET_UBOOT_FORMAT_IMX + bool "u-boot.imx" + +config BR2_TARGET_UBOOT_FORMAT_DTB_IMX + bool "u-boot-dtb.imx" + +config BR2_TARGET_UBOOT_FORMAT_ITB + bool "u-boot.itb" + +config BR2_TARGET_UBOOT_FORMAT_KWB + bool "u-boot.kwb (Marvell)" depends on BR2_arm -config BR2_TARGET_UBOOT_FORMAT_SD - bool "u-boot.sd (Freescale i.MX28)" - depends on BR2_arm - help - This is Freescale i.MX28 SB format, with a header for booting - from an SD card. - - U-Boot includes an mxsboot tool to generate this format, - starting from 2011.12. - - See doc/README.mxs (or doc/README.mx28_common before 2013.07) - config BR2_TARGET_UBOOT_FORMAT_NAND bool "u-boot.nand (Freescale i.MX28)" depends on BR2_arm @@ -316,6 +340,26 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE endif +config BR2_TARGET_UBOOT_FORMAT_SB + bool "u-boot.sb (Freescale i.MX28)" + depends on BR2_arm + +config BR2_TARGET_UBOOT_FORMAT_SD + bool "u-boot.sd (Freescale i.MX28)" + depends on BR2_arm + help + This is Freescale i.MX28 SB format, with a header for booting + from an SD card. + + U-Boot includes an mxsboot tool to generate this format, + starting from 2011.12. + + See doc/README.mxs (or doc/README.mx28_common before 2013.07) + +config BR2_TARGET_UBOOT_FORMAT_STM32 + bool "u-boot.stm32" + depends on BR2_arm + config BR2_TARGET_UBOOT_FORMAT_CUSTOM bool "Custom (specify below)" help @@ -431,6 +475,28 @@ config BR2_TARGET_UBOOT_ZYNQMP_PMUFW This feature requires U-Boot >= 2018.07. +config BR2_TARGET_UBOOT_ZYNQMP_PM_CFG + string "PMU configuration location" + depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + help + Location of a PMU configuration file. + + If not empty, Buildroot will convert the PMU configuration + file into a loadable blob and pass it to U-Boot. The blob gets + embedded into the U-Boot SPL and is used to configure the PMU + during board initialization. + + Unlike the PMU firmware, the PMU configuration file is unique + to each board configuration. A PMU configuration file can be + generated by building your Xilinx SDK BSP. It can be found in + the BSP source, for example at + ./psu_cortexa53_0/libsrc/xilpm_v2_4/src/pm_cfg_obj.c + + Leave this option empty if your PMU firmware has a hard-coded + configuration object or you are loading it by any other means. + + This feature requires U-Boot >= v2019.10. + config BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE string "Custom psu_init_gpl file" depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG @@ -484,65 +550,6 @@ config BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC In either case the resulting file will be given a .crc extension. -menuconfig BR2_TARGET_UBOOT_ENVIMAGE - bool "Environment image" - help - Generate a valid binary environment image from a text file - describing the key=value pairs of the environment. - - The environment image will be called uboot-env.bin. - -if BR2_TARGET_UBOOT_ENVIMAGE - -config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE - string "Source files for environment" - help - Text files describing the environment. Files should have - lines of the form var=value, one per line. Blank lines and - lines starting with a # are ignored. - - Multiple source files are concatenated in the order listed. - - Leave empty to generate image from compiled-in env. - -config BR2_TARGET_UBOOT_ENVIMAGE_SIZE - string "Size of environment" - help - Size of envronment, can be prefixed with 0x for hexadecimal - values. - -config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT - bool "Environment has two copies" - help - Some platforms define in their U-Boot configuration that the - U-Boot environment should be duplicated in two locations (for - extra safety). Check your U-Boot configuration for the - CONFIG_ENV_ADDR_REDUND and CONFIG_ENV_SIZE_REDUND settings to - see if this is the case for your platform. - - If it is the case, then you should enable this option to - ensure that the U-Boot environment image generated by - Buildroot is compatible with the "redundant environment" - mechanism of U-Boot. - -endif # BR2_TARGET_UBOOT_ENVIMAGE - -config BR2_TARGET_UBOOT_BOOT_SCRIPT - bool "Generate a U-Boot boot script" - help - Generate a U-Boot boot script, given a file listing U-Boot - commands to be executed at boot time. The generated boot - script will be called 'boot.scr'. - -if BR2_TARGET_UBOOT_BOOT_SCRIPT - -config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE - string "U-Boot boot script source" - help - Source file to generate the U-Boot boot script. - -endif - if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG config BR2_TARGET_UBOOT_CUSTOM_DTS_PATH diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 6c17ef02b2..5a48926ebe 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 u-boot-2020.01.tar.bz2 +sha256 312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e u-boot-2021.07.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 2bfa50779b..4f3c9b7c3a 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -11,11 +11,14 @@ UBOOT_LICENSE = GPL-2.0+ ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),y) UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt endif +UBOOT_CPE_ID_VENDOR = denx +UBOOT_CPE_ID_PRODUCT = u-boot UBOOT_INSTALL_IMAGES = YES # u-boot 2020.01+ needs make 4.0+ -UBOOT_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) +UBOOT_DEPENDENCIES = host-pkgconf $(BR2_MAKE_HOST_DEPENDENCY) +UBOOT_MAKE = $(BR2_MAKE) ifeq ($(UBOOT_VERSION),custom) # Handle custom U-Boot tarballs as specified by the configuration @@ -33,7 +36,7 @@ UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = svn else # Handle stable official U-Boot versions -UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot +UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif @@ -45,6 +48,10 @@ ifeq ($(BR2_TARGET_UBOOT_FORMAT_BIN),y) UBOOT_BINS += u-boot.bin endif +ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB),y) +UBOOT_BINS += u-boot.dtb +endif + ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y) UBOOT_BINS += u-boot # To make elf usable for debuging on ARC use special target @@ -120,6 +127,11 @@ UBOOT_MAKE_TARGET += u-boot.sb UBOOT_DEPENDENCIES += host-elftosb host-openssl endif +ifeq ($(BR2_TARGET_UBOOT_FORMAT_STM32),y) +UBOOT_BINS += u-boot.stm32 +UBOOT_MAKE_TARGET += u-boot.stm32 +endif + ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y) UBOOT_BINS += $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME)) endif @@ -155,16 +167,31 @@ UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.bin endif endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) +UBOOT_DEPENDENCIES += opensbi +UBOOT_MAKE_OPTS += OPENSBI=$(BINARIES_DIR)/fw_dynamic.bin +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) +UBOOT_DEPENDENCIES += host-python host-python-setuptools +else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) +UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) -UBOOT_DEPENDENCIES += host-python host-swig +UBOOT_DEPENDENCIES += host-swig endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) UBOOT_DEPENDENCIES += host-python-pyelftools +else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) +UBOOT_DEPENDENCIES += host-python3-pyelftools +endif endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) @@ -247,7 +274,7 @@ UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) define UBOOT_CONFIGURE_CMDS $(TARGET_CONFIGURE_OPTS) \ - $(BR2_MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ + $(UBOOT_MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ $(UBOOT_BOARD_NAME)_config endef else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y) @@ -269,12 +296,6 @@ UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig # override again. In addition, host-ccache is not ready at kconfig # time, so use HOSTCC_NOCCACHE. UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTLDFLAGS="" -define UBOOT_HELP_CMDS - @echo ' uboot-menuconfig - Run U-Boot menuconfig' - @echo ' uboot-savedefconfig - Run U-Boot savedefconfig' - @echo ' uboot-update-defconfig - Save the U-Boot configuration to the path specified' - @echo ' by BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE' -endef endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY UBOOT_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH)) @@ -284,7 +305,12 @@ define UBOOT_BUILD_CMDS cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/ ) $(TARGET_CONFIGURE_OPTS) \ - $(BR2_MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + PKG_CONFIG_SYSROOT_DIR="/" \ + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ + PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ + PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig" \ + $(UBOOT_MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ $(UBOOT_MAKE_TARGET) $(if $(BR2_TARGET_UBOOT_FORMAT_SD), $(@D)/tools/mxsboot sd $(@D)/u-boot.sb $(@D)/u-boot.sd) @@ -301,21 +327,6 @@ define UBOOT_BUILD_OMAP_IFT -c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)) endef -ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),) -UBOOT_GENERATE_ENV_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) -define UBOOT_GENERATE_ENV_IMAGE - $(if $(UBOOT_GENERATE_ENV_FILE), \ - cat $(UBOOT_GENERATE_ENV_FILE), \ - CROSS_COMPILE="$(TARGET_CROSS)" $(@D)/scripts/get_default_envs.sh $(@D)) \ - >$(@D)/buildroot-env.txt - $(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ - $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ - $(if $(filter "BIG",$(BR2_ENDIAN)),-b) \ - -o $(BINARIES_DIR)/uboot-env.bin \ - $(@D)/buildroot-env.txt -endef -endif - define UBOOT_INSTALL_IMAGES_CMDS $(foreach f,$(UBOOT_BINS), \ cp -dpf $(@D)/$(f) $(BINARIES_DIR)/ @@ -327,11 +338,6 @@ define UBOOT_INSTALL_IMAGES_CMDS cp -dpf $(@D)/$(f) $(BINARIES_DIR)/ ) ) - $(UBOOT_GENERATE_ENV_IMAGE) - $(if $(BR2_TARGET_UBOOT_BOOT_SCRIPT), - $(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \ - -d $(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)) \ - $(BINARIES_DIR)/boot.scr) endef ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y) @@ -347,17 +353,31 @@ UBOOT_ZYNQMP_PMUFW_PATH = $(shell readlink -f $(UBOOT_ZYNQMP_PMUFW)) endif define UBOOT_ZYNQMP_KCONFIG_PMUFW - $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)", \ - $(@D)/.config) + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)") endef +UBOOT_ZYNQMP_PM_CFG = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PM_CFG)) +ifneq ($(UBOOT_ZYNQMP_PM_CFG),) +UBOOT_ZYNQMP_PM_CFG_BIN = $(UBOOT_DIR)/pm_cfg_obj.bin +define UBOOT_ZYNQMP_KCONFIG_PM_CFG + $(call KCONFIG_SET_OPT,CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE,"$(UBOOT_ZYNQMP_PM_CFG_BIN)", \ + $(@D)/.config) +endef + +define UBOOT_ZYNQMP_PM_CFG_CONVERT + $(UBOOT_DIR)/tools/zynqmp_pm_cfg_obj_convert.py \ + "$(UBOOT_ZYNQMP_PM_CFG)" \ + "$(UBOOT_ZYNQMP_PM_CFG_BIN)" +endef +UBOOT_PRE_BUILD_HOOKS += UBOOT_ZYNQMP_PM_CFG_CONVERT +endif + UBOOT_ZYNQMP_PSU_INIT = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE)) UBOOT_ZYNQMP_PSU_INIT_PATH = $(shell readlink -f $(UBOOT_ZYNQMP_PSU_INIT)) ifneq ($(UBOOT_ZYNQMP_PSU_INIT),) define UBOOT_ZYNQMP_KCONFIG_PSU_INIT - $(call KCONFIG_SET_OPT,CONFIG_XILINX_PS_INIT_FILE,"$(UBOOT_ZYNQMP_PSU_INIT_PATH)", \ - $(@D)/.config) + $(call KCONFIG_SET_OPT,CONFIG_XILINX_PS_INIT_FILE,"$(UBOOT_ZYNQMP_PSU_INIT_PATH)") endef endif @@ -414,27 +434,10 @@ endif define UBOOT_KCONFIG_FIXUP_CMDS $(UBOOT_ZYNQMP_KCONFIG_PMUFW) + $(UBOOT_ZYNQMP_KCONFIG_PM_CFG) $(UBOOT_ZYNQMP_KCONFIG_PSU_INIT) endef -ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y) -ifeq ($(BR_BUILDING),y) -ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SIZE)),) -$(error Please provide U-Boot environment size (BR2_TARGET_UBOOT_ENVIMAGE_SIZE setting)) -endif -endif -UBOOT_DEPENDENCIES += host-uboot-tools -endif - -ifeq ($(BR2_TARGET_UBOOT_BOOT_SCRIPT),y) -ifeq ($(BR_BUILDING),y) -ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)),) -$(error Please define a source file for U-Boot boot script (BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE setting)) -endif -endif -UBOOT_DEPENDENCIES += host-uboot-tools -endif - ifeq ($(BR2_TARGET_UBOOT)$(BR_BUILDING),yy) # @@ -484,7 +487,7 @@ ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),) $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting) endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_URL ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION)),) -$(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) +$(error No custom U-Boot repository version specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_VERSION endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG @@ -498,6 +501,7 @@ $(eval $(generic-package)) else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y) UBOOT_MAKE_ENV = $(TARGET_MAKE_ENV) UBOOT_KCONFIG_DEPENDENCIES = \ + $(BR2_MAKE_HOST_DEPENDENCY) \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY) $(eval $(kconfig-package)) diff --git a/boot/vexpress-firmware/vexpress-firmware.hash b/boot/vexpress-firmware/vexpress-firmware.hash index 40f64c7528..ac636e1512 100644 --- a/boot/vexpress-firmware/vexpress-firmware.hash +++ b/boot/vexpress-firmware/vexpress-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 def599c86ab3606f7f67c0190e9b237fbc0cf934a951ffb1c5fb0c47d8a8f3d2 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3.tar.gz +sha256 ea92d686e6e211074fb0f62cb5e011f4cfc294c7f6ec9fb27b7d987db7bf51c5 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3-br1.tar.gz diff --git a/configs/aarch64_efi_defconfig b/configs/aarch64_efi_defconfig index 2aab6e9699..6cb8d1fac2 100644 --- a/configs/aarch64_efi_defconfig +++ b/configs/aarch64_efi_defconfig @@ -5,7 +5,6 @@ BR2_aarch64=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # System -BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y ## Required tools to create bootable media @@ -23,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/aarch64-efi/genimage-efi.cfg" -# Linux headers same as kernel, a 4.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +# Linux headers same as kernel, a 5.11 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.11.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/acmesystems_aria_g25_128mb_defconfig b/configs/acmesystems_aria_g25_128mb_defconfig index 4f8f4d5406..8bc8c4dcef 100644 --- a/configs/acmesystems_aria_g25_128mb_defconfig +++ b/configs/acmesystems_aria_g25_128mb_defconfig @@ -24,13 +24,12 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" # AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-128m" # Tools to build sdcard.img diff --git a/configs/acmesystems_aria_g25_256mb_defconfig b/configs/acmesystems_aria_g25_256mb_defconfig index 4569a7b7aa..d161b118ae 100644 --- a/configs/acmesystems_aria_g25_256mb_defconfig +++ b/configs/acmesystems_aria_g25_256mb_defconfig @@ -24,13 +24,12 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" # AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-256m" # Tools to build sdcard.img diff --git a/configs/acmesystems_arietta_g25_128mb_defconfig b/configs/acmesystems_arietta_g25_128mb_defconfig index 0174f356da..62bcbd44cb 100644 --- a/configs/acmesystems_arietta_g25_128mb_defconfig +++ b/configs/acmesystems_arietta_g25_128mb_defconfig @@ -24,13 +24,12 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" # AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-128m" # Tools to build sdcard.img diff --git a/configs/acmesystems_arietta_g25_256mb_defconfig b/configs/acmesystems_arietta_g25_256mb_defconfig index 14e4dd00be..94258444a2 100644 --- a/configs/acmesystems_arietta_g25_256mb_defconfig +++ b/configs/acmesystems_arietta_g25_256mb_defconfig @@ -24,13 +24,12 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" # AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-256m" # Tools to build sdcard.img diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig index f2e7e7f965..304a3ef824 100644 --- a/configs/amarula_a64_relic_defconfig +++ b/configs/amarula_a64_relic_defconfig @@ -40,6 +40,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_GENERIC_ISSUE="Welcome to Amarula A64-Relic" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_ANDROID_TOOLS=y BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig index 760ad3f9f4..3b12da077c 100644 --- a/configs/amarula_vyasa_rk3288_defconfig +++ b/configs/amarula_vyasa_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y +# Linux headers same as kernel, a 5.11 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y @@ -22,7 +22,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.11" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fceaed0db7..fd33ebf1f6 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,20 +1,21 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v0.2.1935)/linux-v0.2.1935.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -27,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v0.2.1935)/uboot-v0.2.1935.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index d31f69d3ac..363f288b87 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,16 +1,18 @@ BR2_aarch64=y -# Linux headers same as kernel, a 4.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +# Linux headers same as kernel, a 5.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.3" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(LINUX_DIR)/arch/arm64/configs/defconfig" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BOOT_WRAPPER_AARCH64=y -BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8" +BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8-gicv3-psci" BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS="root=/dev/vda consolelog=9 console=ttyAMA0 rw" +BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI=y +BR2_TARGET_BOOT_WRAPPER_AARCH64_GICV3=y diff --git a/configs/at91sam9260eknf_defconfig b/configs/at91sam9260eknf_defconfig index 807d0294e8..b795ad6eff 100644 --- a/configs/at91sam9260eknf_defconfig +++ b/configs/at91sam9260eknf_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9260eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig index 7511c96fe9..46626d857a 100644 --- a/configs/at91sam9g20dfc_defconfig +++ b/configs/at91sam9g20dfc_defconfig @@ -27,7 +27,7 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9g20eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9g45m10ek_defconfig b/configs/at91sam9g45m10ek_defconfig index c598527f96..bf0771bc14 100644 --- a/configs/at91sam9g45m10ek_defconfig +++ b/configs/at91sam9g45m10ek_defconfig @@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9m10g45eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9rlek_defconfig b/configs/at91sam9rlek_defconfig index ba3a94c08c..5c0fdc5993 100644 --- a/configs/at91sam9rlek_defconfig +++ b/configs/at91sam9rlek_defconfig @@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9rleknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9x5ek_defconfig b/configs/at91sam9x5ek_defconfig index d544e277a7..70e2d94826 100644 --- a/configs/at91sam9x5ek_defconfig +++ b/configs/at91sam9x5ek_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9x5ek_dev_defconfig b/configs/at91sam9x5ek_dev_defconfig index 5f777fbc72..bfa8e95941 100644 --- a/configs/at91sam9x5ek_dev_defconfig +++ b/configs/at91sam9x5ek_dev_defconfig @@ -84,7 +84,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 633ca8e1cc..79a300a81b 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -26,7 +26,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y @@ -35,9 +35,10 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_ENVIMAGE=y -BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" -BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x4000" # Host packages # Needed to generate the SD card image diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index e8246c8d50..2e1a5c7f59 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -86,7 +86,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y @@ -95,9 +95,10 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_ENVIMAGE=y -BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" -BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x4000" # Host packages # Needed to generate the SD card image diff --git a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index 6b5def3c64..e85c38af50 100644 --- a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_som1_ek_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam-2020.04)/linux-at91-linux4sam-2020.04.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_som1_ek" @@ -71,12 +71,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam-2020.04)/u-boot-at91-linux4sam-2020.04.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d27_som1_ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/atmel_sama5d2_xplained_mmc_defconfig b/configs/atmel_sama5d2_xplained_mmc_defconfig index 2c73cc4c27..32e9f582e6 100644 --- a/configs/atmel_sama5d2_xplained_mmc_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_defconfig @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index 6f641280c8..f71e284ff5 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -88,7 +88,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d3_xplained_defconfig b/configs/atmel_sama5d3_xplained_defconfig index 65304a2e42..b03c0db2c5 100644 --- a/configs/atmel_sama5d3_xplained_defconfig +++ b/configs/atmel_sama5d3_xplained_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig index 28efe4cc8f..89c273da33 100644 --- a/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_dev_defconfig @@ -85,7 +85,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d3_xplained_mmc_defconfig b/configs/atmel_sama5d3_xplained_mmc_defconfig index 3fd5f1dde0..8256a5e199 100644 --- a/configs/atmel_sama5d3_xplained_mmc_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index 1f1881f8b7..7c39a5a2d4 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -87,7 +87,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d3xek_defconfig b/configs/atmel_sama5d3xek_defconfig index 63417eae7c..f71e84bf0f 100644 --- a/configs/atmel_sama5d3xek_defconfig +++ b/configs/atmel_sama5d3xek_defconfig @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.8.10)/at91bootstrap3-v3.8.10.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3xeknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d4_xplained_defconfig b/configs/atmel_sama5d4_xplained_defconfig index 319f31956d..2a3e91954d 100644 --- a/configs/atmel_sama5d4_xplained_defconfig +++ b/configs/atmel_sama5d4_xplained_defconfig @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig index 71568f7497..6779c04d47 100644 --- a/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_dev_defconfig @@ -89,7 +89,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d4_xplained_mmc_defconfig b/configs/atmel_sama5d4_xplained_mmc_defconfig index ed294c35a1..e0b1e5147f 100644 --- a/configs/atmel_sama5d4_xplained_mmc_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_defconfig @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index 93a5bd9299..e638e6758a 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -88,7 +88,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/bananapi_m1_defconfig b/configs/bananapi_m1_defconfig index 558ef3d4ab..23da363345 100644 --- a/configs/bananapi_m1_defconfig +++ b/configs/bananapi_m1_defconfig @@ -21,8 +21,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m1/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m1/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/bananapi_m2_plus_defconfig b/configs/bananapi_m2_plus_defconfig index 0e2d91d21b..77a403ce81 100644 --- a/configs/bananapi_m2_plus_defconfig +++ b/configs/bananapi_m2_plus_defconfig @@ -22,8 +22,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/sinovoip/m2-plus/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sinovoip/m2-plus/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index bc1d31a60a..22f7974bcb 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -22,8 +22,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m2-ultra/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m2-ultra/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig index 5e56eaed85..b93332ed21 100644 --- a/configs/bananapi_m64_defconfig +++ b/configs/bananapi_m64_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m64/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m64/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 5d6b680d29..763696d1dd 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -1,31 +1,52 @@ +# Architecture BR2_arm=y BR2_cortex_a8=y +BR2_ARM_FPU_VFPV3=y + +# Patches BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +# System +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +# Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglebone/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" + +# Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y + +# Supporting host tools to build FIT image BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 6e07bc9ac0..5f084b77df 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -5,6 +5,7 @@ BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_ROOTFS_OVERLAY="board/beaglebone/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglebone/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" @@ -20,11 +21,8 @@ BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_EXAMPLES=y BR2_PACKAGE_QT5BASE_EGLFS=y -BR2_PACKAGE_QT5BASE_DEFAULT_QPA="wayland" +BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs" BR2_PACKAGE_QT5QUICKCONTROLS=y -BR2_PACKAGE_QT5WAYLAND=y -BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=y -BR2_PACKAGE_WESTON=y BR2_PACKAGE_TI_SGX_DEMOS=y BR2_PACKAGE_TI_SGX_KM=y BR2_PACKAGE_TI_SGX_UM=y @@ -34,7 +32,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set diff --git a/configs/beagleboneai_defconfig b/configs/beagleboneai_defconfig index eb23cdf69a..745bb0794a 100644 --- a/configs/beagleboneai_defconfig +++ b/configs/beagleboneai_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboneai/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.14.108-ti-r117)/linux-4.14.108-ti-r117.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.14.108-ti-r143)/linux-4.14.108-ti-r143.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bb.org" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am5729-beagleboneai" diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index 80b111aee7..b461574a98 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -8,13 +8,12 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" -BR2_GLOBAL_PATCH_DIR="board/beelink/gs1/patches/" -# Kernel Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Kernel Linux headers same as kernel, a 5.5 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" @@ -25,16 +24,17 @@ BR2_TARGET_ROOTFS_EXT2_4=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/chromebook_snow_defconfig b/configs/chromebook_snow_defconfig index 5558c101d6..bcb94b716b 100644 --- a/configs/chromebook_snow_defconfig +++ b/configs/chromebook_snow_defconfig @@ -4,7 +4,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/snow/sign.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/snow/mksd.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/mksd.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index 8f2604b07c..09eddc4e68 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -2,9 +2,8 @@ BR2_mipsel=y BR2_mips_xburst=y # BR2_MIPS_SOFT_FLOAT is not set - -# Linux headers same as kernel, a 3.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y +BR2_KERNEL_HEADERS_AS_KERNEL=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyS4" @@ -15,25 +14,24 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci20/genimage.cfg" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,MIPS,CI20_linux,7dff33297116643485ca37141d804eddd793e834)/linux-7dff33297116643485ca37141d804eddd793e834.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_DEFCONFIG="ci20" BR2_LINUX_KERNEL_INSTALL_TARGET=y # u-boot BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y -BR2_TARGET_UBOOT_BOARDNAME="ci20_mmc" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/MIPS/CI20_u-boot" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="dd3c1b95dac7d10b2ca5806f65e5c1050d7dd0fa" -BR2_TARGET_UBOOT_PATCH="board/ci20/patches/uboot" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ci20_mmc" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin" -BR2_TARGET_UBOOT_ENVIMAGE=y -BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/ci20/uboot-env.txt" -BR2_TARGET_UBOOT_ENVIMAGE_SIZE="32768" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/ci20/uboot-env.txt" +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="32768" # host BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index fd50742d09..8924c88c54 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -24,8 +24,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/engicam_imx6qdl_icore_qt5_defconfig b/configs/engicam_imx6qdl_icore_qt5_defconfig index 4d3d4e3a22..2d213e4ab9 100644 --- a/configs/engicam_imx6qdl_icore_qt5_defconfig +++ b/configs/engicam_imx6qdl_icore_qt5_defconfig @@ -9,6 +9,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Bootloader BR2_TARGET_UBOOT=y @@ -51,7 +52,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y # qt5 BR2_PACKAGE_QT5=y -BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y BR2_PACKAGE_QT5BASE_OPENGL_LIB=y BR2_PACKAGE_QT5BASE_LINUXFB=y BR2_PACKAGE_QT5BASE_FONTCONFIG=y @@ -61,8 +61,8 @@ BR2_PACKAGE_QT5BASE_JPEG=y # mesa3d BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y -BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y BR2_PACKAGE_MESA3D_OPENGL_ES=y +BR2_PACKAGE_MESA3D_OPENGL_EGL=y # qt5 demo packages BR2_PACKAGE_GLMARK2=y diff --git a/configs/freescale_imx28evk_defconfig b/configs/freescale_imx28evk_defconfig index b0a0c15ef8..bd5b007ed1 100644 --- a/configs/freescale_imx28evk_defconfig +++ b/configs/freescale_imx28evk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -11,7 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.42" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" @@ -20,12 +20,12 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx28evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_FORMAT_SD=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT4=y +BR2_TARGET_ROOTFS_EXT2_4=y # To generate SD Image BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index ce68a9dacb..8fe10f6275 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -18,7 +18,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" @@ -40,5 +40,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index 8cc1ef818e..74debbfd46 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -18,7 +18,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" @@ -39,5 +39,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index d444fa6731..58b4a5f92d 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -18,7 +18,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" @@ -40,5 +40,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index 3edfe6677f..f2ac993da0 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -18,7 +18,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" @@ -40,5 +40,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 79f4bf5268..9f48ef2da5 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -18,7 +18,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" @@ -38,6 +38,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index aaf8ad8a93..4c5c3b2524 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -17,7 +17,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 7c5fc0cb64..5a9cff488d 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" @@ -27,7 +27,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx8mmevk_defconfig b/configs/freescale_imx8mmevk_defconfig index 7bce834ab8..ae82f29158 100644 --- a/configs/freescale_imx8mmevk_defconfig +++ b/configs/freescale_imx8mmevk_defconfig @@ -1,16 +1,16 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8mm-evk.dtb" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8mm-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb-qca-wifi" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y @@ -21,14 +21,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/freescale_imx8mqevk_defconfig b/configs/freescale_imx8mqevk_defconfig index 62e530840d..7f5dd87b5f 100644 --- a/configs/freescale_imx8mqevk_defconfig +++ b/configs/freescale_imx8mqevk_defconfig @@ -1,16 +1,16 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8mq-evk.dtb" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8mq-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y @@ -21,14 +21,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/freescale_imx8qmmek_defconfig b/configs/freescale_imx8qmmek_defconfig index c9fc3a781c..8a0e866cee 100644 --- a/configs/freescale_imx8qmmek_defconfig +++ b/configs/freescale_imx8qmmek_defconfig @@ -1,15 +1,15 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8qm-mek" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qm-mek" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y @@ -22,14 +22,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig index 03ecd22ee6..1ffbd123e0 100644 --- a/configs/freescale_imx8qxpmek_defconfig +++ b/configs/freescale_imx8qxpmek_defconfig @@ -1,17 +1,17 @@ BR2_aarch64=y BR2_cortex_a35=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8qxp-mek" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qxp-mek" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y @@ -24,14 +24,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/friendlyarm_nanopi_a64_defconfig b/configs/friendlyarm_nanopi_a64_defconfig index 7d9535e6ae..4df22b2a2f 100644 --- a/configs/friendlyarm_nanopi_a64_defconfig +++ b/configs/friendlyarm_nanopi_a64_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-a64/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-a64/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig index e932ae3bb1..9262737b88 100644 --- a/configs/friendlyarm_nanopi_neo2_defconfig +++ b/configs/friendlyarm_nanopi_neo2_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo2/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index 6cee075006..8bec2e1d54 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/liteboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.23" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.2" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard" @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 24576570da..0b87f2588f 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -12,29 +12,44 @@ BR2_RISCV_ABI_LP64D=y BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttySIF0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/sifive/hifive-unleashed/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sifive/hifive-unleashed/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sifive/hifive-unleashed/genimage_sdcard.cfg" # Filesystem +BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 5.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/alistair23/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="hifive-unleashed-5.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/hifive-unleashed/linux.config.fragment" BR2_LINUX_KERNEL_IMAGE=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sifive/hifive-unleashed-a00" +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Bootloader BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_PLAT="sifive/fu540" -BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_fu540" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_SPL=y # Host tools BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sifive/hifive-unleashed/boot.cmd" diff --git a/configs/imx23evk_defconfig b/configs/imx23evk_defconfig index 87610d1b72..b5bfc849b4 100644 --- a/configs/imx23evk_defconfig +++ b/configs/imx23evk_defconfig @@ -25,7 +25,7 @@ BR2_TARGET_UBOOT_FORMAT_SD=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT4=y +BR2_TARGET_ROOTFS_EXT2_4=y # To generate SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index d244c5961a..5a39f333d1 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index 47c00284d9..1330b5cfbf 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -30,7 +30,7 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" @@ -48,8 +48,8 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # GL driver BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y -BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y BR2_PACKAGE_MESA3D_OPENGL_ES=y +BR2_PACKAGE_MESA3D_OPENGL_EGL=y # Fonts BR2_PACKAGE_BITSTREAM_VERA=y @@ -64,11 +64,11 @@ BR2_PACKAGE_LIBERATION=y BR2_PACKAGE_GLMARK2=y BR2_PACKAGE_KMSCUBE=y BR2_PACKAGE_LIBV4L=y +BR2_PACKAGE_LIBV4L_UTILS=y BR2_PACKAGE_MESA3D_DEMOS=y # Qt5 BR2_PACKAGE_QT5=y -BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y BR2_PACKAGE_QT5BASE_OPENGL_LIB=y BR2_PACKAGE_QT5BASE_LINUXFB=y BR2_PACKAGE_QT5BASE_FONTCONFIG=y diff --git a/configs/imx7d-sdb_defconfig b/configs/imx7d-sdb_defconfig index 1a3494b4af..8ee5e1fc40 100644 --- a/configs/imx7d-sdb_defconfig +++ b/configs/imx7d-sdb_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.13 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,20 +12,22 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y # Filesystem +BR2_ROOTFS_OVERLAY="board/freescale/imx7dsdb/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/imx7dpico_defconfig b/configs/imx7dpico_defconfig index 190e77fbfe..c6ea04b683 100644 --- a/configs/imx7dpico_defconfig +++ b/configs/imx7dpico_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Linux headers same as kernel, a 5.13 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi" @@ -25,7 +25,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx7d" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y # wifi firmware for brcm43439 diff --git a/configs/lafrite_defconfig b/configs/lafrite_defconfig index 63370928e5..b3326f6b49 100644 --- a/configs/lafrite_defconfig +++ b/configs/lafrite_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a53=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/librecomputer/lafrite/overlay/" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/librecomputer/lafrite/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxl-s805x-libretech-ac" @@ -16,5 +16,6 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/licheepi_zero_defconfig b/configs/licheepi_zero_defconfig index fd875d5f4c..2e1a413988 100644 --- a/configs/licheepi_zero_defconfig +++ b/configs/licheepi_zero_defconfig @@ -42,8 +42,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/licheepi/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/licheepi/boot.cmd" # Required host utilities for building an SDCard image BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index 5a00e57281..b58f970493 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -17,13 +17,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -# Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" @@ -38,11 +38,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_USE_DEFCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" diff --git a/configs/minnowboard_max-graphical_defconfig b/configs/minnowboard_max-graphical_defconfig index 33630c6b09..051c7584dc 100644 --- a/configs/minnowboard_max-graphical_defconfig +++ b/configs/minnowboard_max-graphical_defconfig @@ -3,7 +3,7 @@ BR2_x86_64=y BR2_x86_silvermont=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_TOOLCHAIN_BUILDROOT_CXX=y # needed for TARGET_GRUB2 @@ -24,7 +24,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # Linux BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config" @@ -40,8 +40,8 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y BR2_PACKAGE_GLMARK2=y BR2_PACKAGE_MESA3D_DEMOS=y BR2_PACKAGE_MESA3D=y -BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y +BR2_PACKAGE_MESA3D_OPENGL_GLX=y # Framebuffer (just for testing purposes) BR2_PACKAGE_FB_TEST_APP=y diff --git a/configs/minnowboard_max_defconfig b/configs/minnowboard_max_defconfig index fef597c350..1270f23953 100644 --- a/configs/minnowboard_max_defconfig +++ b/configs/minnowboard_max_defconfig @@ -8,8 +8,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for grub2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -24,7 +24,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config" diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index 0cb8f476cd..a4bebdec97 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx51evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-babbage" diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index 06f434e5de..18785aa0c8 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx53loco" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.27" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb" diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index 7e9b16bd2c..60bfd17092 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -1,30 +1,46 @@ +# Architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y + +# Toolchain +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +# System configuration BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/mx6cubox/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/solidrun/mx6cubox/post-image.sh" +BR2_ROOTFS_OVERLAY="board/solidrun/mx6cubox/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_GLOBAL_PATCH_DIR="board/solidrun/mx6cubox/patches" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.48" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem images BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloaders BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="mx6cuboxi" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-cubox-i imx6dl-cubox-i imx6q-hummingboard imx6dl-hummingboard" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index e2e36b907b..2bdcade252 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -3,28 +3,31 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/neo/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/neo/post-image.sh" +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/udoo/common/boot.scr.txt" diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index 86ad13bbf3..60436e8616 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -3,27 +3,33 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_GLOBAL_PATCH_DIR="board/udoo/mx6qdl/patches" +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/mx6qdl/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-udoo imx6dl-udoo" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/udoo/common/boot.scr.txt" diff --git a/configs/nexbox_a95x_defconfig b/configs/nexbox_a95x_defconfig index 4820d47d52..69f8b9078f 100644 --- a/configs/nexbox_a95x_defconfig +++ b/configs/nexbox_a95x_defconfig @@ -1,13 +1,13 @@ BR2_aarch64=y BR2_cortex_a53=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/nexbox/a95x/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nexbox/a95x/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxbb-nexbox-a95x amlogic/meson-gxl-s905x-nexbox-a95x" diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index 7330d00f69..73dfe2caff 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -17,26 +17,28 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Last version of branch boundary-v2018.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/26bfd1de.tar.gz" +# Last version of branch boundary-v2020.10 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/e05b6d68.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" +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" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_4.14.x_2.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" +# Last version of branch boundary-imx_5.4.x_2.3.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/8961f5c1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-nitrogen6sx imx6sx-nitrogen6sx-m4" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig index cd0697dbfb..8e4b268356 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -11,32 +11,33 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y # filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Last version of branch boundary-v2018.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/26bfd1de.tar.gz" +# Last version of branch boundary-v2020.10 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/e05b6d68.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" +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" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_4.14.x_2.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" +# Last version of branch boundary-imx_5.4.x_2.3.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/8961f5c1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-nit6xlite imx6dl-nitrogen6_vm imx6dl-nitrogen6x imx6q-nitrogen6x imx6dl-nitrogen6_som2 imx6q-nitrogen6_som2 imx6qp-nitrogen6_som2 imx6q-nitrogen6_max imx6qp-nitrogen6_max imx6q-sabrelite" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig index 7a2ff4d3ad..8b152d931b 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -16,26 +16,28 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Last version of branch boundary-v2018.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/26bfd1de.tar.gz" +# Last version of branch boundary-v2020.10 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/e05b6d68.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" +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" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_4.14.x_2.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" +# Last version of branch boundary-imx_5.4.x_2.3.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/8961f5c1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-nitrogen7 imx7d-nitrogen7-m4" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig index a1e555a84a..438a0bc29e 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -28,8 +28,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_4.14.98_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/99e07a29.tar.gz" +# Latest revision of branch boundary-imx_5.4.70_2.3.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -38,19 +38,21 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2018.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/26bfd1de.tar.gz" +# Latest revision of branch boundary-imx_v2020.10 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/e05b6d68.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_4.14.x_2.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" +# Latest revision of branch boundary-imx_5.4.x_2.3.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/8961f5c1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-nitrogen8m freescale/imx8mq-nitrogen8m-m4 freescale/imx8mq-nitrogen8m_som freescale/imx8mq-nitrogen8m_som-m4" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/nitrogen8mm_defconfig b/configs/nitrogen8mm_defconfig index a7aa55c527..567636ee4c 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -28,8 +28,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_4.14.98_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/99e07a29.tar.gz" +# Latest revision of branch boundary-imx_5.4.70_2.3.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -38,19 +38,21 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mm_2g" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2018.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/26bfd1de.tar.gz" +# Latest revision of branch boundary-imx_v2020.10 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/e05b6d68.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_4.14.x_2.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" +# Latest revision of branch boundary-imx_5.4.x_2.3.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/8961f5c1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-nitrogen8mm freescale/imx8mm-nitrogen8mm-m4 freescale/imx8mm-nitrogen8mm_rev2 freescale/imx8mm-nitrogen8mm_rev2-m4 freescale/imx8mm-nitrogen8mm_som freescale/imx8mm-nitrogen8mm_som-m4" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/olimex_a10_olinuxino_lime_defconfig b/configs/olimex_a10_olinuxino_lime_defconfig index 8248daf92c..0896a66dda 100644 --- a/configs/olimex_a10_olinuxino_lime_defconfig +++ b/configs/olimex_a10_olinuxino_lime_defconfig @@ -40,8 +40,9 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a10_olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a10_olinuxino/boot.cmd" # Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 21b681a1fb..dca6123c18 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,22 +3,26 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +# Toolchain +# glibc is needed for sunxi-mali-mainline-package. +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration 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_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" +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" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.48" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -39,15 +43,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y # Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 029f9ebad3..0eaacc9ec1 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -3,22 +3,26 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +# Toolchain +# glibc is needed for sunxi-mali-mainline-package. +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration 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_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" +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" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.48" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -39,15 +43,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y # Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index a2aff0ca33..4a2a8a4ba7 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -38,8 +38,9 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" # Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/olimex_a33_olinuxino_defconfig b/configs/olimex_a33_olinuxino_defconfig index 71b1669b27..7c691ab20d 100644 --- a/configs/olimex_a33_olinuxino_defconfig +++ b/configs/olimex_a33_olinuxino_defconfig @@ -22,8 +22,9 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/olimex_a64_olinuxino_defconfig b/configs/olimex_a64_olinuxino_defconfig index d5b2d3530a..e35c6014bd 100644 --- a/configs/olimex_a64_olinuxino_defconfig +++ b/configs/olimex_a64_olinuxino_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig index 26e5ad1393..275dd98afe 100644 --- a/configs/olimex_imx233_olinuxino_defconfig +++ b/configs/olimex_imx233_olinuxino_defconfig @@ -33,7 +33,7 @@ BR2_PACKAGE_ZD1211_FIRMWARE=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT4=y +BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set # U-Boot diff --git a/configs/openblocks_a6_defconfig b/configs/openblocks_a6_defconfig index c805ae9c61..2238c0940c 100644 --- a/configs/openblocks_a6_defconfig +++ b/configs/openblocks_a6_defconfig @@ -17,7 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.253" BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" BR2_LINUX_KERNEL_APPENDED_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index 249224ed35..e75943c986 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -28,8 +28,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-lite/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-lite/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index 4863eebff3..1a2772a307 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -1,33 +1,35 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-one/boot.cmd" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-one/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one/genimage.cfg" diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig index 864f8bb8a2..c7e17c8eb1 100644 --- a/configs/orangepi_pc2_defconfig +++ b/configs/orangepi_pc2_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc2/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index fcb6bdc9ec..44ea9b95c4 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_SYSTEM_DHCP="eth0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -20,14 +20,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index 4d22e7840b..c3ff8bc417 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC Plus" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" @@ -20,14 +20,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig index be3eba51fe..11d7486486 100644 --- a/configs/orangepi_plus_defconfig +++ b/configs/orangepi_plus_defconfig @@ -20,6 +20,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-plus/boot.cmd" # Kernel BR2_LINUX_KERNEL=y @@ -32,8 +35,6 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-plus" # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-plus/boot.cmd" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-plus/genimage.cfg" diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig index f78711ce4f..f8f958c67b 100644 --- a/configs/orangepi_prime_defconfig +++ b/configs/orangepi_prime_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-prime/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-prime/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig index b1d35f2998..bad1f9400c 100644 --- a/configs/orangepi_r1_defconfig +++ b/configs/orangepi_r1_defconfig @@ -1,13 +1,13 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_R1" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-r1" @@ -19,14 +19,16 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_r1" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig index 8aae602458..715ff3b711 100644 --- a/configs/orangepi_win_defconfig +++ b/configs/orangepi_win_defconfig @@ -25,8 +25,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-win/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-win/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 354e3bfdba..1c107b10e6 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -3,13 +3,13 @@ BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" @@ -21,14 +21,16 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index a0183714a4..da2d3b4178 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -2,38 +2,38 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd" +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" diff --git a/configs/pandaboard_defconfig b/configs/pandaboard_defconfig index 408bced9c0..376ecfe504 100644 --- a/configs/pandaboard_defconfig +++ b/configs/pandaboard_defconfig @@ -1,32 +1,48 @@ +# Architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_ARM_FPU_VFPV3=y + +# Linux headers same as kernel, a 5.12 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y + +# System BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" BR2_SYSTEM_DHCP="eth0" + +# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pandaboard/genimage.cfg" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.62" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="omap4-panda-es omap4-panda omap4-panda-a4" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="omap4_panda" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" + +# Required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig index 1c1f7a3666..3290a1dda0 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -23,13 +23,13 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-bios.cfg" -# Linux headers same as kernel, a 4.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index 984fc8f92f..18d2c477d5 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -25,13 +25,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh" -# Linux headers same as kernel, a 4.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig index d2e3a360fa..2bdb6f6ae1 100644 --- a/configs/pine64_defconfig +++ b/configs/pine64_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/pine64_sopine_defconfig b/configs/pine64_sopine_defconfig index 3007d5a643..6fa511477c 100644 --- a/configs/pine64_sopine_defconfig +++ b/configs/pine64_sopine_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/pine64/sopine/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/sopine/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 6a9bc25bea..aa00ddf831 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -11,13 +11,17 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 42d29e3bf3..10dd9e52b4 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -10,13 +10,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig index 6e4de0a0dd..fa783f9299 100644 --- a/configs/qemu_arm_versatile_nommu_defconfig +++ b/configs/qemu_arm_versatile_nommu_defconfig @@ -21,13 +21,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 188fd72014..20fdbb4062 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -13,13 +13,19 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" +# Qemu >= 5.1 requires an SD card size to be a power of 2, e.g. 64 MiB. +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index eff3f52d11..2f5189b8eb 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -7,26 +7,31 @@ BR2_ARM_FPU_VFPV3D16=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/arm-vexpress-tz/post-build.sh" +# optee-test needs toolchain C++ +BR2_TOOLCHAIN_BUILDROOT_CXX=y + # Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.11 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11=y + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.11.3" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca15_a7" # TF-A for booting OP-TEE secure and uboot/linux non secure BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.4" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram" @@ -38,18 +43,19 @@ BR2_PACKAGE_OPTEE_BENCHMARK=y BR2_PACKAGE_OPTEE_EXAMPLES=y BR2_PACKAGE_OPTEE_TEST=y -# OP-TEE components needs host-python3 interpreter and its modules -BR2_PACKAGE_HOST_PYTHON3=y -# Select python3 on the target to make sure Buildroot builds host-python using -# python3 and builds all host-python modules for python3. -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PACKAGE_PYTHON3=y +# Enable OpenSSL library for some optee-test tests +BR2_PACKAGE_OPENSSL=y +BR2_PACKAGE_LIBOPENSSL=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # U-boot for booting the dear Linux kernel BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/u-boot.config" diff --git a/configs/qemu_csky610_virt_defconfig b/configs/qemu_csky610_virt_defconfig index f337bd7eb4..e7d75f5f49 100644 --- a/configs/qemu_csky610_virt_defconfig +++ b/configs/qemu_csky610_virt_defconfig @@ -5,6 +5,10 @@ BR2_ck610=y # System BR2_TARGET_ROOTFS_INITRAMFS=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # linux kernel header, the same version with linux kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y diff --git a/configs/qemu_csky807_virt_defconfig b/configs/qemu_csky807_virt_defconfig index c4a10b8ade..df12450a55 100644 --- a/configs/qemu_csky807_virt_defconfig +++ b/configs/qemu_csky807_virt_defconfig @@ -5,6 +5,10 @@ BR2_ck807=y # System BR2_TARGET_ROOTFS_INITRAMFS=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # linux kernel header, the same version with linux kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y diff --git a/configs/qemu_csky810_virt_defconfig b/configs/qemu_csky810_virt_defconfig index 56efe8a6ae..dd1fd329f5 100644 --- a/configs/qemu_csky810_virt_defconfig +++ b/configs/qemu_csky810_virt_defconfig @@ -5,6 +5,10 @@ BR2_ck810=y # System BR2_TARGET_ROOTFS_INITRAMFS=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # linux kernel header, the same version with linux kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y diff --git a/configs/qemu_csky860_virt_defconfig b/configs/qemu_csky860_virt_defconfig index 9ec8f633af..6edfba4e8e 100644 --- a/configs/qemu_csky860_virt_defconfig +++ b/configs/qemu_csky860_virt_defconfig @@ -5,6 +5,10 @@ BR2_ck860=y # System BR2_TARGET_ROOTFS_INITRAMFS=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # linux kernel header, the same version with linux kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index a2cadffa92..c45a775556 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 2ef73d1dd6..abd0560cb1 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 2bcf13e085..638c6629da 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -10,17 +10,21 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/xilinx-xemaclite.patch" +BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 4352ad6873..6e62cc3304 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -10,17 +10,21 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/xilinx-xemaclite.patch" +BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index baacc3cc83..434e3d9530 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 35ad64368e..2b8b2e8df1 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index a0553ed964..bf1306a2b2 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -9,16 +9,21 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y +BR2_GLOBAL_PATCH_DIR="board/qemu/mips32r6-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index aaace9540b..5edf591bcf 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -9,16 +9,21 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y +BR2_GLOBAL_PATCH_DIR="board/qemu/mips32r6el-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index 2a8b50a18f..ec841b5a09 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index 1d9d0807d0..680ccbbd60 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index ed42042292..53c5c09788 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -10,16 +10,21 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y +BR2_GLOBAL_PATCH_DIR="board/qemu/mips64r6-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 7f4f28a708..8230b1a9f9 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -10,16 +10,21 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y +BR2_GLOBAL_PATCH_DIR="board/qemu/mips64r6el-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 48d1513846..d562e941b7 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,13 +1,17 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 60147acd4b..21d86e22ce 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -5,13 +5,17 @@ BR2_or1k=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4,19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 3c71c17e0a..dace0af8ee 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -5,13 +5,17 @@ BR2_powerpc_e5500=y # Serial port config BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 42856a52b7..4ce116e26a 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -10,13 +10,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 653d111953..3be9de74a6 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -10,13 +10,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index acb9d86fb6..6e41afe8d7 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index 496b0fb2a4..a1e9c1a5a6 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -5,13 +5,13 @@ BR2_powerpc_7400=y # System BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.2 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y @@ -25,6 +25,10 @@ BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 66bc1d2089..55e6db5a0d 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -3,19 +3,24 @@ BR2_powerpc=y BR2_powerpc_8548=y # System +BR2_GLOBAL_PATCH_DIR="board/qemu/ppc-mpc8544ds/patches" BR2_SYSTEM_DHCP="eth0" # Filesystem # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 914eada004..1042088988 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -5,26 +5,27 @@ BR2_RISCV_32=y # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_GLOBAL_PATCH_DIR="board/qemu/riscv32-virt/patches/" # Filesystem BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 5.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_USE_PLAT=y -BR2_TARGET_OPENSBI_PLAT="qemu/virt" +BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 5c52f7a0f8..93d38b1ec2 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -5,25 +5,27 @@ BR2_RISCV_64=y # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # Filesystem BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 5.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_USE_PLAT=y -BR2_TARGET_OPENSBI_PLAT="qemu/virt" +BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index c7c5126bf9..a14277dd05 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -3,7 +3,6 @@ BR2_sh=y BR2_sh4=y # System -BR2_GLOBAL_PATCH_DIR="board/qemu/sh4-r2d/patches" BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" @@ -11,13 +10,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index 4d9559a387..4911ba0353 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -3,20 +3,23 @@ BR2_sh=y BR2_sh4eb=y # System -BR2_GLOBAL_PATCH_DIR="board/qemu/sh4eb-r2d/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" # Filesystem BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index d7be664cbf..6a999298eb 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -2,6 +2,9 @@ BR2_sparc64=y BR2_sparc_v9=y +# Patches +BR2_GLOBAL_PATCH_DIR="board/qemu/sparc64-sun4u/patches" + # System BR2_SYSTEM_DHCP="eth0" @@ -9,13 +12,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index dada40d469..0181f16846 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index b561e42e51..25e0d43f49 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -11,13 +11,17 @@ BR2_TARGET_ROOTFS_EXT2=y # Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 52f1744344..bcd325b7ec 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -12,13 +12,17 @@ BR2_TARGET_ROOTFS_EXT2=y # Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86/post-build.sh" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 7cf8c41fd4..50c1c4ccf0 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -11,13 +11,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index 8cb93f2d3d..baf72da9b8 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -15,13 +15,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index da20eb4dae..c17fe99c45 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4afd064509b23882268922824edc5b391a1ea55d)/linux-4afd064509b23882268922824edc5b391a1ea55d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index 14a8853117..3a5e306299 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4afd064509b23882268922824edc5b391a1ea55d)/linux-4afd064509b23882268922824edc5b391a1ea55d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index c45461d108..1eee3ae37e 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4afd064509b23882268922824edc5b391a1ea55d)/linux-4afd064509b23882268922824edc5b391a1ea55d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index 10e6079d54..859d95314c 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -6,18 +6,17 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4afd064509b23882268922824edc5b391a1ea55d)/linux-4afd064509b23882268922824edc5b391a1ea55d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b" -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index f001d8f845..67ce0d5314 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4afd064509b23882268922824edc5b391a1ea55d)/linux-4afd064509b23882268922824edc5b391a1ea55d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index d62e66d08b..d9538dc648 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4afd064509b23882268922824edc5b391a1ea55d)/linux-4afd064509b23882268922824edc5b391a1ea55d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index fd6f8e4dce..312ec64471 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -6,18 +6,17 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4afd064509b23882268922824edc5b391a1ea55d)/linux-4afd064509b23882268922824edc5b391a1ea55d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b" -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index c4a97f8f3c..3ae2d253fb 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4afd064509b23882268922824edc5b391a1ea55d)/linux-4afd064509b23882268922824edc5b391a1ea55d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index f07411b2e6..75e7177974 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -4,14 +4,14 @@ BR2_ARM_EABIHF=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4afd064509b23882268922824edc5b391a1ea55d)/linux-4afd064509b23882268922824edc5b391a1ea55d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig index 114b0e8c95..dfbc5e4f47 100644 --- a/configs/roc_pc_rk3399_defconfig +++ b/configs/roc_pc_rk3399_defconfig @@ -22,8 +22,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="roc-pc-rk3399" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/rock64_defconfig b/configs/rock64_defconfig index 30bf12c061..a9d29a424d 100644 --- a/configs/rock64_defconfig +++ b/configs/rock64_defconfig @@ -18,15 +18,17 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="128M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v1.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="bl31/*.elf" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/ayufan-rock64/linux-u-boot.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="2017.09-rockchip-ayufan-1035-gd646df03ac" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/ayufan-rock64/linux-mainline-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="release-2020-07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock64-rk3328" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index d315a02e16..2af94d010b 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -2,27 +2,25 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y - BR2_GLOBAL_PATCH_DIR="board/roseapplepi/patches" -# Linux headers same as kernel, a 3.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y -# kernel does not build with gcc 8.x -BR2_GCC_VERSION_7_X=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/roseapplepi/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,xapp-le,kernel,59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b)/linux-59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="actduino_bubble_gum_linux" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.1" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config" BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="actduino_bubble_gum_sdboot_linux" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="owl-s500-roseapplepi" # Filesystem / image -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloaders diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 052e39398a..4c3bb21b4a 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -26,7 +26,7 @@ BR2_TARGET_UBOOT_FORMAT_KWB=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.63" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.253" BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" BR2_LINUX_KERNEL_APPENDED_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" diff --git a/configs/shredos_defconfig b/configs/shredos_defconfig index c5233da722..37eaeef9a0 100644 --- a/configs/shredos_defconfig +++ b/configs/shredos_defconfig @@ -1,59 +1,87 @@ BR2_x86_64=y -BR2_GLOBAL_PATCH_DIR="board/shredos/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_KERNEL_HEADERS_5_13=y +BR2_PACKAGE_GLIBC_UTILS=y BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y BR2_TARGET_GENERIC_HOSTNAME="shredos" -BR2_TARGET_GENERIC_ISSUE="ShredOS" +BR2_TARGET_GENERIC_ISSUE="Welcome to Shredos www.github.com/PartialVolume/shredos" BR2_INIT_SYSV=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set +BR2_ROOTFS_MERGED_USR=y +BR2_SYSTEM_BIN_SH_BASH=y +BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin" # BR2_ENABLE_LOCALE_PURGE is not set +BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/shredos/fsoverlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/shredos/doimg.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-5.6-defconfig.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-5.13-defconfig.config" +BR2_PACKAGE_FFMPEG=y +BR2_PACKAGE_FFMPEG_GPL=y +BR2_PACKAGE_FFMPEG_NONFREE=y +BR2_PACKAGE_GZIP=y +BR2_PACKAGE_UNZIP=y +BR2_PACKAGE_ZIP=y BR2_PACKAGE_HEXEDIT=y BR2_PACKAGE_BINUTILS=y +BR2_PACKAGE_GREP=y +BR2_PACKAGE_SED=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_E2FSPROGS=y +BR2_PACKAGE_SOUND_THEME_BOREALIS=y +BR2_PACKAGE_SOUND_THEME_FREEDESKTOP=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y BR2_PACKAGE_FBTERM=y BR2_PACKAGE_FBV=y -BR2_PACKAGE_XORG7=y -BR2_PACKAGE_XAPP_XRANDR=y +BR2_PACKAGE_DBUS=y +BR2_PACKAGE_EDID_DECODE=y BR2_PACKAGE_HDPARM=y BR2_PACKAGE_HWDATA=y BR2_PACKAGE_KBD=y +BR2_PACKAGE_LM_SENSORS=y BR2_PACKAGE_MEMTEST86=y BR2_PACKAGE_NVME=y +BR2_PACKAGE_PCIUTILS=y +BR2_PACKAGE_READ_EDID=y +BR2_PACKAGE_SG3_UTILS=y +BR2_PACKAGE_SG3_UTILS_PROGS=y BR2_PACKAGE_SMARTMONTOOLS=y +BR2_PACKAGE_SYSSTAT=y BR2_PACKAGE_TRIGGERHAPPY=y -BR2_PACKAGE_USBUTILS=y -BR2_PACKAGE_HIDAPI=y -BR2_PACKAGE_LIBATASMART=y +BR2_PACKAGE_LIBJPEG=y +BR2_PACKAGE_LIBDRM=y +BR2_PACKAGE_LIBDRM_INTEL=y +BR2_PACKAGE_LIBDRM_RADEON=y +BR2_PACKAGE_LIBDRM_AMDGPU=y +BR2_PACKAGE_LIBDRM_NOUVEAU=y +BR2_PACKAGE_LIBDRM_VMWGFX=y BR2_PACKAGE_LIBHID=y -BR2_PACKAGE_ELFUTILS=y BR2_PACKAGE_KERNEL_CMDLINE_EXTRACTOR=y +BR2_PACKAGE_LIBCAP=y BR2_PACKAGE_NWIPE=y +BR2_PACKAGE_SHREDOS=y BR2_PACKAGE_COLLECTD=y BR2_PACKAGE_COLLECTD_NTPD=y +BR2_PACKAGE_XUTIL_UTIL_MACROS=y BR2_PACKAGE_LFTP=y BR2_PACKAGE_LFTP_PROTO_SFTP=y -BR2_PACKAGE_BASH=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y +BR2_PACKAGE_UTIL_LINUX_AGETTY=y +BR2_PACKAGE_UTIL_LINUX_FSCK=y BR2_PACKAGE_UTIL_LINUX_MOUNT=y BR2_PACKAGE_UTIL_LINUX_SETTERM=y BR2_TARGET_ROOTFS_CPIO_LZMA=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="512M" BR2_TARGET_ROOTFS_INITRAMFS=y -# BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_GRUB2=y BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat squash4 part_msdos part_gpt normal biosdisk progress" BR2_TARGET_GRUB2_INSTALL_TOOLS=y diff --git a/configs/snps_arc700_axs101_defconfig b/configs/snps_arc700_axs101_defconfig index 5d9b5a5139..080250e92b 100644 --- a/configs/snps_arc700_axs101_defconfig +++ b/configs/snps_arc700_axs101_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="axs101" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/snps_archs38_axs103_defconfig b/configs/snps_archs38_axs103_defconfig index c6e2b10f0f..c5847809ba 100644 --- a/configs/snps_archs38_axs103_defconfig +++ b/configs/snps_archs38_axs103_defconfig @@ -9,13 +9,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/snps_archs38_haps_defconfig b/configs/snps_archs38_haps_defconfig index cb5edea2c8..a95d760df2 100644 --- a/configs/snps_archs38_haps_defconfig +++ b/configs/snps_archs38_haps_defconfig @@ -7,12 +7,12 @@ BR2_TARGET_GENERIC_HOSTNAME="zebu_hs" BR2_TARGET_GENERIC_ISSUE="Welcome to the HAPS Development Platform" BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="haps_hs_smp" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/snps_archs38_hsdk_defconfig b/configs/snps_archs38_hsdk_defconfig index 646cd99d99..4a1ac3fcff 100644 --- a/configs/snps_archs38_hsdk_defconfig +++ b/configs/snps_archs38_hsdk_defconfig @@ -1,33 +1,23 @@ -# Architecture BR2_arcle=y BR2_archs38_full=y - -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# System +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +BR2_PACKAGE_GLIBC_UTILS=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TARGET_OPTIMIZATION="-mfpu=fpud_all" BR2_TARGET_GENERIC_HOSTNAME="hsdk" BR2_TARGET_GENERIC_ISSUE="Welcome to the HSDK Platform" BR2_SYSTEM_DHCP="eth0" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/synopsys/hsdk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="hsdk" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/synopsys/hsdk/linux.fragment" - -# Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/synopsys/hsdk/genimage.cfg" - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y @@ -35,6 +25,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="hsdk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_ELF=y -BR2_TARGET_UBOOT_ENVIMAGE=y -BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/synopsys/hsdk/uboot.env.txt" -BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/synopsys/hsdk/uboot.env.txt" +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x4000" diff --git a/configs/snps_archs38_vdk_defconfig b/configs/snps_archs38_vdk_defconfig index 7c7834f9bd..8d8e9f7559 100644 --- a/configs/snps_archs38_vdk_defconfig +++ b/configs/snps_archs38_vdk_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/socrates_cyclone5_defconfig b/configs/socrates_cyclone5_defconfig index 4c659263df..6ecbf05d8c 100644 --- a/configs/socrates_cyclone5_defconfig +++ b/configs/socrates_cyclone5_defconfig @@ -23,9 +23,10 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC=y -BR2_TARGET_UBOOT_ENVIMAGE=y -BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/altera/socrates_cyclone5/boot-env.txt" -BR2_TARGET_UBOOT_ENVIMAGE_SIZE="8192" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/altera/socrates_cyclone5/boot-env.txt" +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="8192" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/solidrun_clearfog_gt_8k_defconfig b/configs/solidrun_clearfog_gt_8k_defconfig index 8804ce0473..bec4a7dacc 100644 --- a/configs/solidrun_clearfog_gt_8k_defconfig +++ b/configs/solidrun_clearfog_gt_8k_defconfig @@ -1,17 +1,16 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="clearfog-gt-8k" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for SolidRun Clearfog GT-8K" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git" -# This commit corresponds to release armada-18.12.2 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="9484123bfe29011ed44b717a23eb53a70b97ce3d" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.4" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="mrvl_flash" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" BR2_TARGET_BINARIES_MARVELL=y BR2_TARGET_MV_DDR_MARVELL=y @@ -19,7 +18,7 @@ BR2_TARGET_MV_DDR_MARVELL=y # U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog_gt_8k" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/uboot-fragment.config" @@ -27,7 +26,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/uboot-frag # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.5" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/linux-extras.config" @@ -38,6 +37,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # rootfs BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_GENIMAGE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" diff --git a/configs/stm32f469_disco_defconfig b/configs/stm32f469_disco_defconfig index 9760d51878..e538a664e2 100644 --- a/configs/stm32f469_disco_defconfig +++ b/configs/stm32f469_disco_defconfig @@ -1,19 +1,25 @@ BR2_arm=y BR2_cortex_m4=y -BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh board/stmicroelectronics/stm32f469-disco/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f469-disco/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.11" BR2_LINUX_KERNEL_DEFCONFIG="stm32" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/dram_0x00000000.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/dram_0x00000000.config board/stmicroelectronics/stm32f469-disco/linux.fragment" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" +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_TARGET_ROOTFS_INITRAMFS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="32M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_AFBOOT_STM32=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f469-discovery" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_OPENOCD=y diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index 81404d2f01..86265d77f8 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -1,12 +1,11 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/common/stm32mp157/genimage.cfg" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157a-dk1/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -15,17 +14,20 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^metadata_csum" # 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=stm32mp157a-dk1.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_basic" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.stm32" +BR2_TARGET_UBOOT_FORMAT_STM32=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157a-dk1" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index d38fa5bab4..45205982d7 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -1,12 +1,11 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/common/stm32mp157/genimage.cfg" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -15,17 +14,20 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^metadata_csum" # 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-dk2.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_basic" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32mp157c-dk2/uboot-fragment.config" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.stm32" +BR2_TARGET_UBOOT_FORMAT_STM32=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 1f42707ef0..0966719d48 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -1,32 +1,45 @@ +# Architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y + +# Linux headers same as kernel, a 5.13 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y + +# System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/wandboard/genimage.cfg" + +# Image +BR2_ROOTFS_OVERLAY="board/wandboard/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" + +# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="wandboard" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="wandboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1 imx6qp-wandboard-revd1" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -# required tools to create the SD card image + +# Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 8ee56b8f21..23ae4c2257 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.13 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="warp7" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y # wifi firmware for brcm43430 diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt index c9eef567f4..8d1c8b69c3 100644 --- a/docs/manual/configure.txt +++ b/docs/manual/configure.txt @@ -1,430 +1 @@ -// -*- mode:doc; -*- -// vim: set syntax=asciidoc: - -[[configure]] -== Buildroot configuration - -All the configuration options in +make *config+ have a help text -providing details about the option. - -The +make *config+ commands also offer a search tool. Read the help -message in the different frontend menus to know how to use it: - -* in _menuconfig_, the search tool is called by pressing +/+; -* in _xconfig_, the search tool is called by pressing +Ctrl+ + +f+. - -The result of the search shows the help message of the matching items. -In _menuconfig_, numbers in the left column provide a shortcut to the -corresponding entry. Just type this number to directly jump to the -entry, or to the containing menu in case the entry is not selectable due -to a missing dependency. - -Although the menu structure and the help text of the entries should be -sufficiently self-explanatory, a number of topics require additional -explanation that cannot easily be covered in the help text and are -therefore covered in the following sections. - -=== Cross-compilation toolchain - -A compilation toolchain is the set of tools that allows you to compile -code for your system. It consists of a compiler (in our case, +gcc+), -binary utils like assembler and linker (in our case, +binutils+) and a -C standard library (for example -http://www.gnu.org/software/libc/libc.html[GNU Libc], -http://www.uclibc-ng.org/[uClibc-ng]). - -The system installed on your development station certainly already has -a compilation toolchain that you can use to compile an application -that runs on your system. If you're using a PC, your compilation -toolchain runs on an x86 processor and generates code for an x86 -processor. Under most Linux systems, the compilation toolchain uses -the GNU libc (glibc) as the C standard library. This compilation -toolchain is called the "host compilation toolchain". The machine on -which it is running, and on which you're working, is called the "host -system" footnote:[This terminology differs from what is used by GNU -configure, where the host is the machine on which the application will -run (which is usually the same as target)]. - -The compilation toolchain is provided by your distribution, and -Buildroot has nothing to do with it (other than using it to build a -cross-compilation toolchain and other tools that are run on the -development host). - -As said above, the compilation toolchain that comes with your system -runs on and generates code for the processor in your host system. As -your embedded system has a different processor, you need a -cross-compilation toolchain - a compilation toolchain that runs on -your _host system_ but generates code for your _target system_ (and -target processor). For example, if your host system uses x86 and your -target system uses ARM, the regular compilation toolchain on your host -runs on x86 and generates code for x86, while the cross-compilation -toolchain runs on x86 and generates code for ARM. - -Buildroot provides two solutions for the cross-compilation toolchain: - - * The *internal toolchain backend*, called +Buildroot toolchain+ in - the configuration interface. - - * The *external toolchain backend*, called +External toolchain+ in - the configuration interface. - -The choice between these two solutions is done using the +Toolchain -Type+ option in the +Toolchain+ menu. Once one solution has been -chosen, a number of configuration options appear, they are detailed in -the following sections. - -[[internal-toolchain-backend]] -==== Internal toolchain backend - -The _internal toolchain backend_ is the backend where Buildroot builds -by itself a cross-compilation toolchain, before building the userspace -applications and libraries for your target embedded system. - -This backend supports several C libraries: -http://www.uclibc-ng.org[uClibc-ng], -http://www.gnu.org/software/libc/libc.html[glibc] and -http://www.musl-libc.org[musl]. - -Once you have selected this backend, a number of options appear. The -most important ones allow to: - - * Change the version of the Linux kernel headers used to build the - toolchain. This item deserves a few explanations. In the process of - building a cross-compilation toolchain, the C library is being - built. This library provides the interface between userspace - applications and the Linux kernel. In order to know how to "talk" - to the Linux kernel, the C library needs to have access to the - _Linux kernel headers_ (i.e. the +.h+ files from the kernel), which - define the interface between userspace and the kernel (system - calls, data structures, etc.). Since this interface is backward - compatible, the version of the Linux kernel headers used to build - your toolchain do not need to match _exactly_ the version of the - Linux kernel you intend to run on your embedded system. They only - need to have a version equal or older to the version of the Linux - kernel you intend to run. If you use kernel headers that are more - recent than the Linux kernel you run on your embedded system, then - the C library might be using interfaces that are not provided by - your Linux kernel. - - * Change the version of the GCC compiler, binutils and the C library. - - * Select a number of toolchain options (uClibc only): whether the - toolchain should have RPC support (used mainly for NFS), - wide-char support, locale support (for internationalization), - C++ support or thread support. Depending on which options you choose, - the number of userspace applications and libraries visible in - Buildroot menus will change: many applications and libraries require - certain toolchain options to be enabled. Most packages show a comment - when a certain toolchain option is required to be able to enable - those packages. If needed, you can further refine the uClibc - configuration by running +make uclibc-menuconfig+. Note however that - all packages in Buildroot are tested against the default uClibc - configuration bundled in Buildroot: if you deviate from this - configuration by removing features from uClibc, some packages may no - longer build. - -It is worth noting that whenever one of those options is modified, -then the entire toolchain and system must be rebuilt. See -xref:full-rebuild[]. - -Advantages of this backend: - -* Well integrated with Buildroot -* Fast, only builds what's necessary - -Drawbacks of this backend: - -* Rebuilding the toolchain is needed when doing +make clean+, which - takes time. If you're trying to reduce your build time, consider - using the _External toolchain backend_. - -[[external-toolchain-backend]] -==== External toolchain backend - -The _external toolchain backend_ allows to use existing pre-built -cross-compilation toolchains. Buildroot knows about a number of -well-known cross-compilation toolchains (from -http://www.linaro.org[Linaro] for ARM, -http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/[Sourcery -CodeBench] for ARM, x86-64, PowerPC, and MIPS, and is capable of -downloading them automatically, or it can be pointed to a custom -toolchain, either available for download or installed locally. - -Then, you have three solutions to use an external toolchain: - -* Use a predefined external toolchain profile, and let Buildroot - download, extract and install the toolchain. Buildroot already knows - about a few CodeSourcery and Linaro toolchains. Just select the - toolchain profile in +Toolchain+ from the available ones. This is - definitely the easiest solution. - -* Use a predefined external toolchain profile, but instead of having - Buildroot download and extract the toolchain, you can tell Buildroot - where your toolchain is already installed on your system. Just - select the toolchain profile in +Toolchain+ through the available - ones, unselect +Download toolchain automatically+, and fill the - +Toolchain path+ text entry with the path to your cross-compiling - toolchain. - -* Use a completely custom external toolchain. This is particularly - useful for toolchains generated using crosstool-NG or with Buildroot - itself. To do this, select the +Custom toolchain+ solution in the - +Toolchain+ list. You need to fill the +Toolchain path+, +Toolchain - prefix+ and +External toolchain C library+ options. Then, you have - to tell Buildroot what your external toolchain supports. If your - external toolchain uses the 'glibc' library, you only have to tell - whether your toolchain supports C\++ or not and whether it has - built-in RPC support. If your external toolchain uses the 'uClibc' - library, then you have to tell Buildroot if it supports RPC, - wide-char, locale, program invocation, threads and C++. - At the beginning of the execution, Buildroot will tell you if - the selected options do not match the toolchain configuration. - -Our external toolchain support has been tested with toolchains from -CodeSourcery and Linaro, toolchains generated by -http://crosstool-ng.org[crosstool-NG], and toolchains generated by -Buildroot itself. In general, all toolchains that support the -'sysroot' feature should work. If not, do not hesitate to contact the -developers. - -We do not support toolchains or SDK generated by OpenEmbedded or -Yocto, because these toolchains are not pure toolchains (i.e. just the -compiler, binutils, the C and C++ libraries). Instead these toolchains -come with a very large set of pre-compiled libraries and -programs. Therefore, Buildroot cannot import the 'sysroot' of the -toolchain, as it would contain hundreds of megabytes of pre-compiled -libraries that are normally built by Buildroot. - -We also do not support using the distribution toolchain (i.e. the -gcc/binutils/C library installed by your distribution) as the -toolchain to build software for the target. This is because your -distribution toolchain is not a "pure" toolchain (i.e. only with the -C/C++ library), so we cannot import it properly into the Buildroot -build environment. So even if you are building a system for a x86 or -x86_64 target, you have to generate a cross-compilation toolchain with -Buildroot or crosstool-NG. - -If you want to generate a custom toolchain for your project, that can -be used as an external toolchain in Buildroot, our recommendation is -to build it either with Buildroot itself (see -xref:build-toolchain-with-buildroot[]) or with -http://crosstool-ng.org[crosstool-NG]. - -Advantages of this backend: - -* Allows to use well-known and well-tested cross-compilation - toolchains. - -* Avoids the build time of the cross-compilation toolchain, which is - often very significant in the overall build time of an embedded - Linux system. - -Drawbacks of this backend: - -* If your pre-built external toolchain has a bug, may be hard to get a - fix from the toolchain vendor, unless you build your external - toolchain by yourself using Buildroot or Crosstool-NG. - -[[build-toolchain-with-buildroot]] -==== Build an external toolchain with Buildroot - -The Buildroot internal toolchain option can be used to create an -external toolchain. Here are a series of steps to build an internal -toolchain and package it up for reuse by Buildroot itself (or other -projects). - -Create a new Buildroot configuration, with the following details: - -* Select the appropriate *Target options* for your target CPU - architecture - -* In the *Toolchain* menu, keep the default of *Buildroot toolchain* - for *Toolchain type*, and configure your toolchain as desired - -* In the *System configuration* menu, select *None* as the *Init - system* and *none* as */bin/sh* - -* In the *Target packages* menu, disable *BusyBox* - -* In the *Filesystem images* menu, disable *tar the root filesystem* - -Then, we can trigger the build, and also ask Buildroot to generate a -SDK. This will conveniently generate for us a tarball which contains -our toolchain: - ------ -make sdk ------ - -This produces the SDK tarball in +$(O)/images+, with a name similar to -+arm-buildroot-linux-uclibcgnueabi_sdk-buildroot.tar.gz+. Save this -tarball, as it is now the toolchain that you can re-use as an external -toolchain in other Buildroot projects. - -In those other Buildroot projects, in the *Toolchain* menu: - -* Set *Toolchain type* to *External toolchain* - -* Set *Toolchain* to *Custom toolchain* - -* Set *Toolchain origin* to *Toolchain to be downloaded and installed* - -* Set *Toolchain URL* to +file:///path/to/your/sdk/tarball.tar.gz+ - -===== External toolchain wrapper - -When using an external toolchain, Buildroot generates a wrapper program, -that transparently passes the appropriate options (according to the -configuration) to the external toolchain programs. In case you need to -debug this wrapper to check exactly what arguments are passed, you can -set the environment variable +BR2_DEBUG_WRAPPER+ to either one of: - -* +0+, empty or not set: no debug - -* +1+: trace all arguments on a single line - -* +2+: trace one argument per line - -=== /dev management - -On a Linux system, the +/dev+ directory contains special files, called -_device files_, that allow userspace applications to access the -hardware devices managed by the Linux kernel. Without these _device -files_, your userspace applications would not be able to use the -hardware devices, even if they are properly recognized by the Linux -kernel. - -Under +System configuration+, +/dev management+, Buildroot offers four -different solutions to handle the +/dev+ directory : - - * The first solution is *Static using device table*. This is the old - classical way of handling device files in Linux. With this method, - the device files are persistently stored in the root filesystem - (i.e. they persist across reboots), and there is nothing that will - automatically create and remove those device files when hardware - devices are added or removed from the system. Buildroot therefore - creates a standard set of device files using a _device table_, the - default one being stored in +system/device_table_dev.txt+ in the - Buildroot source code. This file is processed when Buildroot - generates the final root filesystem image, and the _device files_ - are therefore not visible in the +output/target+ directory. The - +BR2_ROOTFS_STATIC_DEVICE_TABLE+ option allows to change the - default device table used by Buildroot, or to add an additional - device table, so that additional _device files_ are created by - Buildroot during the build. So, if you use this method, and a - _device file_ is missing in your system, you can for example create - a +board///device_table_dev.txt+ file - that contains the description of your additional _device files_, - and then you can set +BR2_ROOTFS_STATIC_DEVICE_TABLE+ to - +system/device_table_dev.txt - board///device_table_dev.txt+. For more - details about the format of the device table file, see - xref:makedev-syntax[]. - - * The second solution is *Dynamic using devtmpfs only*. _devtmpfs_ is - a virtual filesystem inside the Linux kernel that has been - introduced in kernel 2.6.32 (if you use an older kernel, it is not - possible to use this option). When mounted in +/dev+, this virtual - filesystem will automatically make _device files_ appear and - disappear as hardware devices are added and removed from the - system. This filesystem is not persistent across reboots: it is - filled dynamically by the kernel. Using _devtmpfs_ requires the - following kernel configuration options to be enabled: - +CONFIG_DEVTMPFS+ and +CONFIG_DEVTMPFS_MOUNT+. When Buildroot is in - charge of building the Linux kernel for your embedded device, it - makes sure that those two options are enabled. However, if you - build your Linux kernel outside of Buildroot, then it is your - responsibility to enable those two options (if you fail to do so, - your Buildroot system will not boot). - - * The third solution is *Dynamic using devtmpfs + mdev*. This method - also relies on the _devtmpfs_ virtual filesystem detailed above (so - the requirement to have +CONFIG_DEVTMPFS+ and - +CONFIG_DEVTMPFS_MOUNT+ enabled in the kernel configuration still - apply), but adds the +mdev+ userspace utility on top of it. +mdev+ - is a program part of BusyBox that the kernel will call every time a - device is added or removed. Thanks to the +/etc/mdev.conf+ - configuration file, +mdev+ can be configured to for example, set - specific permissions or ownership on a device file, call a script - or application whenever a device appears or disappear, - etc. Basically, it allows _userspace_ to react on device addition - and removal events. +mdev+ can for example be used to automatically - load kernel modules when devices appear on the system. +mdev+ is - also important if you have devices that require a firmware, as it - will be responsible for pushing the firmware contents to the - kernel. +mdev+ is a lightweight implementation (with fewer - features) of +udev+. For more details about +mdev+ and the syntax - of its configuration file, see - http://git.busybox.net/busybox/tree/docs/mdev.txt. - - * The fourth solution is *Dynamic using devtmpfs + eudev*. This - method also relies on the _devtmpfs_ virtual filesystem detailed - above, but adds the +eudev+ userspace daemon on top of it. +eudev+ - is a daemon that runs in the background, and gets called by the - kernel when a device gets added or removed from the system. It is a - more heavyweight solution than +mdev+, but provides higher - flexibility. +eudev+ is a standalone version of +udev+, the - original userspace daemon used in most desktop Linux distributions, - which is now part of Systemd. For more details, see - http://en.wikipedia.org/wiki/Udev. - -The Buildroot developers recommendation is to start with the *Dynamic -using devtmpfs only* solution, until you have the need for userspace -to be notified when devices are added/removed, or if firmwares are -needed, in which case *Dynamic using devtmpfs + mdev* is usually a -good solution. - -Note that if +systemd+ is chosen as init system, /dev management will -be performed by the +udev+ program provided by +systemd+. - -=== init system - -The _init_ program is the first userspace program started by the -kernel (it carries the PID number 1), and is responsible for starting -the userspace services and programs (for example: web server, -graphical applications, other network servers, etc.). - -Buildroot allows to use three different types of init systems, which -can be chosen from +System configuration+, +Init system+: - - * The first solution is *BusyBox*. Amongst many programs, BusyBox has - an implementation of a basic +init+ program, which is sufficient - for most embedded systems. Enabling the +BR2_INIT_BUSYBOX+ will - ensure BusyBox will build and install its +init+ program. This is - the default solution in Buildroot. The BusyBox +init+ program will - read the +/etc/inittab+ file at boot to know what to do. The syntax - of this file can be found in - http://git.busybox.net/busybox/tree/examples/inittab (note that - BusyBox +inittab+ syntax is special: do not use a random +inittab+ - documentation from the Internet to learn about BusyBox - +inittab+). The default +inittab+ in Buildroot is stored in - +system/skeleton/etc/inittab+. Apart from mounting a few important - filesystems, the main job the default inittab does is to start the - +/etc/init.d/rcS+ shell script, and start a +getty+ program (which - provides a login prompt). - - * The second solution is *systemV*. This solution uses the old - traditional _sysvinit_ program, packed in Buildroot in - +package/sysvinit+. This was the solution used in most desktop - Linux distributions, until they switched to more recent - alternatives such as Upstart or Systemd. +sysvinit+ also works with - an +inittab+ file (which has a slightly different syntax than the - one from BusyBox). The default +inittab+ installed with this init - solution is located in +package/sysvinit/inittab+. - - * The third solution is *systemd*. +systemd+ is the new generation - init system for Linux. It does far more than traditional _init_ - programs: aggressive parallelization capabilities, uses socket and - D-Bus activation for starting services, offers on-demand starting - of daemons, keeps track of processes using Linux control groups, - supports snapshotting and restoring of the system state, - etc. +systemd+ will be useful on relatively complex embedded - systems, for example the ones requiring D-Bus and services - communicating between each other. It is worth noting that +systemd+ - brings a fairly big number of large dependencies: +dbus+, +udev+ - and more. For more details about +systemd+, see - http://www.freedesktop.org/wiki/Software/systemd. - -The solution recommended by Buildroot developers is to use the -*BusyBox init* as it is sufficient for most embedded -systems. *systemd* can be used for more complex situations. + diff --git a/docs/manual/getting.txt b/docs/manual/getting.txt index 549938a223..7c44e128a6 100644 --- a/docs/manual/getting.txt +++ b/docs/manual/getting.txt @@ -1,4 +1,4 @@ -// -*- mode:doc; -*- + // -*- mode:doc; -*- // vim: set syntax=asciidoc: [[getting-buildroot]] diff --git a/docs/manual/introduction.txt b/docs/manual/introduction.txt index 476aa81edc..8d1c8b69c3 100644 --- a/docs/manual/introduction.txt +++ b/docs/manual/introduction.txt @@ -1,26 +1 @@ -// -*- mode:doc; -*- -// vim: set syntax=asciidoc: - -== About Buildroot - -Buildroot is a tool that simplifies and automates the process of -building a complete Linux system for an embedded system, using -cross-compilation. - -In order to achieve this, Buildroot is able to generate a -cross-compilation toolchain, a root filesystem, a Linux kernel image -and a bootloader for your target. Buildroot can be used for any -combination of these options, independently (you can for example use -an existing cross-compilation toolchain, and build only your root -filesystem with Buildroot). - -Buildroot is useful mainly for people working with embedded systems. -Embedded systems often use processors that are not the regular x86 -processors everyone is used to having in his PC. They can be PowerPC -processors, MIPS processors, ARM processors, etc. - -Buildroot supports numerous processors and their variants; it also -comes with default configurations for several boards available -off-the-shelf. Besides this, a number of third-party projects are based on, -or develop their BSP footnote:[BSP: Board Support Package] or -SDK footnote:[SDK: Software Development Kit] on top of Buildroot. + diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk index 1d03b213db..ccfd3156af 100644 --- a/docs/manual/manual.mk +++ b/docs/manual/manual.mk @@ -4,7 +4,7 @@ # ################################################################################ -MANUAL_SOURCES = $(sort $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)) +MANUAL_SOURCES = $(sort $(wildcard docs/manual/*.txt) $(wildcard docs/images/* )) MANUAL_RESOURCES = $(TOPDIR)/docs/images $(eval $(call asciidoc-document)) diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt index b76ab40d40..19ca0d0066 100644 --- a/docs/manual/manual.txt +++ b/docs/manual/manual.txt @@ -1,71 +1,60 @@ // -*- mode:doc; -*- // vim: set syntax=asciidoc: -= The Buildroot user manual += The ShredOS user and developer manual + +image::shred_db.png[] + :toc: -Buildroot {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {localdate} +ShredOS {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {localdate} {localtime} from git revision {sys:git rev-parse --short HEAD} -The Buildroot manual is written by the Buildroot developers. +---- +The ShredOS user and developer manual is written by the PartialVolume and the ShredOS developers. It is licensed under the GNU General Public License, version 2. Refer to the http://git.buildroot.org/buildroot/tree/COPYING?id={sys:git rev-parse HEAD}[COPYING] file in the Buildroot sources for the full text of this license. +---- -Copyright (C) 2004-2020 The Buildroot developers + + + +WARNING: Warning. + + + +Copyright (C) 2018-2021 PartialVolume and The ShredOS developers -image::logo.png[] = Getting started include::introduction.txt[] -include::prerequisite.txt[] +//include::prerequisite.txt[] -include::getting.txt[] +//include::getting.txt[] -include::quickstart.txt[] +//= User guide -include::resources.txt[] +//include::configure.txt[] -= User guide +//include::graphical_user_interface.txt[] -include::configure.txt[] +//include::known-issues.txt[] -include::configure-other-components.txt[] +//include::legal-notice.txt[] -include::common-usage.txt[] +//include::beyond-buildroot.txt[] -include::customize.txt[] +//= Developer guide -include::faq-troubleshooting.txt[] +//include::key_shredos_components.txt[] -include::known-issues.txt[] +//include::build_procedure.txt[] -include::legal-notice.txt[] +//include::contributing_to_the_shredos_manual.txt[] -include::beyond-buildroot.txt[] +//= Appendix -= Developer guide - -include::how-buildroot-works.txt[] - -include::writing-rules.txt[] - -include::adding-board-support.txt[] - -include::adding-packages.txt[] - -include::patch-policy.txt[] - -include::download-infra.txt[] - -include::debugging-buildroot.txt[] - -include::contribute.txt[] - -include::developers.txt[] - -= Appendix - -include::appendix.txt[] +//include::appendix.txt[] diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt index 4e614cfa1b..8d1c8b69c3 100644 --- a/docs/manual/prerequisite.txt +++ b/docs/manual/prerequisite.txt @@ -1,96 +1 @@ -// -*- mode:doc; -*- -// vim: set syntax=asciidoc: - -[[requirement]] -== System requirements - -Buildroot is designed to run on Linux systems. - -While Buildroot itself will build most host packages it needs for the -compilation, certain standard Linux utilities are expected to be -already installed on the host system. Below you will find an overview of -the mandatory and optional packages (note that package names may vary -between distributions). - -[[requirement-mandatory]] - -=== Mandatory packages - -* Build tools: - -** +which+ -** +sed+ -** +make+ (version 3.81 or any later) -** +binutils+ -** +build-essential+ (only for Debian based systems) -** +gcc+ (version 4.8 or any later) -** `g++` (version 4.8 or any later) -** +bash+ -** +patch+ -** +gzip+ -** +bzip2+ -** +perl+ (version 5.8.7 or any later) -** +tar+ -** +cpio+ -** +unzip+ -** +rsync+ -** +file+ (must be in +/usr/bin/file+) -** +bc+ - -* Source fetching tools: -** +wget+ - -[[requirement-optional]] - -=== Optional packages - -* Recommended dependencies: -+ -Some features or utilities in Buildroot, like the legal-info, or the -graph generation tools, have additional dependencies. Although they -are not mandatory for a simple build, they are still highly recommended: -+ -** +python+ (version 2.7 or any later) - -* Configuration interface dependencies: -+ -For these libraries, you need to install both runtime and development -data, which in many distributions are packaged separately. The -development packages typically have a _-dev_ or _-devel_ suffix. -+ -** +ncurses5+ to use the 'menuconfig' interface -** +qt5+ to use the 'xconfig' interface -** +glib2+, +gtk2+ and +glade2+ to use the 'gconfig' interface - -* Source fetching tools: -+ -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+ -(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: -+ -** +bazaar+ -** +cvs+ -** +git+ -** +mercurial+ -** +rsync+ -** +scp+ -** +subversion+ - -* Java-related packages, if the Java Classpath needs to be built for - the target system: -** The +javac+ compiler -** The +jar+ tool - -* Documentation generation tools: -** +asciidoc+, version 8.6.3 or higher -** +w3m+ -** +python+ with the +argparse+ module (automatically present in 2.7+ and 3.2+) -** +dblatex+ (required for the pdf manual only) - -* Graph generation tools: -** +graphviz+ to use 'graph-depends' and '-graph-depends' -** +python-matplotlib+ to use 'graph-build' + diff --git a/fs/common.mk b/fs/common.mk index 842ea924a5..afab7b50fb 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -36,12 +36,6 @@ ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) ROOTFS_FULL_DEVICES_TABLE = $(FS_DIR)/full_devices_table.txt ROOTFS_FULL_USERS_TABLE = $(FS_DIR)/full_users_table.txt -ifeq ($(BR2_REPRODUCIBLE),y) -define ROOTFS_REPRODUCIBLE - find $(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$(SOURCE_DATE_EPOCH) -endef -endif - ROOTFS_COMMON_NAME = rootfs-common ROOTFS_COMMON_TYPE = rootfs ROOTFS_COMMON_DEPENDENCIES = \ @@ -49,6 +43,22 @@ ROOTFS_COMMON_DEPENDENCIES = \ $(BR2_TAR_HOST_DEPENDENCY) \ $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) +ifeq ($(BR2_REPRODUCIBLE),y) +define ROOTFS_REPRODUCIBLE + find $(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$(SOURCE_DATE_EPOCH) +endef +endif + +ifeq ($(BR2_PACKAGE_REFPOLICY),y) +define ROOTFS_SELINUX + $(HOST_DIR)/sbin/setfiles -m -r $(TARGET_DIR) \ + -c $(TARGET_DIR)/etc/selinux/targeted/policy/policy.$(BR2_PACKAGE_LIBSEPOL_POLICY_VERSION) \ + $(TARGET_DIR)/etc/selinux/targeted/contexts/files/file_contexts \ + $(TARGET_DIR) +endef +ROOTFS_COMMON_DEPENDENCIES += host-policycoreutils +endif + ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES = $(sort \ $(if $(filter undefined,$(origin ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X)), \ $(eval ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X := \ @@ -144,6 +154,11 @@ ifeq ($(BR2_REPRODUCIBLE),) ROOTFS_$(2)_COMPRESS_CMD += -T $(PARALLEL_JOBS) endif endif +ifeq ($(BR2_TARGET_ROOTFS_$(2)_ZSTD),y) +ROOTFS_$(2)_DEPENDENCIES += host-zstd +ROOTFS_$(2)_COMPRESS_EXT = .zst +ROOTFS_$(2)_COMPRESS_CMD = zstd -19 -z -f -T$(PARALLEL_JOBS) +endif $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): ROOTFS=$(2) $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot @@ -163,15 +178,16 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) PATH=$$(BR_PATH) $$(TOPDIR)/support/scripts/mkusers $$(ROOTFS_FULL_USERS_TABLE) $$(TARGET_DIR) >> $$(FAKEROOT_SCRIPT) echo "$$(HOST_DIR)/bin/makedevs -d $$(ROOTFS_FULL_DEVICES_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) + $$(foreach hook,$$(ROOTFS_PRE_CMD_HOOKS),\ + $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \ echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) - $$(foreach hook,$$(ROOTFS_PRE_CMD_HOOKS),\ - $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) + $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) chmod a+x $$(FAKEROOT_SCRIPT) PATH=$$(BR_PATH) FAKEROOTDONTTRYCHOWN=1 $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT) diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in index 83a7fa5824..c1151a2881 100644 --- a/fs/cpio/Config.in +++ b/fs/cpio/Config.in @@ -51,6 +51,11 @@ config BR2_TARGET_ROOTFS_CPIO_XZ help Do compress the cpio filesystem with xz. +config BR2_TARGET_ROOTFS_CPIO_ZSTD + bool "zstd" + help + Do compress the cpio filesystem with zstd. + endchoice config BR2_TARGET_ROOTFS_CPIO_UIMAGE diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index 28a435dd5e..81f8c393d1 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -37,7 +37,11 @@ ROOTFS_CPIO_OPTS += --reproducible endif define ROOTFS_CPIO_CMD - cd $(TARGET_DIR) && find . | cpio $(ROOTFS_CPIO_OPTS) --quiet -o -H newc > $@ + cd $(TARGET_DIR) && \ + find . \ + | LC_ALL=C sort \ + | cpio $(ROOTFS_CPIO_OPTS) --quiet -o -H newc \ + > $@ endef ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y) diff --git a/fs/cpio/init b/fs/cpio/init index dbe09ac68e..f74ef7e15f 100755 --- a/fs/cpio/init +++ b/fs/cpio/init @@ -1,7 +1,15 @@ #!/bin/sh # devtmpfs does not get automounted for initramfs /bin/mount -t devtmpfs devtmpfs /dev -exec 0/dev/console -exec 2>/dev/console + +# use the /dev/console device node from devtmpfs if possible to not +# confuse glibc's ttyname_r(). +# This may fail (E.G. booted with console=), and errors from exec will +# terminate the shell, so use a subshell for the test +if (exec 0/dev/null; then + exec 0/dev/console + exec 2>/dev/console +fi + exec /sbin/init "$@" diff --git a/fs/erofs/Config.in b/fs/erofs/Config.in index d7360edeab..e112572688 100644 --- a/fs/erofs/Config.in +++ b/fs/erofs/Config.in @@ -11,4 +11,14 @@ config BR2_TARGET_ROOTFS_EROFS_LZ4HC help Use lz4 high-compression to compress data in the filesystem. +config BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE + int "pcluster size" + default 0 + help + Specify the maximum size of physical cluster in bytes, as a + multiple of 4KiB, for the big pcluster feature in order to + get much better compression ratios (thus better sequential + read performance for common storage devices), which has been + introduced since Linux 5.13. + endif # BR2_TARGET_ROOTFS_EROFS diff --git a/fs/erofs/erofs.mk b/fs/erofs/erofs.mk index 58559d4833..0e9d4401a9 100644 --- a/fs/erofs/erofs.mk +++ b/fs/erofs/erofs.mk @@ -10,6 +10,10 @@ ifeq ($(BR2_TARGET_ROOTFS_EROFS_LZ4HC),y) ROOTFS_EROFS_ARGS += -zlz4hc endif +ifneq ($(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE),0) +ROOTFS_EROFS_ARGS += -C$(strip $(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE)) +endif + define ROOTFS_EROFS_CMD $(HOST_DIR)/bin/mkfs.erofs $(ROOTFS_EROFS_ARGS) $@ $(TARGET_DIR) endef diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in index 74bacc1141..333ead95fe 100644 --- a/fs/ext2/Config.in +++ b/fs/ext2/Config.in @@ -43,6 +43,7 @@ config BR2_TARGET_ROOTFS_EXT2_REV config BR2_TARGET_ROOTFS_EXT2_LABEL string "filesystem label" + default "rootfs" config BR2_TARGET_ROOTFS_EXT2_SIZE string "exact size" diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk index 74c99bd7b1..5b5393f092 100644 --- a/fs/ext2/ext2.mk +++ b/fs/ext2/ext2.mk @@ -4,32 +4,32 @@ # ################################################################################ -EXT2_SIZE = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_SIZE)) -ifeq ($(BR2_TARGET_ROOTFS_EXT2)-$(EXT2_SIZE),y-) +ROOTFS_EXT2_SIZE = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_SIZE)) +ifeq ($(BR2_TARGET_ROOTFS_EXT2)-$(ROOTFS_EXT2_SIZE),y-) $(error BR2_TARGET_ROOTFS_EXT2_SIZE cannot be empty) endif -EXT2_MKFS_OPTS = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS)) +ROOTFS_EXT2_MKFS_OPTS = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS)) # qstrip results in stripping consecutive spaces into a single one. So the # variable is not qstrip-ed to preserve the integrity of the string value. -EXT2_LABEL = $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL)) +ROOTFS_EXT2_LABEL = $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL)) #" Syntax highlighting... :-/ ) -EXT2_OPTS = \ +ROOTFS_EXT2_OPTS = \ -d $(TARGET_DIR) \ -r $(BR2_TARGET_ROOTFS_EXT2_REV) \ -N $(BR2_TARGET_ROOTFS_EXT2_INODES) \ -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) \ - -L "$(EXT2_LABEL)" \ - $(EXT2_MKFS_OPTS) + -L "$(ROOTFS_EXT2_LABEL)" \ + $(ROOTFS_EXT2_MKFS_OPTS) ROOTFS_EXT2_DEPENDENCIES = host-e2fsprogs define ROOTFS_EXT2_CMD rm -f $@ - $(HOST_DIR)/sbin/mkfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN) $(EXT2_OPTS) $@ \ - "$(EXT2_SIZE)" \ + $(HOST_DIR)/sbin/mkfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN) $(ROOTFS_EXT2_OPTS) $@ \ + "$(ROOTFS_EXT2_SIZE)" \ || { ret=$$?; \ echo "*** Maybe you need to increase the filesystem size (BR2_TARGET_ROOTFS_EXT2_SIZE)" 1>&2; \ exit $$ret; \ diff --git a/fs/jffs2/jffs2.mk b/fs/jffs2/jffs2.mk index 2adbc2320e..0096af2ea9 100644 --- a/fs/jffs2/jffs2.mk +++ b/fs/jffs2/jffs2.mk @@ -4,7 +4,7 @@ # ################################################################################ -JFFS2_OPTS = -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) +JFFS2_OPTS = -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) --with-xattr SUMTOOL_OPTS = -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) ifeq ($(BR2_TARGET_ROOTFS_JFFS2_PAD),y) diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in index dde2097cb7..70d4a20cf0 100644 --- a/fs/squashfs/Config.in +++ b/fs/squashfs/Config.in @@ -5,6 +5,13 @@ config BR2_TARGET_ROOTFS_SQUASHFS if BR2_TARGET_ROOTFS_SQUASHFS +config BR2_TARGET_ROOTFS_SQUASHFS_PAD + bool "pad to a 4K boundary" + default y # legacy was always ON + help + Say 'y' here (the default) to pad the the filesystem image + to a 4K boundary. Say 'n' to disable padding. + choice prompt "Compression algorithm" default BR2_TARGET_ROOTFS_SQUASHFS4_GZIP @@ -31,4 +38,5 @@ config BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD bool "zstd" endchoice + endif diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk index 34ab048603..7a5e3e313e 100644 --- a/fs/squashfs/squashfs.mk +++ b/fs/squashfs/squashfs.mk @@ -8,6 +8,10 @@ ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs ROOTFS_SQUASHFS_ARGS = -noappend -processors $(PARALLEL_JOBS) +ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_PAD),) +ROOTFS_SQUASHFS_ARGS += -nopad +endif + ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y) ROOTFS_SQUASHFS_ARGS += -comp lz4 -Xhc else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y) diff --git a/fs/ubi/Config.in b/fs/ubi/Config.in index 85b1c56bb0..3427ea0518 100644 --- a/fs/ubi/Config.in +++ b/fs/ubi/Config.in @@ -38,6 +38,11 @@ config BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG So the volume defined for the root filesystem can specify the image path as: image=BR2_ROOTFS_UBIFS_PATH + Buildroot also replaces the string "BINARIES_DIR" with the + value of $(BINARIES_DIR), so that it is possible to reference + other build artefacts (e.g. to include the kernel in a UBI + volume). + config BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE string "Configuration file path" depends on BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG diff --git a/fs/ubi/ubi.mk b/fs/ubi/ubi.mk index d848f8b23a..54bb81ea08 100644 --- a/fs/ubi/ubi.mk +++ b/fs/ubi/ubi.mk @@ -23,7 +23,7 @@ endif # don't use sed -i as it misbehaves on systems with SELinux enabled when this is # executed through fakeroot (see #9386) define ROOTFS_UBI_CMD - sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \ + sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;;s;BINARIES_DIR;$(BINARIES_DIR);' \ $(UBI_UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg $(HOST_DIR)/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg rm $(BUILD_DIR)/ubinize.cfg diff --git a/linux/Config.in b/linux/Config.in index d11707b32f..078ef56cc4 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -2,6 +2,7 @@ menu "Kernel" config BR2_LINUX_KERNEL bool "Linux Kernel" + select BR2_PACKAGE_HOST_KMOD # Unconditional, even if modules not enabled select BR2_PACKAGE_HOST_IMAGEMAGICK if BR2_LINUX_KERNEL_CUSTOM_LOGO_PATH != "" help Enable this option if you want to build a Linux kernel for @@ -27,10 +28,10 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (5.6)" + bool "Latest version (5.13)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (4.19.98-cip19)" + bool "Latest CIP SLTS version (4.19.198-cip54)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -43,13 +44,13 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION implementation of software building blocks that meet these requirements. - The CIP community plans to maintain 4.4 for security and + The CIP community plans to maintain 4.19 for security and bug fixes for more than 10 years. https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (4.19.98-cip19-rt7)" + bool "Latest CIP RT SLTS version (4.19.198-cip54-rt21)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -113,13 +114,9 @@ if BR2_LINUX_KERNEL_CUSTOM_GIT || BR2_LINUX_KERNEL_CUSTOM_HG || BR2_LINUX_KERNEL config BR2_LINUX_KERNEL_CUSTOM_REPO_URL string "URL of custom repository" - default BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL \ - if BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL != "" # legacy config BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION string "Custom repository version" - default BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION \ - if BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION != "" # legacy help Revision to use in the typical format used by Git/Mercurial/Subversion E.G. a sha id, a tag, branch, .. @@ -128,9 +125,9 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.6.3" if BR2_LINUX_KERNEL_LATEST_VERSION - default "4.19.98-cip19" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "4.19.98-cip19-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.13.19" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL @@ -230,7 +227,7 @@ config BR2_LINUX_KERNEL_APPENDED_UIMAGE config BR2_LINUX_KERNEL_BZIMAGE bool "bzImage" - depends on BR2_i386 || BR2_x86_64 + depends on BR2_i386 || BR2_x86_64 || BR2_s390x config BR2_LINUX_KERNEL_ZIMAGE bool "zImage" @@ -266,6 +263,10 @@ config BR2_LINUX_KERNEL_IMAGE bool "Image" depends on BR2_aarch64 || BR2_riscv +config BR2_LINUX_KERNEL_IMAGEGZ + bool "Image.gz" + depends on BR2_aarch64 || BR2_riscv + config BR2_LINUX_KERNEL_LINUX_BIN bool "linux.bin" depends on BR2_microblaze @@ -325,6 +326,13 @@ config BR2_LINUX_KERNEL_LZO config BR2_LINUX_KERNEL_XZ bool "xz compression" +config BR2_LINUX_KERNEL_ZSTD + bool "zstd compression" + +config BR2_LINUX_KERNEL_UNCOMPRESSED + bool "uncompressed" + depends on BR2_s390x + endchoice config BR2_LINUX_KERNEL_IMAGE_TARGET_NAME @@ -407,6 +415,13 @@ config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH You can provide a list of dts paths to copy and build, separated by spaces. +config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME + bool "Keep the directory name of the Device Tree" + help + If enabled, the device tree blobs keep their + directory prefixes when they get copied to the + output image directory or the target directory. + config BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT bool "Build Device Tree with overlay support" help diff --git a/linux/linux.hash b/linux/linux.hash index 5ffd1ee003..42474e62ea 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,17 +1,19 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 1d13689abbcab59250a8231a5871747be25a1d2fe431cf263395de35780c50aa linux-5.6.3.tar.xz -sha256 85fb308a8a204e4913e078d50ac94dad05a6aca9cacfe5d6b6fbfbb903f70708 linux-5.5.16.tar.xz -sha256 a11083f8f809887f6a0f8d4467532385b99418f17998fe6e837807491c276eeb linux-5.4.31.tar.xz +sha256 e877ec724e917c967603225c7e5dc21b6e0f34998c7d086cab8c50324363ab7b linux-5.13.19.tar.xz +sha256 e9381cd3525a02f5b895f74147e2440be443ecd45484c6c64075046bc6f94c73 linux-5.12.19.tar.xz +sha256 11027c6114eb916edbcc37897226fb6263b2931911d2d5093550473ce1a57600 linux-5.11.22.tar.xz +sha256 d3b64edfc1dd7212e62ed733aeeb73d64ffd6d9658d322d44cddf1b41d5b8fc3 linux-5.10.77.tar.xz +sha256 9f3fbbbcb3c8a53e1cbed9ae6b06991ba618c1deeaef0a125ba9e82d8414864a linux-5.4.157.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 ea68cb8e9fa255bb1d0402c5aa8f26984f9b1c8607ff3bed5d3284109167f063 linux-4.4.218.tar.xz -sha256 df3a6e615ec4c57b04775e9c018c67045223ac662e696d28fd37baa5114349cd linux-4.9.218.tar.xz -sha256 cb440ac5d20071dcb482e5062958514064b0c5a8375c92653062ea201ae0222c linux-4.14.175.tar.xz -sha256 1e40a0dc6afc95a259f97b80d5f5ef8f89e2ee49e993ba6844e2bc55de361f0e linux-4.19.114.tar.xz +sha256 70a7f59ab5755d746dd35d5bc09fe122348f15986d21283fb7a81105c7de6b51 linux-4.4.291.tar.xz +sha256 a5c2d0fdd5b34aca1fb2d7bdce48a6a5a0fa85ad926e6d6d74df17fe30397fa6 linux-4.9.289.tar.xz +sha256 dfd95c1bc3af5b0e57e53608f8356037510b19cb55cac520e43c3d499ea60d46 linux-4.14.254.tar.xz +sha256 9e2064f9cb942999a76737d510f08a85bcd8164e9762ce0f7dbfeac58bc2f2b3 linux-4.19.215.tar.xz # Locally computed -sha256 18f9ddba0b777d1942d6c81877ba97c4bcd08488e2c409e57dcce866b9de5fc2 linux-cip-4.19.98-cip19.tar.gz -sha256 7d5aeb67da41dc66ef28621ef994ef4403e8b1f5c3df38b1843da20972444280 linux-cip-4.19.98-cip19-rt7.tar.gz +sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz +sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz # Licenses hashes -sha256 ee5808b032a67f587d3541099d46de34f5bec8cd5976114ba07f1299ee6001ff COPYING +sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/preferred/GPL-2.0 sha256 8e378ab93586eb55135d3bc119cce787f7324f48394777d00c34fa3d0be3303f LICENSES/exceptions/Linux-syscall-note diff --git a/linux/linux.mk b/linux/linux.mk index 3d9052a337..61fdc0c76c 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -12,13 +12,9 @@ LINUX_LICENSE_FILES = \ LICENSES/preferred/GPL-2.0 \ LICENSES/exceptions/Linux-syscall-note endif - -define LINUX_HELP_CMDS - @echo ' linux-menuconfig - Run Linux kernel menuconfig' - @echo ' linux-savedefconfig - Run Linux kernel savedefconfig' - @echo ' linux-update-defconfig - Save the Linux configuration to the path specified' - @echo ' by BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE' -endef +LINUX_CPE_ID_VENDOR = linux +LINUX_CPE_ID_PRODUCT = linux_kernel +LINUX_CPE_ID_PREFIX = cpe:2.3:o # Compute LINUX_SOURCE and LINUX_SITE from the configuration ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) @@ -75,7 +71,8 @@ LINUX_MAKE_ENV = \ LINUX_INSTALL_IMAGES = YES LINUX_DEPENDENCIES = host-kmod \ - $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) + $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \ + $(if $(BR2_PACKAGE_LINUX_FIRMWARE),linux-firmware) # Starting with 4.16, the generated kconfig paser code is no longer # shipped with the kernel sources, so we need flex and bison, but @@ -98,12 +95,16 @@ else ifeq ($(BR2_LINUX_KERNEL_LZO),y) LINUX_DEPENDENCIES += host-lzop else ifeq ($(BR2_LINUX_KERNEL_XZ),y) LINUX_DEPENDENCIES += host-xz +else ifeq ($(BR2_LINUX_KERNEL_ZSTD),y) +LINUX_DEPENDENCIES += host-zstd endif LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_GZIP) += CONFIG_KERNEL_GZIP LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZ4) += CONFIG_KERNEL_LZ4 LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZMA) += CONFIG_KERNEL_LZMA LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZO) += CONFIG_KERNEL_LZO LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_XZ) += CONFIG_KERNEL_XZ +LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_ZSTD) += CONFIG_KERNEL_ZSTD +LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_UNCOMPRESSED) += CONFIG_KERNEL_UNCOMPRESSED ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL),y) LINUX_DEPENDENCIES += host-openssl @@ -160,7 +161,8 @@ endif # Get the real Linux version, which tells us where kernel modules are # going to be installed in the target filesystem. -LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` +# Filter out 'w' from MAKEFLAGS, to workaround a bug in make 4.1 (#13141) +LINUX_VERSION_PROBED = `MAKEFLAGS='$(filter-out w,$(MAKEFLAGS))' $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) @@ -197,6 +199,8 @@ else ifeq ($(BR2_LINUX_KERNEL_SIMPLEIMAGE),y) LINUX_IMAGE_NAME = simpleImage.$(firstword $(LINUX_DTS_NAME)) else ifeq ($(BR2_LINUX_KERNEL_IMAGE),y) LINUX_IMAGE_NAME = Image +else ifeq ($(BR2_LINUX_KERNEL_IMAGEGZ),y) +LINUX_IMAGE_NAME = Image.gz else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y) LINUX_IMAGE_NAME = linux.bin else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y) @@ -304,40 +308,40 @@ LINUX_NEEDS_MODULES ?= $(BR2_LINUX_NEEDS_MODULES) # option will be thrown away and ignored if it doesn't exist. ifeq ($(BR2_ENDIAN),"BIG") define LINUX_FIXUP_CONFIG_ENDIANNESS - $(call KCONFIG_ENABLE_OPT,CONFIG_CPU_BIG_ENDIAN,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_CPU_BIG_ENDIAN) endef else define LINUX_FIXUP_CONFIG_ENDIANNESS - $(call KCONFIG_ENABLE_OPT,CONFIG_CPU_LITTLE_ENDIAN,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_CPU_LITTLE_ENDIAN) endef endif define LINUX_KCONFIG_FIXUP_CMDS $(if $(LINUX_NEEDS_MODULES), - $(call KCONFIG_ENABLE_OPT,CONFIG_MODULES,$(@D)/.config)) - $(call KCONFIG_ENABLE_OPT,$(strip $(LINUX_COMPRESSION_OPT_y)),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_MODULES)) + $(call KCONFIG_ENABLE_OPT,$(strip $(LINUX_COMPRESSION_OPT_y))) $(foreach opt, $(LINUX_COMPRESSION_OPT_), - $(call KCONFIG_DISABLE_OPT,$(opt),$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,$(opt)) ) $(LINUX_FIXUP_CONFIG_ENDIANNESS) $(if $(BR2_arm)$(BR2_armeb), - $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI)) $(if $(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le), - $(call KCONFIG_ENABLE_OPT,CONFIG_PPC_DISABLE_WERROR,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_PPC_DISABLE_WERROR)) $(if $(BR2_ARC_PAGE_SIZE_4K), - $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K)) $(if $(BR2_ARC_PAGE_SIZE_8K), - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K,$(@D)/.config)) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K)) $(if $(BR2_ARC_PAGE_SIZE_16K), - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K,$(@D)/.config)) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K)) $(if $(BR2_TARGET_ROOTFS_CPIO), - $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD)) # As the kernel gets compiled before root filesystems are # built, we create a fake cpio file. It'll be # replaced later by the real cpio archive, and the kernel will be @@ -345,77 +349,24 @@ define LINUX_KCONFIG_FIXUP_CMDS $(if $(BR2_TARGET_ROOTFS_INITRAMFS), mkdir -p $(BINARIES_DIR) touch $(BINARIES_DIR)/rootfs.cpio - $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,"$${BR_BINARIES_DIR}/rootfs.cpio",$(@D)/.config) - $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config) - $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)) + $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,"$${BR_BINARIES_DIR}/rootfs.cpio") + $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0) + $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0)) $(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),, - $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS) + $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT)) $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV), - $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER)) $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV), - $(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config)) - $(if $(BR2_PACKAGE_AUDIT), - $(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT,$(@D)/.config)) - $(if $(BR2_PACKAGE_INTEL_MICROCODE), - $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL,$(@D)/.config)) - $(if $(BR2_PACKAGE_KTAP), - $(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_FUNCTION_TRACER,$(@D)/.config)) - $(if $(BR2_PACKAGE_LINUX_TOOLS_PERF), - $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS,$(@D)/.config)) - $(if $(BR2_PACKAGE_PCM_TOOLS), - $(call KCONFIG_ENABLE_OPT,CONFIG_X86_MSR,$(@D)/.config)) - $(if $(BR2_PACKAGE_SYSTEMD), - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR,$(@D)/.config)) - $(if $(BR2_PACKAGE_SMACK), - $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SMACK,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK,$(@D)/.config)) - $(if $(BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER), - $(call KCONFIG_ENABLE_OPT,CONFIG_CMA,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA,$(@D)/.config)) - $(if $(BR2_PACKAGE_IPTABLES), - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES,$(@D)/.config)) - $(if $(BR2_PACKAGE_XTABLES_ADDONS), - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NF_NAT,$(@D)/.config)) - $(if $(BR2_PACKAGE_WIREGUARD_LINUX_COMPAT), - $(call KCONFIG_ENABLE_OPT,CONFIG_INET,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NET_FOU,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_MANAGER,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET)) $(if $(BR2_LINUX_KERNEL_APPENDED_DTB), - $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB,$(@D)/.config)) - $(if $(BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV), - $(call KCONFIG_DISABLE_OPT,CONFIG_MXC_GPU_VIV,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB)) $(if $(LINUX_KERNEL_CUSTOM_LOGO_PATH), - $(call KCONFIG_ENABLE_OPT,CONFIG_FB,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224,$(@D)/.config)) - $(if $(BR2_PACKAGE_LIBSELINUX), - $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_SECURITY_SELINUX,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_INET,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SELINUX,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_FB) + $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO) + $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224)) + $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS) + $(PACKAGES_LINUX_CONFIG_FIXUPS) endef ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y) @@ -431,10 +382,11 @@ endef ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),) define LINUX_INSTALL_DTB # dtbs moved from arch//boot to arch//boot/dts since 3.8-rc1 - cp $(addprefix \ - $(LINUX_ARCH_PATH)/boot/$(if $(wildcard \ - $(addprefix $(LINUX_ARCH_PATH)/boot/dts/,$(LINUX_DTBS))),dts/),$(LINUX_DTBS)) \ - $(1) + $(foreach dtb,$(LINUX_DTBS), \ + install -D \ + $(or $(wildcard $(LINUX_ARCH_PATH)/boot/dts/$(dtb)),$(LINUX_ARCH_PATH)/boot/$(dtb)) \ + $(1)/$(if $(BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME),$(dtb),$(notdir $(dtb))) + ) endef endif # BR2_LINUX_KERNEL_APPENDED_DTB endif # BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT @@ -475,7 +427,10 @@ endif # '$(LINUX_TARGET_NAME)' targets separately because calling them in # the same $(MAKE) invocation has shown to cause parallel build # issues. +# The call to disable gcc-plugins is a stop-gap measure: +# http://lists.busybox.net/pipermail/buildroot/2020-May/282727.html define LINUX_BUILD_CMDS + $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS) $(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \ cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/ ) @@ -539,7 +494,8 @@ endef # Run depmod in a target-finalize hook, to encompass modules installed by # packages. define LINUX_RUN_DEPMOD - if grep -q "CONFIG_MODULES=y" $(LINUX_DIR)/.config; then \ + if test -d $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED) \ + && grep -q "CONFIG_MODULES=y" $(LINUX_DIR)/.config; then \ $(HOST_DIR)/sbin/depmod -a -b $(TARGET_DIR) $(LINUX_VERSION_PROBED); \ fi endef diff --git a/package/18xx-ti-utils/18xx-ti-utils.hash b/package/18xx-ti-utils/18xx-ti-utils.hash index faa23d0b3e..7ecca54b9b 100644 --- a/package/18xx-ti-utils/18xx-ti-utils.hash +++ b/package/18xx-ti-utils/18xx-ti-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9ce2c7228dd0ac8d3cc530a32bb92b532bdbc5dfb6a405c245abee678d878697 18xx-ti-utils-R8.7_SP3.tar.gz -sha256 363cef40b276a7a91ebcff3f78626d9cfe5e5a51927c725236007259403d5fc4 COPYING +sha256 ce0185ba8a9bf456cc94a798bf66903775065e337e53ff812f18a6d88f5bac13 18xx-ti-utils-R8.8.tar.xz +sha256 363cef40b276a7a91ebcff3f78626d9cfe5e5a51927c725236007259403d5fc4 COPYING diff --git a/package/18xx-ti-utils/18xx-ti-utils.mk b/package/18xx-ti-utils/18xx-ti-utils.mk index d1f0388c3a..5d45191cde 100644 --- a/package/18xx-ti-utils/18xx-ti-utils.mk +++ b/package/18xx-ti-utils/18xx-ti-utils.mk @@ -4,8 +4,9 @@ # ################################################################################ -18XX_TI_UTILS_VERSION = R8.7_SP3 -18XX_TI_UTILS_SITE = git://git.ti.com/wilink8-wlan/18xx-ti-utils +18XX_TI_UTILS_VERSION = 8.8 +18XX_TI_UTILS_SITE = https://git.ti.com/cgit/wilink8-wlan/18xx-ti-utils/snapshot +18XX_TI_UTILS_SOURCE = 18xx-ti-utils-R$(18XX_TI_UTILS_VERSION).tar.xz 18XX_TI_UTILS_DEPENDENCIES = libnl 18XX_TI_UTILS_LICENSE = BSD-3-Clause 18XX_TI_UTILS_LICENSE_FILES = COPYING @@ -21,10 +22,14 @@ define 18XX_TI_UTILS_BUILD_CMDS NFSROOT="$(STAGING_DIR)" NLVER=3 $(MAKE) -C $(@D) \ CFLAGS="$(TARGET_CFLAGS) $(18XX_TI_UTILS_CFLAGS)" \ $(18XX_TI_UTILS_BUILD_TARGET) + + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/wlconf \ + $(HOST_CONFIGURE_OPTS) endef define 18XX_TI_UTILS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/calibrator $(TARGET_DIR)/usr/bin/calibrator + $(INSTALL) -m 0755 $(@D)/wlconf/wlconf $(HOST_DIR)/bin/wlconf endef $(eval $(generic-package)) diff --git a/package/Config.in b/package/Config.in index ba759d594d..dcbdf62819 100644 --- a/package/Config.in +++ b/package/Config.in @@ -13,7 +13,6 @@ menu "Audio and video applications" source "package/alsa-utils/Config.in" source "package/atest/Config.in" source "package/aumix/Config.in" - source "package/bellagio/Config.in" source "package/bluez-alsa/Config.in" source "package/dvblast/Config.in" source "package/dvdauthor/Config.in" @@ -70,7 +69,6 @@ menu "Compressors and decompressors" source "package/bzip2/Config.in" source "package/gzip/Config.in" source "package/lrzip/Config.in" - source "package/lz4/Config.in" source "package/lzip/Config.in" source "package/lzop/Config.in" source "package/p7zip/Config.in" @@ -84,11 +82,15 @@ menu "Compressors and decompressors" endmenu menu "Debugging, profiling and benchmark" + source "package/babeltrace2/Config.in" source "package/blktrace/Config.in" source "package/bonnie/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" + source "package/coremark/Config.in" + source "package/coremark-pro/Config.in" source "package/dacapo/Config.in" + source "package/delve/Config.in" source "package/dhrystone/Config.in" source "package/dieharder/Config.in" source "package/dmalloc/Config.in" @@ -108,6 +110,7 @@ menu "Debugging, profiling and benchmark" source "package/kvm-unit-tests/Config.in" source "package/kyua/Config.in" source "package/latencytop/Config.in" + source "package/libbpf/Config.in" source "package/lmbench/Config.in" source "package/lsof/Config.in" source "package/ltp-testsuite/Config.in" @@ -124,12 +127,15 @@ menu "Debugging, profiling and benchmark" source "package/pax-utils/Config.in" source "package/pcm-tools/Config.in" source "package/piglit/Config.in" + source "package/ply/Config.in" + source "package/poke/Config.in" source "package/ptm2human/Config.in" source "package/pv/Config.in" source "package/racehound/Config.in" source "package/ramsmp/Config.in" source "package/ramspeed/Config.in" source "package/rt-tests/Config.in" + source "package/sentry-native/Config.in" source "package/spidev_test/Config.in" source "package/strace/Config.in" source "package/stress/Config.in" @@ -141,6 +147,7 @@ menu "Debugging, profiling and benchmark" source "package/trace-cmd/Config.in" source "package/trinity/Config.in" source "package/uclibc-ng-test/Config.in" + source "package/uftrace/Config.in" source "package/valgrind/Config.in" source "package/vmtouch/Config.in" source "package/whetstone/Config.in" @@ -149,11 +156,13 @@ endmenu menu "Development tools" source "package/bats-core/Config.in" source "package/binutils/Config.in" + source "package/bitwise/Config.in" source "package/bsdiff/Config.in" source "package/bustle/Config.in" source "package/check/Config.in" source "package/cmake/Config.in" source "package/cppunit/Config.in" + source "package/cukinia/Config.in" source "package/cunit/Config.in" source "package/cvs/Config.in" source "package/cxxtest/Config.in" @@ -173,6 +182,7 @@ menu "Development tools" source "package/jq/Config.in" source "package/libtool/Config.in" source "package/make/Config.in" + source "package/mawk/Config.in" source "package/patch/Config.in" source "package/pkgconf/Config.in" source "package/ripgrep/Config.in" @@ -187,6 +197,7 @@ menu "Filesystem and flash utilities" source "package/aufs/Config.in" source "package/aufs-util/Config.in" source "package/autofs/Config.in" + source "package/bmap-tools/Config.in" source "package/btrfs-progs/Config.in" source "package/cifs-utils/Config.in" source "package/cpio/Config.in" @@ -200,9 +211,11 @@ menu "Filesystem and flash utilities" source "package/erofs-utils/Config.in" source "package/exfat/Config.in" source "package/exfat-utils/Config.in" + source "package/exfatprogs/Config.in" source "package/f2fs-tools/Config.in" source "package/flashbench/Config.in" source "package/fscryptctl/Config.in" + source "package/fuse-overlayfs/Config.in" source "package/fwup/Config.in" source "package/genext2fs/Config.in" source "package/genpart/Config.in" @@ -221,6 +234,7 @@ menu "Filesystem and flash utilities" source "package/udftools/Config.in" source "package/unionfs/Config.in" source "package/xfsprogs/Config.in" + source "package/zfs/Config.in" endmenu menu "Fonts, cursors, icons, sounds and themes" @@ -237,6 +251,7 @@ comment "Fonts" source "package/ghostscript-fonts/Config.in" source "package/inconsolata/Config.in" source "package/liberation/Config.in" + source "package/wqy-zenhei/Config.in" comment "Icons" source "package/adwaita-icon-theme/Config.in" @@ -258,6 +273,7 @@ menu "Games" source "package/doom-wad/Config.in" source "package/flare-engine/Config.in" source "package/flare-game/Config.in" + source "package/frotz/Config.in" source "package/gnuchess/Config.in" source "package/lbreakout2/Config.in" source "package/ltris/Config.in" @@ -273,11 +289,13 @@ menu "Games" source "package/stella/Config.in" source "package/supertux/Config.in" source "package/supertuxkart/Config.in" + source "package/xorcurses/Config.in" endmenu menu "Graphic libraries and applications (graphic/text)" comment "Graphic applications" + source "package/cage/Config.in" source "package/cog/Config.in" source "package/fswebcam/Config.in" source "package/ghostscript/Config.in" @@ -307,6 +325,7 @@ comment "Graphic libraries" source "package/fbterm/Config.in" source "package/fbv/Config.in" source "package/freerdp/Config.in" + source "package/graphicsmagick/Config.in" source "package/imagemagick/Config.in" source "package/linux-fusion/Config.in" source "package/lite/Config.in" @@ -344,7 +363,6 @@ comment "QT libraries and helper libraries" endif source "package/tekui/Config.in" source "package/weston/Config.in" - source "package/weston-imx/Config.in" source "package/x11r7/Config.in" comment "X applications" @@ -356,10 +374,10 @@ comment "X applications" source "package/docker/Config.in" source "package/feh/Config.in" source "package/gmpc/Config.in" - source "package/gqview/Config.in" source "package/gtkperf/Config.in" source "package/leafpad/Config.in" source "package/midori/Config.in" + source "package/mupdf/Config.in" source "package/nodm/Config.in" source "package/pcmanfm/Config.in" source "package/qt-webkit-kiosk/Config.in" @@ -398,6 +416,9 @@ menu "Firmware" source "package/b43-firmware/Config.in" source "package/linux-firmware/Config.in" source "package/murata-cyw-fw/Config.in" + source "package/odroidc2-firmware/Config.in" + source "package/qcom-db410c-firmware/Config.in" + source "package/rcw-smarc-sal28/Config.in" source "package/rpi-bt-firmware/Config.in" source "package/rpi-firmware/Config.in" source "package/rpi-wifi-firmware/Config.in" @@ -414,8 +435,9 @@ endmenu source "package/acpid/Config.in" source "package/acpitool/Config.in" source "package/aer-inject/Config.in" + source "package/altera-stapl/Config.in" source "package/am335x-pru-package/Config.in" - source "package/amd-catalyst/Config.in" + source "package/apcupsd/Config.in" source "package/avrdude/Config.in" source "package/bcache-tools/Config.in" source "package/biosdevname/Config.in" @@ -443,6 +465,7 @@ endmenu source "package/dvb-apps/Config.in" source "package/dvbsnoop/Config.in" source "package/edid-decode/Config.in" + source "package/edk2-platforms/Config.in" source "package/eudev/Config.in" source "package/ev3dev-linux-drivers/Config.in" source "package/evemu/Config.in" @@ -466,13 +489,13 @@ endmenu source "package/i7z/Config.in" source "package/input-event-daemon/Config.in" source "package/intel-microcode/Config.in" - source "package/iostat/Config.in" source "package/ipmitool/Config.in" source "package/ipmiutil/Config.in" source "package/irda-utils/Config.in" source "package/iucode-tool/Config.in" source "package/kbd/Config.in" source "package/lcdproc/Config.in" + source "package/libiec61850/Config.in" source "package/libubootenv/Config.in" source "package/libuio/Config.in" source "package/linux-backports/Config.in" @@ -486,6 +509,7 @@ endmenu source "package/luksmeta/Config.in" source "package/lvm2/Config.in" source "package/mali-t76x/Config.in" + source "package/mbpfan/Config.in" source "package/mdadm/Config.in" source "package/mdevd/Config.in" source "package/memtest86/Config.in" @@ -496,7 +520,7 @@ endmenu source "package/nanocom/Config.in" source "package/neard/Config.in" source "package/nvidia-driver/Config.in" - source "package/nvidia-tegra23/Config.in" + source "package/nvidia-modprobe/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" source "package/on2-8170-modules/Config.in" @@ -526,6 +550,7 @@ endmenu source "package/rtl8189fs/Config.in" source "package/rtl8723bs/Config.in" source "package/rtl8723bu/Config.in" + source "package/rtl8812au-aircrack-ng/Config.in" source "package/rtl8821au/Config.in" source "package/sane-backends/Config.in" source "package/sdparm/Config.in" @@ -548,7 +573,6 @@ endmenu source "package/ti-gfx/Config.in" source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" - source "package/ti-sgx-libgbm/Config.in" source "package/ti-sgx-um/Config.in" source "package/ti-uim/Config.in" source "package/ti-utils/Config.in" @@ -565,6 +589,7 @@ endmenu source "package/upower/Config.in" source "package/usb_modeswitch/Config.in" source "package/usb_modeswitch_data/Config.in" + source "package/usbguard/Config.in" source "package/usbmount/Config.in" source "package/usbutils/Config.in" source "package/w_scan/Config.in" @@ -609,6 +634,7 @@ endif source "package/gauche/Config.in" source "package/guile/Config.in" source "package/haserl/Config.in" + source "package/janet/Config.in" source "package/jimtcl/Config.in" source "package/lua/Config.in" source "package/luainterpreter/Config.in" @@ -655,6 +681,7 @@ menu "Lua libraries/modules" source "package/lua-livr-extra/Config.in" source "package/lua-lpeg-patterns/Config.in" source "package/lua-lunitx/Config.in" + source "package/lua-lunix/Config.in" source "package/lua-lyaml/Config.in" source "package/lua-markdown/Config.in" source "package/lua-messagepack/Config.in" @@ -671,6 +698,7 @@ menu "Lua libraries/modules" source "package/lua-testmore/Config.in" source "package/lua-utf8/Config.in" source "package/lua-valua/Config.in" + source "package/lua-zlib/Config.in" source "package/luabitop/Config.in" source "package/luadbi/Config.in" source "package/luadbi-sqlite3/Config.in" @@ -678,6 +706,7 @@ menu "Lua libraries/modules" source "package/luaexpatutils/Config.in" source "package/luafilesystem/Config.in" source "package/luajson/Config.in" + source "package/lualdap/Config.in" source "package/lualogging/Config.in" source "package/luaossl/Config.in" source "package/luaposix/Config.in" @@ -734,7 +763,9 @@ menu "Perl libraries/modules" source "package/perl-datetime-tiny/Config.in" source "package/perl-dbd-mysql/Config.in" source "package/perl-dbi/Config.in" + source "package/perl-devel-cycle/Config.in" source "package/perl-devel-globaldestruction/Config.in" + source "package/perl-devel-size/Config.in" source "package/perl-devel-stacktrace/Config.in" source "package/perl-devel-stacktrace-ashtml/Config.in" source "package/perl-device-serialport/Config.in" @@ -776,6 +807,7 @@ menu "Perl libraries/modules" source "package/perl-lwp-protocol-https/Config.in" source "package/perl-mail-dkim/Config.in" source "package/perl-mailtools/Config.in" + source "package/perl-math-int64/Config.in" source "package/perl-math-prime-util/Config.in" source "package/perl-mime-base64-urlsafe/Config.in" source "package/perl-mime-tools/Config.in" @@ -799,6 +831,7 @@ menu "Perl libraries/modules" source "package/perl-number-bytes-human/Config.in" source "package/perl-package-stash/Config.in" source "package/perl-params-util/Config.in" + source "package/perl-parse-yapp/Config.in" source "package/perl-path-tiny/Config.in" source "package/perl-plack/Config.in" source "package/perl-posix-strftime-compiler/Config.in" @@ -834,6 +867,7 @@ menu "External php extensions" source "package/php-imagick/Config.in" source "package/php-memcached/Config.in" source "package/php-ssh2/Config.in" + source "package/php-xdebug/Config.in" source "package/php-yaml/Config.in" source "package/php-zmq/Config.in" endmenu @@ -851,6 +885,7 @@ menu "External python modules" source "package/python-aiocoap/Config.in" source "package/python-aioconsole/Config.in" source "package/python-aiodns/Config.in" + source "package/python-aiofiles/Config.in" source "package/python-aiohttp/Config.in" source "package/python-aiohttp-cors/Config.in" source "package/python-aiohttp-debugtoolbar/Config.in" @@ -868,13 +903,16 @@ menu "External python modules" source "package/python-aiosignal/Config.in" source "package/python-aiozipkin/Config.in" source "package/python-alsaaudio/Config.in" + source "package/python-ansicolors/Config.in" source "package/python-argh/Config.in" + source "package/python-argon2-cffi/Config.in" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" source "package/python-async-lru/Config.in" source "package/python-async-timeout/Config.in" source "package/python-attrs/Config.in" + source "package/python-augeas/Config.in" source "package/python-autobahn/Config.in" source "package/python-automat/Config.in" source "package/python-avro/Config.in" @@ -887,13 +925,19 @@ menu "External python modules" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bitstring/Config.in" + source "package/python-bleak/Config.in" source "package/python-bluezero/Config.in" + source "package/python-boto3/Config.in" + source "package/python-botocore/Config.in" source "package/python-bottle/Config.in" source "package/python-brotli/Config.in" + source "package/python-bsdiff4/Config.in" source "package/python-bunch/Config.in" source "package/python-cached-property/Config.in" source "package/python-can/Config.in" + source "package/python-canopen/Config.in" source "package/python-cbor/Config.in" + source "package/python-cbor2/Config.in" source "package/python-cchardet/Config.in" source "package/python-certifi/Config.in" source "package/python-cffi/Config.in" @@ -905,13 +949,14 @@ menu "External python modules" source "package/python-cheroot/Config.in" source "package/python-cherrypy/Config.in" source "package/python-click/Config.in" - source "package/python-coherence/Config.in" source "package/python-colorama/Config.in" source "package/python-colorlog/Config.in" + source "package/python-colorzero/Config.in" source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-constantly/Config.in" source "package/python-couchdb/Config.in" + source "package/python-crayons/Config.in" source "package/python-crc16/Config.in" source "package/python-crcmod/Config.in" source "package/python-crontab/Config.in" @@ -925,7 +970,9 @@ menu "External python modules" source "package/python-daphne/Config.in" source "package/python-dataproperty/Config.in" source "package/python-dateutil/Config.in" + source "package/python-dbus-next/Config.in" source "package/python-decorator/Config.in" + source "package/python-defusedxml/Config.in" source "package/python-dialog/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" @@ -954,6 +1001,7 @@ menu "External python modules" source "package/python-flask-jsonrpc/Config.in" source "package/python-flask-login/Config.in" source "package/python-flask-sqlalchemy/Config.in" + source "package/python-flask-wtf/Config.in" source "package/python-flatbuffers/Config.in" source "package/python-flup/Config.in" source "package/python-frozenlist/Config.in" @@ -962,6 +1010,8 @@ menu "External python modules" source "package/python-futures/Config.in" source "package/python-gitdb2/Config.in" source "package/python-gobject/Config.in" + source "package/python-gpiozero/Config.in" + source "package/python-greenlet/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h2/Config.in" source "package/python-hiredis/Config.in" @@ -979,21 +1029,26 @@ menu "External python modules" source "package/python-incremental/Config.in" source "package/python-inflection/Config.in" source "package/python-influxdb/Config.in" + source "package/python-iniconfig/Config.in" source "package/python-iniparse/Config.in" + source "package/python-intelhex/Config.in" source "package/python-iowait/Config.in" source "package/python-ipaddr/Config.in" source "package/python-ipaddress/Config.in" + source "package/python-ipdb/Config.in" source "package/python-iptables/Config.in" source "package/python-ipy/Config.in" source "package/python-ipython/Config.in" source "package/python-ipython-genutils/Config.in" source "package/python-iso8601/Config.in" source "package/python-itsdangerous/Config.in" + source "package/python-iwlib/Config.in" source "package/python-janus/Config.in" source "package/python-jaraco-classes/Config.in" source "package/python-jaraco-functools/Config.in" source "package/python-jedi/Config.in" source "package/python-jinja2/Config.in" + source "package/python-jmespath/Config.in" source "package/python-json-schema-validator/Config.in" source "package/python-jsonmodels/Config.in" source "package/python-jsonschema/Config.in" @@ -1006,6 +1061,7 @@ menu "External python modules" source "package/python-logbook/Config.in" source "package/python-logstash/Config.in" source "package/python-lxml/Config.in" + source "package/python-m2crypto/Config.in" source "package/python-m2r/Config.in" source "package/python-mad/Config.in" source "package/python-mako/Config.in" @@ -1017,6 +1073,7 @@ menu "External python modules" source "package/python-meld3/Config.in" source "package/python-mimeparse/Config.in" source "package/python-mistune/Config.in" + source "package/python-modbus-tk/Config.in" source "package/python-more-itertools/Config.in" source "package/python-msgfy/Config.in" source "package/python-msgpack/Config.in" @@ -1033,6 +1090,8 @@ menu "External python modules" source "package/python-nfc/Config.in" source "package/python-numpy/Config.in" source "package/python-oauthlib/Config.in" + source "package/python-opcua-asyncio/Config.in" + source "package/python-packaging/Config.in" source "package/python-paho-mqtt/Config.in" source "package/python-pam/Config.in" source "package/python-paramiko/Config.in" @@ -1045,9 +1104,11 @@ menu "External python modules" source "package/python-periphery/Config.in" source "package/python-pexpect/Config.in" source "package/python-pickleshare/Config.in" + source "package/python-piexif/Config.in" source "package/python-pigpio/Config.in" source "package/python-pillow/Config.in" source "package/python-pip/Config.in" + source "package/python-pluggy/Config.in" source "package/python-ply/Config.in" source "package/python-portend/Config.in" source "package/python-posix-ipc/Config.in" @@ -1060,16 +1121,16 @@ menu "External python modules" source "package/python-pudb/Config.in" source "package/python-py/Config.in" source "package/python-pyaes/Config.in" - source "package/python-pyasn/Config.in" - source "package/python-pyasn-modules/Config.in" + source "package/python-pyalsa/Config.in" source "package/python-pyasn1/Config.in" source "package/python-pyasn1-modules/Config.in" + source "package/python-pybind/Config.in" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" - source "package/python-pycrypto/Config.in" source "package/python-pycryptodomex/Config.in" + source "package/python-pycups/Config.in" source "package/python-pydal/Config.in" source "package/python-pydantic/Config.in" source "package/python-pyelftools/Config.in" @@ -1083,6 +1144,7 @@ menu "External python modules" source "package/python-pylibftdi/Config.in" source "package/python-pylru/Config.in" source "package/python-pymodbus/Config.in" + source "package/python-pymupdf/Config.in" source "package/python-pymysql/Config.in" source "package/python-pynacl/Config.in" source "package/python-pyopenssl/Config.in" @@ -1103,6 +1165,8 @@ menu "External python modules" source "package/python-pysocks/Config.in" source "package/python-pytablereader/Config.in" source "package/python-pytablewriter/Config.in" + source "package/python-pytest/Config.in" + source "package/python-pytest-asyncio/Config.in" source "package/python-pytrie/Config.in" source "package/python-pytz/Config.in" source "package/python-pyudev/Config.in" @@ -1113,6 +1177,7 @@ menu "External python modules" source "package/python-raven/Config.in" source "package/python-redis/Config.in" source "package/python-reentry/Config.in" + source "package/python-regex/Config.in" source "package/python-remi/Config.in" source "package/python-request-id/Config.in" source "package/python-requests/Config.in" @@ -1121,6 +1186,7 @@ menu "External python modules" source "package/python-rpi-gpio/Config.in" source "package/python-rpi-ws281x/Config.in" source "package/python-rtslib-fb/Config.in" + source "package/python-s3transfer/Config.in" source "package/python-scandir/Config.in" source "package/python-scapy/Config.in" source "package/python-schedule/Config.in" @@ -1147,6 +1213,7 @@ menu "External python modules" source "package/python-slob/Config.in" source "package/python-smbus-cffi/Config.in" source "package/python-smmap2/Config.in" + source "package/python-snappy/Config.in" source "package/python-socketio/Config.in" source "package/python-sockjs/Config.in" source "package/python-sortedcontainers/Config.in" @@ -1176,6 +1243,7 @@ menu "External python modules" source "package/python-txtorcon/Config.in" source "package/python-typepy/Config.in" source "package/python-typing/Config.in" + source "package/python-typing-extensions/Config.in" source "package/python-u-msgpack/Config.in" source "package/python-ubjson/Config.in" source "package/python-ujson/Config.in" @@ -1205,13 +1273,16 @@ menu "External python modules" source "package/python-xlutils/Config.in" source "package/python-xlwt/Config.in" source "package/python-xmltodict/Config.in" + source "package/python-xmodem/Config.in" source "package/python-yarl/Config.in" + source "package/python-yatl/Config.in" source "package/python-yieldfrom/Config.in" source "package/python-zc-lockfile/Config.in" source "package/python-zeroconf/Config.in" source "package/python-zope-interface/Config.in" endmenu endif + source "package/quickjs/Config.in" source "package/ruby/Config.in" source "package/tcl/Config.in" if BR2_PACKAGE_TCL @@ -1226,9 +1297,9 @@ menu "Libraries" menu "Audio/Sound" source "package/alsa-lib/Config.in" + source "package/alsa-plugins/Config.in" source "package/alure/Config.in" source "package/aubio/Config.in" - source "package/audiofile/Config.in" source "package/bcg729/Config.in" source "package/caps/Config.in" source "package/fdk-aac/Config.in" @@ -1282,6 +1353,7 @@ menu "Compression and decompression" source "package/libmspack/Config.in" source "package/libsquish/Config.in" source "package/libzip/Config.in" + source "package/lz4/Config.in" source "package/lzo/Config.in" source "package/minizip/Config.in" source "package/snappy/Config.in" @@ -1305,7 +1377,6 @@ menu "Crypto" source "package/libgpgme/Config.in" source "package/libkcapi/Config.in" source "package/libksba/Config.in" - source "package/libmcrypt/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" source "package/libolm/Config.in" @@ -1318,11 +1389,14 @@ menu "Crypto" source "package/libssh2/Config.in" source "package/libtomcrypt/Config.in" source "package/libuecc/Config.in" + source "package/libxcrypt/Config.in" source "package/mbedtls/Config.in" source "package/nettle/Config.in" source "package/openssl/Config.in" + source "package/pkcs11-helper/Config.in" source "package/rhash/Config.in" source "package/tinydtls/Config.in" + source "package/tpm2-pkcs11/Config.in" source "package/tpm2-tss/Config.in" source "package/trousers/Config.in" source "package/ustream-ssl/Config.in" @@ -1337,14 +1411,24 @@ menu "Database" source "package/kompexsqlite/Config.in" source "package/leveldb/Config.in" source "package/libgit2/Config.in" + source "package/libmdbx/Config.in" + source "package/libodb/Config.in" + source "package/libodb-boost/Config.in" + source "package/libodb-mysql/Config.in" + source "package/libodb-pgsql/Config.in" source "package/libpqxx/Config.in" source "package/mongodb/Config.in" source "package/mysql/Config.in" source "package/postgresql/Config.in" +if BR2_PACKAGE_POSTGRESQL + source "package/osm2pgsql/Config.in" + source "package/postgis/Config.in" +endif source "package/redis/Config.in" source "package/rocksdb/Config.in" source "package/sqlcipher/Config.in" source "package/sqlite/Config.in" + source "package/timescaledb/Config.in" source "package/unixodbc/Config.in" endmenu @@ -1353,6 +1437,7 @@ menu "Filesystem" source "package/libconfig/Config.in" source "package/libconfuse/Config.in" source "package/libfuse/Config.in" + source "package/libfuse3/Config.in" source "package/liblockfile/Config.in" source "package/libnfs/Config.in" source "package/libsysfs/Config.in" @@ -1424,7 +1509,6 @@ menu "Graphics" source "package/libqrencode/Config.in" source "package/libraw/Config.in" source "package/librsvg/Config.in" - source "package/libsoil/Config.in" source "package/libsvg/Config.in" source "package/libsvg-cairo/Config.in" source "package/libsvgtiny/Config.in" @@ -1434,8 +1518,8 @@ menu "Graphics" source "package/libvips/Config.in" source "package/libwpe/Config.in" source "package/menu-cache/Config.in" - source "package/opencv/Config.in" source "package/opencv3/Config.in" + source "package/opencv4/Config.in" source "package/opengl/Config.in" source "package/openjpeg/Config.in" source "package/pango/Config.in" @@ -1445,12 +1529,15 @@ menu "Graphics" source "package/poppler/Config.in" source "package/powervr/Config.in" source "package/tiff/Config.in" + source "package/unclutter-xfixes/Config.in" source "package/waffle/Config.in" source "package/wayland/Config.in" source "package/wayland-protocols/Config.in" + source "package/wayland-utils/Config.in" source "package/waylandpp/Config.in" source "package/webkitgtk/Config.in" source "package/webp/Config.in" + source "package/wlroots/Config.in" source "package/woff2/Config.in" source "package/wpebackend-fdo/Config.in" source "package/wpewebkit/Config.in" @@ -1472,6 +1559,7 @@ menu "Hardware handling" source "package/let-me-create/Config.in" source "package/libaio/Config.in" source "package/libatasmart/Config.in" + source "package/libblockdev/Config.in" source "package/libcec/Config.in" source "package/libfreefare/Config.in" source "package/libftdi/Config.in" @@ -1490,6 +1578,7 @@ menu "Hardware handling" source "package/libphidget/Config.in" source "package/libpri/Config.in" source "package/libqmi/Config.in" + source "package/libqrtr-glib/Config.in" source "package/libraw1394/Config.in" source "package/librtas/Config.in" source "package/librtlsdr/Config.in" @@ -1511,8 +1600,8 @@ menu "Hardware handling" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" source "package/tslib/Config.in" + source "package/uhd/Config.in" source "package/urg/Config.in" - source "package/wiringpi/Config.in" endmenu menu "Javascript" @@ -1524,6 +1613,10 @@ endmenu endif source "package/bootstrap/Config.in" source "package/chartjs/Config.in" + source "package/datatables/Config.in" + source "package/datatables-buttons/Config.in" + source "package/datatables-fixedcolumns/Config.in" + source "package/datatables-responsive/Config.in" source "package/duktape/Config.in" source "package/explorercanvas/Config.in" source "package/flot/Config.in" @@ -1542,8 +1635,9 @@ endmenu endif source "package/jsmin/Config.in" source "package/json-javascript/Config.in" + source "package/jszip/Config.in" source "package/openlayers/Config.in" - source "package/spidermonkey/Config.in" + source "package/popperjs/Config.in" source "package/vuejs/Config.in" endmenu @@ -1551,7 +1645,6 @@ menu "JSON/XML" source "package/benejson/Config.in" source "package/cjson/Config.in" source "package/expat/Config.in" - source "package/ezxml/Config.in" source "package/jansson/Config.in" source "package/jose/Config.in" source "package/jsmn/Config.in" @@ -1578,6 +1671,7 @@ menu "JSON/XML" source "package/tinyxml2/Config.in" source "package/valijson/Config.in" source "package/xerces/Config.in" + source "package/xml-security-c/Config.in" source "package/yajl/Config.in" source "package/yaml-cpp/Config.in" endmenu @@ -1589,6 +1683,7 @@ menu "Logging" source "package/log4cplus/Config.in" source "package/log4cpp/Config.in" source "package/log4cxx/Config.in" + source "package/log4qt/Config.in" source "package/opentracing-cpp/Config.in" source "package/spdlog/Config.in" source "package/zlog/Config.in" @@ -1643,6 +1738,7 @@ menu "Networking" source "package/curlpp/Config.in" source "package/czmq/Config.in" source "package/daq/Config.in" + source "package/daq3/Config.in" source "package/davici/Config.in" source "package/enet/Config.in" source "package/filemq/Config.in" @@ -1697,13 +1793,17 @@ menu "Networking" source "package/libnfnetlink/Config.in" source "package/libnftnl/Config.in" source "package/libnice/Config.in" + source "package/libnids/Config.in" source "package/libnl/Config.in" + source "package/libnpupnp/Config.in" source "package/liboauth/Config.in" source "package/liboping/Config.in" source "package/libosip2/Config.in" source "package/libpagekite/Config.in" source "package/libpcap/Config.in" source "package/libpjsip/Config.in" + source "package/libpsl/Config.in" + source "package/librelp/Config.in" source "package/librsync/Config.in" source "package/libshairplay/Config.in" source "package/libshout/Config.in" @@ -1715,9 +1815,9 @@ menu "Networking" source "package/libtirpc/Config.in" source "package/libtorrent/Config.in" source "package/libtorrent-rasterbar/Config.in" + source "package/libuev/Config.in" source "package/libuhttpd/Config.in" source "package/libupnp/Config.in" - source "package/libupnp18/Config.in" source "package/libupnpp/Config.in" source "package/liburiparser/Config.in" source "package/libuwsc/Config.in" @@ -1726,15 +1826,18 @@ menu "Networking" source "package/libwebsockets/Config.in" source "package/libyang/Config.in" source "package/lksctp-tools/Config.in" + source "package/mbuffer/Config.in" source "package/mongoose/Config.in" source "package/nanomsg/Config.in" source "package/neon/Config.in" + source "package/netopeer2/Config.in" source "package/nghttp2/Config.in" source "package/norm/Config.in" source "package/nss-mdns/Config.in" source "package/nss-myhostname/Config.in" source "package/nss-pam-ldapd/Config.in" source "package/omniorb/Config.in" + source "package/open62541/Config.in" source "package/openldap/Config.in" source "package/openmpi/Config.in" source "package/openpgm/Config.in" @@ -1742,11 +1845,14 @@ menu "Networking" source "package/ortp/Config.in" source "package/paho-mqtt-c/Config.in" source "package/paho-mqtt-cpp/Config.in" + source "package/pistache/Config.in" source "package/qdecoder/Config.in" source "package/qpid-proton/Config.in" source "package/rabbitmq-c/Config.in" + source "package/resiprocate/Config.in" source "package/restclient-cpp/Config.in" source "package/rtmpdump/Config.in" + source "package/siproxd/Config.in" source "package/slirp/Config.in" source "package/snmppp/Config.in" source "package/sofia-sip/Config.in" @@ -1776,7 +1882,6 @@ menu "Other" source "package/cctz/Config.in" source "package/cereal/Config.in" source "package/clang/Config.in" - source "package/clapack/Config.in" source "package/cmocka/Config.in" source "package/cppcms/Config.in" source "package/cracklib/Config.in" @@ -1798,21 +1903,24 @@ menu "Other" source "package/gobject-introspection/Config.in" source "package/gsl/Config.in" source "package/gtest/Config.in" + source "package/gumbo-parser/Config.in" source "package/jemalloc/Config.in" source "package/kernel_cmdline_extractor/Config.in" source "package/lapack/Config.in" + source "package/libabseil-cpp/Config.in" source "package/libargtable2/Config.in" source "package/libatomic_ops/Config.in" source "package/libavl/Config.in" source "package/libb64/Config.in" + source "package/libbacktrace/Config.in" source "package/libbsd/Config.in" + source "package/libbytesize/Config.in" source "package/libcap/Config.in" source "package/libcap-ng/Config.in" source "package/libcgroup/Config.in" source "package/libclc/Config.in" source "package/libcofi/Config.in" source "package/libcorrect/Config.in" - source "package/libcroco/Config.in" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" @@ -1823,6 +1931,7 @@ menu "Other" source "package/libevent/Config.in" source "package/libffi/Config.in" source "package/libgee/Config.in" + source "package/libgeos/Config.in" source "package/libglib2/Config.in" source "package/libglob/Config.in" source "package/libical/Config.in" @@ -1831,16 +1940,19 @@ menu "Other" source "package/libloki/Config.in" source "package/libnpth/Config.in" source "package/libnspr/Config.in" + source "package/libosmium/Config.in" source "package/libpfm4/Config.in" source "package/libplatform/Config.in" source "package/libplist/Config.in" source "package/libpthread-stubs/Config.in" source "package/libpthsem/Config.in" source "package/libpwquality/Config.in" + source "package/libqb/Config.in" source "package/libseccomp/Config.in" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in" source "package/libspatialindex/Config.in" + source "package/libtalloc/Config.in" source "package/libtasn1/Config.in" source "package/libtommath/Config.in" source "package/libtpl/Config.in" @@ -1860,12 +1972,12 @@ endif source "package/liquid-dsp/Config.in" source "package/llvm/Config.in" source "package/lttng-libust/Config.in" + source "package/matio/Config.in" source "package/mpc/Config.in" source "package/mpdecimal/Config.in" source "package/mpfr/Config.in" source "package/mpir/Config.in" source "package/msgpack/Config.in" - source "package/mtdev2tuio/Config.in" source "package/musl-compat-headers/Config.in" source "package/musl-fts/Config.in" source "package/nwipe/Config.in" @@ -1875,10 +1987,12 @@ endif source "package/poco/Config.in" source "package/protobuf/Config.in" source "package/protobuf-c/Config.in" + source "package/protozero/Config.in" source "package/qhull/Config.in" source "package/qlibc/Config.in" source "package/riemann-c-client/Config.in" source "package/shapelib/Config.in" + source "package/shredos/Config.in" source "package/skalibs/Config.in" source "package/sphinxbase/Config.in" source "package/startup-notification/Config.in" @@ -1890,6 +2004,7 @@ endif endmenu menu "Security" + source "package/libapparmor/Config.in" source "package/libselinux/Config.in" source "package/libsemanage/Config.in" source "package/libsepol/Config.in" @@ -1902,6 +2017,7 @@ menu "Text and terminal handling" source "package/fmt/Config.in" source "package/fstrcmp/Config.in" source "package/icu/Config.in" + source "package/inih/Config.in" source "package/libcli/Config.in" source "package/libedit/Config.in" source "package/libenca/Config.in" @@ -1916,6 +2032,7 @@ menu "Text and terminal handling" source "package/pcre/Config.in" source "package/pcre2/Config.in" source "package/popt/Config.in" + source "package/re2/Config.in" source "package/readline/Config.in" source "package/slang/Config.in" source "package/tclap/Config.in" @@ -1951,16 +2068,17 @@ menu "Miscellaneous" source "package/gsettings-desktop-schemas/Config.in" source "package/haveged/Config.in" source "package/linux-syscall-support/Config.in" - source "package/mcrypt/Config.in" source "package/mobile-broadband-provider-info/Config.in" source "package/netdata/Config.in" source "package/proj/Config.in" source "package/qemu/Config.in" source "package/qpdf/Config.in" + source "package/rtl_433/Config.in" source "package/shared-mime-info/Config.in" source "package/sunwait/Config.in" source "package/taskd/Config.in" source "package/wine/Config.in" + source "package/xmrig/Config.in" source "package/xutil_util-macros/Config.in" endmenu @@ -1985,7 +2103,6 @@ menu "Networking applications" source "package/bluez-tools/Config.in" source "package/bluez5_utils/Config.in" source "package/bmon/Config.in" - source "package/boa/Config.in" source "package/boinc/Config.in" source "package/brcm-patchram-plus/Config.in" source "package/bridge-utils/Config.in" @@ -1994,6 +2111,7 @@ menu "Networking applications" source "package/c-icap-modules/Config.in" source "package/can-utils/Config.in" source "package/cannelloni/Config.in" + source "package/casync/Config.in" source "package/chrony/Config.in" source "package/civetweb/Config.in" source "package/connman/Config.in" @@ -2013,6 +2131,7 @@ menu "Networking applications" source "package/dnsmasq/Config.in" source "package/drbd-utils/Config.in" source "package/dropbear/Config.in" + source "package/easyframes/Config.in" source "package/ebtables/Config.in" source "package/ejabberd/Config.in" source "package/ethtool/Config.in" @@ -2025,8 +2144,10 @@ menu "Networking applications" source "package/fping/Config.in" source "package/freeswitch/Config.in" source "package/freeswitch-mod-bcg729/Config.in" + source "package/frr/Config.in" source "package/gerbera/Config.in" source "package/gesftpserver/Config.in" + source "package/gloox/Config.in" source "package/glorytun/Config.in" source "package/gupnp-tools/Config.in" source "package/gutenprint/Config.in" @@ -2035,6 +2156,7 @@ menu "Networking applications" source "package/hiawatha/Config.in" source "package/hostapd/Config.in" source "package/hplip/Config.in" + source "package/htpdate/Config.in" source "package/httping/Config.in" source "package/i2pd/Config.in" source "package/ibrdtn-tools/Config.in" @@ -2050,10 +2172,10 @@ menu "Networking applications" source "package/igmpproxy/Config.in" source "package/inadyn/Config.in" source "package/iodine/Config.in" + source "package/ipcalc/Config.in" source "package/iperf/Config.in" source "package/iperf3/Config.in" source "package/iproute2/Config.in" - source "package/ipsec-tools/Config.in" source "package/ipset/Config.in" source "package/iptables/Config.in" source "package/iptraf-ng/Config.in" @@ -2086,16 +2208,17 @@ menu "Networking applications" source "package/mjpg-streamer/Config.in" source "package/modem-manager/Config.in" source "package/mongrel2/Config.in" - source "package/monkey/Config.in" source "package/mosh/Config.in" source "package/mosquitto/Config.in" source "package/mrouted/Config.in" + source "package/mrp/Config.in" source "package/mtr/Config.in" source "package/nbd/Config.in" source "package/ncftp/Config.in" source "package/ndisc6/Config.in" source "package/net-tools/Config.in" source "package/netatalk/Config.in" + source "package/netcalc/Config.in" source "package/netcat/Config.in" source "package/netcat-openbsd/Config.in" source "package/netplug/Config.in" @@ -2133,6 +2256,7 @@ endif source "package/openswan/Config.in" source "package/openvpn/Config.in" source "package/p910nd/Config.in" + source "package/parprouted/Config.in" source "package/phidgetwebservice/Config.in" source "package/phytool/Config.in" source "package/pimd/Config.in" @@ -2152,6 +2276,7 @@ endif source "package/rabbitmq-server/Config.in" source "package/radvd/Config.in" source "package/reaver/Config.in" + source "package/redir/Config.in" source "package/rp-pppoe/Config.in" source "package/rpcbind/Config.in" source "package/rsh-redone/Config.in" @@ -2171,6 +2296,7 @@ endif source "package/sngrep/Config.in" source "package/snmpclitools/Config.in" source "package/snort/Config.in" + source "package/snort3/Config.in" source "package/socat/Config.in" source "package/socketcand/Config.in" source "package/softether/Config.in" @@ -2178,19 +2304,20 @@ endif source "package/spice/Config.in" source "package/spice-protocol/Config.in" source "package/squid/Config.in" + source "package/ssdp-responder/Config.in" source "package/sshguard/Config.in" source "package/sshpass/Config.in" source "package/sslh/Config.in" source "package/strongswan/Config.in" source "package/stunnel/Config.in" source "package/suricata/Config.in" + source "package/system-config-printer/Config.in" source "package/tcpdump/Config.in" source "package/tcping/Config.in" source "package/tcpreplay/Config.in" source "package/tftpd/Config.in" source "package/thttpd/Config.in" source "package/tinc/Config.in" - source "package/tinyhttpd/Config.in" source "package/tinyproxy/Config.in" source "package/tinyssh/Config.in" source "package/tor/Config.in" @@ -2204,6 +2331,7 @@ endif source "package/uhttpd/Config.in" source "package/ulogd/Config.in" source "package/unbound/Config.in" + source "package/uredir/Config.in" source "package/ushare/Config.in" source "package/ussp-push/Config.in" source "package/vde2/Config.in" @@ -2243,6 +2371,7 @@ comment "See the manual: " comment "http://buildroot.org/manual.html#faq-no-binary-packages" comment "-------------------------------------------------------" source "package/opkg/Config.in" + source "package/opkg-utils/Config.in" source "package/rpm/Config.in" endmenu @@ -2252,6 +2381,7 @@ menu "Real-Time" endmenu menu "Security" + source "package/apparmor/Config.in" source "package/checkpolicy/Config.in" source "package/ima-evm-utils/Config.in" source "package/optee-benchmark/Config.in" @@ -2265,6 +2395,7 @@ menu "Security" source "package/selinux-python/Config.in" source "package/semodule-utils/Config.in" source "package/setools/Config.in" + source "package/urandom-scripts/Config.in" endmenu menu "Shell and utilities" @@ -2274,6 +2405,7 @@ comment "Shells" source "package/mksh/Config.in" source "package/zsh/Config.in" comment "Utilities" + source "package/apg/Config.in" source "package/at/Config.in" source "package/bash-completion/Config.in" source "package/ccrypt/Config.in" @@ -2288,16 +2420,20 @@ comment "Utilities" source "package/lockfile-progs/Config.in" source "package/logrotate/Config.in" source "package/logsurfer/Config.in" + source "package/neofetch/Config.in" source "package/pdmenu/Config.in" source "package/pinentry/Config.in" + source "package/qprint/Config.in" source "package/ranger/Config.in" source "package/rtty/Config.in" source "package/screen/Config.in" + source "package/screenfetch/Config.in" source "package/sudo/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" source "package/tini/Config.in" source "package/tmux/Config.in" + source "package/ttyd/Config.in" source "package/which/Config.in" source "package/xmlstarlet/Config.in" source "package/xxhash/Config.in" @@ -2310,9 +2446,11 @@ menu "System tools" source "package/atop/Config.in" source "package/attr/Config.in" source "package/audit/Config.in" + source "package/balena-engine/Config.in" source "package/bubblewrap/Config.in" source "package/cgroupfs-mount/Config.in" source "package/circus/Config.in" + source "package/containerd/Config.in" source "package/coreutils/Config.in" source "package/cpuload/Config.in" source "package/daemon/Config.in" @@ -2322,15 +2460,17 @@ menu "System tools" source "package/debianutils/Config.in" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" - source "package/docker-containerd/Config.in" source "package/docker-engine/Config.in" source "package/docker-proxy/Config.in" + source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" source "package/emlog/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" + source "package/gkrellm/Config.in" source "package/htop/Config.in" + source "package/ibm-sw-tpm2/Config.in" source "package/initscripts/Config.in" source "package/iotop/Config.in" source "package/iprutils/Config.in" @@ -2340,11 +2480,14 @@ menu "System tools" source "package/kmod/Config.in" source "package/kvmtool/Config.in" source "package/libostree/Config.in" + source "package/libvirt/Config.in" source "package/lxc/Config.in" + source "package/makedumpfile/Config.in" source "package/mender/Config.in" source "package/mender-grubenv/Config.in" source "package/mfoc/Config.in" source "package/monit/Config.in" + source "package/multipath-tools/Config.in" source "package/ncdu/Config.in" source "package/netifrc/Config.in" source "package/numactl/Config.in" @@ -2363,6 +2506,7 @@ menu "System tools" source "package/rauc/Config.in" source "package/rsyslog/Config.in" source "package/runc/Config.in" + source "package/s390-tools/Config.in" source "package/s6/Config.in" source "package/s6-linux-init/Config.in" source "package/s6-linux-utils/Config.in" @@ -2371,6 +2515,7 @@ menu "System tools" source "package/scrub/Config.in" source "package/scrypt/Config.in" source "package/sdbusplus/Config.in" + source "package/seatd/Config.in" source "package/smack/Config.in" source "package/start-stop-daemon/Config.in" source "package/supervisor/Config.in" @@ -2388,6 +2533,7 @@ menu "System tools" source "package/tpm2-totp/Config.in" source "package/unscd/Config.in" source "package/util-linux/Config.in" + source "package/watchdog/Config.in" source "package/xdg-dbus-proxy/Config.in" source "package/xen/Config.in" source "package/xvisor/Config.in" @@ -2398,6 +2544,7 @@ menu "Text editors and viewers" source "package/joe/Config.in" source "package/less/Config.in" source "package/mc/Config.in" + source "package/mg/Config.in" source "package/most/Config.in" source "package/nano/Config.in" source "package/uemacs/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index eb8f63f689..551352482e 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -1,9 +1,12 @@ menu "Host utilities" + source "package/abootimg/Config.in.host" source "package/aespipe/Config.in.host" source "package/android-tools/Config.in.host" + source "package/asn1c/Config.in.host" + source "package/babeltrace2/Config.in.host" + source "package/bmap-tools/Config.in.host" source "package/btrfs-progs/Config.in.host" - source "package/cargo/Config.in.host" source "package/cbootimage/Config.in.host" source "package/checkpolicy/Config.in.host" source "package/checksec/Config.in.host" @@ -18,8 +21,10 @@ menu "Host utilities" source "package/dtc/Config.in.host" source "package/e2fsprogs/Config.in.host" source "package/e2tools/Config.in.host" + source "package/environment-setup/Config.in.host" source "package/erofs-utils/Config.in.host" source "package/eudev/Config.in.host" + source "package/exfatprogs/Config.in.host" source "package/f2fs-tools/Config.in.host" source "package/faketime/Config.in.host" source "package/fatcat/Config.in.host" @@ -35,18 +40,22 @@ menu "Host utilities" source "package/imagemagick/Config.in.host" source "package/imx-mkimage/Config.in.host" source "package/imx-usb-loader/Config.in.host" + source "package/jh71xx-tools/Config.in.host" source "package/jq/Config.in.host" source "package/jsmin/Config.in.host" + source "package/kmod/Config.in.host" source "package/libp11/Config.in.host" source "package/lld/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" source "package/mender-artifact/Config.in.host" + source "package/meson-tools/Config.in.host" source "package/mfgtools/Config.in.host" source "package/mkpasswd/Config.in.host" source "package/mtd/Config.in.host" source "package/mtools/Config.in.host" source "package/mxsldr/Config.in.host" + source "package/odb/Config.in.host" source "package/omap-u-boot-utils/Config.in.host" source "package/openocd/Config.in.host" source "package/opkg-utils/Config.in.host" @@ -63,9 +72,9 @@ menu "Host utilities" source "package/python-xlrd/Config.in.host" source "package/python3/Config.in.host" source "package/qemu/Config.in.host" + source "package/qoriq-rcw/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" - source "package/rcw/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/package/Makefile.in b/package/Makefile.in index 51f5cbce4f..86db62ba5b 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -136,6 +136,9 @@ endif ifeq ($(BR2_OPTIMIZE_FAST),y) TARGET_OPTIMIZATION = -Ofast endif +ifeq ($(BR2_ENABLE_DEBUG),) +TARGET_DEBUGGING = -g0 +endif ifeq ($(BR2_DEBUG_1),y) TARGET_DEBUGGING = -g1 endif @@ -318,6 +321,7 @@ EXTRA_ENV = \ PATH=$(BR_PATH) \ BR2_DL_DIR=$(BR2_DL_DIR) \ BUILD_DIR=$(BUILD_DIR) \ + CONFIG_DIR=$(CONFIG_DIR) \ O=$(CANONICAL_O) ################################################################################ diff --git a/package/a10disp/a10disp.hash b/package/a10disp/a10disp.hash index f1bddec5df..acaafc3530 100644 --- a/package/a10disp/a10disp.hash +++ b/package/a10disp/a10disp.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 5077405030e8f97a1edd4b86d469466abbc4d32b4a4609e58459347fcd1ba35b a10disp-0.6.1.tar.gz +sha256 5077405030e8f97a1edd4b86d469466abbc4d32b4a4609e58459347fcd1ba35b a10disp-0.6.1.tar.gz +sha256 ddf849966f57fee8f9675f5a3c7791353d1cba71695cd58016212fc236bbdbee a10disp.c diff --git a/package/a10disp/a10disp.mk b/package/a10disp/a10disp.mk index 4c2ee14e29..c919202329 100644 --- a/package/a10disp/a10disp.mk +++ b/package/a10disp/a10disp.mk @@ -7,6 +7,7 @@ A10DISP_VERSION = 0.6.1 A10DISP_SITE = $(call github,hglm,a10disp,v$(A10DISP_VERSION)) A10DISP_LICENSE = MIT +A10DISP_LICENSE_FILES = a10disp.c A10DISP_DEPENDENCIES = linux diff --git a/package/abootimg/Config.in b/package/abootimg/Config.in index 30e5bd1fb0..bcd2a082c9 100644 --- a/package/abootimg/Config.in +++ b/package/abootimg/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_ABOOTIMG Tool to manipulate Android Boot Images, either on files or directly on /dev block devices. - https://github.com/ggrandou/abootimg + https://gitlab.com/ajs124/abootimg diff --git a/package/abootimg/abootimg.hash b/package/abootimg/abootimg.hash index fa5282c6c3..141db26860 100644 --- a/package/abootimg/abootimg.hash +++ b/package/abootimg/abootimg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eb8d912bc7b5454c2afd3385fd86f4917d3587c48a6f5ae45df7856d88502cab abootimg-7e127fee6a3981f6b0a50ce9910267cd501e09d4.tar.gz +sha256 f377da42a57d982cfc22fa75c5a69febdc3e4c1ef43cd0ceaec42e14067e2f37 abootimg-1ebeb393252ab5aeed62e34bc439b6728444f06e-br1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/abootimg/abootimg.mk b/package/abootimg/abootimg.mk index e906546948..a07100df5a 100644 --- a/package/abootimg/abootimg.mk +++ b/package/abootimg/abootimg.mk @@ -4,13 +4,15 @@ # ################################################################################ -ABOOTIMG_VERSION = 7e127fee6a3981f6b0a50ce9910267cd501e09d4 -ABOOTIMG_SITE = $(call github,ggrandou,abootimg,$(ABOOTIMG_VERSION)) +ABOOTIMG_VERSION = 1ebeb393252ab5aeed62e34bc439b6728444f06e +ABOOTIMG_SITE = https://gitlab.com/ajs124/abootimg.git +ABOOTIMG_SITE_METHOD = git ABOOTIMG_LICENSE = GPL-2.0+ ABOOTIMG_LICENSE_FILES = LICENSE # depends on libblkid from util-linux ABOOTIMG_DEPENDENCIES = util-linux +HOST_ABOOTIMG_DEPENDENCIES = host-util-linux define ABOOTIMG_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) @@ -20,4 +22,13 @@ define ABOOTIMG_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/abootimg $(TARGET_DIR)/usr/bin/abootimg endef +define HOST_ABOOTIMG_BUILD_CMDS + $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) +endef + +define HOST_ABOOTIMG_INSTALL_CMDS + $(INSTALL) -m 0755 $(@D)/abootimg $(HOST_DIR)/usr/bin/abootimg +endef + $(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/acl/acl.hash b/package/acl/acl.hash index 50c32d7734..32e904baf3 100644 --- a/package/acl/acl.hash +++ b/package/acl/acl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7 acl-2.2.53.tar.gz +sha256 c0234042e17f11306c23c038b08e5e070edb7be44bef6697fb8734dcff1c66b1 acl-2.3.1.tar.xz # Locally calculated sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 doc/COPYING diff --git a/package/acl/acl.mk b/package/acl/acl.mk index 8dce274150..c898421dc5 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -4,10 +4,12 @@ # ################################################################################ -ACL_VERSION = 2.2.53 +ACL_VERSION = 2.3.1 +ACL_SOURCE = acl-$(ACL_VERSION).tar.xz ACL_SITE = http://download.savannah.gnu.org/releases/acl ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL +ACL_CPE_ID_VENDOR = acl_project ACL_DEPENDENCIES = attr HOST_ACL_DEPENDENCIES = host-attr diff --git a/package/acpica/acpica.hash b/package/acpica/acpica.hash index ac2201d570..a2fdfe602e 100644 --- a/package/acpica/acpica.hash +++ b/package/acpica/acpica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 edb9a886455d22955c93753e2de61b780bed94fb434079e844dc5e4376cadd4c acpica-unix2-20191018.tar.gz -sha256 65464cea6ee2f7a5d38e2b5f1050a4b39a15358a09b8e36119416d4e2c5031b8 source/include/acpi.h +sha256 8a49904744a8159b7f325ed941b56968ba37a0371c634036628064f97538de4b acpica-unix2-20200717.tar.gz +sha256 cb17c679d3291eba1a70a1336062fb07eec2e839b0821b443b24f41de18c5218 source/include/acpi.h diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk index 68b948c86d..21ecc155be 100644 --- a/package/acpica/acpica.mk +++ b/package/acpica/acpica.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACPICA_VERSION = 20191018 +ACPICA_VERSION = 20200717 ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz ACPICA_SITE = https://acpica.org/sites/acpica/files ACPICA_LICENSE = BSD-3-Clause or GPL-2.0 diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk index ff6e62b5cd..1214251dc3 100644 --- a/package/acpid/acpid.mk +++ b/package/acpid/acpid.mk @@ -9,6 +9,9 @@ ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz ACPID_SITE = http://downloads.sourceforge.net/project/acpid2 ACPID_LICENSE = GPL-2.0+ ACPID_LICENSE_FILES = COPYING +ACPID_CPE_ID_VENDOR = tedfelix +ACPID_CPE_ID_PRODUCT = acpid2 +ACPID_SELINUX_MODULES = acpi define ACPID_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/acpid/acpid.service \ diff --git a/package/acsccid/Config.in b/package/acsccid/Config.in index 74dd6de295..a926be6e16 100644 --- a/package/acsccid/Config.in +++ b/package/acsccid/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_ACSCCID bool "acsccid" depends on BR2_TOOLCHAIN_HAS_THREADS # pcsc-lite, libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_MMU # pcsc-lite depends on !BR2_STATIC_LIBS # pcsc-lite select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE @@ -14,7 +15,7 @@ config BR2_PACKAGE_ACSCCID http://acsccid.sourceforge.net/ -comment "acsccid needs a toolchain w/ threads, dynamic library" +comment "acsccid needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/acsccid/acsccid.hash b/package/acsccid/acsccid.hash index 2d61ad6643..f43a7930a4 100644 --- a/package/acsccid/acsccid.hash +++ b/package/acsccid/acsccid.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.7/ -sha1 f4db3c2393f392191291df128008832e245d821b acsccid-1.1.7.tar.bz2 -md5 0b34146571d9492ecfff066582dd9356 acsccid-1.1.7.tar.bz2 +sha1 c0062401e5fedf3ec12c8c2d375d6e1561a8a8ed acsccid-1.1.8.tar.bz2 +md5 3eba7b2527aa0b14c73b1a620a1d72d2 acsccid-1.1.8.tar.bz2 # Locally computed -sha256 3778548ff9b639dd46d1570922e425698e16c5a0a0840ed1fad235052e291ee3 acsccid-1.1.7.tar.bz2 -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING +sha256 f86fd846bc88594a569ea27040cb441d933b7eca8d51d2a90bacf161e7740051 acsccid-1.1.8.tar.bz2 +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/acsccid/acsccid.mk b/package/acsccid/acsccid.mk index 28a31b95a3..db74e9cb76 100644 --- a/package/acsccid/acsccid.mk +++ b/package/acsccid/acsccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACSCCID_VERSION = 1.1.7 +ACSCCID_VERSION = 1.1.8 ACSCCID_SOURCE = acsccid-$(ACSCCID_VERSION).tar.bz2 ACSCCID_SITE = http://downloads.sourceforge.net/acsccid ACSCCID_LICENSE = LGPL-2.1+ diff --git a/package/adwaita-icon-theme/adwaita-icon-theme.hash b/package/adwaita-icon-theme/adwaita-icon-theme.hash index 0daef24db5..ce6acb8d9a 100644 --- a/package/adwaita-icon-theme/adwaita-icon-theme.hash +++ b/package/adwaita-icon-theme/adwaita-icon-theme.hash @@ -1,5 +1,5 @@ # From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.sha256sum -sha256 c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7 adwaita-icon-theme-3.22.0.tar.xz +sha256 a594e7440971f860cc61b1b8291be15ffc1b8dd06a9f11485a5a7faf189bcf6b adwaita-icon-theme-3.37.2.tar.xz # locally computed sha256 51f83b2b4e9ed2beebc9b8eed2ecad29314a58ed8c5184b22ad8f9df703d3ce5 COPYING sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING_LGPL diff --git a/package/adwaita-icon-theme/adwaita-icon-theme.mk b/package/adwaita-icon-theme/adwaita-icon-theme.mk index 8c9dec14f5..3950cfa636 100644 --- a/package/adwaita-icon-theme/adwaita-icon-theme.mk +++ b/package/adwaita-icon-theme/adwaita-icon-theme.mk @@ -4,8 +4,8 @@ # ################################################################################ -ADWAITA_ICON_THEME_VERSION_MAJOR = 3.22 -ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0 +ADWAITA_ICON_THEME_VERSION_MAJOR = 3.37 +ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).2 ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR) ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz ADWAITA_ICON_THEME_INSTALL_STAGING = YES diff --git a/package/aer-inject/aer-inject.hash b/package/aer-inject/aer-inject.hash index ee097c873a..6259bb9054 100644 --- a/package/aer-inject/aer-inject.hash +++ b/package/aer-inject/aer-inject.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 49a44b7a9e3983dc15fdc5bacd0e095df650296024f43f9d6c080ad54de0b07f aer-inject-9bd5e2c7886fca72f139cd8402488a2235957d41.tar.gz +sha256 2dd2bd73aa738c1cc26ba04b6e502329778d18c2cc873c0bd00e6b2d38e9477c aer-inject-9bd5e2c7886fca72f139cd8402488a2235957d41-br1.tar.gz sha256 659a191d8775e05c6c6a9a4ba66b3577c577342bb83f20d393135eb6633c8973 README diff --git a/package/agentpp/agentpp.hash b/package/agentpp/agentpp.hash index f458190720..11b23c8ee2 100644 --- a/package/agentpp/agentpp.hash +++ b/package/agentpp/agentpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ffbd06e6582978b6ea7344ae0ccfe58e634b84d31496bb6eb77f0a9e8f1e1df1 agent++-4.1.2.tar.gz -sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt +sha256 9b45123df45e803198a1181540b37a4ccd0e63c68df6e826702e2ba49167edac agent++-4.3.1.tar.gz +sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index 0b6ef0a2a7..8982d9e564 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -AGENTPP_VERSION = 4.1.2 +AGENTPP_VERSION = 4.3.1 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in index f3e2bc4ef1..eb997e8d1b 100644 --- a/package/aircrack-ng/Config.in +++ b/package/aircrack-ng/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_AIRCRACK_NG depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL help A set of tools for auditing wireless networks diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk index baa1fad9e1..ff87766d6f 100644 --- a/package/aircrack-ng/aircrack-ng.mk +++ b/package/aircrack-ng/aircrack-ng.mk @@ -8,6 +8,7 @@ AIRCRACK_NG_VERSION = 1.6 AIRCRACK_NG_SITE = http://download.aircrack-ng.org AIRCRACK_NG_LICENSE = GPL-2.0+ AIRCRACK_NG_LICENSE_FILES = LICENSE +AIRCRACK_NG_CPE_ID_VENDOR = aircrack-ng AIRCRACK_NG_DEPENDENCIES = \ $(if $(BR2_PACKAGE_CMOCKA),cmocka) \ $(if $(BR2_PACKAGE_LIBNL),libnl) \ diff --git a/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch b/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch index 5bf9dd2057..17b57d1f3d 100644 --- a/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch +++ b/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch @@ -10,6 +10,8 @@ Signed-off-by: Thomas Petazzoni [Jörg: update patch for 1.1.6] Signed-off-by: Jörg Krause Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141376.html +[Bernd: update patch for 1.2.4] +Signed-off-by: Bernd Kuhls --- configure.ac | 2 ++ src/pcm/pcm_direct.c | 10 +++++++++- @@ -32,7 +34,7 @@ diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 2b07eff9..4dc3ea26 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c -@@ -431,13 +431,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix) +@@ -437,13 +437,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix) close(dmix->server_fd); return ret; } diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in index f334b66bff..4168d1f220 100644 --- a/package/alsa-lib/Config.in +++ b/package/alsa-lib/Config.in @@ -22,7 +22,7 @@ if BR2_PACKAGE_ALSA_LIB config BR2_PACKAGE_ALSA_LIB_PYTHON bool "Python support for alsa-lib" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help Add python support for alsa-lib. Python will be built and libpython will be installed diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index 2f34a12fb5..6660c8a104 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 958e260e3673f1f6ff6b2d2c0df3fc2e469bea5b2957163ce96ce17f23e87943 alsa-lib-1.2.1.2.tar.bz2 -sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING -sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING +sha256 628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e alsa-lib-1.2.5.1.tar.bz2 +sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING +sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 38bd0fb70a..99c53f9408 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,11 +4,12 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.1.2 +ALSA_LIB_VERSION = 1.2.5.1 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) ALSA_LIB_LICENSE_FILES = COPYING aserver/COPYING +ALSA_LIB_CPE_ID_VENDOR = alsa-project ALSA_LIB_INSTALL_STAGING = YES ALSA_LIB_CFLAGS = $(TARGET_CFLAGS) ALSA_LIB_AUTORECONF = YES @@ -56,12 +57,22 @@ ALSA_LIB_CONF_OPTS += --disable-old-symbols endif ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) +ALSA_LIB_CONF_OPTS += \ + --enable-mixer-pymods +ifeq ($(BR2_PACKAGE_PYTHON),y) ALSA_LIB_CONF_OPTS += \ --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \ --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) ALSA_LIB_DEPENDENCIES = python else +ALSA_LIB_CONF_OPTS += \ + --with-pythonlibs=-lpython$(PYTHON3_VERSION_MAJOR) \ + --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) +ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) +ALSA_LIB_DEPENDENCIES = python3 +endif +else ALSA_LIB_CONF_OPTS += --disable-python endif diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index 2c55ce6217..dda009c1af 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0b110ba71ef41d3009db1bc4dcae0cf79efb99cb5426fa19d0312470560a2c0d alsa-utils-1.2.1.tar.bz2 -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426 alsa-utils-1.2.4.tar.bz2 +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 2cd3c4a333..427280c1e6 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,9 +4,9 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.1 +ALSA_UTILS_VERSION = 1.2.4 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 -ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils +ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 ALSA_UTILS_LICENSE_FILES = COPYING ALSA_UTILS_INSTALL_STAGING = YES @@ -14,10 +14,10 @@ ALSA_UTILS_DEPENDENCIES = host-pkgconf alsa-lib \ $(if $(BR2_PACKAGE_NCURSES),ncurses) \ $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \ $(TARGET_NLS_DEPENDENCIES) -# Regenerate aclocal.m4 to pick the patched -# version of alsa.m4 from alsa-lib -ALSA_UTILS_AUTORECONF = YES -ALSA_UTILS_GETTEXTIZE = YES + +ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSACTL),y) +ALSA_UTILS_SELINUX_MODULES += alsa +endif ALSA_UTILS_CONF_ENV = \ ac_cv_prog_ncurses5_config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) \ @@ -77,7 +77,6 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS fi if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \ mkdir -p $(TARGET_DIR)/usr/share/; \ - rm -rf $(TARGET_DIR)/usr/share/alsa/; \ cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \ fi endef @@ -90,10 +89,10 @@ define ALSA_UTILS_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service $(INSTALL) -D -m 0644 $(@D)/alsactl/alsa-state.service \ $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service - mkdir $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service.d + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service.d printf '[Install]\nWantedBy=multi-user.target\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service.d/buildroot-enable.conf - mkdir $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service.d + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service.d printf '[Install]\nWantedBy=multi-user.target\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service.d/buildroot-enable.conf; endef diff --git a/package/am33x-cm3/am33x-cm3.hash b/package/am33x-cm3/am33x-cm3.hash index a63ba64a3c..2210e8ac69 100644 --- a/package/am33x-cm3/am33x-cm3.hash +++ b/package/am33x-cm3/am33x-cm3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a722098b362f58f4dfb2a7c30afd604424d435b3d5ebe6ebf5d76ad942f796d0 am33x-cm3-11107db2f1e9e58ee75d4fe9cc38423c9a6e4365.tar.gz +sha256 c0b11d7ed2300172354f2948e858ddb5cae19d084bd1ab6d48cfa7b6bfa13261 am33x-cm3-11107db2f1e9e58ee75d4fe9cc38423c9a6e4365-br1.tar.gz sha256 e136e6949a1d3ca144374375af8b9387faa11d2eee7debff8cf22ca8fe7bf7e9 License.txt diff --git a/package/angularjs/angularjs.hash b/package/angularjs/angularjs.hash index 4f0f36b2a1..5468174e4d 100644 --- a/package/angularjs/angularjs.hash +++ b/package/angularjs/angularjs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7182e7f39b921469157971d9e0783745758df4b625322d606ec7d9abf2b28af2 angular-1.7.9.zip -sha256 2420c59374dcdc1ca9721c334a32afee92f0610280cae0d1b3952b1279bc2b24 angular.js +sha256 471b57064031da8c5fd3b1ba3f52dd1e0d2740a97ed34da2e8ab2a4cc2718280 angular-1.8.2.zip +sha256 237656fae6e39d02cd71cbcfbf91b7964eba5796aafca1bfcfff3b054ce3fed6 angular.js diff --git a/package/angularjs/angularjs.mk b/package/angularjs/angularjs.mk index 295be5400a..d393c82c19 100644 --- a/package/angularjs/angularjs.mk +++ b/package/angularjs/angularjs.mk @@ -4,12 +4,14 @@ # ################################################################################ -ANGULARJS_VERSION = 1.7.9 +ANGULARJS_VERSION = 1.8.2 ANGULARJS_SOURCE = angular-$(ANGULARJS_VERSION).zip ANGULARJS_SITE = https://code.angularjs.org/$(ANGULARJS_VERSION) ANGULARJS_LICENSE = MIT # There's no separate license file in the archive, so use angular.js instead. ANGULARJS_LICENSE_FILES = angular.js +ANGULARJS_CPE_ID_VENDOR = angularjs +ANGULARJS_CPE_ID_PRODUCT = angular.js define ANGULARJS_EXTRACT_CMDS unzip $(ANGULARJS_DL_DIR)/$(ANGULARJS_SOURCE) -d $(@D) diff --git a/package/apache/Config.in b/package/apache/Config.in index 693ee20a1b..8b6a5bf7ea 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_APACHE server that provides HTTP services in sync with the current HTTP standards. - http://httpd.apache.org + https://httpd.apache.org if BR2_PACKAGE_APACHE diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 7b0e4ad8e7..138717c336 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,4 +1,5 @@ -# From http://archive.apache.org/dist/httpd/httpd-2.4.43.tar.bz2.sha256 -sha256 a497652ab3fc81318cdc2a203090a999150d86461acff97c1065dc910fe10f43 httpd-2.4.43.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.51.tar.bz2.{sha256,sha512} +sha256 20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4 httpd-2.4.51.tar.bz2 +sha512 9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 httpd-2.4.51.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 48a64eae0e..ff01b25106 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,11 +4,14 @@ # ################################################################################ -APACHE_VERSION = 2.4.43 +APACHE_VERSION = 2.4.51 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 -APACHE_SITE = http://archive.apache.org/dist/httpd +APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 APACHE_LICENSE_FILES = LICENSE +APACHE_CPE_ID_VENDOR = apache +APACHE_CPE_ID_PRODUCT = http_server +APACHE_SELINUX_MODULES = apache # Needed for mod_php APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, @@ -21,7 +24,7 @@ define APACHE_FIXUP_APR_LIBTOOL $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \ $(STAGING_DIR)/usr/build-1/libtool endef -APACHE_POST_CONFIGURE_HOOKS += APACHE_FIXUP_APR_LIBTOOL +APACHE_POST_PREPARE_HOOKS += APACHE_FIXUP_APR_LIBTOOL endif APACHE_CONF_ENV= \ @@ -99,6 +102,7 @@ APACHE_CONF_OPTS += --disable-deflate endif define APACHE_FIX_STAGING_APACHE_CONFIG + $(SED) 's%"/usr/bin"%"$(STAGING_DIR)/usr/bin"%' $(STAGING_DIR)/usr/bin/apxs $(SED) 's%/usr/build%$(STAGING_DIR)/usr/build%' $(STAGING_DIR)/usr/bin/apxs $(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' $(STAGING_DIR)/usr/build/config_vars.mk endef diff --git a/package/apitrace/Config.in b/package/apitrace/Config.in index 263eec5e7d..44bd696431 100644 --- a/package/apitrace/Config.in +++ b/package/apitrace/Config.in @@ -1,8 +1,8 @@ -comment "apitrace needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 4.9" +comment "apitrace needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 7" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 config BR2_PACKAGE_APITRACE bool "apitrace" @@ -10,7 +10,7 @@ config BR2_PACKAGE_APITRACE depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBPNG diff --git a/package/apitrace/apitrace.hash b/package/apitrace/apitrace.hash index 9479f06425..7ccf6cfbe1 100644 --- a/package/apitrace/apitrace.hash +++ b/package/apitrace/apitrace.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0eec81ba7d3799622336319785465a2982a0621898842517a07894d7e2aa18eb apitrace-9.0.tar.gz -sha256 7066bb1b787519c42f8278b77757c21de522cd97755cb30a22759ac401c62260 LICENSE +sha256 2e57d37af39369d7ce78666acb8afb1a49ec758f683a21077ec39eb0befae4ad apitrace-10.0.tar.gz +sha256 7066bb1b787519c42f8278b77757c21de522cd97755cb30a22759ac401c62260 LICENSE diff --git a/package/apitrace/apitrace.mk b/package/apitrace/apitrace.mk index e4e6c41fed..3656a5722b 100644 --- a/package/apitrace/apitrace.mk +++ b/package/apitrace/apitrace.mk @@ -4,7 +4,7 @@ # ################################################################################ -APITRACE_VERSION = 9.0 +APITRACE_VERSION = 10.0 APITRACE_SITE = $(call github,apitrace,apitrace,$(APITRACE_VERSION)) APITRACE_LICENSE = MIT APITRACE_LICENSE_FILES = LICENSE @@ -27,6 +27,10 @@ APITRACE_CXXFLAGS = $(TARGET_CXXFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) # This works around embedded Brotli build failure APITRACE_CFLAGS += -O0 +# CMakeLists.txt sets CMAKE_CXX_FLAGS_ depending on +# BUILD_TYPE, and this comes after the generic CMAKE_CXX_FLAGS. +# Override CMAKE_BUILD_TYPE so no overrides are applied. +APITRACE_CONF_OPTS += -DCMAKE_BUILD_TYPE=Buildroot endif ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index 53b633b159..f6ce7ac064 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -9,6 +9,8 @@ APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2 APR_UTIL_SITE = http://archive.apache.org/dist/apr APR_UTIL_LICENSE = Apache-2.0 APR_UTIL_LICENSE_FILES = LICENSE +APR_UTIL_CPE_ID_VENDOR = apache +APR_UTIL_CPE_ID_PRODUCT = portable_runtime_utility APR_UTIL_INSTALL_STAGING = YES APR_UTIL_DEPENDENCIES = apr expat APR_UTIL_CONF_OPTS = \ @@ -16,13 +18,17 @@ APR_UTIL_CONF_OPTS = \ APR_UTIL_CONFIG_SCRIPTS = apu-1-config ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APR_UTIL_FIX_RULES_MK_LIBTOOL - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ - $(@D)/build/rules.mk +define APR_UTIL_FIX_LIBTOOL $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ $(STAGING_DIR)/usr/build-1/libtool endef -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK_LIBTOOL +APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL + +define APR_UTIL_FIX_RULES_MK + $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ + $(@D)/build/rules.mk +endef +APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK endif # When iconv is available, then use it to provide charset conversion diff --git a/package/argp-standalone/argp-standalone.hash b/package/argp-standalone/argp-standalone.hash index 5798214406..c780f9e53f 100644 --- a/package/argp-standalone/argp-standalone.hash +++ b/package/argp-standalone/argp-standalone.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be argp-standalone-1.3.tar.gz +sha256 dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be argp-standalone-1.3.tar.gz + +# License file +sha256 bbb8919aa520069b0234faf5e83a94052d278419ffe97ca8e843ecc9b212d1ab argp.h diff --git a/package/argp-standalone/argp-standalone.mk b/package/argp-standalone/argp-standalone.mk index 977b9547b6..651bc400f4 100644 --- a/package/argp-standalone/argp-standalone.mk +++ b/package/argp-standalone/argp-standalone.mk @@ -8,6 +8,7 @@ ARGP_STANDALONE_VERSION = 1.3 ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive ARGP_STANDALONE_INSTALL_STAGING = YES ARGP_STANDALONE_LICENSE = LGPL-2.0+ +ARGP_STANDALONE_LICENSE_FILES = argp.h ARGP_STANDALONE_CONF_ENV = \ CFLAGS="$(TARGET_CFLAGS) -fPIC -fgnu89-inline" diff --git a/package/argparse/argparse.hash b/package/argparse/argparse.hash index 1b01e4b6f9..fd7c48eab3 100644 --- a/package/argparse/argparse.hash +++ b/package/argparse/argparse.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 47b3ca9e734971ba24ef26b0beff692ce6008f53aaf78c303f3d883648c96acb argparse-0.7.0-1.src.rock -sha256 9a918f21485b2a4529c901491d9101392f03586d65ad5b024a4445ebc1dc37b4 argparse-0.7.0/LICENSE +sha256 ea30d0643586a20aeb6349ca8cb7db63aefc21d9aa007c7b7168a7c564817879 argparse-0.7.1-1.src.rock +sha256 9a918f21485b2a4529c901491d9101392f03586d65ad5b024a4445ebc1dc37b4 argparse-0.7.1/LICENSE diff --git a/package/argparse/argparse.mk b/package/argparse/argparse.mk index a9b7a2f719..d719e67d83 100644 --- a/package/argparse/argparse.mk +++ b/package/argparse/argparse.mk @@ -4,7 +4,7 @@ # ################################################################################ -ARGPARSE_VERSION = 0.7.0-1 +ARGPARSE_VERSION = 0.7.1-1 ARGPARSE_LICENSE = MIT ARGPARSE_LICENSE_FILES = $(ARGPARSE_SUBDIR)/LICENSE diff --git a/package/armadillo/Config.in b/package/armadillo/Config.in index b2b61a3233..7aed4fd02f 100644 --- a/package/armadillo/Config.in +++ b/package/armadillo/Config.in @@ -1,20 +1,38 @@ comment "armadillo needs a toolchain w/ C++" + depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP - depends on !BR2_powerpc - depends on !BR2_m68k_cf -comment "armadillo needs a glibc toolchain w/ C++" - depends on BR2_powerpc - depends on !BR2_INSTALL_LIBSTDCPP || BR2_TOOLCHAIN_USES_UCLIBC +comment "armadillo needs a toolchain w/ fortran, C++" + depends on !BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS # otherwise, see comment above + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_FORTRAN || !BR2_INSTALL_LIBSTDCPP config BR2_PACKAGE_ARMADILLO bool "armadillo" + depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS || \ + (BR2_PACKAGE_LAPACK_ARCH_SUPPORTS && BR2_TOOLCHAIN_HAS_FORTRAN) depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_powerpc || BR2_TOOLCHAIN_USES_GLIBC # clapack - depends on !BR2_m68k_cf # clapack - select BR2_PACKAGE_CLAPACK help Armadillo: An Open Source C++ Linear Algebra Library for Fast Prototyping and Computationally Intensive Experiments. http://arma.sourceforge.net/ + +if BR2_PACKAGE_ARMADILLO + +choice + prompt "BLAS implementation" + +config BR2_PACKAGE_ARMADILLO_OPENBLAS + bool "openblas" + depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS + select BR2_PACKAGE_OPENBLAS + +config BR2_PACKAGE_ARMADILLO_LAPACK + bool "lapack" + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS && BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_PACKAGE_LAPACK + +endchoice + +endif diff --git a/package/armadillo/armadillo.hash b/package/armadillo/armadillo.hash index aa21570803..cc91fb456a 100644 --- a/package/armadillo/armadillo.hash +++ b/package/armadillo/armadillo.hash @@ -1,7 +1,4 @@ -# From http://sourceforge.net/projects/arma/files/?source=navbar -md5 12c3b63c301d414659d7592ff58a71cb armadillo-9.850.1.tar.xz -sha1 0a2d3ef140fd8587867def7359fe45f9df4a925a armadillo-9.850.1.tar.xz # Locally computed: -sha256 d4c389b9597a5731500ad7a2656c11a6031757aaaadbcafdea5cc8ac0fd2c01f armadillo-9.850.1.tar.xz +sha256 d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05 armadillo-9.900.2.tar.xz # License files, locally calculated sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE.txt diff --git a/package/armadillo/armadillo.mk b/package/armadillo/armadillo.mk index d9a28e9878..8661bfd9da 100644 --- a/package/armadillo/armadillo.mk +++ b/package/armadillo/armadillo.mk @@ -4,12 +4,30 @@ # ################################################################################ -ARMADILLO_VERSION = 9.850.1 +ARMADILLO_VERSION = 9.900.2 ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma -ARMADILLO_DEPENDENCIES = clapack ARMADILLO_INSTALL_STAGING = YES ARMADILLO_LICENSE = Apache-2.0 ARMADILLO_LICENSE_FILES = LICENSE.txt +ARMADILLO_CONF_OPTS = -DDETECT_HDF5=false + +# blas support may be provided by lapack (libblas.a) or openblas (libopenblas.a) +ARMADILLO_CONF_OPTS += -DBLAS_FOUND=ON +ifeq ($(BR2_PACKAGE_ARMADILLO_OPENBLAS),y) +ARMADILLO_CONF_OPTS += -DBLAS_LIBRARIES=-lopenblas +ARMADILLO_DEPENDENCIES += openblas +else +# Since BR2_PACKAGE_LAPACK is selected in this case, the dependency on it is +# added below. +ARMADILLO_CONF_OPTS += -DBLAS_LIBRARIES=-lblas +endif + +# lapack support is optional and can only be provided by lapack, not openblas +ifeq ($(BR2_PACKAGE_LAPACK),y) +ARMADILLO_CONF_OPTS += -DLAPACK_FOUND=ON +ARMADILLO_DEPENDENCIES += lapack +endif + $(eval $(cmake-package)) diff --git a/package/armbian-firmware/Config.in b/package/armbian-firmware/Config.in index 761c316612..7c5f6ba193 100644 --- a/package/armbian-firmware/Config.in +++ b/package/armbian-firmware/Config.in @@ -8,14 +8,19 @@ config BR2_PACKAGE_ARMBIAN_FIRMWARE if BR2_PACKAGE_ARMBIAN_FIRMWARE -config BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819 - bool "XR819 WiFi" - help - Firmware files for XR819 WiFi SDIO chip. - config BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212 bool "AP6212 WiFi/BT" help Firmware files for AP6212 WiFi/BT combo chip. +config BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6256 + bool "AP6256 WiFi/BT" + help + Firmware files for AP6256 WiFi/BT combo chip. + +config BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819 + bool "XR819 WiFi" + help + Firmware files for XR819 WiFi SDIO chip. + endif diff --git a/package/armbian-firmware/armbian-firmware.hash b/package/armbian-firmware/armbian-firmware.hash index 0f3858dedf..ceefafd97c 100644 --- a/package/armbian-firmware/armbian-firmware.hash +++ b/package/armbian-firmware/armbian-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 876958ce6ba8a4a01a424f2b4455208b7a989eaba96015649c774340553f0c35 armbian-firmware-455d6b6701178dafe7fd0168eb4a4ef78a8d24a3.tar.gz +sha256 a370a6aeb30f12a17f8d47c81a4d81aa822b9408589305a4d6a67d544280520d armbian-firmware-70a08503ac9e765f5d1ccf4fa3e825db0751e53e-br1.tar.gz diff --git a/package/armbian-firmware/armbian-firmware.mk b/package/armbian-firmware/armbian-firmware.mk index 77e518542b..0ed069025d 100644 --- a/package/armbian-firmware/armbian-firmware.mk +++ b/package/armbian-firmware/armbian-firmware.mk @@ -4,10 +4,23 @@ # ################################################################################ -ARMBIAN_FIRMWARE_VERSION = 455d6b6701178dafe7fd0168eb4a4ef78a8d24a3 +ARMBIAN_FIRMWARE_VERSION = 70a08503ac9e765f5d1ccf4fa3e825db0751e53e ARMBIAN_FIRMWARE_SITE = https://github.com/armbian/firmware ARMBIAN_FIRMWARE_SITE_METHOD = git +# AP6212 WiFi/BT combo firmware +ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212),y) +ARMBIAN_FIRMWARE_DIRS += ap6212 +endif + +# AP6256 WiFi/BT combo firmware +ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6256),y) +ARMBIAN_FIRMWARE_FILES += \ + brcm/BCM4345C5.hcd \ + brcm/brcmfmac43456-sdio.bin \ + brcm/brcmfmac43456-sdio.txt +endif + # XR819 WiFi firmware ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819),y) ARMBIAN_FIRMWARE_FILES += \ @@ -16,11 +29,6 @@ ARMBIAN_FIRMWARE_FILES += \ xr819/sdd_xr819.bin endif -# AP6212 WiFi/BT combo firmware -ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212),y) -ARMBIAN_FIRMWARE_DIRS += ap6212 -endif - ifneq ($(ARMBIAN_FIRMWARE_FILES),) define ARMBIAN_FIRMWARE_INSTALL_FILES cd $(@D) && \ diff --git a/package/assimp/Config.in b/package/assimp/Config.in index 42bfee945d..c535240efc 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 - select BR2_PACKAGE_ZLIB + depends on BR2_PACKAGE_LIBZLIB help Open Asset Import Library (assimp) is a portable Open Source library to import various well-known 3D model formats in a @@ -13,4 +13,8 @@ config BR2_PACKAGE_ASSIMP http://www.assimp.org comment "assimp needs a toolchain w/ C++, wchar" + depends on BR2_PACKAGE_LIBZLIB depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR + +comment "assimp needs libzlib" + depends on !BR2_PACKAGE_LIBZLIB diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index 5e8e825375..eddfbc48b0 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -11,8 +11,17 @@ ASSIMP_LICENSE_FILES = LICENSE ASSIMP_DEPENDENCIES = zlib ASSIMP_INSTALL_STAGING = YES -# relocation truncated to fit: R_68K_GOT16O +# relocation truncated to fit: R_68K_GOT16O. We also need to disable +# optimizations to not run into "Error: value -43420 out of range" +# assembler issues. ifeq ($(BR2_m68k),y) +ASSIMP_CXXFLAGS += -mxgot -O0 +endif + +# just like m68k coldfire, mips64 also has some limitations on the GOT +# size for large libraries, which can be overcome by passing +# -mxgot. Solves "relocation truncated to fit: R_MIPS_CALL16" issues. +ifeq ($(BR2_mips64)$(BR2_mips64el),y) ASSIMP_CXXFLAGS += -mxgot endif diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 26aa4b89b7..eabe11e052 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 474cbc6f9dddee94616f8af8e097bc4d340dc9698c4165dc45be6e0be80ff725 asterisk-16.6.2.tar.gz +sha256 1ba86666072b903e24b5cfef3d6d607d0d090c0fd232429ed410496e8f93ac40 asterisk-16.21.1.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed @@ -12,4 +12,4 @@ sha256 449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538 asteri sha256 82af40ed7f49c08685360811993d9396320842f021df828801d733e8fdc0312f COPYING sha256 ac5571f00e558e3b7c9b3f13f421b874cc12cf4250c4f70094c71544cf486312 main/sha1.c sha256 6215e3ed73c3982a5c6701127d681ec0b9f1121ac78a28805bd93f93c3eb84c0 codecs/speex/speex_resampler.h -sha256 1ca2c7a7a1ae7ccd75212a8c1e85dd9ec92bdbc9170aafd97ea60459387755fd utils/db1-ast/include/db.h +sha256 ea69cc96ab8a779c180a362377caeada71926897d1b55b980f04d74ba5aaa388 utils/db1-ast/include/db.h diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index cea287f0d7..d3a1cd08ff 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.6.2 +ASTERISK_VERSION = 16.21.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)) @@ -21,6 +21,10 @@ ASTERISK_LICENSE_FILES = \ codecs/speex/speex_resampler.h \ utils/db1-ast/include/db.h +ASTERISK_CPE_ID_VENDOR = asterisk +ASTERISK_CPE_ID_PRODUCT = open_source +ASTERISK_SELINUX_MODULES = asterisk + # For patches 0002, 0003 and 0005 ASTERISK_AUTORECONF = YES ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson @@ -107,6 +111,9 @@ ASTERISK_CONF_OPTS = \ # the time of this writing). ASTERISK_CONF_OPTS += --without-avcodec +# asterisk is not compatible with freeswitch spandsp +ASTERISK_CONF_OPTS += --without-spandsp + ASTERISK_CONF_ENV = \ ac_cv_file_bridges_bridge_softmix_include_hrirs_h=true \ ac_cv_path_CONFIG_LIBXML2=$(STAGING_DIR)/usr/bin/xml2-config @@ -232,13 +239,6 @@ else ASTERISK_CONF_OPTS += --without-ssl endif -ifeq ($(BR2_PACKAGE_SPANDSP),y) -ASTERISK_DEPENDENCIES += spandsp -ASTERISK_CONF_OPTS += --with-spandsp -else -ASTERISK_CONF_OPTS += --without-spandsp -endif - ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy) ASTERISK_DEPENDENCIES += speex ASTERISK_CONF_OPTS += --with-speex --with-speexdsp @@ -281,6 +281,17 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ASTERISK_MAKE_OPTS += ASTLDFLAGS="-latomic" endif +# Remove default -O3 optimization flag +ASTERISK_MAKE_OPTS += OPTIMIZE="" + +ASTERISK_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_93847),y) +ASTERISK_CFLAGS += -O0 +endif + +ASTERISK_CONF_OPTS += CFLAGS="$(ASTERISK_CFLAGS)" + # We want to install sample configuration files, too. ASTERISK_INSTALL_TARGET_OPTS = \ $(ASTERISK_DIRS) \ diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash index 77c8f68e47..9c564c32af 100644 --- a/package/at-spi2-atk/at-spi2-atk.hash +++ b/package/at-spi2-atk/at-spi2-atk.hash @@ -1,3 +1,5 @@ +# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum +sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz + # locally calculated -sha256 61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e at-spi2-atk-2.26.2.tar.xz -sha256 c6105b34ab6829ff5c70eba234f40053215fa9f8383ced271b0e370a1923624b COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk index 4ef681b3b1..232b577230 100644 --- a/package/at-spi2-atk/at-spi2-atk.mk +++ b/package/at-spi2-atk/at-spi2-atk.mk @@ -4,13 +4,16 @@ # ################################################################################ -AT_SPI2_ATK_VERSION_MAJOR = 2.26 +AT_SPI2_ATK_VERSION_MAJOR = 2.34 AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2 AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz -AT_SPI2_ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) -AT_SPI2_ATK_LICENSE = LGPL-2.0+ +AT_SPI2_ATK_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) +AT_SPI2_ATK_LICENSE = LGPL-2.1+ AT_SPI2_ATK_LICENSE_FILES = COPYING +AT_SPI2_ATK_CPE_ID_VENDOR = gnome AT_SPI2_ATK_INSTALL_STAGING = YES AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf +AT_SPI2_ATK_CONF_OPTS = -Dtests=false -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index 9c96da312b..e2cc403e71 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,3 +1,5 @@ +# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum +sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz + # locally calculated -sha256 42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87 at-spi2-core-2.28.0.tar.xz -sha256 c6105b34ab6829ff5c70eba234f40053215fa9f8383ced271b0e370a1923624b COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index 3a5197eb03..cf7fdd297c 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -4,11 +4,11 @@ # ################################################################################ -AT_SPI2_CORE_VERSION_MAJOR = 2.28 +AT_SPI2_CORE_VERSION_MAJOR = 2.36 AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) -AT_SPI2_CORE_LICENSE = LGPL-2.0+ +AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \ diff --git a/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch b/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch index 856b6c8d08..a9538589c1 100644 --- a/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch +++ b/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch @@ -1,25 +1,26 @@ -From 195d30e2e01fe2f91ed3bdaeec3982aa66b309dd Mon Sep 17 00:00:00 2001 +From cbfd3296d7d0742d9e35b01ec9e433afe2c36c63 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Tue, 1 Dec 2009 20:57:45 +0100 -Subject: [PATCH 5/5] Makefile.in: replace IROOT by DESTDIR +Subject: [PATCH] Makefile.in: replace IROOT by DESTDIR This patch replaces IROOT by DESTDIR, which is the autotools standard variable. For backwards compatibilty IROOT overwrites the DESTDIR. -[Vincent: tweak the patch for the new version] - Signed-off-by: Marc Kleine-Budde Signed-off-by: Vicente Olivert Riera +[Vincent: tweak the patch for the new version] +Signed-off-by: Giulio Benetti +[Giulio: convert patch to git format and rebase to version 3.2.2] --- - Makefile.in | 68 ++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 36 insertions(+), 32 deletions(-) + Makefile.in | 72 ++++++++++++++++++++++++++++------------------------- + 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 06544f9..1f699d9 100644 +index 3e8303c..a7197f2 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -17,6 +17,10 @@ atdocdir = $(docdir)/at - etcdir = @ETCDIR@ +@@ -20,6 +20,10 @@ etcdir = @ETCDIR@ + atjobdir = @ATJBD@ systemdsystemunitdir = @systemdsystemunitdir@ +ifdef IROOT @@ -29,13 +30,14 @@ index 06544f9..1f699d9 100644 DAEMON_USERNAME = @DAEMON_USERNAME@ DAEMON_GROUPNAME= @DAEMON_GROUPNAME@ LOADAVG_MX = @LOADAVG_MX@ -@@ -91,41 +95,41 @@ atrun: atrun.in +@@ -95,43 +99,43 @@ atrun: atrun.in $(CC) -c $(CFLAGS) $(DEFS) $*.c install: all - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir) - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir) - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir) +- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdatadir) - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir) - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir) - $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) @@ -48,6 +50,7 @@ index 06544f9..1f699d9 100644 - $(LN_S) -f at $(IROOT)$(bindir)/atq - $(LN_S) -f at $(IROOT)$(bindir)/atrm - $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) +- $(INSTALL) -g root -o root -m 755 batch-job $(IROOT)$(atdatadir) - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir) - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir) - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir) @@ -59,6 +62,7 @@ index 06544f9..1f699d9 100644 + $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir) + $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir) + $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir) ++ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdatadir) + $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir) + $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir) + $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) @@ -71,6 +75,7 @@ index 06544f9..1f699d9 100644 + $(LN_S) -f at $(DESTDIR)$(bindir)/atq + $(LN_S) -f at $(DESTDIR)$(bindir)/atrm + $(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir) ++ $(INSTALL) -g root -o root -m 755 batch-job $(DESTDIR)$(atdatadir) + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir) + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir) + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir) @@ -104,5 +109,5 @@ index 06544f9..1f699d9 100644 dist: checkin $(DIST) $(LIST) Filelist.asc -- -2.4.10 +2.25.1 diff --git a/package/at/at.hash b/package/at/at.hash index e20c00b3cd..88a9e8a91d 100644 --- a/package/at/at.hash +++ b/package/at/at.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9ae5761a1fb897cda3a6f14439bed33cda33c0eedfcee6866e3d2ebad67fbd2f at-7c74fa1aece6bc6db351763dc012193d5d634b7e.tar.gz +sha256 2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088 at_3.2.2.orig.tar.gz -sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright -sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING +sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright +sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/at/at.mk b/package/at/at.mk index dbf649c0be..bbeed2a0e8 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,9 +4,9 @@ # ################################################################################ -AT_VERSION = 7c74fa1aece6bc6db351763dc012193d5d634b7e -AT_SITE = https://salsa.debian.org/debian/at.git -AT_SITE_METHOD = git +AT_VERSION = 3.2.2 +AT_SOURCE = at_$(AT_VERSION).orig.tar.gz +AT_SITE = http://software.calhariz.com/at AT_AUTORECONF = YES AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex AT_LICENSE = GPL-2.0+, GPL-3.0+, ISC diff --git a/package/atftp/atftp.hash b/package/atftp/atftp.hash index 3e5e783cff..6b0d9a5879 100644 --- a/package/atftp/atftp.hash +++ b/package/atftp/atftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1ad080674e9f974217b3a703e7356c6c8446dc5e7b2014d0d06e1bfaa11b5041 atftp-0.7.2.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE +sha256 93c87a4fb18218414e008e01c995dadd231ba4c752d0f894b34416d1e6d3038a atftp-0.7.5.tar.gz +sha256 86dc744860e6dfacfeba2f33fea908db03fe67c7e37a878285b7aae8e4596735 LICENSE diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk index cbe05ba7e0..70ef4c0fae 100644 --- a/package/atftp/atftp.mk +++ b/package/atftp/atftp.mk @@ -4,12 +4,12 @@ # ################################################################################ -ATFTP_VERSION = 0.7.2 +ATFTP_VERSION = 0.7.5 ATFTP_SITE = http://sourceforge.net/projects/atftp/files ATFTP_LICENSE = GPL-2.0+ ATFTP_LICENSE_FILES = LICENSE -# 0001-Makefile.am-link-against-libpthread-for-atftp.patch patches Makefile.am -ATFTP_AUTORECONF = YES +ATFTP_CPE_ID_VENDOR = atftp_project +ATFTP_SELINUX_MODULES = tftp ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp # For static we need to explicitly link against libpthread ATFTP_LIBS = -lpthread diff --git a/package/atk/atk.hash b/package/atk/atk.hash index 8c1bad5b1a..2e7c3b5fec 100644 --- a/package/atk/atk.hash +++ b/package/atk/atk.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.33/atk-2.33.3.sha256sum -sha256 532d1081e87b9f0a8d71733101e791818442fa1896531621d1aecc189e1a4ffe atk-2.33.3.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.sha256sum +sha256 fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 atk-2.36.0.tar.xz # Hash for license file -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/atk/atk.mk b/package/atk/atk.mk index a16143d2c0..dfeb4de8b2 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -4,8 +4,8 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.33 -ATK_VERSION = $(ATK_VERSION_MAJOR).3 +ATK_VERSION_MAJOR = 2.36 +ATK_VERSION = $(ATK_VERSION_MAJOR).0 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) ATK_LICENSE = LGPL-2.0+ diff --git a/package/atop/Config.in b/package/atop/Config.in index 9e42eddb57..b8ee30c306 100644 --- a/package/atop/Config.in +++ b/package/atop/Config.in @@ -1,8 +1,10 @@ config BR2_PACKAGE_ATOP bool "atop" depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # ncurses wchar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # PERF_FLAG_FD_CLOEXEC select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR select BR2_PACKAGE_ZLIB help Atop is an ASCII full-screen performance monitor for Linux @@ -18,6 +20,7 @@ config BR2_PACKAGE_ATOP http://www.atoptool.nl -comment "atop needs a toolchain w/ headers >= 3.14" +comment "atop needs a toolchain w/ wchar, headers >= 3.14" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 + depends on !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 diff --git a/package/atop/atop.hash b/package/atop/atop.hash index f404ed5d1b..65148b8578 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33 atop-2.5.0.tar.gz +sha256 9ec2ca3a571692f7efaa095f99a5106432bcb71cc22cd6c49597ef0481058f72 atop-2.6.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 46baff8f72..88f292b6b3 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,10 +4,11 @@ # ################################################################################ -ATOP_VERSION = 2.5.0 +ATOP_VERSION = 2.6.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING +ATOP_CPE_ID_VENDOR = atop_project ATOP_DEPENDENCIES = ncurses zlib ATOP_CFLAGS = $(TARGET_CFLAGS) diff --git a/package/attr/attr.hash b/package/attr/attr.hash index ba9f45669f..334a438cae 100644 --- a/package/attr/attr.hash +++ b/package/attr/attr.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7 attr-2.4.48.tar.gz +sha256 db448a626f9313a1a970d636767316a8da32aede70518b8050fa0de7947adc32 attr-2.5.1.tar.xz # Locally calculated sha256 98f318493be6b08bff3cd295791cde06c54e17882a3c74a1ed245eaa02533d52 doc/COPYING diff --git a/package/attr/attr.mk b/package/attr/attr.mk index ba77e802d2..0327497e1e 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -4,10 +4,12 @@ # ################################################################################ -ATTR_VERSION = 2.4.48 +ATTR_VERSION = 2.5.1 +ATTR_SOURCE = attr-$(ATTR_VERSION).tar.xz ATTR_SITE = http://download.savannah.gnu.org/releases/attr ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL +ATTR_CPE_ID_VENDOR = attr_project ATTR_INSTALL_STAGING = YES diff --git a/package/audit/S02auditd b/package/audit/S02auditd index 2ecf0f1df9..dd3dc22d6d 100644 --- a/package/audit/S02auditd +++ b/package/audit/S02auditd @@ -18,9 +18,9 @@ start(){ # Create dir to store log files in if one doesn't exist. Create # the directory with SELinux permissions if possible - command -v matchpathcon >/dev/null 2>&1 + command -v selabel_lookup >/dev/null 2>&1 if [ $? = 0 ]; then - mkdir -p /var/log/audit -Z `matchpathcon -n /var/log/audit` + mkdir -p /var/log/audit -Z `selabel_lookup -b file -k /var/log/audit | cut -d ' ' -f 3` else mkdir -p /var/log/audit fi diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 71e7df7dbc..4ef9a42b0d 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 0e5d4103646e00f8d1981e1cd2faea7a2ae28e854c31a803e907a383c5e2ecb7 audit-2.8.5.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING -sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB +sha256 994c4250d8fd43f3087a3c2ce73461832e30f1e9b278bf5bb03c3e07091155a5 audit-3.0.1.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 03967ee650..bbf4f85629 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,12 +4,12 @@ # ################################################################################ -AUDIT_VERSION = 2.8.5 +AUDIT_VERSION = 3.0.1 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB -# 0002-Add-substitue-functions-for-strndupa-rawmemchr.patch -AUDIT_AUTORECONF = YES +AUDIT_CPE_ID_VENDOR = linux_audit_project +AUDIT_CPE_ID_PRODUCT = linux_audit AUDIT_INSTALL_STAGING = YES @@ -54,6 +54,11 @@ define AUDIT_INSTALL_CLEANUP endef AUDIT_POST_INSTALL_TARGET_HOOKS += AUDIT_INSTALL_CLEANUP +define AUDIT_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT) +endef + HOST_AUDIT_CONF_OPTS = \ --without-python \ --without-python3 \ diff --git a/package/augeas/augeas.mk b/package/augeas/augeas.mk index cf369d6910..a0bc294565 100644 --- a/package/augeas/augeas.mk +++ b/package/augeas/augeas.mk @@ -9,6 +9,7 @@ AUGEAS_SITE = http://download.augeas.net AUGEAS_INSTALL_STAGING = YES AUGEAS_LICENSE = LGPL-2.1+ AUGEAS_LICENSE_FILES = COPYING +AUGEAS_CPE_ID_VENDOR = augeas AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2 AUGEAS_CONF_OPTS = --disable-gnulib-tests diff --git a/package/aumix/aumix.hash b/package/aumix/aumix.hash index 2fbab4bda2..43c09dc54e 100644 --- a/package/aumix/aumix.hash +++ b/package/aumix/aumix.hash @@ -1,3 +1,4 @@ # Locally calculated sha256 d2ce43d532ef75072c8d4e7922e3bc06be6d97765a508d9ceb0d1766bbe70e29 aumix-2.9.1.tar.bz2 sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING +sha256 3bfa74db4aeb68bfef7ee213bb1dbf236d784dea3d35a52f6e23a48c847375dd 19_no-common.patch diff --git a/package/aumix/aumix.mk b/package/aumix/aumix.mk index 9bcc19a37c..a4001f5bbb 100644 --- a/package/aumix/aumix.mk +++ b/package/aumix/aumix.mk @@ -12,6 +12,9 @@ AUMIX_GETTEXTIZE = YES AUMIX_LICENSE = GPL-2.0+ AUMIX_LICENSE_FILES = COPYING +AUMIX_PATCH = \ + https://sources.debian.org/data/main/a/aumix/2.9.1-7/debian/patches/19_no-common.patch + AUMIX_CONF_OPTS = \ --without-gtk \ --without-gtk1 \ diff --git a/package/autofs/autofs.hash b/package/autofs/autofs.hash index 07432bf769..10ca42ebed 100644 --- a/package/autofs/autofs.hash +++ b/package/autofs/autofs.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/daemons/autofs/v5/sha256sums.asc -sha256 dddee3d9b7388ce6cb7432832dfade25b07ef68ad48dcce01cf247b26a10caef autofs-5.1.6.tar.xz +sha256 a36b268611b79b07051749870ba540b139938efc84bc0293244c483e94f9ced7 autofs-5.1.7.tar.xz # Hash for license files -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING -sha256 2ac2e352a92629e3abcdddbd3eeec64e7c2f5b58b6e819ff2c1444fb6e249fa3 COPYRIGHT +sha256 458028929f712b4795bc5adc31a1d6a2151364ce1b372ac43f613f56c8448fed COPYING +sha256 26c826658dfa9e5ce5f182fbfbadf3fda2d184e78dba3d99da34c60113b2ce54 COPYRIGHT diff --git a/package/autofs/autofs.mk b/package/autofs/autofs.mk index e9b374ec07..4c5200584f 100644 --- a/package/autofs/autofs.mk +++ b/package/autofs/autofs.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOFS_VERSION = 5.1.6 +AUTOFS_VERSION = 5.1.7 AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5 AUTOFS_LICENSE = GPL-2.0+ diff --git a/package/automake/automake.mk b/package/automake/automake.mk index 89dcaa1293..ad8f0f474d 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -9,6 +9,7 @@ AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake AUTOMAKE_LICENSE = GPL-2.0+ AUTOMAKE_LICENSE_FILES = COPYING +AUTOMAKE_CPE_ID_VENDOR = gnu HOST_AUTOMAKE_DEPENDENCIES = host-autoconf diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 73db37545f..9de6ebc4d2 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -8,8 +8,17 @@ AVAHI_VERSION = 0.8 AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION) AVAHI_LICENSE = LGPL-2.1+ AVAHI_LICENSE_FILES = LICENSE +AVAHI_CPE_ID_VENDOR = avahi +AVAHI_SELINUX_MODULES = avahi AVAHI_INSTALL_STAGING = YES +# CVE-2021-26720 is an issue in avahi-daemon-check-dns.sh, which is +# part of the Debian packaging and not part of upstream avahi +AVAHI_IGNORE_CVES += CVE-2021-26720 + +# 0001-Fix-NULL-pointer-crashes-from-175.patch +AVAHI_IGNORE_CVES += CVE-2021-36217 + AVAHI_CONF_ENV = \ avahi_cv_sys_cxx_works=yes \ DATADIRNAME=share @@ -35,6 +44,7 @@ AVAHI_CONF_OPTS = \ --disable-mono \ --disable-monodoc \ --disable-stack-protector \ + --disable-introspection \ --with-distro=none \ --disable-manpages \ $(if $(BR2_PACKAGE_AVAHI_AUTOIPD),--enable,--disable)-autoipd \ diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in index a5680b0028..89558a5ff5 100644 --- a/package/avrdude/Config.in +++ b/package/avrdude/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_AVRDUDE depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT @@ -14,6 +15,19 @@ config BR2_PACKAGE_AVRDUDE https://github.com/kcuzner/avrdude -comment "avrdude needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ +if BR2_PACKAGE_AVRDUDE + +config BR2_PACKAGE_AVRDUDE_SPI + bool "SPI support" + default y # Backward compatibility + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + +comment "SPI support needs a toolchain w/ linux headers >= 4.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + +endif + +comment "avrdude needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR \ + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index 888668ae44..ec43355451 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cfa97af7badc713c62306ab85d0e7a288b064bf72e698494f73cb16c5b2c659e avrdude-f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa.tar.gz +sha256 2a09913450c6457c3fe8d43d5141de579d4e57d67e593e7399a4cd3768cc60f9 avrdude-r1450-br2.tar.gz sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 avrdude/COPYING diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index ae378dfbac..ae623a7929 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,18 +4,25 @@ # ################################################################################ -AVRDUDE_VERSION = f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa -AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION)) +AVRDUDE_VERSION = r1450 +AVRDUDE_SITE_METHOD = svn +AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk AVRDUDE_LICENSE = GPL-2.0+ AVRDUDE_LICENSE_FILES = avrdude/COPYING AVRDUDE_SUBDIR = avrdude -# Sources coming from git, without generated configure and Makefile.in +# Sources coming from svn, without generated configure and Makefile.in # files. AVRDUDE_AUTORECONF = YES AVRDUDE_CONF_OPTS = --enable-linuxgpio AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ host-flex host-bison +ifeq ($(BR2_PACKAGE_AVRDUDE_SPI),y) +AVRDUDE_CONF_OPTS += --enable-linuxspi +else +AVRDUDE_CONF_OPTS += --disable-linuxspi +endif + ifeq ($(BR2_PACKAGE_LIBFTDI1),y) AVRDUDE_DEPENDENCIES += libftdi1 else ifeq ($(BR2_PACKAGE_LIBFTDI),y) diff --git a/package/avro-c/avro-c.hash b/package/avro-c/avro-c.hash index fdddf0bd80..c4fd7d3f57 100644 --- a/package/avro-c/avro-c.hash +++ b/package/avro-c/avro-c.hash @@ -1,5 +1,5 @@ -# From https://www-eu.apache.org/dist/avro/avro-1.9.2/c/avro-c-1.9.2.tar.gz.sha512 -sha512 1bc4bb22c88b70235e8e0280dbb7aeee7aa3f6cb7ff78a1aa5a7a6a1aca5522e8cfc89064096eace1c07a50e98f2397abd3620de1a29f9e5103b6f4c84316927 avro-c-1.9.2.tar.gz +# From https://downloads.apache.org/avro/avro-1.10.0/c/avro-c-1.10.0.tar.gz.sha512 +sha512 2e64926b214fd996abf0553572ec6f46b312cf84df17149d1a7e89f4033b63cc34fabef62b98d727799a8a5d452ac9254e275bdea4bf894e9e1e4588bc5dfc9b avro-c-1.10.0.tar.gz # License files sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE diff --git a/package/avro-c/avro-c.mk b/package/avro-c/avro-c.mk index 5cdbe362d8..ee6e864161 100644 --- a/package/avro-c/avro-c.mk +++ b/package/avro-c/avro-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AVRO_C_VERSION = 1.9.2 +AVRO_C_VERSION = 1.10.0 AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c AVRO_C_LICENSE = Apache-2.0 AVRO_C_LICENSE_FILES = LICENSE diff --git a/package/axel/axel.hash b/package/axel/axel.hash index 955b5eab59..552f940652 100644 --- a/package/axel/axel.hash +++ b/package/axel/axel.hash @@ -1,2 +1,2 @@ -sha256 19c82a095e3ea84f1e24fe6fd6018ee06af73ee03ca8ecf31b34dcc57ef4351e axel-2.17.8.tar.xz +sha256 46eb4f10a11c4e50320ae6a034ef03ffe59dc11c3c6542a9867a3e4dc0c4b44e axel-2.17.10.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/axel/axel.mk b/package/axel/axel.mk index 5c7e99894e..8e3d7679e7 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -4,11 +4,12 @@ # ################################################################################ -AXEL_VERSION = 2.17.8 +AXEL_VERSION = 2.17.10 AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION) AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ AXEL_LICENSE_FILES = COPYING +AXEL_CPE_ID_VENDOR = axel_project AXEL_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test diff --git a/package/azmq/Config.in b/package/azmq/Config.in index 2904890d5f..37131a260a 100644 --- a/package/azmq/Config.in +++ b/package/azmq/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_AZMQ depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # boost-log depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_USE_WCHAR # boost + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_ZEROMQ select BR2_PACKAGE_BOOST @@ -21,6 +22,7 @@ config BR2_PACKAGE_AZMQ https://github.com/zeromq/azmq comment "azmq needs a toolchain w/ C++11, wchar and NPTL" + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS_NPTL) diff --git a/package/azure-iot-sdk-c/Config.in b/package/azure-iot-sdk-c/Config.in index c554d2fb9b..860746524c 100644 --- a/package/azure-iot-sdk-c/Config.in +++ b/package/azure-iot-sdk-c/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_AZURE_IOT_SDK_C bool "azure-iot-sdk-c" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_OPENSSL @@ -13,5 +14,6 @@ config BR2_PACKAGE_AZURE_IOT_SDK_C https://github.com/Azure/azure-iot-sdk-c -comment "azure-iot-sdk-c needs a toolchain w/ C++ and NPTL" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL +comment "azure-iot-sdk-c needs a toolchain w/ C++, NPTL and wchar" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR 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 8b3f670399..3f00db3ff4 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = 2018-12-13 +AZURE_IOT_SDK_C_VERSION = LTS_01_2021_Ref01 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES @@ -17,35 +17,59 @@ AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON # The project only supports building one kind of library. # Further the install target installs the wrong files, so we do it here: ifeq ($(BR2_STATIC_LIBS),y) -AZURE_IOT_SDK_C_LIBS += uamqp/libuamqp.a c-utility/libaziotsharedutil.a \ - iothub_client/libiothub_client.a iothub_client/libiothub_client_mqtt_ws_transport.a \ +AZURE_IOT_SDK_C_LIBS += \ + uamqp/libuamqp.a \ + c-utility/libaziotsharedutil.a \ + iothub_client/libiothub_client.a \ + iothub_client/libiothub_client_mqtt_ws_transport.a \ iothub_client/libiothub_client_amqp_ws_transport.a \ iothub_client/libiothub_client_http_transport.a \ iothub_client/libiothub_client_amqp_transport.a \ iothub_client/libiothub_client_mqtt_transport.a \ - iothub_service_client/libiothub_service_client.a serializer/libserializer.a umqtt/libumqtt.a + iothub_service_client/libiothub_service_client.a \ + serializer/libserializer.a \ + umqtt/libumqtt.a \ + deps/uhttp/libuhttp.a \ + deps/umock-c/libumock_c.a \ + libparson.a else -AZURE_IOT_SDK_C_LIBS += uamqp/libuamqp.so c-utility/libaziotsharedutil.so \ - iothub_client/libiothub_client.so iothub_client/libiothub_client_mqtt_ws_transport.so \ +AZURE_IOT_SDK_C_LIBS += \ + uamqp/libuamqp.so \ + c-utility/libaziotsharedutil.so \ + iothub_client/libiothub_client.so \ + iothub_client/libiothub_client_mqtt_ws_transport.so \ iothub_client/libiothub_client_amqp_ws_transport.so \ iothub_client/libiothub_client_http_transport.so \ iothub_client/libiothub_client_amqp_transport.so \ iothub_client/libiothub_client_mqtt_transport.so \ - iothub_service_client/libiothub_service_client.so serializer/libserializer.so umqtt/libumqtt.so + iothub_service_client/libiothub_service_client.so \ + serializer/libserializer.so \ + umqtt/libumqtt.so.1.1.12 \ + deps/uhttp/libuhttp.so \ + deps/umock-c/libumock_c.so \ + libparson.so + +define AZURE_IOT_SDK_C_CREATE_SYMLINKS + ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 + ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so +endef endif -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS +define AZURE_IOT_SDK_C_INSTALL_LIBS $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(STAGING_DIR)/usr/lib/ + $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) ) + $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) +endef + +define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS + $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ endef define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(TARGET_DIR)/usr/lib/ - ) + $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) endef $(eval $(cmake-package)) diff --git a/package/babeld/babeld.hash b/package/babeld/babeld.hash index 510fe2bc95..2e0513efa0 100644 --- a/package/babeld/babeld.hash +++ b/package/babeld/babeld.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98070dc418c190f047b8d69eb47987df30ded8f0fca353c49427d3137ad08b87 babeld-1.8.4.tar.gz -sha256 b415c41292cedef6c97b243609e50552887c29343566c639f23282d31efd2afd LICENCE +sha256 154f00e0a8bf35d6ea9028886c3dc5c3c342dd1a367df55ef29a547b75867f07 babeld-1.9.2.tar.gz +sha256 b415c41292cedef6c97b243609e50552887c29343566c639f23282d31efd2afd LICENCE diff --git a/package/babeld/babeld.mk b/package/babeld/babeld.mk index f864b5db26..785fa2bce9 100644 --- a/package/babeld/babeld.mk +++ b/package/babeld/babeld.mk @@ -4,7 +4,7 @@ # ################################################################################ -BABELD_VERSION = 1.8.4 +BABELD_VERSION = 1.9.2 BABELD_SITE = http://www.pps.univ-paris-diderot.fr/~jch/software/files BABELD_LICENSE = MIT BABELD_LICENSE_FILES = LICENCE diff --git a/package/bandwidthd/bandwidthd.hash b/package/bandwidthd/bandwidthd.hash index c73584de2e..5b1bbce978 100644 --- a/package/bandwidthd/bandwidthd.hash +++ b/package/bandwidthd/bandwidthd.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 0270d0def6cc53c8d47d59a9dd093d51fbca1620adeef85c15e35a32010e26ab bandwidthd-2.0.1-auto-r11.tar.gz +sha256 0270d0def6cc53c8d47d59a9dd093d51fbca1620adeef85c15e35a32010e26ab bandwidthd-2.0.1-auto-r11.tar.gz +sha256 58573c40770e0c0b91f3eef8192952832321a344f66a4fb2d966095cbbfc86c2 README diff --git a/package/bandwidthd/bandwidthd.mk b/package/bandwidthd/bandwidthd.mk index 990d8c5d8f..88222a910e 100644 --- a/package/bandwidthd/bandwidthd.mk +++ b/package/bandwidthd/bandwidthd.mk @@ -10,6 +10,7 @@ BANDWIDTHD_SITE = $(call github,nroach44,bandwidthd,v$(BANDWIDTHD_VERSION)) # Specified as "any version of the GPL that is current as of your # download" by upstream. BANDWIDTHD_LICENSE = GPL +BANDWIDTHD_LICENSE_FILES = README BANDWIDTHD_DEPENDENCIES = gd libpng libpcap host-pkgconf diff --git a/package/bandwidthd/bandwidthd.service b/package/bandwidthd/bandwidthd.service index 9c03d42946..ab7f05a2e8 100644 --- a/package/bandwidthd/bandwidthd.service +++ b/package/bandwidthd/bandwidthd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking ExecStart=/usr/bin/bandwidthd -PIDFile=/var/run/bandwidthd.pid +PIDFile=/run/bandwidthd.pid [Install] WantedBy=multi-user.target diff --git a/package/bash-completion/bash-completion.hash b/package/bash-completion/bash-completion.hash index fa98272be6..7e952e5b02 100644 --- a/package/bash-completion/bash-completion.hash +++ b/package/bash-completion/bash-completion.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 123c17998e34b937ce57bb1b111cd817bc369309e9a8047c0bcf06ead4a3ec92 bash-completion-2.10.tar.xz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac bash-completion-2.11.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/bash-completion/bash-completion.mk b/package/bash-completion/bash-completion.mk index 4b86e9f118..8b0e949416 100644 --- a/package/bash-completion/bash-completion.mk +++ b/package/bash-completion/bash-completion.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_COMPLETION_VERSION = 2.10 +BASH_COMPLETION_VERSION = 2.11 BASH_COMPLETION_SITE = https://github.com/scop/bash-completion/releases/download/$(BASH_COMPLETION_VERSION) BASH_COMPLETION_SOURCE = bash-completion-$(BASH_COMPLETION_VERSION).tar.xz BASH_COMPLETION_LICENSE = GPL-2.0 diff --git a/package/bash/Config.in b/package/bash/Config.in index 5a9ebb8d02..0212df6bfd 100644 --- a/package/bash/Config.in +++ b/package/bash/Config.in @@ -9,3 +9,17 @@ config BR2_PACKAGE_BASH The standard GNU Bourne again shell. http://tiswww.case.edu/php/chet/bash/bashtop.html + +if BR2_PACKAGE_BASH + +config BR2_PACKAGE_BASH_LOADABLE_EXAMPLES + bool "loadable examples" + depends on !BR2_STATIC_LIBS + help + This option will enable the installation of the "loadable" + examples, which are dynamically loadable extension providing + additional built-ins commands to bash. There are typically + not needed as they are provided as regular, external + commands. + +endif diff --git a/package/bash/bash.hash b/package/bash/bash.hash index 9113b1653f..2e547c8c30 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz.sig -sha256 b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d bash-5.0.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +# http://mirror.keystealth.org/gnu/bash/bash-5.1.tar.gz.sig +sha256 cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa bash-5.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 1843862e49..7b853ece08 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,12 +4,18 @@ # ################################################################################ -BASH_VERSION = 5.0 +BASH_VERSION = 5.1 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison -BASH_CONF_OPTS = --with-installed-readline --without-bash-malloc BASH_LICENSE = GPL-3.0+ BASH_LICENSE_FILES = COPYING +BASH_CPE_ID_VENDOR = gnu + +# We want the bash binary in /bin +BASH_CONF_OPTS = \ + --bindir=/bin \ + --with-installed-readline \ + --without-bash-malloc BASH_CONF_ENV += \ ac_cv_rl_prefix="$(STAGING_DIR)" \ @@ -23,7 +29,6 @@ BASH_CONF_ENV += \ # The static build needs some trickery ifeq ($(BR2_STATIC_LIBS),y) BASH_CONF_OPTS += --enable-static-link -BASH_CONF_ENV += SHOBJ_STATUS=unsupported # bash wants to redefine the getenv() function. To check whether this is # possible, AC_TRY_RUN is used which is not possible in # cross-compilation. @@ -37,11 +42,23 @@ BASH_CONF_ENV += bash_cv_getenv_redef=yes endif endif -define BASH_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) exec_prefix=/ install +define BASH_REMOVE_UNUSED_FILES rm -f $(TARGET_DIR)/bin/bashbug endef +BASH_POST_INSTALL_TARGET_HOOKS += BASH_REMOVE_UNUSED_FILES + +ifeq ($(BR2_PACKAGE_BASH_LOADABLE_EXAMPLES),y) +define BASH_REMOVE_LOADABLE_UNUSED_FILES + rm -f $(TARGET_DIR)/usr/lib/bash/Makefile.inc + rm -f $(TARGET_DIR)/usr/lib/bash/loadables.h +endef +BASH_POST_INSTALL_TARGET_HOOKS += BASH_REMOVE_LOADABLE_UNUSED_FILES +else +define BASH_REMOVE_LOADABLE_EXAMPLES + rm -rf $(TARGET_DIR)/usr/lib/bash +endef +BASH_POST_INSTALL_TARGET_HOOKS += BASH_REMOVE_LOADABLE_EXAMPLES +endif # Add /bin/bash to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. diff --git a/package/batctl/batctl.hash b/package/batctl/batctl.hash index 94f3de0230..56bea3c5da 100644 --- a/package/batctl/batctl.hash +++ b/package/batctl/batctl.hash @@ -1,6 +1,6 @@ -# From https://downloads.open-mesh.org/batman/releases/batman-adv-2019.3/batctl-2019.3.tar.gz.sha1 -sha1 3a1357d51e9338e79e9953b7d8b33ace9f904b30 batctl-2019.3.tar.gz +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.0/batctl-2021.0.tar.gz.sha1 +sha1 87d0bb34950cb70578a0ca5ce706513a8279a01c batctl-2021.0.tar.gz # Locally calculated -sha256 2bd93fa14925a8dc63a67e64266c8ccd2fa3ac44b10253d93e6f8a630350070c batctl-2019.3.tar.gz -sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 -sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT +sha256 9cec8bf1952f885192749a9dc0318a54633b717aaf05c438d504efd83f5201e4 batctl-2021.0.tar.gz +sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/package/batctl/batctl.mk b/package/batctl/batctl.mk index 17ed15e36d..8ff591844d 100644 --- a/package/batctl/batctl.mk +++ b/package/batctl/batctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATCTL_VERSION = 2019.3 +BATCTL_VERSION = 2021.0 BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION) BATCTL_LICENSE = GPL-2.0, MIT (batman_adv.h, list.h) BATCTL_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT diff --git a/package/batman-adv/Config.in b/package/batman-adv/Config.in index 9d3d7967b9..eae94fd130 100644 --- a/package/batman-adv/Config.in +++ b/package/batman-adv/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_BATMAN_ADV depends on BR2_LINUX_KERNEL help batman-adv mesh networking kernel module + Note: batman-adv is part of the linux mainline + kernel since version 2.6.38 https://www.open-mesh.org/projects/batman-adv/ diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash index dabbec8120..f81df11000 100644 --- a/package/batman-adv/batman-adv.hash +++ b/package/batman-adv/batman-adv.hash @@ -1,7 +1,7 @@ -# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2019.3.tar.gz.{md5,sha1} -md5 39345688ddf12a542853b2318325f07b batman-adv-2019.3.tar.gz -sha1 202539c0cbf4604f6c8e9d427b338d4e807bd220 batman-adv-2019.3.tar.gz +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.1/batman-adv-2021.1.tar.gz.sha1 +sha1 27a0dc7cb74b868bc0ab52794ecedd0448f0fb61 batman-adv-2021.1.tar.gz # Hash for license files -sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 -sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT +sha256 5a989ba580897268373bd516b87b588061f344af773a0f6b038a3d8d2af028a1 batman-adv-2021.0.tar.gz +sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk index 3f48e62051..e58ac85bef 100644 --- a/package/batman-adv/batman-adv.mk +++ b/package/batman-adv/batman-adv.mk @@ -4,33 +4,39 @@ # ################################################################################ -BATMAN_ADV_VERSION = 2019.3 +BATMAN_ADV_VERSION = 2021.1 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h) BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT -# Bridge Loop Avoidance, Distributed Arp Table are always enabled BATMAN_ADV_CFLAGS = \ -I$(@D)/compat-include/ \ -I$(@D)/include/ \ -include $(@D)/compat.h \ -DBATADV_SOURCE_VERSION=\"\\\"$(BATMAN_ADV_VERSION)\\\"\" + +# Bridge Loop Avoidance, Distributed Arp Table are always enabled BATMAN_ADV_MODULE_MAKE_OPTS = \ KVER=$(LINUX_VERSION_PROBED) \ INSTALL_MOD_DIR=updates/net/batman-adv \ NOSTDINC_FLAGS="$(BATMAN_ADV_CFLAGS)" \ CONFIG_BATMAN_ADV=m \ - CONFIG_BATMAN_ADV_BATMAN_V=$(BR2_PACKAGE_BATMAN_ADV_BATMAN_V) \ CONFIG_BATMAN_ADV_BLA=y \ CONFIG_BATMAN_ADV_DAT=y \ - CONFIG_BATMAN_ADV_DEBUG=$(BR2_PACKAGE_BATMAN_ADV_DEBUG) \ CONFIG_BATMAN_ADV_MCAST=y \ - CONFIG_BATMAN_ADV_NC=$(BR2_PACKAGE_BATMAN_ADV_NC) + CONFIG_BATMAN_ADV_BATMAN_V=$(if $(BR2_PACKAGE_BATMAN_ADV_BATMAN_V),y,n) \ + CONFIG_BATMAN_ADV_DEBUG=$(if $(BR2_PACKAGE_BATMAN_ADV_DEBUG),y,n) \ + CONFIG_BATMAN_ADV_NC=$(if $(BR2_PACKAGE_BATMAN_ADV_NC),y,n) + BATMAN_ADV_MODULE_SUBDIRS = net/batman-adv define BATMAN_ADV_CONFIGURE_CMDS $(BATMAN_ADV_MODULE_MAKE_OPTS) $(@D)/gen-compat-autoconf.sh $(@D)/compat-autoconf.h endef +define BATMAN_ADV_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_LIBCRC32C) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/package/bats-core/bats-core.hash b/package/bats-core/bats-core.hash index 4d10d785d6..b50543a269 100644 --- a/package/bats-core/bats-core.hash +++ b/package/bats-core/bats-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 855d8b8bed466bc505e61123d12885500ef6fcdb317ace1b668087364717ea82 bats-core-1.1.0.tar.gz +sha256 91c49b1fe6f0656c46491929ed728f8dfa9a96df0cce294963e8c6082bff87a2 bats-core-1.2.1.tar.gz # License files -sha256 55074b2b3b87809105034e1468e59076554d76a80c67bcc592000cc3d929852d LICENSE.md +sha256 55074b2b3b87809105034e1468e59076554d76a80c67bcc592000cc3d929852d LICENSE.md diff --git a/package/bats-core/bats-core.mk b/package/bats-core/bats-core.mk index eee38056fe..fc8ac674ae 100644 --- a/package/bats-core/bats-core.mk +++ b/package/bats-core/bats-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATS_CORE_VERSION = 1.1.0 +BATS_CORE_VERSION = 1.2.1 BATS_CORE_SITE = $(call github,bats-core,bats-core,v$(BATS_CORE_VERSION)) BATS_CORE_LICENSE = MIT BATS_CORE_LICENSE_FILES = LICENSE.md diff --git a/package/bayer2rgb-neon/Config.in b/package/bayer2rgb-neon/Config.in index ed065c1ed7..8fd18b4fa9 100644 --- a/package/bayer2rgb-neon/Config.in +++ b/package/bayer2rgb-neon/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_BAYER2RGB_NEON to decode raw camera bayer to RGB using NEON hardware acceleration. - https://git.phytec.de/bayer2rgb-neon/ + https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb comment "bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9" depends on BR2_arm && BR2_ARM_CPU_HAS_NEON diff --git a/package/bayer2rgb-neon/bayer2rgb-neon.hash b/package/bayer2rgb-neon/bayer2rgb-neon.hash index 1f4f5f33b3..b1e87d7a36 100644 --- a/package/bayer2rgb-neon/bayer2rgb-neon.hash +++ b/package/bayer2rgb-neon/bayer2rgb-neon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1a84dcf6557c2017ebe258502f60575e0971511c548fc88aee5ab68ca0bb268a bayer2rgb-neon-bef3ecafe290d61a50fd27da3e5d0df6f4b88045.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 d2e3e97bb9da218f223c03b2f080c5da727224e6e4cb99979398971110dfae04 bayer2rgb-neon-bef3ecafe290d61a50fd27da3e5d0df6f4b88045-br1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bc/bc.mk b/package/bc/bc.mk index fdfacb6c89..06b6feae4f 100644 --- a/package/bc/bc.mk +++ b/package/bc/bc.mk @@ -9,6 +9,7 @@ BC_SITE = http://ftp.gnu.org/gnu/bc BC_DEPENDENCIES = host-flex BC_LICENSE = GPL-2.0+, LGPL-2.1+ BC_LICENSE_FILES = COPYING COPYING.LIB +BC_CPE_ID_VENDOR = gnu BC_CONF_ENV = MAKEINFO=true # 0001-bc-use-MAKEINFO-variable-for-docs.patch and 0004-no-gen-libmath.patch diff --git a/package/bcm2835/bcm2835.hash b/package/bcm2835/bcm2835.hash index c722a97456..e366f19038 100644 --- a/package/bcm2835/bcm2835.hash +++ b/package/bcm2835/bcm2835.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 aec4b33ed9ecda4a1c4c12b8ed2abdd13cf87f352f0d27a24be726d11f1fbf54 bcm2835-1.63.tar.gz +sha256 b7eda59fd7bc3cb97fdac14e8455e86ddad75006d69270358ac8d00108e369a9 bcm2835-1.68.tar.gz sha256 8b1ba204bb69a0ade2bfcf65ef294a920f6bb361b317dba43c7ef29d96332b9b COPYING diff --git a/package/bcm2835/bcm2835.mk b/package/bcm2835/bcm2835.mk index d43dd7e574..1ddd035818 100644 --- a/package/bcm2835/bcm2835.mk +++ b/package/bcm2835/bcm2835.mk @@ -4,10 +4,13 @@ # ################################################################################ -BCM2835_VERSION = 1.63 +BCM2835_VERSION = 1.68 BCM2835_SITE = http://www.airspayce.com/mikem/bcm2835 BCM2835_LICENSE = GPL-3.0 BCM2835_LICENSE_FILES = COPYING BCM2835_INSTALL_STAGING = YES +# disable doxygen doc generation +BCM2835_CONF_ENV = ac_cv_prog_DOXYGEN=/bin/true + $(eval $(autotools-package)) diff --git a/package/bctoolbox/bctoolbox.hash b/package/bctoolbox/bctoolbox.hash index 7d64c32013..9b1f9e821d 100644 --- a/package/bctoolbox/bctoolbox.hash +++ b/package/bctoolbox/bctoolbox.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d8501e3793c10abbf913759d7a0e5f6eb3140af6bacf5e2bdcd532049bde69c0 bctoolbox-4.3.1.tar.gz -sha256 849dd903d98f12a964466ccfbaf3a1de1f94ad0ebd49a59d12f8ce4506f9f647 COPYING +sha256 446b60e81a79b11e8212c44e312aeb0ce46e9ecf0269a35c492ecdca3e7428c3 bctoolbox-4.4.8.tar.gz +sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/bctoolbox/bctoolbox.mk b/package/bctoolbox/bctoolbox.mk index f9d740820d..ac9361026f 100644 --- a/package/bctoolbox/bctoolbox.mk +++ b/package/bctoolbox/bctoolbox.mk @@ -4,10 +4,10 @@ # ################################################################################ -BCTOOLBOX_VERSION = 4.3.1 +BCTOOLBOX_VERSION = 4.4.8 BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION)) -BCTOOLBOX_LICENSE = GPL-2.0+ -BCTOOLBOX_LICENSE_FILES = COPYING +BCTOOLBOX_LICENSE = GPL-3.0+ +BCTOOLBOX_LICENSE_FILES = LICENSE.txt BCTOOLBOX_INSTALL_STAGING = YES # Set CMAKE_SKIP_RPATH to prevent bctoolbox from adding the rpath to @@ -17,7 +17,6 @@ BCTOOLBOX_CONF_OPTS = \ -DENABLE_STRICT=OFF \ -DENABLE_TESTS_COMPONENT=OFF \ -DENABLE_TESTS=OFF \ - -DGIT_EXECUTABLE=OFF \ -DCMAKE_SKIP_RPATH=ON ifeq ($(BR2_PACKAGE_LIBICONV),y) diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk index 6ae9627a60..57dd82cab4 100644 --- a/package/bdwgc/bdwgc.mk +++ b/package/bdwgc/bdwgc.mk @@ -10,6 +10,7 @@ BDWGC_SITE = http://www.hboehm.info/gc/gc_source BDWGC_INSTALL_STAGING = YES BDWGC_LICENSE = bdwgc license BDWGC_LICENSE_FILES = README.QUICK +BDWGC_CPE_ID_VENDOR = bdwgc_project BDWGC_DEPENDENCIES = libatomic_ops host-pkgconf HOST_BDWGC_DEPENDENCIES = host-libatomic_ops host-pkgconf diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk index f13f72c8ac..78c3c2ebb1 100644 --- a/package/beecrypt/beecrypt.mk +++ b/package/beecrypt/beecrypt.mk @@ -10,6 +10,7 @@ BEECRYPT_AUTORECONF = YES BEECRYPT_INSTALL_STAGING = YES BEECRYPT_LICENSE = LGPL-2.1+ BEECRYPT_LICENSE_FILES = COPYING.LIB +BEECRYPT_CPE_ID_VENDOR = beecrypt_project BEECRYPT_CONF_OPTS = \ --disable-expert-mode \ diff --git a/package/belle-sip/belle-sip.hash b/package/belle-sip/belle-sip.hash index 889ad2be70..670ce0062e 100644 --- a/package/belle-sip/belle-sip.hash +++ b/package/belle-sip/belle-sip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3ac7051ea6ac758cccbf1483a5dd6cda4293b5cde1370a3f0d298e3a6f0ee032 belle-sip-4.3.1.tar.gz +sha256 eabba615c97080572c1b9d3c76f8f9cf6a7432eedf37482672e5fa178a688f72 belle-sip-4.4.8.tar.gz sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/belle-sip/belle-sip.mk b/package/belle-sip/belle-sip.mk index 1daef1d2df..11b96f3fd9 100644 --- a/package/belle-sip/belle-sip.mk +++ b/package/belle-sip/belle-sip.mk @@ -4,11 +4,12 @@ # ################################################################################ -BELLE_SIP_VERSION = 4.3.1 +BELLE_SIP_VERSION = 4.4.8 BELLE_SIP_SITE = \ https://gitlab.linphone.org/BC/public/belle-sip/-/archive/$(BELLE_SIP_VERSION) BELLE_SIP_LICENSE = GPL-3.0+ BELLE_SIP_LICENSE_FILES = LICENSE.txt +BELLE_SIP_CPE_ID_VENDOR = linphone BELLE_SIP_INSTALL_STAGING = YES BELLE_SIP_DEPENDENCIES = \ bctoolbox \ @@ -32,4 +33,12 @@ else ifeq ($(BR2_SHARED_LIBS),y) BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF endif +BELLE_SIP_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99140),y) +BELLE_SIP_CFLAGS += -O0 +endif + +BELLE_SIP_CONF_OPTS += -DCMAKE_C_FLAGS="$(BELLE_SIP_CFLAGS)" + $(eval $(cmake-package)) diff --git a/package/belr/belr.hash b/package/belr/belr.hash index 42cf506972..00c733c7df 100644 --- a/package/belr/belr.hash +++ b/package/belr/belr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d6575c36c32828edcaf39df2775070b187019b21fe5fe274e7a85caf54284f05 belr-4.3.1.tar.gz +sha256 6358aa680193d972c831d677da1652c7f57d7e00649b971d4d9fbdebf4331b48 belr-4.4.8.tar.gz sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/belr/belr.mk b/package/belr/belr.mk index 8855f94fda..f243830a85 100644 --- a/package/belr/belr.mk +++ b/package/belr/belr.mk @@ -4,7 +4,7 @@ # ################################################################################ -BELR_VERSION = 4.3.1 +BELR_VERSION = 4.4.8 BELR_SITE = https://gitlab.linphone.org/BC/public/belr/-/archive/$(BELR_VERSION) BELR_LICENSE = GPL-3.0+ BELR_LICENSE_FILES = LICENSE.txt diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index e077eb4640..36b1894f34 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -15,6 +15,8 @@ BERKELEYDB_SOURCE = db-$(BERKELEYDB_VERSION).NC.tar.gz BERKELEYDB_SUBDIR = build_unix BERKELEYDB_LICENSE = BerkeleyDB License BERKELEYDB_LICENSE_FILES = LICENSE +BERKELEYDB_CPE_ID_VENDOR = oracle +BERKELEYDB_CPE_ID_PRODUCT = berkeley_db BERKELEYDB_INSTALL_STAGING = YES BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \ db_hotbackup db_load db_log_verify db_printlog db_recover db_replicate \ diff --git a/package/bind/0001-cross.patch b/package/bind/0001-cross.patch index d3e7cc68a6..f39be2f837 100644 --- a/package/bind/0001-cross.patch +++ b/package/bind/0001-cross.patch @@ -1,15 +1,24 @@ -Use host compiler to build 'gen' since it's run when building. +From 505cc9fcadda5607dc4c5bacb03928c0b35162a8 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Wed, 4 Nov 2020 17:51:38 +0100 +Subject: [PATCH] Use host compiler to build 'gen' since it's run when + building. Signed-off-by: Gustavo Zacarias [Fabrice: updated for 9.11.10] Signed-off-by: Fabrice Fontaine +Signed-off-by: Petr Vorel +--- + lib/dns/Makefile.in | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) -diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Makefile.in ---- bind-9.5.1-P1/lib/dns/Makefile.in 2007-09-11 22:09:08.000000000 -0300 -+++ bind-9.5.1-P1.gencross/lib/dns/Makefile.in 2009-03-04 16:35:23.000000000 -0200 -@@ -160,10 +160,8 @@ +diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in +index 8fc4e94f26..4ac92857e0 100644 +--- a/lib/dns/Makefile.in ++++ b/lib/dns/Makefile.in +@@ -184,10 +184,8 @@ code.h: gen ./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; } - + gen: gen.c - ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ - ${LFS_CFLAGS} ${LFS_LDFLAGS} \ @@ -17,7 +26,9 @@ diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Make - ${BUILD_LIBS} ${LFS_LIBS} + ${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \ + ${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c - + timestamp: include libdns.@A@ touch timestamp +-- +2.29.1 diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 53b5ce3a47..70299f1677 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.13/bind-9.11.13.tar.gz.asc -# with key AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38 -sha256 fd3f3cc9fcfcdaa752db35eb24598afa1fdcc2509d3227fc90a8631b7b400f7d bind-9.11.13.tar.gz -sha256 cd02c93b8dcda794f55dfd1231828d69633072a98eee4874f9cf732d22d9dcde COPYRIGHT +# Verified from https://ftp.isc.org/isc/bind9/9.11.36/bind-9.11.36.tar.gz.asc +# with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD +sha256 c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 bind-9.11.36.tar.gz +sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 89d83d4d54..ba32d6150a 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.13 +BIND_VERSION = 9.11.36 BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) @@ -12,6 +12,12 @@ BIND_INSTALL_STAGING = YES BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT +BIND_CPE_ID_VENDOR = isc +BIND_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 BIND_TARGET_SERVER_SBIN += dnssec-importkey dnssec-keygen dnssec-revoke BIND_TARGET_SERVER_SBIN += dnssec-settime dnssec-verify genrandom @@ -30,7 +36,8 @@ BIND_CONF_OPTS = \ --with-randomdev=/dev/urandom \ --enable-epoll \ --with-gssapi=no \ - --enable-filter-aaaa + --enable-filter-aaaa \ + --disable-backtrace ifeq ($(BR2_PACKAGE_ZLIB),y) BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr @@ -47,7 +54,7 @@ BIND_CONF_OPTS += --disable-linux-caps endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr --enable-newstats +BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr BIND_DEPENDENCIES += libxml2 else BIND_CONF_OPTS += --with-libxml2=no diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 9beabe357c..b4c86dd473 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,29 +7,39 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_32_X if !BR2_arc && !BR2_csky + default BR2_BINUTILS_VERSION_2_36_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc default BR2_BINUTILS_VERSION_CSKY if BR2_csky help Select the version of binutils you wish to use. -config BR2_BINUTILS_VERSION_2_31_X - bool "binutils 2.31.1" - depends on !BR2_csky - config BR2_BINUTILS_VERSION_2_32_X bool "binutils 2.32" depends on !BR2_csky -config BR2_BINUTILS_VERSION_2_33_X - bool "binutils 2.33.1" +config BR2_BINUTILS_VERSION_2_35_X + bool "binutils 2.35.2" + depends on !BR2_csky + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT + +config BR2_BINUTILS_VERSION_2_36_X + bool "binutils 2.36.1" + depends on !BR2_csky + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT + +config BR2_BINUTILS_VERSION_2_37_X + bool "binutils 2.37" depends on !BR2_csky # https://github.com/uclinux-dev/elf2flt/pull/16 # https://github.com/uclinux-dev/elf2flt/issues/12 depends on !BR2_BINFMT_FLAT config BR2_BINUTILS_VERSION_ARC - bool "binutils arc (2.31)" + bool "binutils arc (2.34.50)" depends on BR2_arc config BR2_BINUTILS_VERSION_CSKY @@ -40,11 +50,12 @@ endchoice config BR2_BINUTILS_VERSION string - default "arc-2019.09-release" if BR2_BINUTILS_VERSION_ARC + default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC default "c66d8bbcebfddf713b2b436e1b135e6b125a55a5" if BR2_BINUTILS_VERSION_CSKY - default "2.31.1" if BR2_BINUTILS_VERSION_2_31_X default "2.32" if BR2_BINUTILS_VERSION_2_32_X - default "2.33.1" if BR2_BINUTILS_VERSION_2_33_X + default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X + default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X + default "2.37" if BR2_BINUTILS_VERSION_2_37_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 797dd5b923..f543b49940 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,10 +1,11 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 binutils-2.31.1.tar.xz sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz -sha512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac binutils-2.33.1.tar.xz +sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz +sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz +sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz # Locally calculated (fetched from Github) -sha512 33ac5ad662db551870193f5c76c35a18de465adfa1c7f4bf5c1bb4145805a47507bf11ec21eb446b52f91f70cfe392252dd2b02724dc9dad3505258e3f6f4d45 binutils-gdb-arc-2019.09-release.tar.gz +sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz # Locally calculated (fetched from https://github.com/c-sky/binutils-gdb) sha512 979552d4b3a4f31e9f3b9a7027321bd4eb3ac6c2d8deac1720e94e54f81d736db09c53c5d87c301010e307b64127e14400a036c7a35e5d63a954a4edd9cc8e2c binutils-c66d8bbcebfddf713b2b436e1b135e6b125a55a5.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 876c9c59f8..8ec76134bc 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,13 +9,13 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2019.09-release +BINUTILS_VERSION = arc-2020.09-release else -BINUTILS_VERSION = 2.32 +BINUTILS_VERSION = 2.36.1 endif endif # BINUTILS_VERSION -ifeq ($(BINUTILS_VERSION),arc-2019.09-release) +ifeq ($(BINUTILS_VERSION),arc-2020.09-release) BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION)) BINUTILS_SOURCE = binutils-gdb-$(BINUTILS_VERSION).tar.gz BINUTILS_FROM_GIT = y @@ -35,6 +35,7 @@ BINUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) BINUTILS_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) BINUTILS_LICENSE = GPL-3.0+, libiberty LGPL-2.1+ BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB +BINUTILS_CPE_ID_VENDOR = gnu ifeq ($(BINUTILS_FROM_GIT),y) BINUTILS_DEPENDENCIES += host-flex host-bison @@ -93,6 +94,7 @@ HOST_BINUTILS_CONF_OPTS = \ --enable-static \ --with-sysroot=$(STAGING_DIR) \ --enable-poison-system-directories \ + --without-debuginfod \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ $(BINUTILS_EXTRA_CONFIG_OPTIONS) @@ -112,6 +114,7 @@ endef ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) define BINUTILS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef endif diff --git a/package/bird/Config.in b/package/bird/Config.in index e78dfdf90f..866fc65617 100644 --- a/package/bird/Config.in +++ b/package/bird/Config.in @@ -73,6 +73,11 @@ config BR2_PACKAGE_BIRD_RIP help Enable RIP protocol. +config BR2_PACKAGE_BIRD_RPKI + bool "rpki" + help + Enable RPKI protocol. + config BR2_PACKAGE_BIRD_STATIC bool "static" help diff --git a/package/bird/bird.hash b/package/bird/bird.hash index 303fc21205..2d20491dd6 100644 --- a/package/bird/bird.hash +++ b/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 631d2b58aebdbd651aaa3c68c3756c02ebfe5b1e60d307771ea909eeaa5b1066 bird-2.0.7.tar.gz -sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README +sha256 19d2de83ee25a307b9e5b9e58797dd68766d439bcee33e3ac617ed502370e7f6 bird-2.0.8.tar.gz +sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/package/bird/bird.mk b/package/bird/bird.mk index 6b28102754..7d7002d5f2 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -4,11 +4,14 @@ # ################################################################################ -BIRD_VERSION = 2.0.7 +BIRD_VERSION = 2.0.8 BIRD_SITE = ftp://bird.network.cz/pub/bird BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README +BIRD_CPE_ID_VENDOR = nic +BIRD_SELINUX_MODULES = bird BIRD_DEPENDENCIES = host-flex host-bison +BIRD_AUTORECONF = YES ifeq ($(BR2_PACKAGE_BIRD_CLIENT),y) BIRD_CONF_OPTS += --enable-client @@ -17,6 +20,13 @@ else BIRD_CONF_OPTS += --disable-client endif +ifeq ($(BR2_PACKAGE_LIBSSH),y) +BIRD_CONF_OPTS += --enable-libssh +BIRD_DEPENDENCIES += libssh +else +BIRD_CONF_OPTS += --disable-libssh +endif + BIRD_PROTOCOLS = \ $(if $(BR2_PACKAGE_BIRD_BFD),bfd) \ $(if $(BR2_PACKAGE_BIRD_BABEL),babel) \ @@ -27,6 +37,7 @@ BIRD_PROTOCOLS = \ $(if $(BR2_PACKAGE_BIRD_PIPE),pipe) \ $(if $(BR2_PACKAGE_BIRD_RADV),radv) \ $(if $(BR2_PACKAGE_BIRD_RIP),rip) \ + $(if $(BR2_PACKAGE_BIRD_RPKI),rpki) \ $(if $(BR2_PACKAGE_BIRD_STATIC),static) BIRD_CONF_OPTS += --with-protocols=$(subst $(space),$(comma),$(strip $(BIRD_PROTOCOLS))) diff --git a/package/bison/bison.hash b/package/bison/bison.hash index 01ee17d76e..f4abe4c661 100644 --- a/package/bison/bison.hash +++ b/package/bison/bison.hash @@ -1,4 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0 bison-3.4.2.tar.xz +# Locally calculated after checking pgp signature from +# http://mirror.keystealth.org/gnu/bison/bison-3.7.6.tar.xz.sig +sha256 67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf bison-3.7.6.tar.xz # License files, locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/bison/bison.mk b/package/bison/bison.mk index 2174a9061c..26db307e20 100644 --- a/package/bison/bison.mk +++ b/package/bison/bison.mk @@ -4,13 +4,16 @@ # ################################################################################ -BISON_VERSION = 3.4.2 +BISON_VERSION = 3.7.6 BISON_SOURCE = bison-$(BISON_VERSION).tar.xz BISON_SITE = $(BR2_GNU_MIRROR)/bison BISON_LICENSE = GPL-3.0+ BISON_LICENSE_FILES = COPYING +BISON_CPE_ID_VENDOR = gnu # parallel build issue in examples/c/reccalc/ BISON_MAKE = $(MAKE1) HOST_BISON_DEPENDENCIES = host-m4 +HOST_BISON_CONF_OPTS = --enable-relocatable +HOST_BISON_CONF_ENV = ac_cv_libtextstyle=no $(eval $(host-autotools-package)) diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index 1f08f9f26f..7ce4f80656 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS config BR2_PACKAGE_BITCOIN bool "bitcoin" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS # boost @@ -18,9 +19,6 @@ config BR2_PACKAGE_BITCOIN select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_THREAD - select BR2_PACKAGE_BOOST_CHRONO - select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS - select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBEVENT help Bitcoin Core is an open source project which maintains and @@ -40,6 +38,7 @@ config BR2_PACKAGE_BITCOIN comment "bitcoin needs a toolchain w/ C++, threads, wchar" 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 diff --git a/package/bitcoin/bitcoin.hash b/package/bitcoin/bitcoin.hash index fe7c1562a8..643fcbc141 100644 --- a/package/bitcoin/bitcoin.hash +++ b/package/bitcoin/bitcoin.hash @@ -1,5 +1,5 @@ -# From https://bitcoincore.org/bin/bitcoin-core-0.19.0.1/SHA256SUMS.asc -sha256 7ac9f972249a0a16ed01352ca2a199a5448fe87a4ea74923404a40b4086de284 bitcoin-0.19.0.1.tar.gz +# From https://bitcoincore.org/bin/bitcoin-core-0.21.2/SHA256SUMS.asc +sha256 4146f751fc5691bdcf911cbdb8d32d8d25c297d29d58173227ae1ae6438edb9e bitcoin-0.21.2.tar.gz # Hash for license file -sha256 9a0f75d688e9cf5c69d3efdaa2a83af496700d252b212ec6a72f7784b47fed0c COPYING +sha256 96fe807030b21f88305adc32af62f9aa19915f2783509fd6f52aea02cf83f644 COPYING diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 040c55b8a6..10ae32202c 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -4,12 +4,15 @@ # ################################################################################ -BITCOIN_VERSION = 0.19.0.1 +BITCOIN_VERSION = 0.21.2 BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT BITCOIN_LICENSE_FILES = COPYING -BITCOIN_DEPENDENCIES = host-pkgconf boost openssl libevent +BITCOIN_CPE_ID_VENDOR = bitcoin +BITCOIN_CPE_ID_PRODUCT = bitcoin_core +BITCOIN_DEPENDENCIES = host-pkgconf boost libevent +BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1 BITCOIN_CONF_OPTS = \ --disable-bench \ --disable-wallet \ diff --git a/package/bitstream/bitstream.hash b/package/bitstream/bitstream.hash index 89da7c6fd0..0d2e5a1f1a 100644 --- a/package/bitstream/bitstream.hash +++ b/package/bitstream/bitstream.hash @@ -1,6 +1,6 @@ -# From https://get.videolan.org/bitstream/1.4/bitstream-1.4.tar.bz2.md5 -md5 dfb1449194250b2d364d54b5bbac858d bitstream-1.4.tar.bz2 -# From https://get.videolan.org/bitstream/1.4/bitstream-1.4.tar.bz2.sha256 -sha256 b2484940d3b8733bec9dd1ec1731de428261dff31c9f95874264be9dc9ce786b bitstream-1.4.tar.bz2 +# From https://get.videolan.org/bitstream/1.5/bitstream-1.5.tar.bz2.md5 +md5 34630d13332fd1575bcc8531b0a596be bitstream-1.5.tar.bz2 +# From https://get.videolan.org/bitstream/1.5/bitstream-1.5.tar.bz2.sha256 +sha256 45fc5a5a6e4537a69fa8440821e87b76252135180a3070c631b0b36ce0a3b90a bitstream-1.5.tar.bz2 # Locally computed sha256 9644a812f9a8377a59acb7092a36ce8882a39743425d9171a8fb84637e2f6e04 COPYING diff --git a/package/bitstream/bitstream.mk b/package/bitstream/bitstream.mk index 1746d1386c..12124a63d3 100644 --- a/package/bitstream/bitstream.mk +++ b/package/bitstream/bitstream.mk @@ -4,7 +4,7 @@ # ################################################################################ -BITSTREAM_VERSION = 1.4 +BITSTREAM_VERSION = 1.5 BITSTREAM_SOURCE = bitstream-$(BITSTREAM_VERSION).tar.bz2 BITSTREAM_SITE = https://get.videolan.org/bitstream/$(BITSTREAM_VERSION) BITSTREAM_LICENSE = MIT diff --git a/package/blktrace/blktrace.hash b/package/blktrace/blktrace.hash index d4f6218486..d279419c9e 100644 --- a/package/blktrace/blktrace.hash +++ b/package/blktrace/blktrace.hash @@ -1,6 +1,6 @@ # From http://brick.kernel.dk/snaps/MD5SUMS -md5 05abb873b4de96c5e7b2deba80695bf1 blktrace-1.2.0.tar.gz +md5 aa9bc7d76870d8dae56aa816527e8e15 blktrace-1.3.0.tar.bz2 # Locally computed -sha256 d14029bc096026dacb206bf115c912dcdb795320b5aba6dff3e46d7f94c5242d blktrace-1.2.0.tar.gz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 d6deda03862de2bd1b1b9fba729bbb862d9bca795e6aa7f7ca86b656811a70d6 blktrace-1.3.0.tar.bz2 +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/blktrace/blktrace.mk b/package/blktrace/blktrace.mk index 4ada2e8e4b..d66a35227e 100644 --- a/package/blktrace/blktrace.mk +++ b/package/blktrace/blktrace.mk @@ -4,14 +4,13 @@ # ################################################################################ -BLKTRACE_VERSION = 1.2.0 +BLKTRACE_VERSION = 1.3.0 +BLKTRACE_SOURCE = blktrace-$(BLKTRACE_VERSION).tar.bz2 BLKTRACE_SITE = http://brick.kernel.dk/snaps BLKTRACE_DEPENDENCIES = libaio BLKTRACE_LICENSE = GPL-2.0+ BLKTRACE_LICENSE_FILES = COPYING - -# 0001-btt-make-device-devno-use-PATH_MAX-to-avoid-overflow.patch -BLKTRACE_IGNORE_CVES += CVE-2018-10689 +BLKTRACE_CPE_ID_VENDOR = blktrace_project define BLKTRACE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) diff --git a/package/bluez-alsa/Config.in b/package/bluez-alsa/Config.in index 2f103f409c..42bb9133bf 100644 --- a/package/bluez-alsa/Config.in +++ b/package/bluez-alsa/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_BLUEZ_ALSA bool "bluez-alsa" depends on !BR2_STATIC_LIBS # bluez5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5 @@ -8,6 +9,7 @@ config BR2_PACKAGE_BLUEZ_ALSA depends on BR2_USE_WCHAR # libglib2 select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_BLUEZ5_UTILS + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_SBC help @@ -33,8 +35,9 @@ config BR2_PACKAGE_BLUEZ_ALSA_RFCOMM endif -comment "bluez-alsa needs a toolchain w/ wchar, NPTL, headers >= 3.4, dynamic library" +comment "bluez-alsa needs a toolchain w/ wchar, NPTL, headers >= 3.4, dynamic library, gcc >= 4.9" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || 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/bluez-alsa/bluez-alsa.hash b/package/bluez-alsa/bluez-alsa.hash index 603a501d4f..f6e7294681 100644 --- a/package/bluez-alsa/bluez-alsa.hash +++ b/package/bluez-alsa/bluez-alsa.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 6459f70e47e70b4c04a85acf148381e6c8a2e86bd638aff21870afc6c14b85b0 bluez-alsa-2.1.0.tar.gz +sha256 d9a878d9fd7f18842c9c8ed83bc96cab684753c90f2751d575a3cdd776ec78a5 bluez-alsa-3.1.0.tar.gz sha256 60253922a459245128c34eb379cbda7c76936636d4c10edc576663a0f560dd4d LICENSE diff --git a/package/bluez-alsa/bluez-alsa.mk b/package/bluez-alsa/bluez-alsa.mk index d5cb3ed67b..f81720f767 100644 --- a/package/bluez-alsa/bluez-alsa.mk +++ b/package/bluez-alsa/bluez-alsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -BLUEZ_ALSA_VERSION = 2.1.0 +BLUEZ_ALSA_VERSION = 3.1.0 BLUEZ_ALSA_SITE = $(call github,Arkq,bluez-alsa,v$(BLUEZ_ALSA_VERSION)) BLUEZ_ALSA_LICENSE = MIT BLUEZ_ALSA_LICENSE_FILES = LICENSE @@ -14,6 +14,7 @@ BLUEZ_ALSA_DEPENDENCIES = alsa-lib bluez5_utils libglib2 sbc host-pkgconf BLUEZ_ALSA_AUTORECONF = YES BLUEZ_ALSA_CONF_OPTS = \ + --enable-a2dpconf \ --enable-aplay \ --disable-debug-time \ --with-alsaplugindir=/usr/lib/alsa-lib \ diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 871986c817..815cf4b160 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,12 +5,14 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.54 +BLUEZ5_UTILS_HEADERS_VERSION = 5.60 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils BLUEZ5_UTILS_HEADERS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_HEADERS_LICENSE_FILES = COPYING COPYING.LIB +BLUEZ5_UTILS_HEADERS_CPE_ID_VENDOR = bluez +BLUEZ5_UTILS_HEADERS_CPE_ID_PRODUCT = bluez BLUEZ5_UTILS_HEADERS_INSTALL_STAGING = YES BLUEZ5_UTILS_HEADERS_INSTALL_TARGET = NO diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in index 1e9eda31dc..2eea8c7ced 100644 --- a/package/bluez5_utils/Config.in +++ b/package/bluez5_utils/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_BLUEZ5_UTILS - bool "bluez-utils 5.x" + bool "bluez-utils" depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus @@ -9,17 +9,12 @@ config BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 help - bluez utils version 5.x + BlueZ utils - With this release BlueZ only supports the new Bluetooth - Management kernel interface (introduced in Linux 3.4). + Provides Stack, Library and Tooling for Bluetooth Classic + and Bluetooth LE. - For Low Energy support at least kernel version 3.5 is - needed. - - The API is not backward compatible with BlueZ 4. - - Bluez utils will use systemd and/or udev if enabled. + BlueZ utils will use systemd and/or udev if enabled. http://www.bluez.org http://www.kernel.org/pub/linux/bluetooth @@ -31,7 +26,7 @@ config BR2_PACKAGE_BLUEZ5_UTILS_OBEX depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBICAL help - Enable the OBEX support in Bluez 5.x. + Enable OBEX support. comment "OBEX support needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP @@ -40,65 +35,120 @@ config BR2_PACKAGE_BLUEZ5_UTILS_CLIENT bool "build CLI client" select BR2_PACKAGE_READLINE help - Enable the Bluez 5.x command line client. + Build the command line client "bluetoothctl". + +config BR2_PACKAGE_BLUEZ5_UTILS_MONITOR + bool "build monitor utility" + help + Build monitor utility btmon. + +config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS + bool "build tools" + help + Build tools like bluemoon, btattach, hex2hcd, l2test, + l2ping, mpris-proxy, rctest. config BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED - bool "install deprecated tool" - depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT + bool "install deprecated tools" + depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT || BR2_PACKAGE_BLUEZ5_UTILS_TOOLS help - Build BlueZ 5.x deprecated tools. These currently include: + Build deprecated tools. + + When "build tools" is selected these tools are installed: hciattach, hciconfig, hcitool, hcidump, rfcomm, sdptool, - ciptool, gatttool. + ciptool. + + When CLI client is enabled "gatttool" is installed. config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL - bool "build experimental obexd plugin" + bool "build experimental tools" help - Build BlueZ 5.x experimental Nokia OBEX PC Suite plugin + Build experimental tools. This is currently only the + "Nokia OBEX PC Suite tool". So, only if OBEX support is + enabled this option has an effect. + +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO + bool "build audio plugins (a2dp and avrcp)" + help + Build plugins for audio profiles (for A2DP and AVRCP). config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH bool "build health plugin" help - Build BlueZ 5.x health plugin + Build plugin for health profiles. + +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID + bool "build hid plugin" + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG + help + Build plugin for HID (input) profiles. + +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG + bool "build hog plugin" + help + Build plugin for HoG (input) profiles. config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH - bool "build mesh profile" + bool "build mesh plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell select BR2_PACKAGE_ELL select BR2_PACKAGE_JSON_C select BR2_PACKAGE_READLINE help - Build BlueZ 5.x mesh plugin + Build plugin for Mesh support. + +comment "mesh profile needs a toolchain w/ headers >= 4.12" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI - bool "build midi profile" + bool "build midi plugin" select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_ALSA_LIB_SEQ help - Build BlueZ 5.x midi plugin + Build MIDI support via ALSA sequencer. + +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NETWORK + bool "build network plugin" + default y + help + Build plugin for PANU, NAP, GN profiles. config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC bool "build nfc plugin" help - Build BlueZ 5.x nfc plugin + Build plugin for NFC pairing. config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP bool "build sap plugin" help - Build BlueZ 5.x sap plugin + Build plugin for SAP profile. config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS bool "build sixaxis plugin" depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime help - Build BlueZ 5.x sixaxis plugin (support Sony Dualshock + Build sixaxis plugin (support Sony Dualshock controller) comment "sixaxis plugin needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_BLUEZ5_UTILS_TEST - bool "build tests" + bool "install test scripts" help - Build BlueZ 5.x tests + Install the python test scripts from the "test" directory. + +config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI + bool "build hid2hci tool" + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS + help + Build hid2hci tool + +comment "hid2hci tool needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV endif diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 3eb6912fb3..117f39cc93 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 68cdab9e63e8832b130d5979dc8c96fdb087b31278f342874d992af3e56656dc bluez-5.54.tar.xz +sha256 710999580d01ee59ec585e5e7c07fd94eddedc001aa26fe7464c546f9d945304 bluez-5.60.tar.xz +# Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 2149614c56..5f5a7f44c9 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,12 +5,14 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.54 +BLUEZ5_UTILS_VERSION = 5.60 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB +BLUEZ5_UTILS_CPE_ID_VENDOR = bluez +BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ @@ -18,9 +20,9 @@ BLUEZ5_UTILS_DEPENDENCIES = \ libglib2 BLUEZ5_UTILS_CONF_OPTS = \ - --enable-tools \ --enable-library \ --disable-cups \ + --disable-manpages \ --with-dbusconfdir=/etc ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y) @@ -37,6 +39,18 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-client endif +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_MONITOR),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-monitor +else +BLUEZ5_UTILS_CONF_OPTS += --disable-monitor +endif + +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_TOOLS),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-tools +else +BLUEZ5_UTILS_CONF_OPTS += --disable-tools +endif + # experimental plugins ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL),y) BLUEZ5_UTILS_CONF_OPTS += --enable-experimental @@ -44,6 +58,13 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-experimental endif +# enable audio plugins (a2dp and avrcp) +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-a2dp --enable-avrcp +else +BLUEZ5_UTILS_CONF_OPTS += --disable-a2dp --disable-avrcp +endif + # enable health plugin ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH),y) BLUEZ5_UTILS_CONF_OPTS += --enable-health @@ -51,6 +72,20 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-health endif +# enable hid plugin +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-hid +else +BLUEZ5_UTILS_CONF_OPTS += --disable-hid +endif + +# enable hog plugin +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-hog +else +BLUEZ5_UTILS_CONF_OPTS += --disable-hog +endif + # enable mesh profile ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH),y) BLUEZ5_UTILS_CONF_OPTS += --enable-external-ell --enable-mesh @@ -67,6 +102,13 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-midi endif +# enable network plugin +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NETWORK),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-network +else +BLUEZ5_UTILS_CONF_OPTS += --disable-network +endif + # enable nfc plugin ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC),y) BLUEZ5_UTILS_CONF_OPTS += --enable-nfc @@ -88,12 +130,16 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-sixaxis endif -# install gatttool (For some reason upstream choose not to do it by default) ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED),y) +# install gatttool (For some reason upstream choose not to do it by default) +# gattool depends on the client for readline +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_CLIENT),y) define BLUEZ5_UTILS_INSTALL_GATTTOOL $(INSTALL) -D -m 0755 $(@D)/attrib/gatttool $(TARGET_DIR)/usr/bin/gatttool endef BLUEZ5_UTILS_POST_INSTALL_TARGET_HOOKS += BLUEZ5_UTILS_INSTALL_GATTTOOL +endif + # hciattach_bcm43xx defines default firmware path in `/etc/firmware`, but # Broadcom firmware blobs are usually located in `/lib/firmware`. BLUEZ5_UTILS_CONF_ENV += \ @@ -110,6 +156,13 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-test endif +# enable hid2hci tool +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-hid2hci +else +BLUEZ5_UTILS_CONF_OPTS += --disable-hid2hci +endif + # use udev if available ifeq ($(BR2_PACKAGE_HAS_UDEV),y) BLUEZ5_UTILS_CONF_OPTS += --enable-udev @@ -126,4 +179,9 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-systemd endif +define BLUEZ5_UTILS_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/bluez5_utils/S40bluetooth \ + $(TARGET_DIR)/etc/init.d/S40bluetooth +endef + $(eval $(autotools-package)) diff --git a/package/boinc/boinc.hash b/package/boinc/boinc.hash index b842b6c017..981d9141ea 100644 --- a/package/boinc/boinc.hash +++ b/package/boinc/boinc.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 caa567da8d3eb50859efe2eeba1c23c7b27d3b0f15b548136e75302713b25303 boinc-7.16.6.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER +sha256 e66fe2e2a804687c1fef2a0d2819d634dc24c9af1cb371c71ac468352f7a562a boinc-7.16.18.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index d32b258ea7..079b065efd 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -5,13 +5,16 @@ ################################################################################ BOINC_VERSION_MAJOR = 7.16 -BOINC_VERSION = $(BOINC_VERSION_MAJOR).6 +BOINC_VERSION = $(BOINC_VERSION_MAJOR).18 BOINC_SITE = \ $(call github,BOINC,boinc,client_release/$(BOINC_VERSION_MAJOR)/$(BOINC_VERSION)) BOINC_LICENSE = LGPL-3.0+ BOINC_LICENSE_FILES = COPYING COPYING.LESSER +BOINC_CPE_ID_VENDOR = rom_walton +BOINC_SELINUX_MODULES = boinc BOINC_DEPENDENCIES = host-pkgconf libcurl openssl BOINC_AUTORECONF = YES +BOINC_CONF_ENV = ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config BOINC_CONF_OPTS = \ --disable-apps \ --disable-boinczip \ diff --git a/package/boost/Config.in b/package/boost/Config.in index 121650b8bc..9248c574f4 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -52,6 +52,7 @@ config BR2_PACKAGE_BOOST_LAYOUT config BR2_PACKAGE_BOOST_ATOMIC bool "boost-atomic" + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS help C++11-style atomic<>. @@ -82,6 +83,8 @@ config BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS config BR2_PACKAGE_BOOST_CONTEXT bool "boost-context" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \ + || BR2_TOOLCHAIN_GCC_AT_LEAST_6 # boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 select BR2_PACKAGE_BOOST_THREAD if !BR2_TOOLCHAIN_GCC_AT_LEAST_6 help @@ -101,6 +104,7 @@ comment "boost-contract needs a toolchain w/ NPTL" config BR2_PACKAGE_BOOST_COROUTINE bool "boost-coroutine" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context, boost-thread select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_CONTEXT @@ -113,6 +117,7 @@ config BR2_PACKAGE_BOOST_COROUTINE comment "boost-coroutine needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_PACKAGE_BOOST_DATE_TIME @@ -135,6 +140,8 @@ config BR2_PACKAGE_BOOST_FIBER # mips support uses the "pause" instruction, only available # since mips32r2/mips64r2. depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64 + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \ + || BR2_TOOLCHAIN_GCC_AT_LEAST_6 # boost-context -> boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context select BR2_PACKAGE_BOOST_CONTEXT select BR2_PACKAGE_BOOST_FILESYSTEM @@ -144,10 +151,14 @@ config BR2_PACKAGE_BOOST_FIBER comment "boost-fiber needs a toolchain w/ NPTL" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \ + || BR2_TOOLCHAIN_GCC_AT_LEAST_6 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL comment "boost-fiber needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \ + || BR2_TOOLCHAIN_GCC_AT_LEAST_6 depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_PACKAGE_BOOST_FILESYSTEM @@ -178,6 +189,16 @@ config BR2_PACKAGE_BOOST_IOSTREAMS Boost.IOStreams provides a framework for defining streams, stream buffers and i/o filters. +config BR2_PACKAGE_BOOST_JSON + bool "boost-json" + select BR2_PACKAGE_BOOST_CONTAINER + help + Boost.JSON is a portable C++ library which provides containers + and algorithms that implement JavaScript Object Notation, or + simply "JSON", a lightweight data-interchange format. + + To use the library "header-only" this option is not needed. + config BR2_PACKAGE_BOOST_LOCALE bool "boost-locale" # When boost-locale is enabled with icu support, Boost no @@ -190,6 +211,8 @@ config BR2_PACKAGE_BOOST_LOCALE # details. depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_ICU) depends on !(BR2_TOOLCHAIN_HAS_GCC_BUG_64735 && BR2_PACKAGE_ICU) # boost-thread + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \ + || !BR2_PACKAGE_ICU # boost-thread select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD if BR2_PACKAGE_ICU select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE @@ -197,16 +220,19 @@ config BR2_PACKAGE_BOOST_LOCALE Provide localization and Unicode handling tools for C++. comment "boost-locale needs a toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on BR2_PACKAGE_ICU depends on BR2_STATIC_LIBS comment "boost-locale needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on BR2_PACKAGE_ICU depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_PACKAGE_BOOST_LOG bool "boost-log" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME @@ -218,6 +244,7 @@ config BR2_PACKAGE_BOOST_LOG Logging library. comment "boost-log needs a toolchain w/ NPTL" + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL comment "boost-log needs a toolchain not affected by GCC bug 64735" @@ -253,6 +280,11 @@ config BR2_PACKAGE_BOOST_MPI Message Passing Interface library, for use in distributed-memory parallel application programming. +config BR2_PACKAGE_BOOST_NOWIDE + bool "boost-nowide" + help + Library for cross-platform, unicode aware programming. + config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS bool "boost-program_options" help @@ -313,8 +345,8 @@ config BR2_PACKAGE_BOOST_TEST config BR2_PACKAGE_BOOST_THREAD bool "boost-thread" + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception - select BR2_PACKAGE_BOOST_ATOMIC if !BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_SYSTEM help @@ -332,6 +364,7 @@ config BR2_PACKAGE_BOOST_TIMER config BR2_PACKAGE_BOOST_TYPE_ERASURE bool "boost-type_erasure" + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD @@ -346,6 +379,7 @@ config BR2_PACKAGE_BOOST_WAVE # limitation of assembler for coldfire # error: Tried to convert PC relative branch to absolute jump depends on !BR2_m68k_cf + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST_DATE_TIME select BR2_PACKAGE_BOOST_FILESYSTEM diff --git a/package/boost/boost.hash b/package/boost/boost.hash index 0348f40461..e6d44a76b6 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From http://www.boost.org/users/history/version_1_72_0.html -sha256 59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 boost_1_72_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_74_0.html +sha256 953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb boost_1_75_0.tar.bz2 # Locally computed -sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 2daf7f5a96..e72ddf897c 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,23 +4,21 @@ # ################################################################################ -BOOST_VERSION = 1.72.0 +BOOST_VERSION = 1.75.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 -BOOST_SITE = https://dl.bintray.com/boostorg/release/$(BOOST_VERSION)/source +BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES BOOST_LICENSE = BSL-1.0 BOOST_LICENSE_FILES = LICENSE_1_0.txt - -# CVE-2009-3654 is misclassified (by our CVE tracker) as affecting to boost, -# while in fact it affects Drupal (a module called boost in there). -BOOST_IGNORE_CVES += CVE-2009-3654 +BOOST_CPE_ID_VENDOR = boost # keep host variant as minimal as possible HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ - contract coroutine date_time exception filesystem graph graph_parallel \ - iostreams locale log math mpi program_options python random regex \ - serialization system test thread timer type_erasure wave) + contract container coroutine date_time exception fiber filesystem graph \ + graph_parallel iostreams json locale log math mpi nowide program_options \ + python random regex serialization stacktrace system test thread timer \ + type_erasure wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) @@ -35,10 +33,12 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH),,graph) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH_PARALLEL),,graph_parallel) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_IOSTREAMS),,iostreams) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_JSON),,json) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOCALE),,locale) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOG),,log) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MATH),,math) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MPI),,mpi) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_NOWIDE),,nowide) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PROGRAM_OPTIONS),,program_options) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PYTHON),,python) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_RANDOM),,random) @@ -95,7 +95,7 @@ BOOST_OPTS += --no-cmake-config \ toolset=gcc \ threading=multi \ abi=$(BOOST_ABI) \ - variant=$(if $(BR2_ENABLE_DEBUG),debug,release) + variant=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) ifeq ($(BR2_sparc64),y) BOOST_OPTS += architecture=sparc instruction-set=ultrasparc @@ -134,6 +134,7 @@ define BOOST_CONFIGURE_CMDS (cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS)) echo "using gcc : `$(TARGET_CC) -dumpversion` : $(TARGET_CXX) : \"$(BOOST_TARGET_CXXFLAGS)\" \"$(TARGET_LDFLAGS)\" ;" > $(@D)/user-config.jam echo "" >> $(@D)/user-config.jam + sed -i "s/: -O.* ;/: $(TARGET_OPTIMIZATION) ;/" $(@D)/tools/build/src/tools/gcc.jam endef define BOOST_BUILD_CMDS diff --git a/package/bootstrap/bootstrap.mk b/package/bootstrap/bootstrap.mk index c9f6003b52..eba1244ad3 100644 --- a/package/bootstrap/bootstrap.mk +++ b/package/bootstrap/bootstrap.mk @@ -9,6 +9,7 @@ BOOTSTRAP_SITE = https://github.com/twbs/bootstrap/releases/download/v$(BOOTSTRA BOOTSTRAP_SOURCE = bootstrap-$(BOOTSTRAP_VERSION)-dist.zip BOOTSTRAP_LICENSE = MIT BOOTSTRAP_LICENSE_FILES = css/bootstrap.css +BOOTSTRAP_CPE_ID_VENDOR = getbootstrap define BOOTSTRAP_EXTRACT_CMDS $(UNZIP) $(BOOTSTRAP_DL_DIR)/$(BOOTSTRAP_SOURCE) -d $(@D) diff --git a/package/botan/Config.in b/package/botan/Config.in index a242a38efc..341fa7c622 100644 --- a/package/botan/Config.in +++ b/package/botan/Config.in @@ -1,9 +1,15 @@ config BR2_PACKAGE_BOTAN_ARCH_SUPPORTS bool - default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_powerpc || BR2_powerpc64 || BR2_sparc || BR2_sh || \ - BR2_x86_64 + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_m68k + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_sparc || BR2_sparc64 + default y if BR2_s390x + default y if BR2_sh config BR2_PACKAGE_BOTAN bool "botan" @@ -14,6 +20,8 @@ config BR2_PACKAGE_BOTAN depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help Botan is a crypto library for C++ diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 29efddb35c..d1b1d14acb 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,3 +1,4 @@ +# From https://botan.randombit.net/releases/sha256sums.txt +sha256 79123b654445a4abba486e09a431788545c708237382a3e765664c9f55b03b88 Botan-2.17.3.tar.xz # Locally computed -sha256 f57ae42a41e1091bca58f44f41addebd9a390b651603952c881ec89d50187e90 Botan-2.13.0.tar.xz sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 6394b5ef95..aa0bb9b261 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,11 +4,15 @@ # ################################################################################ -BOTAN_VERSION = 2.13.0 +BOTAN_VERSION = 2.17.3 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause BOTAN_LICENSE_FILES = license.txt +BOTAN_CPE_ID_VENDOR = botan_project + +# 0001-Avoid-using-short-exponents-with-ElGamal.patch +BOTAN_IGNORE_CVES += CVE-2021-40529 BOTAN_INSTALL_STAGING = YES @@ -17,14 +21,11 @@ BOTAN_CONF_OPTS = \ --os=linux \ --cc=gcc \ --cc-bin="$(TARGET_CXX)" \ - --ldflags="$(BOTAN_LDFLAGS)" \ --prefix=/usr \ --without-documentation -BOTAN_LDFLAGS = $(TARGET_LDFLAGS) - ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -BOTAN_LDFLAGS += -latomic +BOTAN_CONF_OPTS += --extra-libs=atomic endif ifeq ($(BR2_SHARED_LIBS),y) @@ -52,7 +53,7 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) BOTAN_CONF_OPTS += --without-os-feature=getauxval endif -ifeq ($(BR2_PACKAGE_BOOST),y) +ifeq ($(BR2_PACKAGE_BOOST_FILESYSTEM)$(BR2_PACKAGE_BOOST_SYSTEM),yy) BOTAN_DEPENDENCIES += boost BOTAN_CONF_OPTS += --with-boost endif diff --git a/package/brickd/brickd.hash b/package/brickd/brickd.hash index 8de57a9b82..be9ad9ed90 100644 --- a/package/brickd/brickd.hash +++ b/package/brickd/brickd.hash @@ -1,5 +1,5 @@ # Locally computed hash -sha256 0b79f1ccd6fa644d7ecb2e17b19f9ffbf6374702ae9ac536b2c4a0b8b2cfe160 brickd-ev3dev-stretch_1.2.1.tar.gz +sha256 8469b6959a7e32c4b39a56e1a4f7479f785d83e6db3269487f5312f3cf1df382 brickd-v1.2.2-br1.tar.gz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.txt diff --git a/package/brickd/brickd.mk b/package/brickd/brickd.mk index 7fe28daf78..f42b3c9956 100644 --- a/package/brickd/brickd.mk +++ b/package/brickd/brickd.mk @@ -4,7 +4,7 @@ # ################################################################################ -BRICKD_VERSION = ev3dev-stretch/1.2.1 +BRICKD_VERSION = v1.2.2 BRICKD_SITE = https://github.com/ev3dev/brickd BRICKD_SITE_METHOD = git BRICKD_GIT_SUBMODULES = YES diff --git a/package/bridge-utils/Config.in b/package/bridge-utils/Config.in index bc614b0758..de5883f063 100644 --- a/package/bridge-utils/Config.in +++ b/package/bridge-utils/Config.in @@ -4,4 +4,8 @@ config BR2_PACKAGE_BRIDGE_UTILS Manage ethernet bridging; a way to connect networks together to form a larger network. + This utility is DEPRECATED. No new features will ever be + added. Instead use the bridge command from the iproute2 + package which supports more features. + https://git.kernel.org/cgit/linux/kernel/git/shemminger/bridge-utils.git/ diff --git a/package/bridge-utils/bridge-utils.hash b/package/bridge-utils/bridge-utils.hash index 5658116f88..60cdd1cec1 100644 --- a/package/bridge-utils/bridge-utils.hash +++ b/package/bridge-utils/bridge-utils.hash @@ -1,5 +1,5 @@ -# From https://www.kernel.org/pub/linux/utils/net/bridge-utils/sha256sums.asc -sha256 cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8 bridge-utils-1.6.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/utils/net/bridge-utils/sha256sums.asc +sha256 a61d8be4f1a1405c60c8ef38d544f0c18c05b33b9b07e5b4b31033536165e60e bridge-utils-1.7.1.tar.xz # locally computed -sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 COPYING +sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 COPYING diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk index 2519227471..e8e9a3ca3a 100644 --- a/package/bridge-utils/bridge-utils.mk +++ b/package/bridge-utils/bridge-utils.mk @@ -4,12 +4,14 @@ # ################################################################################ -BRIDGE_UTILS_VERSION = 1.6 +BRIDGE_UTILS_VERSION = 1.7.1 BRIDGE_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/bridge-utils -BRIDGE_UTILS_SOURCE = bridge-utils-1.6.tar.xz +BRIDGE_UTILS_SOURCE = bridge-utils-$(BRIDGE_UTILS_VERSION).tar.xz BRIDGE_UTILS_AUTORECONF = YES BRIDGE_UTILS_LICENSE = GPL-2.0+ BRIDGE_UTILS_LICENSE_FILES = COPYING +BRIDGE_UTILS_CPE_ID_VENDOR = kernel +BRIDGE_UTILS_SELINUX_MODULES = brctl # Avoid using the host's headers. Location is not important as # required headers will anyway be found from within the sysroot. diff --git a/package/brltty/Config.in b/package/brltty/Config.in index de11af3bbe..c728cb7e20 100644 --- a/package/brltty/Config.in +++ b/package/brltty/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_BRLTTY depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime help A daemon providing access to the Linux console for a blind person using a refreshable braille display. diff --git a/package/brltty/brltty.hash b/package/brltty/brltty.hash index 4373d7da96..504b0d802a 100644 --- a/package/brltty/brltty.hash +++ b/package/brltty/brltty.hash @@ -1,3 +1,4 @@ -sha256 cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7 brltty-6.0.tar.xz -sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL -sha256 69d7cbb371bcb165ccde6c496f61481a557d17f0afa0aaa86ece214c4bd698cb README +# Locally computed +sha256 b256df8f86b4d6a597cfe982cc5a7c831915de37cfece683ddb02b2329256a8a brltty-6.3.tar.xz +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL +sha256 da78e60359a86eeefb6d6e02bc47d386ece10ae45309d998981157c3746724ab README diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index acc172fab0..602750c9b8 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -4,7 +4,7 @@ # ################################################################################ -BRLTTY_VERSION = 6.0 +BRLTTY_VERSION = 6.3 BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz BRLTTY_SITE = http://brltty.com/archive BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install @@ -12,7 +12,11 @@ BRLTTY_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install BRLTTY_LICENSE = LGPL-2.1+ BRLTTY_LICENSE_FILES = LICENSE-LGPL README -BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf host-pkgconf \ +BRLTTY_DEPENDENCIES = \ + $(TARGET_NLS_DEPENDENCIES) \ + host-autoconf \ + host-gawk \ + host-pkgconf \ $(if $(BR2_PACKAGE_AT_SPI2_CORE),at-spi2-core) BRLTTY_CONF_ENV = \ @@ -92,6 +96,13 @@ else BRLTTY_CONF_OPTS += --without-rgx-package endif +ifeq ($(BR2_PACKAGE_POLKIT),y) +BRLTTY_DEPENDENCIES += polkit +BRLTTY_CONF_OPTS += --enable-polkit +else +BRLTTY_CONF_OPTS += --disable-polkit +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) BRLTTY_DEPENDENCIES += systemd BRLTTY_CONF_OPTS += --with-service-package diff --git a/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch b/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch index ae5386b1ce..2a3204fc34 100644 --- a/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch +++ b/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch @@ -1,6 +1,6 @@ -From 7289e5a378ba13801996a84d89d8fe95c3fc4c11 Mon Sep 17 00:00:00 2001 +From 6cb16322decd643fed9de332d9cda77f7738b7af Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro -Date: Mon, 26 Mar 2018 19:08:31 +0100 +Date: Mon, 7 Sep 2020 12:14:22 +0300 Subject: [PATCH] CMake: Allow using BUILD_SHARED_LIBS to choose static/shared libs @@ -18,16 +18,16 @@ This way, the following will both work as expected: This is helpful for distributions which need (or want) to build only static libraries. ---- - CMakeLists.txt | 42 ++++++++++++++---------------------------- - c/fuzz/test_fuzzer.sh | 6 +++--- - 2 files changed, 17 insertions(+), 31 deletions(-) Signed-off-by: Adrian Perez de Castro -Upstream-Status: Submitted [https://github.com/google/brotli/pull/655] +[Upstream status: https://github.com/google/brotli/pull/655] +--- + CMakeLists.txt | 46 ++++++++++++++----------------------------- + c/fuzz/test_fuzzer.sh | 6 +++--- + 2 files changed, 18 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc45f80..3f87f13 100644 +index 4ff3401..f889311 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,8 @@ cmake_minimum_required(VERSION 2.8.6) @@ -36,10 +36,10 @@ index fc45f80..3f87f13 100644 +option(BUILD_SHARED_LIBS "Build shared libraries" ON) + - # If Brotli is being bundled in another project, we don't want to - # install anything. However, we want to let people override this, so - # we'll use the BROTLI_BUNDLED_MODE variable to let them do that; just -@@ -114,10 +116,6 @@ set(BROTLI_LIBRARIES_CORE brotlienc brotlidec brotlicommon) + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message(STATUS "Setting build type to Release as none was specified.") + set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE) +@@ -137,10 +139,6 @@ set(BROTLI_LIBRARIES_CORE brotlienc brotlidec brotlicommon) set(BROTLI_LIBRARIES ${BROTLI_LIBRARIES_CORE} ${LIBM_LIBRARY}) mark_as_advanced(BROTLI_LIBRARIES) @@ -50,14 +50,20 @@ index fc45f80..3f87f13 100644 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") add_definitions(-DOS_LINUX) elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -@@ -137,24 +135,22 @@ endfunction() - transform_sources_list("scripts/sources.lst" "${CMAKE_CURRENT_BINARY_DIR}/sources.lst.cmake") +@@ -161,29 +159,25 @@ transform_sources_list("scripts/sources.lst" "${CMAKE_CURRENT_BINARY_DIR}/source include("${CMAKE_CURRENT_BINARY_DIR}/sources.lst.cmake") --add_library(brotlicommon SHARED ${BROTLI_COMMON_C}) --add_library(brotlidec SHARED ${BROTLI_DEC_C}) --add_library(brotlienc SHARED ${BROTLI_ENC_C}) -- + if(BROTLI_EMSCRIPTEN) +- set(BROTLI_SHARED_LIBS "") +-else() +- set(BROTLI_SHARED_LIBS brotlicommon brotlidec brotlienc) +- add_library(brotlicommon SHARED ${BROTLI_COMMON_C}) +- add_library(brotlidec SHARED ${BROTLI_DEC_C}) +- add_library(brotlienc SHARED ${BROTLI_ENC_C}) ++ set(BUILD_SHARED_LIBS OFF) + endif() + +-set(BROTLI_STATIC_LIBS brotlicommon-static brotlidec-static brotlienc-static) -add_library(brotlicommon-static STATIC ${BROTLI_COMMON_C}) -add_library(brotlidec-static STATIC ${BROTLI_DEC_C}) -add_library(brotlienc-static STATIC ${BROTLI_ENC_C}) @@ -68,27 +74,27 @@ index fc45f80..3f87f13 100644 # Older CMake versions does not understand INCLUDE_DIRECTORIES property. include_directories(${BROTLI_INCLUDE_DIRS}) +-foreach(lib IN LISTS BROTLI_SHARED_LIBS) +- target_compile_definitions(${lib} PUBLIC "BROTLI_SHARED_COMPILATION" ) +- string(TOUPPER "${lib}" LIB) +- set_target_properties (${lib} PROPERTIES DEFINE_SYMBOL "${LIB}_SHARED_COMPILATION") +-endforeach() +if(BUILD_SHARED_LIBS) + foreach(lib brotlicommon brotlidec brotlienc) + target_compile_definitions(${lib} PUBLIC "BROTLI_SHARED_COMPILATION" ) + string(TOUPPER "${lib}" LIB) -+ set_target_properties (${lib} PROPERTIES DEFINE_SYMBOL "${LIB}_SHARED_COMPILATION" ) ++ set_target_properties (${lib} PROPERTIES DEFINE_SYMBOL "${LIB}_SHARED_COMPILATION") + endforeach() +endif() -+ - foreach(lib brotlicommon brotlidec brotlienc) -- target_compile_definitions(${lib} PUBLIC "BROTLI_SHARED_COMPILATION" ) -- string(TOUPPER "${lib}" LIB) -- set_target_properties (${lib} PROPERTIES DEFINE_SYMBOL "${LIB}_SHARED_COMPILATION" ) --endforeach() -- --foreach(lib brotlicommon brotlidec brotlienc brotlicommon-static brotlidec-static brotlienc-static) + +-foreach(lib IN LISTS BROTLI_SHARED_LIBS BROTLI_STATIC_LIBS) ++foreach(lib brotlicommon brotlidec brotlienc) target_link_libraries(${lib} ${LIBM_LIBRARY}) set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS}) set_target_properties(${lib} PROPERTIES -@@ -167,9 +163,6 @@ endforeach() - target_link_libraries(brotlidec brotlicommon) +@@ -200,9 +194,6 @@ target_link_libraries(brotlidec brotlicommon) target_link_libraries(brotlienc brotlicommon) + endif() -target_link_libraries(brotlidec-static brotlicommon-static) -target_link_libraries(brotlienc-static brotlicommon-static) @@ -96,7 +102,7 @@ index fc45f80..3f87f13 100644 # For projects stuck on older versions of CMake, this will set the # BROTLI_INCLUDE_DIRS and BROTLI_LIBRARIES variables so they still # have a relatively easy way to use Brotli: -@@ -183,7 +176,7 @@ endif() +@@ -216,7 +207,7 @@ endif() # Build the brotli executable add_executable(brotli ${BROTLI_CLI_C}) @@ -104,8 +110,8 @@ index fc45f80..3f87f13 100644 +target_link_libraries(brotli ${BROTLI_LIBRARIES}) # Installation - if(NOT BROTLI_BUNDLED_MODE) -@@ -199,13 +192,6 @@ if(NOT BROTLI_BUNDLED_MODE) + if(NOT BROTLI_EMSCRIPTEN) +@@ -233,13 +224,6 @@ if(NOT BROTLI_BUNDLED_MODE) RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ) @@ -119,26 +125,6 @@ index fc45f80..3f87f13 100644 install( DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" -diff --git a/c/fuzz/test_fuzzer.sh b/c/fuzz/test_fuzzer.sh -index 9985194..4b99947 100755 ---- a/c/fuzz/test_fuzzer.sh -+++ b/c/fuzz/test_fuzzer.sh -@@ -13,12 +13,12 @@ mkdir bin - cd bin - - cmake $BROTLI -DCMAKE_C_COMPILER="$CC" \ -- -DBUILD_TESTING=OFF -DENABLE_SANITIZER=address --make -j$(nproc) brotlidec-static -+ -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_SANITIZER=address -+make -j$(nproc) brotlidec - - ${CC} -o run_decode_fuzzer -std=c99 -fsanitize=address -I$SRC/include \ - $SRC/fuzz/decode_fuzzer.c $SRC/fuzz/run_decode_fuzzer.c \ -- ./libbrotlidec-static.a ./libbrotlicommon-static.a -+ ./libbrotlidec.a ./libbrotlicommon.a - - mkdir decode_corpora - unzip $BROTLI/java/org/brotli/integration/fuzz_data.zip -d decode_corpora -- -2.19.1 +2.28.0 diff --git a/package/brotli/brotli.hash b/package/brotli/brotli.hash index 82163040d1..22f894c403 100644 --- a/package/brotli/brotli.hash +++ b/package/brotli/brotli.hash @@ -1,5 +1,5 @@ # Locally generated: -sha512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a v1.0.7.tar.gz +sha512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5 v1.0.9.tar.gz # Hash for license files: sha512 bae78184c2f50f86d8c727826d3982c469454c42b9af81f4ef007e39036434fa894cf5be3bf5fc65b7de2301f0a72d067a8186e303327db8a96bd14867e0a3a8 LICENSE diff --git a/package/brotli/brotli.mk b/package/brotli/brotli.mk index 134f480895..43c8524c0b 100644 --- a/package/brotli/brotli.mk +++ b/package/brotli/brotli.mk @@ -4,11 +4,12 @@ # ################################################################################ -BROTLI_VERSION = 1.0.7 +BROTLI_VERSION = 1.0.9 BROTLI_SOURCE = v$(BROTLI_VERSION).tar.gz BROTLI_SITE = https://github.com/google/brotli/archive BROTLI_LICENSE = MIT BROTLI_LICENSE_FILES = LICENSE +BROTLI_CPE_ID_VENDOR = google BROTLI_INSTALL_STAGING = YES BROTLI_CONF_OPTS = \ -DBROTLI_DISABLE_TESTS=ON \ diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk index 9030284a0a..97a1b3921d 100644 --- a/package/bsdiff/bsdiff.mk +++ b/package/bsdiff/bsdiff.mk @@ -9,6 +9,7 @@ BSDIFF_SITE = http://www.daemonology.net/bsdiff BSDIFF_DEPENDENCIES = bzip2 BSDIFF_LICENSE = BSD-2-Clause BSDIFF_LICENSE_FILES = bsdiff.c +BSDIFF_CPE_ID_VENDOR = daemonology define BSDIFF_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index b8e6a07fd4..aac144963e 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 36ac4a0198ffff79d5800c537ea4b19769a8fd3ad870f75413d25b20e2d83233 btrfs-progs-v5.2.1.tar.xz +sha256 d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137 btrfs-progs-v5.11.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 11a284499d..96456d1238 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.2.1 +BTRFS_PROGS_VERSION = 5.11 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 388f64880e..18c175951a 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -11,6 +11,7 @@ BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap BUBBLEWRAP_LICENSE = LGPL-2.0+ BUBBLEWRAP_LICENSE_FILES = COPYING +BUBBLEWRAP_CPE_ID_VENDOR = projectatomic BUBBLEWRAP_CONF_OPTS = \ --enable-require-userns=no \ diff --git a/package/bullet/Config.in b/package/bullet/Config.in index fc285ab33a..0c420e8212 100644 --- a/package/bullet/Config.in +++ b/package/bullet/Config.in @@ -1,11 +1,15 @@ config BR2_PACKAGE_BULLET bool "bullet" depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR help Bullet is a Collision Detection and Rigid Body Dynamics Library. http://bulletphysics.org -comment "bullet needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "bullet needs a toolchain w/ C++, dynamic library, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/bullet/bullet.hash b/package/bullet/bullet.hash index 9da8c733d0..813e8299e1 100644 --- a/package/bullet/bullet.hash +++ b/package/bullet/bullet.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 621b36e91c0371933f3c2156db22c083383164881d2a6b84636759dc4cbb0bb8 bullet-2.89.tar.gz +sha256 f2feef9322329c0571d9066fede2db0ede92b19f7f7fdf54def3b4651f02af03 bullet-3.09.tar.gz sha256 885cd516a8420acb7c3e0b1a7119913b686495001ae564e3229740460e8cff59 LICENSE.txt diff --git a/package/bullet/bullet.mk b/package/bullet/bullet.mk index b25fc5d219..cc72be7c60 100644 --- a/package/bullet/bullet.mk +++ b/package/bullet/bullet.mk @@ -4,17 +4,16 @@ # ################################################################################ -BULLET_VERSION = 2.89 +BULLET_VERSION = 3.09 BULLET_SITE = $(call github,bulletphysics,bullet3,$(BULLET_VERSION)) BULLET_INSTALL_STAGING = YES BULLET_LICENSE = Zlib BULLET_LICENSE_FILES = LICENSE.txt -# Disable demos apps and unit tests. -# Disable Bullet3 library. -BULLET_CONF_OPTS = -DBUILD_UNIT_TESTS=OFF \ - -DBUILD_BULLET2_DEMOS=OFF \ - -DBUILD_BULLET3=OFF +# Disable unit tests. +# Don't disable demos apps and Bullet3 library to avoid a build failure: +# https://github.com/bulletphysics/bullet3/issues/3143 +BULLET_CONF_OPTS = -DBUILD_UNIT_TESTS=OFF # extras needs dlfcn.h and NPTL (pthread_barrier_init) ifeq ($(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_HAS_THREADS_NPTL),:y) @@ -25,7 +24,7 @@ endif BULLET_CXXFLAGS = $(TARGET_CXXFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180)$(BR2_TOOLCHAIN_HAS_GCC_BUG_101952),) BULLET_CXXFLAGS += -O0 endif diff --git a/package/bustle/bustle.hash b/package/bustle/bustle.hash index 05281c4f11..0bb899f1c4 100644 --- a/package/bustle/bustle.hash +++ b/package/bustle/bustle.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7760a695b25cb264e7342f353dcdc6d2b7faeacdcd85dd14e03c61b18e791664 bustle-0.7.5.tar.gz -sha256 a6d6109e5b086de8e852e451b91b08b323302f55b6975d506c64c43bb094be38 LICENSE +sha256 2fb3e9d9a97db3cd9a3ce763e86947b642bd7733b46206177a1677f08726573c bustle-0.8.0.tar.gz +sha256 ad168b537264fba8f94380cb10f60847da7db551fb4281bb6d4f24c74f652a1d LICENSE diff --git a/package/bustle/bustle.mk b/package/bustle/bustle.mk index 675ffb0529..b92d1a3ea9 100644 --- a/package/bustle/bustle.mk +++ b/package/bustle/bustle.mk @@ -4,20 +4,21 @@ # ################################################################################ -BUSTLE_VERSION = 0.7.5 -BUSTLE_SITE = https://www.freedesktop.org/software/bustle/$(BUSTLE_VERSION) +BUSTLE_VERSION = 0.8.0 +BUSTLE_SITE = https://hackage.haskell.org/package/bustle-$(BUSTLE_VERSION) BUSTLE_LICENSE = LGPL-2.1+ BUSTLE_LICENSE_FILES = LICENSE BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf -BUSTLE_PCAP_FLAGS = "-lpcap" ifeq ($(BR2_STATIC_LIBS),y) -BUSTLE_PCAP_FLAGS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` +BUSTLE_MAKE_OPTS += PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config --static" +else +BUSTLE_MAKE_OPTS += PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config" endif define BUSTLE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - PCAP_FLAGS="$(BUSTLE_PCAP_FLAGS)" -C $(@D) dist/build/bustle-pcap + $(BUSTLE_MAKE_OPTS) -C $(@D) dist/build/bustle-pcap endef define BUSTLE_INSTALL_TARGET_CMDS diff --git a/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch b/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch index 8375ae0531..84435442c9 100644 --- a/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch +++ b/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch @@ -5,7 +5,9 @@ Subject: [PATCH] Makefile.flags: strip non -l arguments returned by pkg-config Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: refresh for 1.29.0] +[petr.vorel@gmail.com: refresh for 1.32.0] Signed-off-by: "Yann E. MORIN" +Signed-off-by: Petr Vorel --- Makefile.flags | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) @@ -14,7 +16,7 @@ diff --git a/Makefile.flags b/Makefile.flags index 307afa7..885e323 100644 --- a/Makefile.flags +++ b/Makefile.flags -@@ -153,7 +153,9 @@ ifeq ($(CONFIG_SELINUX),y) +@@ -176,7 +176,9 @@ ifeq ($(CONFIG_SELINUX),y) SELINUX_PC_MODULES = libselinux libsepol $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES))) CPPFLAGS += $(SELINUX_CFLAGS) diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index eb12655cba..2e694448bc 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.31.1 -# Sun Oct 17 23:57:28 2021 +# Busybox version: 1.33.1 +# Sun Nov 21 06:08:09 2021 # CONFIG_HAVE_DOT_CONFIG=y @@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_SYSLOG_INFO=y CONFIG_FEATURE_SYSLOG=y -CONFIG_PLATFORM_LINUX=y # # Build Options @@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set CONFIG_STACK_OPTIMIZATION_386=y +CONFIG_STATIC_LIBGCC=y # # Installation Options ("make install" behavior) @@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -330,6 +331,7 @@ CONFIG_UNIQ=y CONFIG_UNLINK=y CONFIG_USLEEP=y CONFIG_UUDECODE=y +CONFIG_BASE32=y CONFIG_BASE64=y CONFIG_UUENCODE=y CONFIG_WC=y @@ -362,11 +364,11 @@ CONFIG_CHVT=y CONFIG_CLEAR=y CONFIG_DEALLOCVT=y CONFIG_DUMPKMAP=y -# CONFIG_FGCONSOLE is not set -# CONFIG_KBD_MODE is not set +CONFIG_FGCONSOLE=y +CONFIG_KBD_MODE=y CONFIG_LOADFONT=y -# CONFIG_SETFONT is not set -# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y CONFIG_DEFAULT_SETFONT_DIR="" # @@ -462,6 +464,7 @@ CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y CONFIG_FEATURE_FIND_QUIT=y # CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_EMPTY=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -554,13 +557,13 @@ CONFIG_LSATTR=y # Linux Module Utilities # # CONFIG_MODPROBE_SMALL is not set -# CONFIG_DEPMOD is not set +CONFIG_DEPMOD=y CONFIG_INSMOD=y CONFIG_LSMOD=y CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -# CONFIG_MODINFO is not set +CONFIG_MODINFO=y CONFIG_MODPROBE=y -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +CONFIG_FEATURE_MODPROBE_BLACKLIST=y CONFIG_RMMOD=y # @@ -586,9 +589,9 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKDISCARD is not set +CONFIG_BLKDISCARD=y CONFIG_BLKID=y -# CONFIG_FEATURE_BLKID_TYPE is not set +CONFIG_FEATURE_BLKID_TYPE=y # CONFIG_BLOCKDEV is not set # CONFIG_CAL is not set CONFIG_CHRT=y @@ -621,7 +624,6 @@ CONFIG_FSTRIM=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y CONFIG_HEXDUMP=y -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set # CONFIG_HD is not set CONFIG_XXD=y CONFIG_HWCLOCK=y @@ -665,7 +667,7 @@ CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y CONFIG_MOUNTPOINT=y CONFIG_NOLOGIN=y -CONFIG_NOLOGIN_DEPENDENCIES=y +# CONFIG_NOLOGIN_DEPENDENCIES is not set # CONFIG_NSENTER is not set CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y @@ -692,6 +694,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y CONFIG_SWITCH_ROOT=y # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -712,6 +715,7 @@ CONFIG_VOLUMEID=y # CONFIG_FEATURE_VOLUMEID_BCACHE is not set # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +CONFIG_FEATURE_VOLUMEID_EROFS=y CONFIG_FEATURE_VOLUMEID_EXFAT=y CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_F2FS=y @@ -719,7 +723,7 @@ CONFIG_FEATURE_VOLUMEID_FAT=y # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_LFS is not set +CONFIG_FEATURE_VOLUMEID_LFS=y # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_LUKS is not set @@ -729,7 +733,7 @@ CONFIG_FEATURE_VOLUMEID_MINIX=y # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set # CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set +CONFIG_FEATURE_VOLUMEID_SQUASHFS=y # CONFIG_FEATURE_VOLUMEID_SYSV is not set CONFIG_FEATURE_VOLUMEID_UBIFS=y # CONFIG_FEATURE_VOLUMEID_UDF is not set @@ -747,9 +751,9 @@ CONFIG_FEATURE_DC_BIG=y # CONFIG_FEATURE_DC_LIBM is not set CONFIG_FEATURE_BC_INTERACTIVE=y CONFIG_FEATURE_BC_LONG_OPTIONS=y -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 # CONFIG_CHAT is not set # CONFIG_FEATURE_CHAT_NOFAIL is not set # CONFIG_FEATURE_CHAT_TTY_HIFI is not set @@ -809,6 +813,7 @@ CONFIG_MAKEDEVS=y CONFIG_FEATURE_MAKEDEVS_TABLE=y CONFIG_MAN=y CONFIG_MICROCOM=y +CONFIG_MIM=y CONFIG_MT=y # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set @@ -849,13 +854,13 @@ CONFIG_ARPING=y # CONFIG_FEATURE_BRCTL_SHOW is not set CONFIG_DNSD=y CONFIG_ETHER_WAKE=y -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTPD_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set -# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_FTPD=y +CONFIG_FEATURE_FTPD_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FEATURE_FTPD_AUTHENTICATION=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_HOSTNAME=y CONFIG_DNSDOMAINNAME=y # CONFIG_HTTPD is not set @@ -870,6 +875,10 @@ CONFIG_DNSDOMAINNAME=y # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set # CONFIG_FEATURE_HTTPD_PROXY is not set # CONFIG_FEATURE_HTTPD_GZIP is not set +# CONFIG_FEATURE_HTTPD_ETAG is not set +# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set +# CONFIG_FEATURE_HTTPD_DATE is not set +# CONFIG_FEATURE_HTTPD_ACL_IP is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_SLIP=y @@ -926,10 +935,10 @@ CONFIG_NETSTAT=y CONFIG_NSLOOKUP=y CONFIG_FEATURE_NSLOOKUP_BIG=y CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -# CONFIG_FEATURE_NTPD_CONF is not set -# CONFIG_FEATURE_NTP_AUTH is not set +CONFIG_NTPD=y +CONFIG_FEATURE_NTPD_SERVER=y +CONFIG_FEATURE_NTPD_CONF=y +CONFIG_FEATURE_NTP_AUTH=y CONFIG_PING=y # CONFIG_PING6 is not set CONFIG_FEATURE_FANCY_PING=y @@ -945,11 +954,11 @@ CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y CONFIG_FEATURE_TELNET_AUTOLOGIN=y CONFIG_FEATURE_TELNET_WIDTH=y -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +CONFIG_FEATURE_TELNETD_INETD_WAIT=y CONFIG_TFTP=y -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y CONFIG_FEATURE_TFTP_HPA_COMPAT=y # CONFIG_TFTPD is not set CONFIG_FEATURE_TFTP_GET=y @@ -1099,6 +1108,7 @@ CONFIG_SH_IS_ASH=y # CONFIG_BASH_IS_ASH is not set # CONFIG_BASH_IS_HUSH is not set CONFIG_BASH_IS_NONE=y +CONFIG_SHELL_ASH=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y @@ -1119,6 +1129,7 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y # CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set +# CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_LINENO_VAR is not set @@ -1181,6 +1192,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_FEATURE_SYSLOGD_DUP is not set # CONFIG_FEATURE_SYSLOGD_CFG is not set +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index e5b05ae731..3e9c30cad0 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,4 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.31.1.tar.bz2.sha256 -sha256 d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 busybox-1.31.1.tar.bz2 +# From https://busybox.net/downloads/busybox-1.33.1.tar.bz2.sha256 +sha256 12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28 busybox-1.33.1.tar.bz2 # Locally computed -sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE +sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE +sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index b9d82ed71e..4b1fbade1d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,15 +4,12 @@ # ################################################################################ -BUSYBOX_VERSION = 1.31.1 -BUSYBOX_SITE = http://www.busybox.net/downloads +BUSYBOX_VERSION = 1.33.1 +BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 -BUSYBOX_LICENSE = GPL-2.0 -BUSYBOX_LICENSE_FILES = LICENSE - -define BUSYBOX_HELP_CMDS - @echo ' busybox-menuconfig - Run BusyBox menuconfig' -endef +BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 +BUSYBOX_LICENSE_FILES = LICENSE archival/libarchive/bz/LICENSE +BUSYBOX_CPE_ID_VENDOR = busybox BUSYBOX_CFLAGS = \ $(TARGET_CFLAGS) @@ -42,6 +39,7 @@ BUSYBOX_DEPENDENCIES = \ $(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \ $(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \ $(if $(BR2_PACKAGE_IFUPDOWN),ifupdown) \ + $(if $(BR2_PACKAGE_IPCALC),ipcalc) \ $(if $(BR2_PACKAGE_IPROUTE2),iproute2) \ $(if $(BR2_PACKAGE_IPUTILS),iputils) \ $(if $(BR2_PACKAGE_KMOD),kmod) \ @@ -67,6 +65,7 @@ BUSYBOX_DEPENDENCIES = \ $(if $(BR2_PACKAGE_USBUTILS),usbutils) \ $(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \ $(if $(BR2_PACKAGE_VIM),vim) \ + $(if $(BR2_PACKAGE_WATCHDOG),watchdog) \ $(if $(BR2_PACKAGE_WGET),wget) \ $(if $(BR2_PACKAGE_WHOIS),whois) @@ -80,7 +79,6 @@ BUSYBOX_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" BUSYBOX_CFLAGS_busybox += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`" endif -BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config # Allows the build system to tweak CFLAGS BUSYBOX_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ @@ -105,6 +103,7 @@ ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif +BUSYBOX_KCONFIG_SUPPORTS_DEFCONFIG = NO BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE) BUSYBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES)) BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig @@ -148,53 +147,53 @@ define BUSYBOX_INSTALL_MDEV_CONF $(TARGET_DIR)/etc/mdev.conf endef define BUSYBOX_SET_MDEV - $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_CONF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_EXEC,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_LOAD_FIRMWARE,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_CONF) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_EXEC) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_LOAD_FIRMWARE) endef endif # sha passwords need USE_BB_CRYPT_SHA ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA256)$(BR2_TARGET_GENERIC_PASSWD_SHA512),y) define BUSYBOX_SET_CRYPT_SHA - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_CRYPT_SHA,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_CRYPT_SHA) endef endif ifeq ($(BR2_USE_MMU),y) define BUSYBOX_SET_MMU - $(call KCONFIG_DISABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_DISABLE_OPT,CONFIG_NOMMU) endef else define BUSYBOX_SET_MMU - $(call KCONFIG_ENABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPOFF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_ASH,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BASH_COMPAT,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BRACE_EXPANSION,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_HELP,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_INTERACTIVE,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_SAVEHISTORY,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_JOB,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_TICK,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_IF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOOPS,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_CASE,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_FUNCTIONS,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOCAL,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_RANDOM_SUPPORT,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_EXPORT_N,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_MODE_X,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_NOMMU) + $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPON) + $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPOFF) + $(call KCONFIG_DISABLE_OPT,CONFIG_ASH) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BASH_COMPAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BRACE_EXPANSION) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_HELP) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_INTERACTIVE) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_SAVEHISTORY) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_JOB) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_TICK) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_IF) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOOPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_CASE) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_FUNCTIONS) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOCAL) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_RANDOM_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_EXPORT_N) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_MODE_X) endef endif # If we're using static libs do the same for busybox ifeq ($(BR2_STATIC_LIBS),y) define BUSYBOX_PREFER_STATIC - $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC) endef endif @@ -207,10 +206,17 @@ define BUSYBOX_INSTALL_UDHCPC_SCRIPT fi endef +define BUSYBOX_INSTALL_ZCIP_SCRIPT + if grep -q CONFIG_ZCIP=y $(@D)/.config; then \ + $(INSTALL) -m 0755 -D $(@D)/examples/zcip.script \ + $(TARGET_DIR)/usr/share/zcip/default.script; \ + fi +endef + ifeq ($(BR2_INIT_BUSYBOX),y) define BUSYBOX_SET_INIT - $(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_INIT) endef ifeq ($(BR2_TARGET_GENERIC_GETTY),y) @@ -232,15 +238,27 @@ endif # BR2_INIT_BUSYBOX ifeq ($(BR2_PACKAGE_BUSYBOX_SELINUX),y) BUSYBOX_DEPENDENCIES += host-pkgconf libselinux libsepol define BUSYBOX_SET_SELINUX - $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUX,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUXENABLED,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUX) + $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUXENABLED) +endef +endif + +# enable relevant options to allow the Busybox less applet to be used +# as a systemd pager +ifeq ($(BR2_PACKAGE_SYSTEMD):$(BR2_PACKAGE_LESS),y:) +define BUSYBOX_SET_LESS_FLAGS + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_LESS_DASHCMD) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_LESS_RAW) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_LESS_TRUNCATE) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_LESS_FLAGS) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_LESS_ENV) endef endif ifeq ($(BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES),y) define BUSYBOX_SET_INDIVIDUAL_BINARIES - $(call KCONFIG_ENABLE_OPT,CONFIG_BUILD_LIBBUSYBOX,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_INDIVIDUAL,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_BUILD_LIBBUSYBOX) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_INDIVIDUAL) endef define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES @@ -285,7 +303,7 @@ endif ifeq ($(BR2_PACKAGE_BUSYBOX_WATCHDOG),y) define BUSYBOX_SET_WATCHDOG - $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG) endef define BUSYBOX_INSTALL_WATCHDOG_SCRIPT $(INSTALL) -D -m 0755 package/busybox/S15watchdog \ @@ -298,12 +316,12 @@ endif # PAM support requires thread support in the toolchain ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_TOOLCHAIN_HAS_THREADS),yy) define BUSYBOX_LINUX_PAM - $(call KCONFIG_ENABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_PAM) endef BUSYBOX_DEPENDENCIES += linux-pam else define BUSYBOX_LINUX_PAM - $(call KCONFIG_DISABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_DISABLE_OPT,CONFIG_PAM) endef endif @@ -338,6 +356,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_INIT) $(BUSYBOX_SET_WATCHDOG) $(BUSYBOX_SET_SELINUX) + $(BUSYBOX_SET_LESS_FLAGS) $(BUSYBOX_SET_INDIVIDUAL_BINARIES) endef @@ -352,9 +371,19 @@ define BUSYBOX_INSTALL_TARGET_CMDS $(BUSYBOX_INSTALL_INDIVIDUAL_BINARIES) $(BUSYBOX_INSTALL_INITTAB) $(BUSYBOX_INSTALL_UDHCPC_SCRIPT) + $(BUSYBOX_INSTALL_ZCIP_SCRIPT) $(BUSYBOX_INSTALL_MDEV_CONF) endef +# Install the sysvinit scripts, for the moment, but not those that already +# have a corresponding one in openrc. +define BUSYBOX_INSTALL_INIT_OPENRC + $(BUSYBOX_INSTALL_MDEV_SCRIPT) + $(BUSYBOX_INSTALL_LOGGING_SCRIPT) + $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) + $(BUSYBOX_INSTALL_TELNET_SCRIPT) +endef + define BUSYBOX_INSTALL_INIT_SYSV $(BUSYBOX_INSTALL_MDEV_SCRIPT) $(BUSYBOX_INSTALL_LOGGING_SCRIPT) diff --git a/package/busybox/udhcpc.script b/package/busybox/udhcpc.script index 711963f974..74dc5532b9 100755 --- a/package/busybox/udhcpc.script +++ b/package/busybox/udhcpc.script @@ -4,6 +4,7 @@ [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 +ACTION="$1" RESOLV_CONF="/etc/resolv.conf" [ -e $RESOLV_CONF ] || touch $RESOLV_CONF [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" @@ -18,7 +19,7 @@ fi wait_for_ipv6_default_route() { printf "Waiting for IPv6 default route to appear" while [ $IF_WAIT_DELAY -gt 0 ]; do - if [ -z "$(ip -6 route list | grep default)" ]; then + if ip -6 route list | grep -q default; then printf "\n" return fi @@ -29,7 +30,7 @@ wait_for_ipv6_default_route() { printf " timeout!\n" } -case "$1" in +case "$ACTION" in deconfig) /sbin/ifconfig $interface up /sbin/ifconfig $interface 0.0.0.0 @@ -42,26 +43,42 @@ case "$1" in rm -f $TMPFILE if [ -x /usr/sbin/avahi-autoipd ]; then - /usr/sbin/avahi-autoipd -k $interface + /usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface fi ;; leasefail|nak) if [ -x /usr/sbin/avahi-autoipd ]; then - /usr/sbin/avahi-autoipd -wD $interface --no-chroot + /usr/sbin/avahi-autoipd -c $interface || /usr/sbin/avahi-autoipd -wD $interface --no-chroot fi ;; renew|bound) if [ -x /usr/sbin/avahi-autoipd ]; then - /usr/sbin/avahi-autoipd -k $interface + /usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface fi /sbin/ifconfig $interface $ip $BROADCAST $NETMASK if [ -n "$ipv6" ] ; then wait_for_ipv6_default_route fi - if [ -n "$router" ] ; then + # RFC3442: If the DHCP server returns both a Classless + # Static Routes option and a Router option, the DHCP + # client MUST ignore the Router option. + if [ -n "$staticroutes" ]; then + echo "deleting routers" + route -n | while read dest gw mask flags metric ref use iface; do + [ "$iface" != "$interface" -o "$gw" = "0.0.0.0" ] || \ + route del -net "$dest" netmask "$mask" gw "$gw" dev "$interface" + done + + # format: dest1/mask gw1 ... destn/mask gwn + set -- $staticroutes + while [ -n "$1" -a -n "$2" ]; do + route add -net "$1" gw "$2" dev "$interface" + shift 2 + done + elif [ -n "$router" ] ; then echo "deleting routers" while route del default gw 0.0.0.0 dev $interface 2> /dev/null; do : @@ -99,7 +116,7 @@ esac HOOK_DIR="$0.d" for hook in "${HOOK_DIR}/"*; do [ -f "${hook}" -a -x "${hook}" ] || continue - "${hook}" "${@}" + "${hook}" "$ACTION" done exit 0 diff --git a/package/bwm-ng/bwm-ng.hash b/package/bwm-ng/bwm-ng.hash index 4b66227676..d447673f5d 100644 --- a/package/bwm-ng/bwm-ng.hash +++ b/package/bwm-ng/bwm-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 906a2d561f2ec9e0dd68b7f51b302908e99515ea1216d0ecaf14d873ef54ae70 bwm-ng-0.6.2.tar.gz +sha256 c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46 bwm-ng-0.6.3.tar.gz sha256 8556cc15ba3c0a411bf7d94bac5870829fb725f294b450c724c1e0856a601556 COPYING diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk index 4a34559e3c..de09eafae5 100644 --- a/package/bwm-ng/bwm-ng.mk +++ b/package/bwm-ng/bwm-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -BWM_NG_VERSION = 0.6.2 +BWM_NG_VERSION = 0.6.3 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+ diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index b4d8eea25e..c2e5f7610e 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -9,6 +9,7 @@ BZIP2_SITE = https://sourceware.org/pub/bzip2 BZIP2_INSTALL_STAGING = YES BZIP2_LICENSE = bzip2 license BZIP2_LICENSE_FILES = LICENSE +BZIP2_CPE_ID_VENDOR = bzip ifeq ($(BR2_STATIC_LIBS),) define BZIP2_BUILD_SHARED_CMDS diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index d4fe483ae6..28657645df 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 de058ad7c128156e2db6dc98b8a359924d6f210a1b99dd36ba15c8f839a83a89 c-ares-1.16.0.tar.gz +sha256 4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d c-ares-1.17.2.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index e8723bf784..71bfa110a1 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,12 +4,15 @@ # ################################################################################ -C_ARES_VERSION = 1.16.0 +C_ARES_VERSION = 1.17.2 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md +C_ARES_CPE_ID_VENDOR = c-ares_project +# We're patching configure.ac +C_ARES_AUTORECONF = YES $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/c-capnproto/Config.in b/package/c-capnproto/Config.in index d1f3236af8..41a59d7a22 100644 --- a/package/c-capnproto/Config.in +++ b/package/c-capnproto/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_C_CAPNPROTO depends on BR2_INSTALL_LIBSTDCPP # capnproto depends on BR2_TOOLCHAIN_HAS_THREADS # capnproto depends on BR2_TOOLCHAIN_HAS_ATOMIC # capnproto + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # capnproto + depends on BR2_TOOLCHAIN_HAS_UCONTEXT # capnproto select BR2_PACKAGE_CAPNPROTO help A C plugin for Cap'n Proto. Generates the code generator @@ -14,10 +16,12 @@ config BR2_PACKAGE_C_CAPNPROTO https://github.com/opensourcerouting/c-capnproto -comment "c-capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic" +comment "c-capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735" depends on BR2_USE_MMU depends on!BR2_HOST_GCC_AT_LEAST_5 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HAS_ATOMIC + !BR2_TOOLCHAIN_HAS_ATOMIC || \ + BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ + !BR2_TOOLCHAIN_HAS_UCONTEXT diff --git a/package/c-capnproto/c-capnproto.hash b/package/c-capnproto/c-capnproto.hash index 75edaebf91..e215400ce5 100644 --- a/package/c-capnproto/c-capnproto.hash +++ b/package/c-capnproto/c-capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 88c454f4f4bad87c9b60cd739c7da5605c1085c0e92b317dd72d547bbb804279 c-capnproto-9053ebe6eeb2ae762655b982e27c341cb568366d.tar.gz +sha256 1e35ef786bd8e418ff04fccb20ac881a87fa2fa76df1cbddc4774e35423bafb8 c-capnproto-9053ebe6eeb2ae762655b982e27c341cb568366d-br1.tar.gz sha256 27797e6c7dce96675d79ed250584d157b7a86405db6eb6fba9644e6d96d42c57 COPYING diff --git a/package/c-icap-modules/c-icap-modules.hash b/package/c-icap-modules/c-icap-modules.hash index fa0eb08983..cc7949a092 100644 --- a/package/c-icap-modules/c-icap-modules.hash +++ b/package/c-icap-modules/c-icap-modules.hash @@ -1,7 +1,7 @@ # From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.5.x/ -md5 d5f1e553cfe60180f9fa22c9a13005be c_icap_modules-0.5.3.tar.gz -sha1 df76f30b2cc29aeef700f477693e7017eaa847f4 c_icap_modules-0.5.3.tar.gz +md5 2f8c174f7a5414616f5a0a976ac4a221 c_icap_modules-0.5.4.tar.gz +sha1 ec7bb138d7775895cd8b2e12adc41dbf48eba1b7 c_icap_modules-0.5.4.tar.gz # Locally calculated -sha256 6e2f87a60379ffde26947c6e82ff0c7f614bc005588bf1efb40c74f69c82f925 c_icap_modules-0.5.3.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 87409920c66027204e9cca5f20e137b63cd12daf6dfcd85c1fa62ab2bd1c57cc c_icap_modules-0.5.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/c-icap-modules/c-icap-modules.mk b/package/c-icap-modules/c-icap-modules.mk index b5356b1db1..2eaa141afe 100644 --- a/package/c-icap-modules/c-icap-modules.mk +++ b/package/c-icap-modules/c-icap-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_MODULES_VERSION = 0.5.3 +C_ICAP_MODULES_VERSION = 0.5.4 C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_MODULES_LICENSE = GPL-2.0+ diff --git a/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch b/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch index 452223c67d..6f886c9b72 100644 --- a/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch +++ b/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch @@ -3,7 +3,7 @@ From: Christos Tsantilas Date: Fri, 25 Jan 2019 06:42:22 -0800 Subject: [PATCH] Required fixes to compile and run under cygwin -[Retrieved from: +[Retrieved (and backported) from: https://github.com/c-icap/c-icap-server/commit/1631a6c1f50e152b8a45d8279c96086e5636795b, which has the side effect of fixing the build with the musl C library] Signed-off-by: Fabrice Fontaine @@ -189,14 +189,14 @@ index e6e9270..2d43a60 100644 +endif + +sys_logger_la_LIBADD = $(MODS_LIB_ADD) - sys_logger_la_CFLAGS= @MODULES_CFLAGS@ + sys_logger_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@ -sys_logger_la_LDFLAGS= -module -avoid-version +sys_logger_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ sys_logger_la_SOURCES = sys_logger.c -dnsbl_tables_la_LIBADD = @MODULES_LIBADD@ +dnsbl_tables_la_LIBADD = $(MODS_LIB_ADD) - dnsbl_tables_la_CFLAGS= @MODULES_CFLAGS@ + dnsbl_tables_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@ -dnsbl_tables_la_LDFLAGS= -module -avoid-version +dnsbl_tables_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ dnsbl_tables_la_SOURCES = dnsbl_tables.c @@ -232,7 +232,7 @@ index e6e9270..2d43a60 100644 -shared_cache_la_LIBADD= @MODULES_LIBADD@ +shared_cache_la_LIBADD= $(MODS_LIB_ADD) - shared_cache_la_CFLAGS= + shared_cache_la_CFLAGS= @OPENSSL_ADD_FLAG@ -shared_cache_la_LDFLAGS= -module -avoid-version +shared_cache_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ shared_cache_la_SOURCES= shared_cache.c @@ -329,7 +329,7 @@ index 402c8f9..7d701b1 100644 +endif + +srv_echo_la_LIBADD = $(MODS_LIB_ADD) - srv_echo_la_CFLAGS= @MODULES_CFLAGS@ + srv_echo_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@ -srv_echo_la_LDFLAGS= -module -avoid-version +srv_echo_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ srv_echo_la_SOURCES = srv_echo.c @@ -351,7 +351,7 @@ index 44bbf21..ff73399 100644 +endif + +srv_ex206_la_LIBADD = $(MODS_LIB_ADD) - srv_ex206_la_CFLAGS= @MODULES_CFLAGS@ + srv_ex206_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@ -srv_ex206_la_LDFLAGS= -module -avoid-version +srv_ex206_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ srv_ex206_la_SOURCES = srv_ex206.c diff --git a/package/c-icap/c-icap.hash b/package/c-icap/c-icap.hash index 9a761175cf..6aa81c2641 100644 --- a/package/c-icap/c-icap.hash +++ b/package/c-icap/c-icap.hash @@ -1,3 +1,6 @@ +# Retrieved from https://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/ +md5 82fd2fba1a08a8a0cf3567fe24aa035d c_icap-0.5.7.tar.gz +sha1 3b2470e00abd1418bec3a440d3073d7a6231c4c1 c_icap-0.5.7.tar.gz # Locally calculated -sha256 5eafc7775ecb3fe49545451eaa31f045716d0242977588c0ba27c2c1b4683d8a c_icap-0.5.5.tar.gz -sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING +sha256 01ef17d7999d3476fe705abc56d0da562c2f180aafe08fc1269f419cad8521a9 c_icap-0.5.7.tar.gz +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk index 8720cb16c9..fb66c75e61 100644 --- a/package/c-icap/c-icap.mk +++ b/package/c-icap/c-icap.mk @@ -4,11 +4,12 @@ # ################################################################################ -C_ICAP_VERSION = 0.5.5 +C_ICAP_VERSION = 0.5.7 C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz C_ICAP_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_LICENSE = LGPL-2.1+ C_ICAP_LICENSE_FILES = COPYING +C_ICAP_CPE_ID_VENDOR = c-icap_project C_ICAP_INSTALL_STAGING = YES C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config C_ICAP_CONF_OPTS = \ diff --git a/package/c-periphery/Config.in b/package/c-periphery/Config.in index cf8675801e..0bfb4b1f11 100644 --- a/package/c-periphery/Config.in +++ b/package/c-periphery/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_C_PERIPHERY bool "c-periphery" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 help c-periphery is a set of C wrapper functions for GPIO, SPI, I2C, MMIO, and Serial peripheral I/O interface access in @@ -15,6 +14,3 @@ config BR2_PACKAGE_C_PERIPHERY integration with other projects, and is MIT licensed. https://github.com/vsergeev/c-periphery - -comment "c-periphery needs a toolchain w/ kernel headers >= 4.8" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 diff --git a/package/c-periphery/c-periphery.hash b/package/c-periphery/c-periphery.hash index 244f8f60f1..516cfb33e5 100644 --- a/package/c-periphery/c-periphery.hash +++ b/package/c-periphery/c-periphery.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1c455c42b26818d199ac227cd19714f265623e15d363fdfdf47a2416a4165654 c-periphery-2.1.0.tar.gz -sha256 e7b9464cb8511f19ddb40f9cf52fe86b3dfe38b2faed9d7bbc3d5707677ffbe3 LICENSE +sha256 ba298aac5c1f6ebe2b89ed623a2f678bedfa3b9dc78aaf4f0534a1dd304629da c-periphery-2.3.1.tar.gz +sha256 7121a0a2ba36ed9388be2f1a916f0e3584d8e49cc7888fbcfcf83bab2a8bebef LICENSE diff --git a/package/c-periphery/c-periphery.mk b/package/c-periphery/c-periphery.mk index bb50434efa..722679f9f8 100644 --- a/package/c-periphery/c-periphery.mk +++ b/package/c-periphery/c-periphery.mk @@ -4,24 +4,11 @@ # ################################################################################ -C_PERIPHERY_VERSION = 2.1.0 +C_PERIPHERY_VERSION = 2.3.1 C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,v$(C_PERIPHERY_VERSION)) C_PERIPHERY_INSTALL_STAGING = YES -# only a static library -C_PERIPHERY_INSTALL_TARGET = NO C_PERIPHERY_LICENSE = MIT C_PERIPHERY_LICENSE_FILES = LICENSE +C_PERIPHERY_CPE_ID_VENDOR = c-periphery_project -define C_PERIPHERY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -# There is no 'install' rule in the Makefile, so we handle things -# manually. -define C_PERIPHERY_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0644 $(@D)/periphery.a $(STAGING_DIR)/usr/lib/libc-periphery.a - mkdir -p $(STAGING_DIR)/usr/include/c-periphery/ - cp -dpfr $(@D)/src/*.h $(STAGING_DIR)/usr/include/c-periphery/ -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/package/ca-certificates/ca-certificates.hash b/package/ca-certificates/ca-certificates.hash index 71a8da4784..024034c977 100644 --- a/package/ca-certificates/ca-certificates.hash +++ b/package/ca-certificates/ca-certificates.hash @@ -1,6 +1,6 @@ # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc : -sha1 47d4584eae85fc905e4994766eb3930a8a84e2e1 ca-certificates_20190110.tar.xz -sha256 ee4bf0f4c6398005f5b5ca4e0b87b82837ac5c3b0280a1cb3a63c47555c3a675 ca-certificates_20190110.tar.xz +sha1 c9875aa16e42981c6975e59a11727539053e2299 ca-certificates_20210119.tar.xz +sha256 daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665 ca-certificates_20210119.tar.xz # Locally computed -sha256 80fd11117df5543d5cf17bfd951b0ead213f7867d0b09f09c6d5a5eca3ff7422 debian/copyright +sha256 e85e1bcad3a915dc7e6f41412bc5bdeba275cadd817896ea0451f2140a93967c debian/copyright diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 79c81a41ea..94302ea96b 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -4,14 +4,10 @@ # ################################################################################ -CA_CERTIFICATES_VERSION = 20190110 +CA_CERTIFICATES_VERSION = 20210119 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz -CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20190513T145054Z/pool/main/c/ca-certificates -CA_CERTIFICATES_DEPENDENCIES = host-openssl -# ca-certificates can be built with either python 2 or python 3 -# but it must be at least python 2.7 -CA_CERTIFICATES_DEPENDENCIES += \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) +CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20210325T091936Z/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 c6a3dad932..98f270442a 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -8,6 +8,7 @@ CAIRO_VERSION = 1.16.0 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 +CAIRO_CPE_ID_VENDOR = cairographics CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES @@ -41,7 +42,7 @@ HOST_CAIRO_CONF_OPTS = \ --enable-interpreter=no \ --disable-directfb \ --enable-ft \ - --disable-gobject \ + --enable-gobject \ --disable-glesv2 \ --disable-vg \ --disable-xlib \ @@ -51,13 +52,14 @@ HOST_CAIRO_CONF_OPTS = \ --disable-ps \ --disable-pdf \ --enable-png \ - --disable-script \ + --enable-script \ --disable-svg \ --disable-tee \ --disable-xml HOST_CAIRO_DEPENDENCIES = \ host-freetype \ host-fontconfig \ + host-libglib2 \ host-libpng \ host-pixman \ host-pkgconf diff --git a/package/can-utils/Config.in b/package/can-utils/Config.in index da56378866..bdc84b461a 100644 --- a/package/can-utils/Config.in +++ b/package/can-utils/Config.in @@ -1,14 +1,9 @@ config BR2_PACKAGE_CAN_UTILS bool "can-utils" depends on BR2_USE_MMU # fork() - depends on !BR2_TOOLCHAIN_USES_MUSL # error() help SocketCAN is a set of open source CAN drivers and a networking stack. This package provides various tools for this stack. https://github.com/linux-can/can-utils - -comment "can-utils needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL - depends on BR2_USE_MMU diff --git a/package/can-utils/can-utils.hash b/package/can-utils/can-utils.hash index adbf5b0bca..145d0a33e5 100644 --- a/package/can-utils/can-utils.hash +++ b/package/can-utils/can-utils.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 ea0f96a02af37f16713284c7bdccdbae716d9bcb979ccfb51185d696c31f9ecf can-utils-2020.02.0.tar.gz +sha256 f7874457224c89f8b2eb55ab741935ddb7f1c9bc52de2642330b0799f89d1040 can-utils-2021.06.0.tar.gz sha256 c3dc748f5e725cf5ed89784fe78e4ff1b05d309bf1e7ade4c572e8fde1b8406c LICENSES/BSD-3-Clause sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 LICENSES/GPL-2.0-only.txt diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk index cd4dba5616..1e7add0556 100644 --- a/package/can-utils/can-utils.mk +++ b/package/can-utils/can-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAN_UTILS_VERSION = 2020.02.0 +CAN_UTILS_VERSION = 2021.06.0 CAN_UTILS_SITE = $(call github,linux-can,can-utils,v$(CAN_UTILS_VERSION)) CAN_UTILS_LICENSE = BSD-3-Clause or GPL-2.0 CAN_UTILS_LICENSE_FILES = LICENSES/BSD-3-Clause LICENSES/GPL-2.0-only.txt diff --git a/package/cannelloni/cannelloni.hash b/package/cannelloni/cannelloni.hash index 41cb72816d..107415b0ac 100644 --- a/package/cannelloni/cannelloni.hash +++ b/package/cannelloni/cannelloni.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fe5abb1c9e523049c48dd906603bc762cc55ccd20c16dbec7dc64163b9eefccf cannelloni-20160414.tar.gz +sha256 de44b7e327fbf38883f46e51a5afd07de5144f2e44c5f42b7f2f0741165f0b13 cannelloni-1.0.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt diff --git a/package/cannelloni/cannelloni.mk b/package/cannelloni/cannelloni.mk index cc99c54aa1..f97a091760 100644 --- a/package/cannelloni/cannelloni.mk +++ b/package/cannelloni/cannelloni.mk @@ -4,10 +4,11 @@ # ################################################################################ -CANNELLONI_VERSION = 20160414 -CANNELLONI_SITE = $(call github,mguentner,cannelloni,$(CANNELLONI_VERSION)) +CANNELLONI_VERSION = 1.0.0 +CANNELLONI_SITE = $(call github,mguentner,cannelloni,v$(CANNELLONI_VERSION)) CANNELLONI_LICENSE = GPL-2.0 CANNELLONI_LICENSE_FILES = gpl-2.0.txt +CANNELLONI_CONF_OPTS = -DCMAKE_CXX_FLAGS="-std=c++11" ifeq ($(BR2_PACKAGE_LKSCTP_TOOLS),y) CANNELLONI_CONF_OPTS += -DSCTP_SUPPORT=ON diff --git a/package/capnproto/Config.in b/package/capnproto/Config.in index cd9cb647af..943ba9de29 100644 --- a/package/capnproto/Config.in +++ b/package/capnproto/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_CAPNPROTO depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + depends on BR2_TOOLCHAIN_HAS_UCONTEXT help Cap'n Proto is an insanely fast data interchange format and capability-based RPC system. Think JSON, except @@ -15,10 +17,12 @@ config BR2_PACKAGE_CAPNPROTO https://capnproto.org/index.html -comment "capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic" +comment "capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735" depends on BR2_USE_MMU depends on !BR2_HOST_GCC_AT_LEAST_5 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HAS_ATOMIC + !BR2_TOOLCHAIN_HAS_ATOMIC || \ + BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ + !BR2_TOOLCHAIN_HAS_UCONTEXT diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index 98467f8634..d4500e0aad 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 76c7114a3d142ad08b7208b3964a26e72a6320ee81331d3f0b87569fc9c47a28 capnproto-0.7.0.tar.gz +sha256 6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820 capnproto-0.8.0.tar.gz sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 34fb885914..901b57ecda 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,10 +4,11 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.7.0 +CAPNPROTO_VERSION = 0.8.0 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE +CAPNPROTO_CPE_ID_VENDOR = capnproto CAPNPROTO_INSTALL_STAGING = YES # Fetched from Github with no configure script CAPNPROTO_AUTORECONF = YES @@ -21,5 +22,12 @@ endif # The actual source to be compiled is within a 'c++' subdirectory CAPNPROTO_SUBDIR = c++ +ifeq ($(BR2_PACKAGE_OPENSSL),y) +CAPNPROTO_CONF_OPTS += --with-openssl +CAPNPROTO_DEPENDENCIES += openssl +else +CAPNPROTO_CONF_OPTS += --without-openssl +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/cc-tool/Config.in b/package/cc-tool/Config.in index 8145b676c9..2661592d7f 100644 --- a/package/cc-tool/Config.in +++ b/package/cc-tool/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_CC_TOOL depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR # boost-filesystem + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS @@ -14,7 +15,9 @@ config BR2_PACKAGE_CC_TOOL for Linux OS in order to program 8051-based System-On-Chip devices: CC254x CC253x CC243x CC251x CC111x - http://sourceforge.net/projects/cctool/ + https://github.com/dashesy/cc-tool/ -comment "cc-tool needs a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "cc-tool needs a toolchain w/ C++, threads, wchar, gcc >= 4.9 " + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/cc-tool/cc-tool.hash b/package/cc-tool/cc-tool.hash index d778b44395..53c74730ff 100644 --- a/package/cc-tool/cc-tool.hash +++ b/package/cc-tool/cc-tool.hash @@ -1,6 +1,5 @@ -# From http://sourceforge.net/projects/cctool/files/ -sha1 f313e55f019ea5338438633f5b5e689b699343e1 cc-tool-0.26-src.tgz -md5 26960676f3e6264e612c299fbf8ec5ea cc-tool-0.26-src.tgz +# Locally computed +sha256 1d26be4446c68413a02bf3156e6434d7fe9ce76aa0a169464ca5d7b2a731610d cc-tool-0.27.tar.gz # Hash for license file -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/cc-tool/cc-tool.mk b/package/cc-tool/cc-tool.mk index e170e06a21..6864589ab1 100644 --- a/package/cc-tool/cc-tool.mk +++ b/package/cc-tool/cc-tool.mk @@ -4,14 +4,13 @@ # ################################################################################ -CC_TOOL_VERSION = 0.26 -CC_TOOL_SITE = http://downloads.sourceforge.net/project/cctool -CC_TOOL_SOURCE = cc-tool-$(CC_TOOL_VERSION)-src.tgz +CC_TOOL_VERSION = 0.27 +CC_TOOL_SITE = $(call github,dashesy,cc-tool,v$(CC_TOOL_VERSION)) CC_TOOL_LICENSE = GPL-2.0 CC_TOOL_LICENSE_FILES = COPYING CC_TOOL_DEPENDENCIES = boost libusb -# we're patching boost.m4 +# From git CC_TOOL_AUTORECONF = YES # Configure script "discovers" boost in /usr/local if not given explicitly diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 3b9dac28b6..16cfad602c 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 99ea7b8fc34fdd5dc628169f452086c1f4d8ca3a1e52bd484fbdef3516893672 ccache-3.7.8.tar.xz +sha256 a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400 ccache-3.7.12.tar.xz sha256 ec6b1a326ff93b2cc21df88a697ae470ff6927a55b8929e7e491b315e1563361 GPL-3.0.txt sha256 4f63223bcdee822d55a6768cc8399ffe06401d7a03cfe79e1dc305f50dc22c59 LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 1e8b9b7c25..97aa8b1c75 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 3.7.8 +CCACHE_VERSION = 3.7.12 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others diff --git a/package/ccid/Config.in b/package/ccid/Config.in index 599bcc042a..aae5a7181c 100644 --- a/package/ccid/Config.in +++ b/package/ccid/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CCID bool "ccid" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_MMU # pcsc-lite depends on !BR2_STATIC_LIBS # pcsc-lite select BR2_PACKAGE_PCSC_LITE @@ -10,6 +11,7 @@ config BR2_PACKAGE_CCID https://ccid.apdu.fr/ -comment "ccid needs a toolchain w/ threads, dynamic library" +comment "ccid needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/ccid/ccid.hash b/package/ccid/ccid.hash index f29f5b3f93..4ef7aff3d4 100644 --- a/package/ccid/ccid.hash +++ b/package/ccid/ccid.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6b48d7b6e4390e038d25630f8664fe81618ab00f232d6efbe0e3cc6df28ce8f7 ccid-1.4.31.tar.bz2 -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING +sha256 e6f7645b59a9a2844eb4b1a7eff512960d7f04a4654af02f7fd2f8aded5db40a ccid-1.4.34.tar.bz2 +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk index a5f9f00473..3cb599d566 100644 --- a/package/ccid/ccid.mk +++ b/package/ccid/ccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCID_VERSION = 1.4.31 +CCID_VERSION = 1.4.34 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2 CCID_SITE = https://ccid.apdu.fr/files CCID_LICENSE = LGPL-2.1+ diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk index f49d5150f3..67814f1418 100644 --- a/package/cdrkit/cdrkit.mk +++ b/package/cdrkit/cdrkit.mk @@ -18,5 +18,14 @@ else CDRKIT_CONF_OPTS += -DBITFIELDS_HTOL=0 endif +ifeq ($(BR2_PACKAGE_FILE),y) +CDRKIT_DEPENDENCIES += host-pkgconf file +CDRKIT_CONF_OPTS += \ + -DUSE_MAGIC=ON \ + -DEXTRA_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libmagic`" +else +CDRKIT_CONF_OPTS += -DUSE_MAGIC=OFF +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/cegui/Config.in b/package/cegui/Config.in index f917be0cc5..20b865835b 100644 --- a/package/cegui/Config.in +++ b/package/cegui/Config.in @@ -1,14 +1,17 @@ -comment "cegui needs a toolchain w/ C++, threads, dynamic library, wchar" +comment "cegui needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 5" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ - || BR2_STATIC_LIBS || !BR2_USE_WCHAR + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_CEGUI bool "cegui" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 PR59987 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR select BR2_PACKAGE_GLM + select BR2_PACKAGE_LIBGLFW if BR2_PACKAGE_HAS_LIBGL # SampleBrowser dependency select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Crazy Eddie's GUI System is a free library providing windowing diff --git a/package/cegui/cegui.hash b/package/cegui/cegui.hash index 8295039037..131b248619 100644 --- a/package/cegui/cegui.hash +++ b/package/cegui/cegui.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7be289d2d8562e7d20bd155d087d6ccb0ba62f7e99cc25d20684b8edf2ba15cd cegui-0-8-7.tar.gz +sha256 5b6f9e209e8a29b2f30d6aef92efd125c8bedaab5be04b562208be51e5e7f04e cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0.tar.gz sha256 cc869e2ece8ad039f6d7fd17259db4ea0ae0a502d02a1bb506c0168deb12e40d COPYING diff --git a/package/cegui/cegui.mk b/package/cegui/cegui.mk index 434201b1f8..2e56322374 100644 --- a/package/cegui/cegui.mk +++ b/package/cegui/cegui.mk @@ -4,32 +4,43 @@ # ################################################################################ -CEGUI_VERSION = 0-8-7 -CEGUI_SITE = $(call github,cegui,cegui,v$(CEGUI_VERSION)) +CEGUI_VERSION = 00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0 +CEGUI_SITE = $(call github,cegui,cegui,$(CEGUI_VERSION)) CEGUI_LICENSE = MIT CEGUI_LICENSE_FILES = COPYING CEGUI_INSTALL_STAGING = YES -CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF \ - -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF +CEGUI_CONF_OPTS = \ + -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF \ + -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF \ + -DCEGUI_BUILD_RENDERER_OGRE=OFF \ + -DCEGUI_BUILD_RENDERER_OPENGLES=OFF \ + -DCEGUI_BUILD_XMLPARSER_XERCES=OFF \ + -DCEGUI_USE_FRIBIDI=OFF \ + -DCEGUI_SAMPLES_ENABLED=OFF \ + -DCEGUI_BUILD_APPLICATION_TEMPLATES=OFF \ + -DCEGUI_BUILD_PYTHON_MODULES_SWIG=OFF CEGUI_DEPENDENCIES = glm \ - $(if $(BR2_PACKAGE_LIBGLFW),libglfw) \ - $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \ - $(if $(BR2_PACKAGE_HAS_LIBGLES),libgles) \ - $(if $(BR2_PACKAGE_LIBGLEW),libglew) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) + $(if $(BR2_PACKAGE_LIBGLFW),libglfw) \ + $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \ + $(if $(BR2_PACKAGE_HAS_LIBGLES),libgles) \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) -ifeq ($(BR2_PACKAGE_LIBEPOXY),y) +# libepoxy support cannot be enabled together with libglew +ifeq ($(BR2_PACKAGE_LIBGLEW)$(BR2_PACKAGE_LIBGLU),yy) +CEGUI_DEPENDENCIES += libglew libglu +CEGUI_CONF_OPTS += -DCEGUI_USE_GLEW=ON -DCEGUI_USE_EPOXY=OFF \ + -DCEGUI_BUILD_RENDERER_OPENGL=ON \ + -DCEGUI_BUILD_RENDERER_OPENGL3=ON +else ifeq ($(BR2_PACKAGE_LIBEPOXY),y) CEGUI_DEPENDENCIES += libepoxy -CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=ON +# old OpenGL renderer module is only supported using GLEW +CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=ON -DCEGUI_USE_GLEW=OFF \ + -DCEGUI_BUILD_RENDERER_OPENGL=OFF \ + -DCEGUI_BUILD_RENDERER_OPENGL3=ON else -CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=OFF -endif - -ifeq ($(BR2_PACKAGE_OGRE),y) -CEGUI_DEPENDENCIES += ogre -CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_OGRE=ON -else -CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_OGRE=OFF +CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=OFF -DCEGUI_USE_GLEW=OFF \ + -DCEGUI_BUILD_RENDERER_OPENGL=OFF \ + -DCEGUI_BUILD_RENDERER_OPENGL3=OFF endif ifeq ($(BR2_PACKAGE_EXPAT),y) @@ -39,13 +50,6 @@ else CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=OFF endif -ifeq ($(BR2_PACKAGE_IRRLICHT),y) -CEGUI_DEPENDENCIES += irrlicht -CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=ON -else -CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF -endif - ifeq ($(BR2_PACKAGE_SDL2)$(BR2_PACKAGE_SDL2_IMAGE),yy) CEGUI_DEPENDENCIES += sdl2 sdl2_image CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_SDL2=ON @@ -88,13 +92,6 @@ else CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF endif -ifeq ($(BR2_PACKAGE_TINYXML2),y) -CEGUI_DEPENDENCIES += tinyxml2 -CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=ON -else -CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=OFF -endif - ifeq ($(BR2_PACKAGE_LIBFREEIMAGE),y) CEGUI_DEPENDENCIES += libfreeimage CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON diff --git a/package/cereal/cereal.mk b/package/cereal/cereal.mk index 3811fdf32f..19faa2ac4e 100644 --- a/package/cereal/cereal.mk +++ b/package/cereal/cereal.mk @@ -9,10 +9,14 @@ CEREAL_SITE = $(call github,USCiLab,cereal,v$(CEREAL_VERSION)) # For licensing, see also: https://github.com/USCiLab/cereal/issues/609 CEREAL_LICENSE = BSD-3-Clause (cereal), Zlib (base64.hpp), MIT (rapidjson), BSL-1.0 or MIT (rapidxml) CEREAL_LICENSE_FILES = LICENSE include/cereal/external/base64.hpp include/cereal/external/rapidjson/rapidjson.h include/cereal/external/rapidxml/license.txt +CEREAL_CPE_ID_VENDOR = usc CEREAL_INSTALL_STAGING = YES CEREAL_INSTALL_TARGET = NO CEREAL_CONF_OPTS = \ -DTHREAD_SAFE=ON \ -DJUST_INSTALL_CEREAL=ON +# 0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch +CEREAL_IGNORE_CVES += CVE-2020-11105 + $(eval $(cmake-package)) diff --git a/package/cgilua/cgilua.hash b/package/cgilua/cgilua.hash index 8bdb1d18f1..385382b9d5 100644 --- a/package/cgilua/cgilua.hash +++ b/package/cgilua/cgilua.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 7d4883e6a89b3463a1d35b8084a6e2afbbb584af7aca1169380e92af0f848413 cgilua-5.2.1-1.src.rock -sha256 0cf6f0858b0fd90bb5705c8ace77a8afd11e8fce1427fe0a48156937222b8c28 cgilua-5.2.1/doc/us/license.html +sha256 7bfb88c483136bca9b814316d7f9ff581a805d68d144c1eebdfda3e8dfb5eb3a cgilua-6.0.2-0.src.rock +sha256 b82f9b13f9b1a1387f53203a625612914630b520377731b0aab7ce93ad2b18c4 cgilua/doc/us/license.html diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk index cd78841fdb..7471be3da0 100644 --- a/package/cgilua/cgilua.mk +++ b/package/cgilua/cgilua.mk @@ -4,7 +4,8 @@ # ################################################################################ -CGILUA_VERSION = 5.2.1-1 +CGILUA_VERSION = 6.0.2-0 +CGILUA_SUBDIR = cgilua CGILUA_LICENSE = MIT CGILUA_LICENSE_FILES = $(CGILUA_SUBDIR)/doc/us/license.html diff --git a/package/cgroupfs-mount/cgroupfs-mount.mk b/package/cgroupfs-mount/cgroupfs-mount.mk index 9a76799952..acf7442056 100644 --- a/package/cgroupfs-mount/cgroupfs-mount.mk +++ b/package/cgroupfs-mount/cgroupfs-mount.mk @@ -8,6 +8,7 @@ CGROUPFS_MOUNT_VERSION = 1.4 CGROUPFS_MOUNT_SITE = $(call github,tianon,cgroupfs-mount,$(CGROUPFS_MOUNT_VERSION)) CGROUPFS_MOUNT_LICENSE = GPL-3.0+ CGROUPFS_MOUNT_LICENSE_FILES = debian/copyright +CGROUPFS_MOUNT_CPE_ID_VENDOR = cgroupfs-mount_project define CGROUPFS_MOUNT_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/cgroupfs-mount $(TARGET_DIR)/usr/bin/cgroupfs-mount diff --git a/package/chartjs/chartjs.hash b/package/chartjs/chartjs.hash index d2426ea614..de4d6d4ebf 100644 --- a/package/chartjs/chartjs.hash +++ b/package/chartjs/chartjs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8079d8fd39131fcfaec33f1c7799412bcf8e051e25b10bd6e37fc16159417aa1 chartjs-v2.9.3.tar.gz +sha256 9ef3697e279a585c79730f35dba16ad4e24ddeed49a150adb341c31f191fb78e chartjs-2.9.4.tar.gz sha256 7b43caae91f31b18dc81fae6e0f7aa1acbecaa6d84e3249905cbe15308307d67 LICENSE.md diff --git a/package/chartjs/chartjs.mk b/package/chartjs/chartjs.mk index 171e0a4a7c..2748a94d36 100644 --- a/package/chartjs/chartjs.mk +++ b/package/chartjs/chartjs.mk @@ -4,10 +4,12 @@ # ################################################################################ -CHARTJS_VERSION = v2.9.3 -CHARTJS_SITE = $(call github,chartjs,Chart.js,$(CHARTJS_VERSION)) +CHARTJS_VERSION = 2.9.4 +CHARTJS_SITE = $(call github,chartjs,Chart.js,v$(CHARTJS_VERSION)) CHARTJS_LICENSE = MIT CHARTJS_LICENSE_FILES = LICENSE.md +CHARTJS_CPE_ID_VENDOR = chartjs +CHARTJS_CPE_ID_PRODUCT = chart.js define CHARTJS_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/dist/Chart.min.css \ diff --git a/package/check/check.hash b/package/check/check.hash index 291b5d095e..543e78f317 100644 --- a/package/check/check.hash +++ b/package/check/check.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 c4336b31447acc7e3266854f73ec188cdb15554d0edd44739631da174a569909 check-0.13.0.tar.gz +sha256 a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a check-0.15.2.tar.gz # License files, locally calculated -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LESSER +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LESSER diff --git a/package/check/check.mk b/package/check/check.mk index b02136dcb2..be82539469 100644 --- a/package/check/check.mk +++ b/package/check/check.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECK_VERSION = 0.13.0 +CHECK_VERSION = 0.15.2 CHECK_SITE = https://github.com/libcheck/check/releases/download/$(CHECK_VERSION) CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index 9e77b9b027..c237913eaf 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 a946c32b284532447857e4c48830f8816867c61220c8c08bdd32e6f691335f8e checkpolicy-2.9.tar.gz +sha256 9b1c81fa86fe3867842164448d90c8e7ea94b2987497809c65d4caa87a5c5bc8 checkpolicy-3.2.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index 8f1ec72549..f8ce48c175 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,8 +4,8 @@ # ################################################################################ -CHECKPOLICY_VERSION = 2.9 -CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +CHECKPOLICY_VERSION = 3.2 +CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION) CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = COPYING diff --git a/package/checksec/checksec.hash b/package/checksec/checksec.hash index 4543f62a36..397cfe381e 100644 --- a/package/checksec/checksec.hash +++ b/package/checksec/checksec.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e50a92a2bb22d40d1aa297cd011209ab5ad0b620236dfb9a7afe4c29744260a9 checksec-2.1.0.tar.gz -sha256 c5e2a8e188040fc34eb9362084778a2e25f8d1f888e47a2be09efa7cecd9c70d LICENSE.txt +sha256 c5e2a8e188040fc34eb9362084778a2e25f8d1f888e47a2be09efa7cecd9c70d LICENSE.txt +sha256 d3c8e80bdd1cee0c2f0e60cb7a8a9482b82f651ea069e3a4453ae9a44072a632 checksec-2.2.2.tar.gz diff --git a/package/checksec/checksec.mk b/package/checksec/checksec.mk index ffa249663c..e46e858437 100644 --- a/package/checksec/checksec.mk +++ b/package/checksec/checksec.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKSEC_VERSION = 2.1.0 +CHECKSEC_VERSION = 2.2.2 CHECKSEC_SITE = $(call github,slimm609,checksec.sh,$(CHECKSEC_VERSION)) CHECKSEC_LICENSE = BSD-3-Clause CHECKSEC_LICENSE_FILES = LICENSE.txt diff --git a/package/chocolate-doom/chocolate-doom.hash b/package/chocolate-doom/chocolate-doom.hash index 7f7fa27ab7..79eb1c6a3f 100644 --- a/package/chocolate-doom/chocolate-doom.hash +++ b/package/chocolate-doom/chocolate-doom.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 73aea623930c7d18a7a778eea391e1ddfbe90ad1ac40a91b380afca4b0e1dab8 chocolate-doom-3.0.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 d435d6177423491d60be706da9f07d3ab4fabf3e077ec2a3fc216e394fcfc8c7 chocolate-doom-3.0.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/chocolate-doom/chocolate-doom.mk b/package/chocolate-doom/chocolate-doom.mk index 4e0a8fee18..8318c123bd 100644 --- a/package/chocolate-doom/chocolate-doom.mk +++ b/package/chocolate-doom/chocolate-doom.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHOCOLATE_DOOM_VERSION = 3.0.0 +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 diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash index c31c6893aa..87e0cf8ea0 100644 --- a/package/chrony/chrony.hash +++ b/package/chrony/chrony.hash @@ -1,5 +1,4 @@ -# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2019/05/msg00001.html -md5 5f66338bc940a9b51eede8f391e7bed3 chrony-3.5.tar.gz -sha1 79e9aeace143550300387a99f17bff04b45673f7 chrony-3.5.tar.gz +# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2020/10/msg00000.html +sha256 be27ea14c55e7a4434b2fa51d53018c7051c42fa6a3198c9aa6a1658bae0c625 chrony-4.0.tar.gz # Locally calculated -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index d7f5c05183..dc162a6c40 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -4,16 +4,18 @@ # ################################################################################ -CHRONY_VERSION = 3.5 +CHRONY_VERSION = 4.0 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING +CHRONY_CPE_ID_VENDOR = tuxfamily +CHRONY_SELINUX_MODULES = chronyd +CHRONY_DEPENDENCIES = host-pkgconf CHRONY_CONF_OPTS = \ --host-system=Linux \ --host-machine=$(BR2_ARCH) \ --prefix=/usr \ - --without-readline \ --without-tomcrypt \ $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) @@ -24,7 +26,7 @@ CHRONY_CONF_OPTS += --without-libcap endif ifeq ($(BR2_PACKAGE_LIBNSS),y) -CHRONY_DEPENDENCIES += host-pkgconf libnss +CHRONY_DEPENDENCIES += libnss else CHRONY_CONF_OPTS += --without-nss endif @@ -48,6 +50,18 @@ ifeq ($(BR2_PACKAGE_PPS_TOOLS),y) CHRONY_DEPENDENCIES += pps-tools endif +ifeq ($(BR2_PACKAGE_GNUTLS),y) +CHRONY_DEPENDENCIES += gnutls +else +CHRONY_CONF_OPTS += --without-gnutls +endif + +ifeq ($(BR2_PACKAGE_NETTLE),y) +CHRONY_DEPENDENCIES += nettle +else +CHRONY_CONF_OPTS += --without-nettle +endif + define CHRONY_CONFIGURE_CMDS cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPTS) endef diff --git a/package/chrony/chrony.service b/package/chrony/chrony.service index 325b63c492..210122cf5d 100644 --- a/package/chrony/chrony.service +++ b/package/chrony/chrony.service @@ -4,6 +4,10 @@ After=syslog.target network.target Conflicts=systemd-timesyncd.service [Service] +# Turn off DNSSEC validation for hostname look-ups, since those need the +# correct time to work, but we likely won't acquire that without NTP. Let's +# break this chicken-and-egg cycle here. +Environment=SYSTEMD_NSS_RESOLVE_VALIDATE=0 ExecStart=/usr/sbin/chronyd -n Restart=always diff --git a/package/cifs-utils/Config.in b/package/cifs-utils/Config.in index b433850a18..f15d1e3dc4 100644 --- a/package/cifs-utils/Config.in +++ b/package/cifs-utils/Config.in @@ -13,3 +13,21 @@ config BR2_PACKAGE_CIFS_UTILS split them off into their own package. http://wiki.samba.org/index.php/LinuxCIFS_utils + +if BR2_PACKAGE_CIFS_UTILS + +config BR2_PACKAGE_CIFS_UTILS_SMBTOOLS + bool "smbtools" + depends on BR2_USE_WCHAR # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 + select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime + help + Install the smb tools smbinfo and smb2-quota (python + implementations). + +comment "smbtools needs a toolchain w/ wchar, threads, dynamic library" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS + +endif diff --git a/package/cifs-utils/cifs-utils.hash b/package/cifs-utils/cifs-utils.hash index bbfbc1d8f4..566a5c4bf4 100644 --- a/package/cifs-utils/cifs-utils.hash +++ b/package/cifs-utils/cifs-utils.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 18d8f1bf92c13c4d611502dbd6759e3a766ddc8467ec8a2eda3f589e40b9ac9c cifs-utils-6.9.tar.bz2 +sha256 43d8786c8613caccfa84913081c1d62bc2409575854cf895b05b48af0863d056 cifs-utils-6.13.tar.bz2 # Hash for license file: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk index 511e9ccc01..b29557cbe8 100644 --- a/package/cifs-utils/cifs-utils.mk +++ b/package/cifs-utils/cifs-utils.mk @@ -4,11 +4,12 @@ # ################################################################################ -CIFS_UTILS_VERSION = 6.9 +CIFS_UTILS_VERSION = 6.13 CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2 CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils CIFS_UTILS_LICENSE = GPL-3.0+ CIFS_UTILS_LICENSE_FILES = COPYING +CIFS_UTILS_CPE_ID_VENDOR = samba # Missing install-sh in release tarball CIFS_UTILS_AUTORECONF = YES CIFS_UTILS_DEPENDENCIES = host-pkgconf @@ -17,6 +18,9 @@ CIFS_UTILS_DEPENDENCIES = host-pkgconf # the global BR2_RELRO_FULL option. CIFS_UTILS_CONF_OPTS = --disable-pie --disable-man +# uses C11 code in smbinfo.c and mtab.c +CIFS_UTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu11" + ifeq ($(BR2_PACKAGE_KEYUTILS),y) CIFS_UTILS_DEPENDENCIES += keyutils endif @@ -27,4 +31,12 @@ endef CIFS_UTILS_POST_PATCH_HOOKS += CIFS_UTILS_NO_WERROR +ifeq ($(BR2_PACKAGE_CIFS_UTILS_SMBTOOLS),) +define CIFS_UTILS_REMOVE_SMBTOOLS + rm -f $(TARGET_DIR)/usr/bin/smbinfo + rm -f $(TARGET_DIR)/usr/bin/smb2-quota +endef +CIFS_UTILS_POST_INSTALL_TARGET_HOOKS += CIFS_UTILS_REMOVE_SMBTOOLS +endif + $(eval $(autotools-package)) diff --git a/package/circus/circus.hash b/package/circus/circus.hash index 6391f0b5f7..b9e1ef2e68 100644 --- a/package/circus/circus.hash +++ b/package/circus/circus.hash @@ -1,4 +1,4 @@ # md5, sha256 from https://pypi.org/pypi/circus/json -md5 ed9082b5ac6ac5786721254b06315183 circus-0.15.0.tar.gz -sha256 d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b circus-0.15.0.tar.gz +md5 9887ddafebef7475c08ff2c8e5cc2fad circus-0.16.1.tar.gz +sha256 dd7c011eb67785a1c96a4db94a56a22810c6ed608cebf301152dabc771654c5d circus-0.16.1.tar.gz sha256 3df739c05a4eed7efdf4987142658d2a4f1243e5f08e72a5ecedac5749c92a49 LICENSE diff --git a/package/circus/circus.mk b/package/circus/circus.mk index d962651924..8f650de1e7 100644 --- a/package/circus/circus.mk +++ b/package/circus/circus.mk @@ -4,8 +4,8 @@ # ################################################################################ -CIRCUS_VERSION = 0.15.0 -CIRCUS_SITE = https://files.pythonhosted.org/packages/12/11/b72ee03c3d1fd09c39466954def2eae176d22a9fa5d9e6e8e6b90ee88f56 +CIRCUS_VERSION = 0.16.1 +CIRCUS_SITE = https://files.pythonhosted.org/packages/09/8a/44a0b6b35ecf5dcf22bf51e4bcf188ec9e7ab9dd4c14330ba1b8bea51102 CIRCUS_SETUP_TYPE = setuptools CIRCUS_LICENSE = Apache-2.0 CIRCUS_LICENSE_FILES = LICENSE diff --git a/package/civetweb/civetweb.hash b/package/civetweb/civetweb.hash index ae3c3c9510..0295e74da6 100644 --- a/package/civetweb/civetweb.hash +++ b/package/civetweb/civetweb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8cab1e2ad8fb3e2e81fed0b2321a5afbd7269a644c44ed4c3607e0a212c6d9e1 civetweb-1.12.tar.gz -sha256 291622dfbbf4fb35829726fbe97177b7227c0d4d6392b350660af73af4f86df8 LICENSE.md +sha256 d02d7ab091c8b4edf21fc13a03c6db08a8a8b8605e35e0073251b9d88443c653 civetweb-1.14.tar.gz +sha256 24d3d2aee56ae3cddcdf3392c1250877818108314233cf15f2bc9eb3ac298934 LICENSE.md diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index a6557561c5..40841285ef 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -4,10 +4,11 @@ # ################################################################################ -CIVETWEB_VERSION = 1.12 +CIVETWEB_VERSION = 1.14 CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION)) CIVETWEB_LICENSE = MIT CIVETWEB_LICENSE_FILES = LICENSE.md +CIVETWEB_CPE_ID_VENDOR = civetweb_project CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \ $(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index b99fcee8ba..c39e884cdd 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d4e77a38f540f2c37f55758f2666655314f1f51c716fea5f279659940efdcf04 cjson-1.7.13.tar.gz +sha256 5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 cjson-1.7.15.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 31fef74d9b..ac8db5701f 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,11 +4,12 @@ # ################################################################################ -CJSON_VERSION = 1.7.13 +CJSON_VERSION = 1.7.15 CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE +CJSON_CPE_ID_VENDOR = cjson_project # Set ENABLE_CUSTOM_COMPILER_FLAGS to OFF in particular to disable # -fstack-protector-strong which depends on BR2_TOOLCHAIN_HAS_SSP CJSON_CONF_OPTS += \ diff --git a/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch index e99a9742ec..d4be5c7b29 100644 --- a/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch +++ b/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch @@ -12,6 +12,8 @@ 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(-) @@ -20,7 +22,7 @@ diff --git a/libclamav/mbox.c b/libclamav/mbox.c index 71f540c0a..4851297a9 100644 --- a/libclamav/mbox.c +++ b/libclamav/mbox.c -@@ -98,7 +98,7 @@ +@@ -91,7 +91,7 @@ #include #endif diff --git a/package/clamav/Config.in b/package/clamav/Config.in index 08f3e47461..990a818b5c 100644 --- a/package/clamav/Config.in +++ b/package/clamav/Config.in @@ -3,10 +3,10 @@ config BR2_PACKAGE_CLAMAV depends on BR2_INSTALL_LIBSTDCPP 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_LIBCURL select BR2_PACKAGE_LIBMSPACK - select BR2_PACKAGE_LIBTOOL select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB @@ -16,7 +16,7 @@ config BR2_PACKAGE_CLAMAV http://www.clamav.net -comment "clamav needs a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP \ +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_USE_MMU diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 613d9b4122..a2ed115d24 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,14 +1,14 @@ # Locally calculated -sha256 89fcdcc0eba329ca84d270df09d2bb89ae55f5024b0c3bddb817512fb2c907d3 clamav-0.102.2.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 9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9 clamav-0.103.3.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 diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index b8d7de52fa..63af111da5 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,17 +4,18 @@ # ################################################################################ -CLAMAV_VERSION = 0.102.2 +CLAMAV_VERSION = 0.103.3 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ COPYING.LGPL COPYING.llvm COPYING.lzma COPYING.pcre COPYING.regex \ COPYING.unrar COPYING.zlib +CLAMAV_CPE_ID_VENDOR = clamav +CLAMAV_SELINUX_MODULES = clamav CLAMAV_DEPENDENCIES = \ host-pkgconf \ libcurl \ libmspack \ - libtool \ openssl \ zlib \ $(TARGET_NLS_DEPENDENCIES) @@ -38,8 +39,6 @@ CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)" CLAMAV_CONF_OPTS = \ --with-dbdir=/var/lib/clamav \ - --with-ltdl-include=$(STAGING_DIR)/usr/include \ - --with-ltdl-lib=$(STAGING_DIR)/usr/lib \ --with-libcurl=$(STAGING_DIR)/usr \ --with-openssl=$(STAGING_DIR)/usr \ --with-system-libmspack=$(STAGING_DIR)/usr \ diff --git a/package/clang/clang.mk b/package/clang/clang.mk index d740af5322..939f000cbd 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -10,6 +10,7 @@ CLANG_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(CL CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz CLANG_LICENSE = Apache-2.0 with exceptions CLANG_LICENSE_FILES = LICENSE.TXT +CLANG_CPE_ID_VENDOR = llvm CLANG_SUPPORTS_IN_SOURCE_BUILD = NO CLANG_INSTALL_STAGING = YES @@ -33,6 +34,7 @@ CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON # By setting BUILD_SHARED_LIBS to OFF, we generate multiple static # libraries (the same way as host's clang build) and finally # libclang.so to be installed on the target. +HOST_CLANG_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF CLANG_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF # Default is Debug build, which requires considerably more disk space diff --git a/package/clinfo/clinfo.hash b/package/clinfo/clinfo.hash index d5766e6322..e433b6740c 100644 --- a/package/clinfo/clinfo.hash +++ b/package/clinfo/clinfo.hash @@ -1,4 +1,4 @@ # locally calculated -sha256 64b02e68ccff3b95437bd0bd70dcb88438c58adec16a7145a5d4e5c26a898ccf clinfo-2.2.18.03.26.tar.gz -sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 legalcode.txt -sha256 2a7a9321be169ea6edbc6b1010e8f7bb0f4c1482a2f65c34a49e9719f129b79a LICENSE +sha256 e52f5c374a10364999d57a1be30219b47fb0b4f090e418f2ca19a0c037c1e694 clinfo-3.0.21.02.21.tar.gz +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 legalcode.txt +sha256 2a7a9321be169ea6edbc6b1010e8f7bb0f4c1482a2f65c34a49e9719f129b79a LICENSE diff --git a/package/clinfo/clinfo.mk b/package/clinfo/clinfo.mk index cf08692316..d4c1df90d4 100644 --- a/package/clinfo/clinfo.mk +++ b/package/clinfo/clinfo.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLINFO_VERSION = 2.2.18.03.26 +CLINFO_VERSION = 3.0.21.02.21 CLINFO_SITE = $(call github,Oblomov,clinfo,$(CLINFO_VERSION)) CLINFO_LICENSE = CC0-1.0 CLINFO_LICENSE_FILES = legalcode.txt LICENSE diff --git a/package/cmake/Config.in b/package/cmake/Config.in index e7bd14e69a..3c47fdcb49 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -5,7 +5,8 @@ config BR2_PACKAGE_CMAKE_ARCH_SUPPORTS BR2_m68k || BR2_mips || BR2_mips64 || \ BR2_mipsel || BR2_mips64el || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \ - BR2_i386 || BR2_x86_64 || BR2_xtensa + BR2_i386 || BR2_x86_64 || BR2_xtensa || \ + BR2_s390x config BR2_PACKAGE_CMAKE bool diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 983c292983..97e83a274c 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.15/cmake-3.15.5-SHA-256.txt -sha256 fbdd7cef15c0ced06bb13024bfda0ecc0dedbcaaaa6b8a5d368c75255243beb4 cmake-3.15.5.tar.gz +# From https://cmake.org/files/v3.16/cmake-3.16.9-SHA-256.txt +sha256 1708361827a5a0de37d55f5c9698004c035abb1de6120a376d5d59a81630191f cmake-3.16.9.tar.gz # Locally calculated -sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt +sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 1f30736023..b1b214982e 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,11 +4,14 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.15 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).5 +CMAKE_VERSION_MAJOR = 3.16 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt +CMAKE_CPE_ID_VENDOR = cmake_project +# Tool download MITM attack warning if using npm package to install cmake +CMAKE_IGNORE_CVES = CVE-2016-10642 # CMake is a particular package: # * CMake can be built using the generic infrastructure or the cmake one. diff --git a/package/cog/Config.in b/package/cog/Config.in index a9ca7473a9..5f00c5a2dd 100644 --- a/package/cog/Config.in +++ b/package/cog/Config.in @@ -47,6 +47,11 @@ config BR2_PACKAGE_COG_PLATFORM_DRM with video drivers that support kernel mode-setting (KMS) via the DRM user-space API. +config BR2_PACKAGE_COG_USE_SYSTEM_DBUS + bool "expose system D-Bus control interface" + help + Expose remote control interface on system bus + comment "DRM platform needs mesa3d w/ EGL driver and GBM" depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL diff --git a/package/cog/cog.hash b/package/cog/cog.hash index dc5c1b3c46..3abc5f2c83 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.6.0.tar.xz.sums -md5 a97df4f0e2d25f4da7cd9bb55294d30e cog-0.6.0.tar.xz -sha1 9392d9251bab8a9f61d00297707e16a983127eae cog-0.6.0.tar.xz -sha256 208f58e0533b269400875237a95e994c93da7234a29fd1c904e756b88963e35d cog-0.6.0.tar.xz +# From https://wpewebkit.org/releases/cog-0.10.1.tar.xz.sums +md5 b997da3c143bc34ec5e953eb7e7ccefc cog-0.10.1.tar.xz +sha1 f25312141de918f41add3e3c9984faa985cda0a9 cog-0.10.1.tar.xz +sha256 aecf546d7b0645119d79559c5574cb5eb68364fc8409dfbd47a4920bd1f221bc cog-0.10.1.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index a826252829..07b8e245ef 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.6.0 +COG_VERSION = 0.10.1 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES @@ -13,6 +13,7 @@ COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \ -DCOG_BUILD_PROGRAMS=ON \ + -DCOG_PLATFORM_HEADLESS=ON \ -DCOG_WESTON_DIRECT_DISPLAY=OFF \ -DINSTALL_MAN_PAGES=OFF \ -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' @@ -31,4 +32,10 @@ else COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF endif +ifeq ($(BR2_PACKAGE_COG_USE_SYSTEM_DBUS),y) +COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=ON +else +COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=OFF +endif + $(eval $(cmake-package)) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 4b34ec60eb..82c24fdbc3 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -65,11 +65,14 @@ config BR2_PACKAGE_COLLECTD_LOGSTASH config BR2_PACKAGE_COLLECTD_LUA bool "lua" - select BR2_PACKAGE_LUA + depends on BR2_PACKAGE_HAS_LUAINTERPRETER help Embeds a Lua interpreter into collectd and provides an interface to collectd's plugin system. +comment "lua support needs a Lua interpreter" + depends on !BR2_PACKAGE_HAS_LUAINTERPRETER + config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL bool "notify_email" depends on !BR2_STATIC_LIBS # libesmtp @@ -128,6 +131,21 @@ config BR2_PACKAGE_COLLECTD_BIND help Collects BIND DNS statistics. +config BR2_PACKAGE_COLLECTD_BUDDYINFO + bool "buddyinfo" + help + Statistics from buddyinfo file about memory fragmentation. + +config BR2_PACKAGE_COLLECTD_CAPABILITIES + bool "capabilities" + depends on BR2_aarch64 || BR2_i386 || BR2_x86_64 # dmidecode + select BR2_PACKAGE_DMIDECODE # runtime + select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_LIBMICROHTTPD + help + Collects selected static platform data using dmidecode and + expose it through micro embedded webserver. + config BR2_PACKAGE_COLLECTD_CEPH bool "ceph" select BR2_PACKAGE_YAJL @@ -210,6 +228,13 @@ config BR2_PACKAGE_COLLECTD_DNS help Collects statistics of DNS traffic using libpcap. +config BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY + bool "dpdk_telemetry" + select BR2_PACKAGE_JANSSON + help + Collects DPDK ethernet device metrics via dpdk_telemetry + library. + config BR2_PACKAGE_COLLECTD_DRBD bool "drbd" help @@ -260,6 +285,11 @@ config BR2_PACKAGE_COLLECTD_HUGEPAGES help Reports the number of used and free hugepages on Linux. +config BR2_PACKAGE_COLLECTD_INFINIBAND + bool "infiniband" + help + Attributes and counters for each port on each IB device. + config BR2_PACKAGE_COLLECTD_INTERFACE bool "interface" help @@ -296,24 +326,21 @@ config BR2_PACKAGE_COLLECTD_LOAD help Collects the system load. -config BR2_PACKAGE_COLLECTD_LVM - bool "lvm" - depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 app library - select BR2_PACKAGE_LVM2 - select BR2_PACKAGE_LVM2_APP_LIBRARY +config BR2_PACKAGE_COLLECTD_LOGPARSER + bool "logparser" help - Collects the size of logical volumes (LV) and free space - inside a volume group (VG) from Linux' Logical Volume Manager - (LVM). - -comment "lvm needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL + Plugin for filtering and parsing log messages. config BR2_PACKAGE_COLLECTD_MD bool "md" help Collects software-RAID device information. +config BR2_PACKAGE_COLLECTD_MDEVENTS + bool "mdevents" + help + Events from md (Linux Software RAID) devices. + config BR2_PACKAGE_COLLECTD_MEMCACHEC bool "memcachec" depends on BR2_INSTALL_LIBSTDCPP @@ -374,6 +401,17 @@ config BR2_PACKAGE_COLLECTD_NTPD help Queries an NTP server and extracts parameters. +config BR2_PACKAGE_COLLECTD_NUT + bool "nut" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_NUT + help + The NUT plugin collects uninterruptible power supply (UPS) + statistics using the Network UPS Tools (NUT). + +comment "nut needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_COLLECTD_OLSRD bool "olsrd" help @@ -475,6 +513,11 @@ config BR2_PACKAGE_COLLECTD_SWAP help Collects the amount of memory currently written to disk. +config BR2_PACKAGE_COLLECTD_SYNPROXY + bool "synproxy" + help + Synproxy stats plugin. + config BR2_PACKAGE_COLLECTD_TABLE bool "table" help @@ -502,6 +545,16 @@ config BR2_PACKAGE_COLLECTD_THERMAL help Reads ACPI thermal zone information. +config BR2_PACKAGE_COLLECTD_UBI + bool "ubi" + help + UBI (Unsorted Block Images) is an erase block management layer + for flash memory devices. UBI serves two purposes, tracking + NAND flash bad blocks and providing wear leveling. + This plugin collects some stats about UBI devices: + * bad physical underlying blocks (bad_peb_count) + * max erase counter value (max_ec) + config BR2_PACKAGE_COLLECTD_UPTIME bool "uptime" help @@ -559,6 +612,7 @@ comment "Select at least one for collectd to be useful" config BR2_PACKAGE_COLLECTD_AMQP bool "amqp" + select BR2_PACKAGE_OPENSSL # needs rabbitmq-c with ssl support select BR2_PACKAGE_RABBITMQ_C help Send/receive values via the Advanced Message Queuing Protocol @@ -581,19 +635,22 @@ config BR2_PACKAGE_COLLECTD_GRPC depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # grpc -> protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # grpc -> libabseil-cpp + depends on BR2_HOST_GCC_AT_LEAST_4_9 # grpc -> host-libabseil-cpp + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc select BR2_PACKAGE_GRPC help Send/receive values using the gRPC protocol. -comment "grpc needs a toolchain w/ C++, gcc >= 4.8" +comment "grpc needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc config BR2_PACKAGE_COLLECTD_MQTT bool "mqtt" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto select BR2_PACKAGE_MOSQUITTO help Sends metrics to and/or receives metrics from an MQTT broker. @@ -605,6 +662,7 @@ config BR2_PACKAGE_COLLECTD_NETWORK config BR2_PACKAGE_COLLECTD_NETWORK_GCRYPT bool "crypto support" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt depends on BR2_PACKAGE_COLLECTD_NETWORK select BR2_PACKAGE_LIBGCRYPT help @@ -644,6 +702,12 @@ config BR2_PACKAGE_COLLECTD_WRITEHTTP Sends values collected to a web-server using HTTP POST and PUTVAL. +config BR2_PACKAGE_COLLECTD_WRITEINFLUXDBUDP + bool "write_influxdb_udp" + help + Sends data to an instance of InfluxDB using the "Line + Protocol". + config BR2_PACKAGE_COLLECTD_WRITELOG bool "write_log" help diff --git a/package/collectd/collectd.hash b/package/collectd/collectd.hash index 7f716b7a93..394904a190 100644 --- a/package/collectd/collectd.hash +++ b/package/collectd/collectd.hash @@ -1,5 +1,5 @@ # Locally computed checksums -sha512 1296085fb19bba0c7b7d8684ec877851158b25c9f7b58fc3ae602fba7d7dc718876e730e1cdba96d39101cc5452705bb3445aaee717b219025ae816299b6a3c5 collectd-5.10.0.tar.bz2 -sha256 a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b collectd-5.10.0.tar.bz2 -sha1 9d64ec4e6e834b8e417e282390e2a9c57934d3bc collectd-5.10.0.tar.bz2 +sha512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70 collectd-5.12.0.tar.bz2 +sha256 5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6 collectd-5.12.0.tar.bz2 +sha1 af36fe83e2995270b5632fc21e5a001e6702cdce collectd-5.12.0.tar.bz2 sha256 ed0409b2b1c30566dab5fcdaf46ee70e140c99788e22f0267645a9357b476ae4 COPYING diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 65307dce4c..9bfbc784ab 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -4,23 +4,23 @@ # ################################################################################ -COLLECTD_VERSION = 5.10.0 +COLLECTD_VERSION = 5.12.0 COLLECTD_SITE = \ - https://github.com/collectd/collectd/releases/download/$(COLLECTD_VERSION) + https://github.com/collectd/collectd/releases/download/collectd-$(COLLECTD_VERSION) COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes COLLECTD_INSTALL_STAGING = YES COLLECTD_LICENSE = MIT (daemon, plugins), GPL-2.0 (plugins), LGPL-2.1 (plugins) COLLECTD_LICENSE_FILES = COPYING -# We're patching configure.ac -COLLECTD_AUTORECONF = YES +COLLECTD_CPE_ID_VENDOR = collectd +COLLECTD_SELINUX_MODULES = apache collectd # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ apple_sensors aquaero ascent barometer dbi dpdkstat email \ gmond hddtemp intel_rdt ipmi java lpar \ madwifi mbmon mic multimeter netapp notify_desktop numa \ - nut oracle perl pf pinba powerdns python routeros \ + oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish virt vserver write_kafka \ write_mongodb xencpu xmms zfs_arc zone @@ -53,6 +53,8 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \ $(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \ $(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \ + $(if $(BR2_PACKAGE_COLLECTD_BUDDYINFO),--enable-buddyinfo,--disable-buddyinfo) \ + $(if $(BR2_PACKAGE_COLLECTD_CAPABILITIES),--enable-capabilities,--disable-capabilities) \ $(if $(BR2_PACKAGE_COLLECTD_CEPH),--enable-ceph,--disable-ceph) \ $(if $(BR2_PACKAGE_COLLECTD_CHRONY),--enable-chrony,--disable-chrony) \ $(if $(BR2_PACKAGE_COLLECTD_CGROUPS),--enable-cgroups,--disable-cgroups) \ @@ -68,6 +70,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_DF),--enable-df,--disable-df) \ $(if $(BR2_PACKAGE_COLLECTD_DISK),--enable-disk,--disable-disk) \ $(if $(BR2_PACKAGE_COLLECTD_DNS),--enable-dns,--disable-dns) \ + $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),--enable-dpdk_telemetry,--disable-dpdk_telemetry) \ $(if $(BR2_PACKAGE_COLLECTD_DRBD),--enable-drbd,--disable-drbd) \ $(if $(BR2_PACKAGE_COLLECTD_EMPTY_COUNTER),--enable-match_empty_counter,--disable-match_empty_counter) \ $(if $(BR2_PACKAGE_COLLECTD_ENTROPY),--enable-entropy,--disable-entropy) \ @@ -81,6 +84,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_GRPC),--enable-grpc,--disable-grpc) \ $(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \ $(if $(BR2_PACKAGE_COLLECTD_HUGEPAGES),--enable-hugepages,--disable-hugepages) \ + $(if $(BR2_PACKAGE_COLLECTD_INFINIBAND),--enable-infiniband,--disable-infiniband) \ $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ $(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ @@ -88,10 +92,11 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \ $(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \ $(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \ + $(if $(BR2_PACKAGE_COLLECTD_LOGPARSER),--enable-logparser,--disable-logparser) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \ $(if $(BR2_PACKAGE_COLLECTD_LUA),--enable-lua,--disable-lua) \ - $(if $(BR2_PACKAGE_COLLECTD_LVM),--enable-lvm,--disable-lvm) \ $(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \ + $(if $(BR2_PACKAGE_COLLECTD_MDEVENTS),--enable-mdevents,--disable-mdevents) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),--enable-memcachec,--disable-memcachec) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \ $(if $(BR2_PACKAGE_COLLECTD_MEMORY),--enable-memory,--disable-memory) \ @@ -106,6 +111,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),--enable-notify_email,--disable-notify_email) \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_NAGIOS),--enable-notify_nagios,--disable-notify_nagios) \ $(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \ + $(if $(BR2_PACKAGE_COLLECTD_NUT),--enable-nut,--disable-nut) \ $(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \ $(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),--enable-onewire,--disable-onewire) \ $(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),--enable-openldap,--disable-openldap) \ @@ -127,6 +133,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_SMART),--enable-smart,--disable-smart) \ $(if $(BR2_PACKAGE_COLLECTD_SNMP),--enable-snmp,--disable-snmp) \ $(if $(BR2_PACKAGE_COLLECTD_SWAP),--enable-swap,--disable-swap) \ + $(if $(BR2_PACKAGE_COLLECTD_SYNPROXY),--enable-synproxy,--disable-synproxy) \ $(if $(BR2_PACKAGE_COLLECTD_SYSLOG),--enable-syslog,--disable-syslog) \ $(if $(BR2_PACKAGE_COLLECTD_TABLE),--enable-table,--disable-table) \ $(if $(BR2_PACKAGE_COLLECTD_TAIL),--enable-tail,--disable-tail) \ @@ -135,6 +142,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_THERMAL),--enable-thermal,--disable-thermal) \ $(if $(BR2_PACKAGE_COLLECTD_THRESHOLD),--enable-threshold,--disable-threshold) \ $(if $(BR2_PACKAGE_COLLECTD_TIMEDIFF),--enable-match_timediff,--disable-match_timediff) \ + $(if $(BR2_PACKAGE_COLLECTD_UBI),--enable-ubi,--disable-ubi) \ $(if $(BR2_PACKAGE_COLLECTD_UNIXSOCK),--enable-unixsock,--disable-unixsock) \ $(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \ $(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \ @@ -142,6 +150,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_VMEM),--enable-vmem,--disable-vmem) \ $(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \ + $(if $(BR2_PACKAGE_COLLECTD_WRITEINFLUXDBUDP),--enable-write_influxdb_udp,--disable-write_influxdb_udp) \ $(if $(BR2_PACKAGE_COLLECTD_WRITELOG),--enable-write_log,--disable-write_log) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),--enable-write_prometheus,--disable-write_prometheus) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),--enable-write_redis,--disable-write_redis) \ @@ -154,17 +163,18 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_AMQP),rabbitmq-c) \ $(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_BIND),libcurl libxml2) \ + $(if $(BR2_PACKAGE_COLLECTD_CAPABILITIES),jansson libmicrohttpd) \ $(if $(BR2_PACKAGE_COLLECTD_CEPH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \ + $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),jansson) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ - $(if $(BR2_PACKAGE_COLLECTD_LUA),lua) \ - $(if $(BR2_PACKAGE_COLLECTD_LVM),lvm2) \ + $(if $(BR2_PACKAGE_COLLECTD_LUA),luainterpreter) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ $(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \ $(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \ @@ -172,6 +182,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \ $(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \ + $(if $(BR2_PACKAGE_COLLECTD_NUT),nut) \ $(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),owfs) \ $(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),openldap) \ $(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \ @@ -187,12 +198,15 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),hiredis) # include/library fixups -ifeq ($(BR2_PACKAGE_GRPC),y) -COLLECTD_CONF_OPTS += --with-libgrpc++=$(STAGING_DIR)/usr +ifeq ($(BR2_PACKAGE_JANSSON),y) +COLLECTD_CONF_OPTS += --with-libjansson=$(STAGING_DIR)/usr endif ifeq ($(BR2_PACKAGE_LIBCURL),y) COLLECTD_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr endif +ifeq ($(BR2_PACKAGE_LUAJIT),y) +COLLECTD_CONF_ENV += LIBLUA_PKG_CONFIG_NAME=luajit +endif ifeq ($(BR2_PACKAGE_MYSQL),y) COLLECTD_CONF_OPTS += --with-libmysql=$(STAGING_DIR)/usr endif @@ -232,4 +246,9 @@ define COLLECTD_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/collectd.service endef +define COLLECTD_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/collectd/S90collectd \ + $(TARGET_DIR)/etc/init.d/S90collectd +endef + $(eval $(autotools-package)) diff --git a/package/comix-cursors/comix-cursors.hash b/package/comix-cursors/comix-cursors.hash index d7f33ca078..e03808c3f8 100644 --- a/package/comix-cursors/comix-cursors.hash +++ b/package/comix-cursors/comix-cursors.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3109e4d19d930a6a2a5c3422ebaaa2002640169118f9b12c042bb64995f3ec31 ComixCursors-0.8.2.tar.bz2 +sha256 9e68ea8ff230dcc793528aa5da9a38b9bf61c478cd6868b4e4f5da659746a019 ComixCursors-0.9.1.tar.bz2 diff --git a/package/comix-cursors/comix-cursors.mk b/package/comix-cursors/comix-cursors.mk index 6cc73764ad..7b034ccee7 100644 --- a/package/comix-cursors/comix-cursors.mk +++ b/package/comix-cursors/comix-cursors.mk @@ -4,8 +4,8 @@ # ################################################################################ -COMIX_CURSORS_VERSION = 0.8.2 -COMIX_CURSORS_SITE = http://limitland.de/downloads/comixcursors +COMIX_CURSORS_VERSION = 0.9.1 +COMIX_CURSORS_SITE = https://limitland.gitlab.io/comixcursors COMIX_CURSORS_SOURCE = ComixCursors-$(COMIX_CURSORS_VERSION).tar.bz2 COMIX_CURSORS_LICENSE = GPL-3.0 COMIX_CURSORS_STRIP_COMPONENTS = 0 diff --git a/package/connman/Config.in b/package/connman/Config.in index 614b826f96..72b76bf19d 100644 --- a/package/connman/Config.in +++ b/package/connman/Config.in @@ -85,8 +85,12 @@ config BR2_PACKAGE_CONNMAN_NEARD config BR2_PACKAGE_CONNMAN_OFONO bool "enable ofono support" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ofono + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ofono select BR2_PACKAGE_OFONO +comment "ofono support needs a toolchain w/ headers >= 4.12" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + config BR2_PACKAGE_CONNMAN_DEBUG bool "enable compiling with debugging information" diff --git a/package/connman/S45connman b/package/connman/S45connman index d3d4bd5df4..c8e913d3a1 100644 --- a/package/connman/S45connman +++ b/package/connman/S45connman @@ -1,22 +1,52 @@ #!/bin/sh +DAEMON="connmand" +PIDFILE="/var/run/$DAEMON.pid" + +CONNMAND_ARGS="-n" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -m -b -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $CONNMAND_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + case "$1" in - start) - printf "Starting connman ... " - start-stop-daemon -S -q -m -b -p /var/run/connmand.pid --exec /usr/sbin/connmand -- -n - echo "done." - ;; - stop) - printf "Stopping connman ..." - start-stop-daemon -K -q -p /var/run/connmand.pid - echo "done." - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; *) - echo "usage: $0 {start|stop|restart}" - ;; + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac diff --git a/package/connman/connman.hash b/package/connman/connman.hash index 3039105027..797448337c 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 cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b connman-1.38.tar.xz +sha256 1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12 connman-1.40.tar.xz # Locally computed -sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 23e7cb7797..0355426e92 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,13 +4,14 @@ # ################################################################################ -CONNMAN_VERSION = 1.38 +CONNMAN_VERSION = 1.40 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus iptables CONNMAN_INSTALL_STAGING = YES CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING +CONNMAN_CPE_ID_VENDOR = intel CONNMAN_CONF_OPTS = --with-dbusconfdir=/etc diff --git a/package/conntrack-tools/conntrack-tools.hash b/package/conntrack-tools/conntrack-tools.hash index cd95a06dc1..ae9af25e8f 100644 --- a/package/conntrack-tools/conntrack-tools.hash +++ b/package/conntrack-tools/conntrack-tools.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/conntrack-tools/downloads.html -sha256 36c6d99c7684851d4d72e75bd07ff3f0ff1baaf4b6f069eb7244990cd1a9a462 conntrack-tools-1.4.5.tar.bz2 +sha256 590859cc848245dbfd9c6487761dd303b3a1771e007f4f42213063ca56205d5f conntrack-tools-1.4.6.tar.bz2 # Locally calculated sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk index 77fcb52956..55ea407924 100644 --- a/package/conntrack-tools/conntrack-tools.mk +++ b/package/conntrack-tools/conntrack-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNTRACK_TOOLS_VERSION = 1.4.5 +CONNTRACK_TOOLS_VERSION = 1.4.6 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \ @@ -12,6 +12,7 @@ CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \ libnetfilter_queue host-bison host-flex CONNTRACK_TOOLS_LICENSE = GPL-2.0+ CONNTRACK_TOOLS_LICENSE_FILES = COPYING +CONNTRACK_TOOLS_CPE_ID_VENDOR = netfilter CONNTRACK_TOOLS_CFLAGS = $(TARGET_CFLAGS) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 3866b76243..3ec3c847c2 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -9,6 +9,13 @@ COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPL-3.0+ COREUTILS_LICENSE_FILES = COPYING +COREUTILS_CPE_ID_VENDOR = gnu +# Only when including SUSE coreutils-i18n.patch +COREUTILS_IGNORE_CVES = CVE-2013-0221 +COREUTILS_IGNORE_CVES += CVE-2013-0222 +COREUTILS_IGNORE_CVES += CVE-2013-0223 +# We're patching m4/pthread-cond.m4 +COREUTILS_AUTORECONF = YES COREUTILS_CONF_OPTS = --disable-rpath \ $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex) @@ -147,7 +154,8 @@ COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_FIX_CHROOT_LOCATION # Explicitly install ln and realpath, which we *are* insterested in. # A lot of other programs still get installed, however, but disabling # them does not gain much at build time, and is a loooong list that is -# difficult to maintain... +# difficult to maintain... Just avoid overwriting fakedate when creating +# a reproducible build HOST_COREUTILS_CONF_OPTS = \ --disable-acl \ --disable-libcap \ @@ -155,7 +163,8 @@ HOST_COREUTILS_CONF_OPTS = \ --disable-single-binary \ --disable-xattr \ --without-gmp \ - --enable-install-program=ln,realpath + --enable-install-program=ln,realpath \ + --enable-no-install-program=date $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/cpio/cpio.mk b/package/cpio/cpio.mk index 1d9c54669e..e95ea742b3 100644 --- a/package/cpio/cpio.mk +++ b/package/cpio/cpio.mk @@ -10,6 +10,11 @@ CPIO_SITE = $(BR2_GNU_MIRROR)/cpio CPIO_CONF_OPTS = --bindir=/bin CPIO_LICENSE = GPL-3.0+ CPIO_LICENSE_FILES = COPYING +CPIO_CPE_ID_VENDOR = gnu + +# 0002-Rewrite-dynamic-string-support.patch +# 0003-Fix-previous-commit.patch +CPIO_IGNORE_CVES += CVE-2021-38185 # cpio uses argp.h which is not provided by uclibc or musl by default. # Use the argp-standalone package to provide this. diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in index f02b283482..1d7635a83e 100644 --- a/package/cppcms/Config.in +++ b/package/cppcms/Config.in @@ -27,15 +27,17 @@ if BR2_PACKAGE_CPPCMS config BR2_PACKAGE_CPPCMS_ICU bool "enable icu support" depends on !BR2_BINFMT_FLAT # icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu select BR2_PACKAGE_ICU help Using ICU allows advanced localization features into CppCMS, in another hand ICU is heavier than iconv. -comment "icu support needs a toolchain w/ gcc >= 4.8" +comment "icu support needs a toolchain w/ gcc >= 4.9, host gcc >= 4.9" depends on !BR2_BINFMT_FLAT - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 endif diff --git a/package/cppzmq/cppzmq.hash b/package/cppzmq/cppzmq.hash index f0e256dc14..4fd07b4052 100644 --- a/package/cppzmq/cppzmq.hash +++ b/package/cppzmq/cppzmq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e9203391a0b913576153a2ad22a2dc1479b1ec325beb6c46a3237c669aef5a52 cppzmq-4.6.0.tar.gz -sha256 7e6db90e2e805c72b3daa77849d1cb5f1f92da0e69750c8a4aa1d86d70704748 LICENSE +sha256 9853e0437d834cbed5d3c223bf1d755cadee70e7c964c6e42c4c6783dee5d02c cppzmq-4.7.1.tar.gz +sha256 7e6db90e2e805c72b3daa77849d1cb5f1f92da0e69750c8a4aa1d86d70704748 LICENSE diff --git a/package/cppzmq/cppzmq.mk b/package/cppzmq/cppzmq.mk index c2994ecfcb..ccab92e2ef 100644 --- a/package/cppzmq/cppzmq.mk +++ b/package/cppzmq/cppzmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPPZMQ_VERSION = 4.6.0 +CPPZMQ_VERSION = 4.7.1 CPPZMQ_SITE = $(call github,zeromq,cppzmq,v$(CPPZMQ_VERSION)) CPPZMQ_INSTALL_STAGING = YES CPPZMQ_DEPENDENCIES = host-pkgconf zeromq diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index 91d510ff34..8e6a844f11 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -8,6 +8,7 @@ CRACKLIB_VERSION = 2.9.7 CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/v$(CRACKLIB_VERSION) CRACKLIB_LICENSE = LGPL-2.1 CRACKLIB_LICENSE_FILES = COPYING.LIB +CRACKLIB_CPE_ID_VENDOR = cracklib_project CRACKLIB_INSTALL_STAGING = YES CRACKLIB_DEPENDENCIES = host-cracklib $(TARGET_NLS_DEPENDENCIES) CRACKLIB_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/cramfs/cramfs.hash b/package/cramfs/cramfs.hash index af7d2e1db3..672266b468 100644 --- a/package/cramfs/cramfs.hash +++ b/package/cramfs/cramfs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 99d87aa5874f4a34c219275e0297b0f4c710895f9c87295267aeabe6a752add1 cramfs-1a1e65f2a049.tar.gz +sha256 cdb7a4ecad034f063b6456b37cdf653ae31758a224c32161e54712a9d7f01cc3 cramfs-2.1.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk index 18bef80bd2..85706d1a8e 100644 --- a/package/cramfs/cramfs.mk +++ b/package/cramfs/cramfs.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRAMFS_VERSION = 1a1e65f2a049 -CRAMFS_SITE = $(call github,npitre,cramfs-tools,$(CRAMFS_VERSION)) +CRAMFS_VERSION = 2.1 +CRAMFS_SITE = $(call github,npitre,cramfs-tools,v$(CRAMFS_VERSION)) CRAMFS_LICENSE = GPL-2.0+ CRAMFS_LICENSE_FILES = COPYING diff --git a/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch b/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch index fb46d58ed2..f2b9cca2d6 100644 --- a/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch +++ b/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch @@ -1,11 +1,11 @@ -From 4c346aa9e816bddfedc8ac99809fd1ed91bfc8ee Mon Sep 17 00:00:00 2001 +From 8228c484a1533ff904b276c342adcb6310abe272 Mon Sep 17 00:00:00 2001 From: Taahir Ahmed Date: Wed, 30 Mar 2016 11:23:54 -0300 Subject: [PATCH] crda: support python 3 in utils/key2pub.py utils/key2pub.py can now be run under either python 2.7 or python 3.x. This required some minor syntactical changes as well as switching from -M2Crypto to pycrypto, since M2Crypto doesn't support python 3.x. +M2Crypto to pycryptodomex, since M2Crypto doesn't support python 3.x. In addition, some errors in the generated source file keys-ssl.h are fixed: @@ -17,12 +17,22 @@ fixed: [Gustavo: don't call /utils/key2pub.py since that doesn't compute] +Use pycryptodomex insdead of pycrypto + +From [1]: +"PyCryptodome is a fork of PyCrypto, which is not maintained any more +(the last release dates back to 2013 [2]). It exposes almost the same +API, but there are a few incompatibilities [3]." + +[1] https://github.com/OP-TEE/optee_os/commit/90ad2450436fdd9fc0d28a3f92f3fbcfd89a38f0 +[2] https://pypi.org/project/pycrypto/#history +[3] https://pycryptodome.readthedocs.io/en/latest/src/vs_pycrypto.html + Signed-off-by: Gustavo Zacarias [Rebased against crda-4.14] Signed-off-by: Peter Seiderer ---- -Status: submitted upstream by author but not (yet) accepted -URL: http://www.spinics.net/lists/linux-wireless/msg138936.html +[Romain: Use pycryptodomex] +Signed-off-by: Romain Naour --- Makefile | 2 +- utils/key2pub.py | 146 ++++++++++++++++++++++++----------------------- @@ -42,7 +52,7 @@ index a3ead30..8da38d0 100644 $(LIBREG): regdb.h reglib.h reglib.c $(NQ) ' CC ' $@ diff --git a/utils/key2pub.py b/utils/key2pub.py -index 9bb04cd..9f92ebd 100755 +index 9bb04cd..8a0ba2a 100755 --- a/utils/key2pub.py +++ b/utils/key2pub.py @@ -1,126 +1,128 @@ @@ -57,11 +67,11 @@ index 9bb04cd..9f92ebd 100755 - sys.stderr.write('Please install the "M2Crypto" Python module.\n') - sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n') - sys.exit(1) -+ from Crypto.PublicKey import RSA ++ from Cryptodome.PublicKey import RSA +except ImportError as e: -+ sys.stderr.write('ERROR: Failed to import the "Crypto.PublicKey" module: %s\n' % e.message) -+ sys.stderr.write('Please install the "Crypto.PublicKey" Python module.\n') -+ sys.stderr.write('On Debian GNU/Linux the package is called "python-crypto".\n') ++ sys.stderr.write('ERROR: Failed to import the "Cryptodome.PublicKey" module: %s\n' % e.message) ++ sys.stderr.write('Please install the "Cryptodome.PublicKey" Python module.\n') ++ sys.stderr.write('On Debian GNU/Linux the package is called "python-cryptodomex".\n') + sys.exit(1) + +def bitwise_collect(value, radix_bits): @@ -269,5 +279,5 @@ index 9bb04cd..9f92ebd 100755 modes[mode][1](output, idx - 1) -- -2.18.0 +2.25.3 diff --git a/package/crda/crda.mk b/package/crda/crda.mk index eb43a7d772..31a64d004b 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -6,9 +6,10 @@ CRDA_VERSION = 4.14 CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot -CRDA_DEPENDENCIES = host-pkgconf host-python-pycrypto libnl libgcrypt +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/cryptodev-linux/cryptodev-linux.hash b/package/cryptodev-linux/cryptodev-linux.hash index 4319fd313a..1cbc2e8597 100644 --- a/package/cryptodev-linux/cryptodev-linux.hash +++ b/package/cryptodev-linux/cryptodev-linux.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 50cf34ecedc897edb11d1a24076f0d4cfcb704dcd294273bc03e2f6c3632fe2c cryptodev-linux-a1e738aef6249ee3bddf997e91e59b1210553209.tar.gz +sha256 0e2d30cf440a55e1125c815f0df229350192cfddbb38e6571e97de19069c97c6 cryptodev-linux-fabe5989a3dc9fba0cd0a40b612247cdde351c01.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk index a02add6310..2a65755aa2 100644 --- a/package/cryptodev-linux/cryptodev-linux.mk +++ b/package/cryptodev-linux/cryptodev-linux.mk @@ -4,11 +4,12 @@ # ################################################################################ -CRYPTODEV_LINUX_VERSION = a1e738aef6249ee3bddf997e91e59b1210553209 +CRYPTODEV_LINUX_VERSION = fabe5989a3dc9fba0cd0a40b612247cdde351c01 CRYPTODEV_LINUX_SITE = $(call github,cryptodev-linux,cryptodev-linux,$(CRYPTODEV_LINUX_VERSION)) CRYPTODEV_LINUX_INSTALL_STAGING = YES CRYPTODEV_LINUX_LICENSE = GPL-2.0+ CRYPTODEV_LINUX_LICENSE_FILES = COPYING +CRYPTODEV_LINUX_CPE_ID_VENDOR = cryptodev-linux CRYPTODEV_LINUX_PROVIDES = cryptodev diff --git a/package/cryptopp/cryptopp.hash b/package/cryptopp/cryptopp.hash index c0d442a97b..9a113b8f04 100644 --- a/package/cryptopp/cryptopp.hash +++ b/package/cryptopp/cryptopp.hash @@ -1,5 +1,5 @@ -# Hash from: https://www.cryptopp.com/release820.html: -sha256 03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058 cryptopp820.zip +# Hash from: https://www.cryptopp.com/release860.html: +sha512 e7773f5e4a7dc7e8e735b1702524bee56ba38e5211544c9c9778bc51ed8dc7b376c17f2e406410043b636312336f26f76dc963f298872f8c13933e88c232fc03 cryptopp860.zip # Hash for license file: -sha256 f29d65ae3f0c8e327284f193524643ffb4d682fcca3e1740a5c6cbab0e720583 License.txt +sha256 e668af8c73a38a66a1e8951d14ec24e7582fee5254dd6c3dae488a416d105d5f License.txt diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index f1d19386ab..6711a37fbc 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -4,11 +4,13 @@ # ################################################################################ -CRYPTOPP_VERSION = 8.2.0 +CRYPTOPP_VERSION = 8.6.0 CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip CRYPTOPP_SITE = https://cryptopp.com CRYPTOPP_LICENSE = BSL-1.0, BSD-3-Clause (CRYPTOGAMS), Public domain (ChaCha SSE2 and AVX) CRYPTOPP_LICENSE_FILES = License.txt +CRYPTOPP_CPE_ID_VENDOR = cryptopp +CRYPTOPP_CPE_ID_PRODUCT = crypto\+\+ CRYPTOPP_INSTALL_STAGING = YES define HOST_CRYPTOPP_EXTRACT_CMDS diff --git a/package/cryptsetup/0001-Remove-json_object-typedef.patch b/package/cryptsetup/0001-Remove-json_object-typedef.patch index fa865314a7..bbfd1aa075 100644 --- a/package/cryptsetup/0001-Remove-json_object-typedef.patch +++ b/package/cryptsetup/0001-Remove-json_object-typedef.patch @@ -12,6 +12,8 @@ In file included from lib/luks2/luks2_internal.h:32, lib/luks2/luks2.h:86: error: redefinition of typedef 'json_object' Signed-off-by: Baruch Siach +[Upstream status: +https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/91] --- lib/luks2/luks2.h | 1 - lib/setup.c | 1 + diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in index c4281f7e26..d9c9d4d4f4 100644 --- a/package/cryptsetup/Config.in +++ b/package/cryptsetup/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_CRYPTSETUP select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBARGON2 + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help This tool helps manipulate dm-crypt and luks partitions for on-disk encryption. diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 175ecf33cf..0aa3f79df7 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.2/sha256sums.asc -sha256 2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46 cryptsetup-2.2.2.tar.xz -sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING -sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/sha256sums.asc +sha256 b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f cryptsetup-2.3.6.tar.xz +sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING +sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 197f5f25b2..3cf6c8a301 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -4,14 +4,18 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 2.2 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 +CRYPTSETUP_VERSION_MAJOR = 2.3 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).6 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) -CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c libargon2 \ +CRYPTSETUP_DEPENDENCIES = \ + lvm2 popt host-pkgconf json-c libargon2 \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \ $(TARGET_NLS_DEPENDENCIES) CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL +CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 @@ -29,6 +33,12 @@ else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif +ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) +CRYPTSETUP_CONF_OPTS += --with-tmpfilesdir=/usr/lib/tmpfiles.d +else +CRYPTSETUP_CONF_OPTS += --without-tmpfilesdir +endif + HOST_CRYPTSETUP_DEPENDENCIES = \ host-pkgconf \ host-lvm2 \ @@ -39,7 +49,8 @@ HOST_CRYPTSETUP_DEPENDENCIES = \ HOST_CRYPTSETUP_CONF_OPTS = --with-crypto_backend=openssl \ --disable-kernel_crypto \ - --enable-blkid + --enable-blkid \ + --with-tmpfilesdir=no $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index 9e24abe393..8c2526ae9d 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ff8679fcd0c31c25d229262c7ad100ba161ef6b2aa455a2df673dd74ef93f488 cups-filters-1.26.0.tar.gz -sha256 527463af65312372111804589a9624f4c52813e253062ae351e75af5003f317f COPYING +sha256 cf90b96b5c7a906a05070e757ee5566d9680db98a279e60567ea5421c38f11de cups-filters-1.28.4.tar.gz +sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 3bb33d963c..b6ab7f1cda 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,21 +4,25 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.26.0 +CUPS_FILTERS_VERSION = 1.28.4 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING +CUPS_FILTERS_CPE_ID_VENDOR = linuxfoundation CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg -CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ +CUPS_FILTERS_CONF_OPTS = \ --disable-mutool \ --disable-foomatic \ --disable-braille \ + --enable-imagefilters \ --with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \ --with-sysroot=$(STAGING_DIR) \ --with-pdftops=pdftops \ - --with-jpeg + --with-jpeg \ + --with-test-font-path=/dev/null \ + --without-rcdir ifeq ($(BR2_PACKAGE_LIBPNG),y) CUPS_FILTERS_CONF_OPTS += --with-png @@ -70,4 +74,14 @@ else CUPS_FILTERS_CONF_OPTS += --disable-poppler endif +define CUPS_FILTERS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/cups-filters/S82cups-browsed \ + $(TARGET_DIR)/etc/init.d/S82cups-browsed +endef + +define CUPS_FILTERS_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0755 $(@D)/utils/cups-browsed.service \ + $(TARGET_DIR)/usr/lib/systemd/system/cups-browsed.service +endef + $(eval $(autotools-package)) diff --git a/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch b/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch index b1ab7cbace..7fcf7133c8 100644 --- a/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch +++ b/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch @@ -6,15 +6,17 @@ Subject: [PATCH] Remove man from BUILDDIRS in configure Signed-off-by: Bernd Kuhls [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi --- config-scripts/cups-common.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 -index fbba715..77d0f5c 100644 +index a460a73..d427acb 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 -@@ -446,7 +446,7 @@ AC_ARG_WITH(components, [ --with-components set components to build: +@@ -434,7 +434,7 @@ LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)" case "$COMPONENTS" in all) @@ -24,5 +26,5 @@ index fbba715..77d0f5c 100644 core) -- -2.8.1 +2.17.1 diff --git a/package/cups/0002-Do-not-use-genstrings.patch b/package/cups/0002-Do-not-use-genstrings.patch index b3566b8b15..c7d6735b5f 100644 --- a/package/cups/0002-Do-not-use-genstrings.patch +++ b/package/cups/0002-Do-not-use-genstrings.patch @@ -16,23 +16,25 @@ genstrings call.] Signed-off-by: Thomas Petazzoni [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi --- ppdc/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/ppdc/Makefile b/ppdc/Makefile -index 68bf6b2..d57a0c9 100644 +index 32e2e0b..7b18879 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile -@@ -242,8 +242,6 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ - $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \ - libcupsppdc.a $(LINKCUPSSTATIC) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ +@@ -186,8 +186,6 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ + $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \ + libcupsppdc.a $(LINKCUPSSTATIC) + $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ - echo Generating localization strings... - ./genstrings >sample.c # -- -2.6.4 +2.17.1 diff --git a/package/cups/0004-Remove-PIE-flags-from-the-build.patch b/package/cups/0004-Remove-PIE-flags-from-the-build.patch index 8401e133e9..c2765dff09 100644 --- a/package/cups/0004-Remove-PIE-flags-from-the-build.patch +++ b/package/cups/0004-Remove-PIE-flags-from-the-build.patch @@ -13,15 +13,17 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Olivier Schonken [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi --- Makedefs.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makedefs.in b/Makedefs.in -index 3afef0a..299b297 100644 +index 5f1d32f..d669ea8 100644 --- a/Makedefs.in +++ b/Makedefs.in -@@ -148,7 +148,7 @@ IPPFIND_BIN = @IPPFIND_BIN@ +@@ -155,7 +155,7 @@ ALL_CXXFLAGS = -I.. -D_CUPS_SOURCE $(CXXFLAGS) \ $(ONDEMANDFLAGS) $(OPTIONS) ALL_DSOFLAGS = -L../cups @ARCHFLAGS@ @RELROFLAGS@ $(DSOFLAGS) $(OPTIM) ALL_LDFLAGS = -L../cups @LDARCHFLAGS@ @RELROFLAGS@ $(LDFLAGS) \ @@ -31,5 +33,5 @@ index 3afef0a..299b297 100644 ARFLAGS = @ARFLAGS@ BACKLIBS = @BACKLIBS@ -- -2.7.4 +2.17.1 diff --git a/package/cups/cups.hash b/package/cups/cups.hash index 8f037c6420..22e081255c 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 1bca9d89507e3f68cbc84482fe46ae8d5333af5bc2b9061347b2007182ac77ce cups-2.3.1-source.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE -sha256 a5d616e6322a9cb1a971e18765025edfca4f3cd9c0eafc32d6d2eb4b8c8787b5 NOTICE +sha256 deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df cups-2.3.3op2-source.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 1f8e5879fb8b15e3ee5111809fd3ca22c606d0897d6b5e74329e480c348e034d NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 18f01d8484..80aecdba5e 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,11 +4,13 @@ # ################################################################################ -CUPS_VERSION = 2.3.1 +CUPS_VERSION = 2.3.3op2 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz -CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION) +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 CUPS_LICENSE_FILES = LICENSE NOTICE +CUPS_CPE_ID_VENDOR = cups +CUPS_SELINUX_MODULES = cups CUPS_INSTALL_STAGING = YES # Using autoconf, not autoheader, so we cannot use AUTORECONF = YES. @@ -21,7 +23,11 @@ CUPS_CONF_OPTS = \ --with-docdir=/usr/share/cups/doc-root \ --disable-gssapi \ --disable-pam \ - --libdir=/usr/lib + --libdir=/usr/lib \ + --with-cups-user=lp \ + --with-cups-group=lp \ + --with-system-groups="lpadmin sys root" \ + --without-rcdir CUPS_CONFIG_SCRIPTS = cups-config CUPS_DEPENDENCIES = \ host-autoconf \ @@ -71,4 +77,25 @@ else CUPS_CONF_OPTS += --disable-avahi endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +define CUPS_INSTALL_UDEV_RULES + $(INSTALL) -D -m 0644 package/cups/70-usb-printers.rules \ + $(TARGET_DIR)/lib/udev/rules.d/70-usb-printers.rules +endef + +CUPS_POST_INSTALL_TARGET_HOOKS += CUPS_INSTALL_UDEV_RULES +endif + +define CUPS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/cups/S81cupsd \ + $(TARGET_DIR)/etc/init.d/S81cupsd +endef + +# lp user is needed to run cups spooler +# lpadmin group membership grants administrative privileges +define CUPS_USERS + lp -1 lp -1 * /var/spool/lpd /bin/false - lp + - - lpadmin -1 * - - - Printers admin group. +endef + $(eval $(autotools-package)) diff --git a/package/cutelyst/cutelyst.hash b/package/cutelyst/cutelyst.hash index e9c1161969..d35fdcc890 100644 --- a/package/cutelyst/cutelyst.hash +++ b/package/cutelyst/cutelyst.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 5036378d0d8242da68f61bc2f51fc37b881b720311073b6f6cfb113cbae18a40 cutelyst-2.9.0.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 b0e3d658a60d68906f7255b78bad64af1aa07cb3b785fbf61629b7355f089baa cutelyst-2.11.0.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/cutelyst/cutelyst.mk b/package/cutelyst/cutelyst.mk index f2129312d5..5313b003ad 100644 --- a/package/cutelyst/cutelyst.mk +++ b/package/cutelyst/cutelyst.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUTELYST_VERSION = 2.9.0 +CUTELYST_VERSION = 2.11.0 CUTELYST_SITE = https://github.com/cutelyst/cutelyst/archive/v$(CUTELYST_VERSION) CUTELYST_INSTALL_STAGING = YES CUTELYST_SUPPORTS_IN_SOURCE_BUILD = NO @@ -18,7 +18,7 @@ CUTELYST_CONF_OPTS += \ # Qt 5.8 needs atomics, which on various architectures are in -latomic ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CUTELYST_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +CUTELYST_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif ifeq ($(BR2_PACKAGE_LIBPWQUALITY),y) diff --git a/package/cvs/cvs.hash b/package/cvs/cvs.hash index b386d887b7..7b03a552d0 100644 --- a/package/cvs/cvs.hash +++ b/package/cvs/cvs.hash @@ -1,3 +1,8 @@ # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cvs/cvs_1.12.13-12%2Bsqueeze1.dsc -sha256 b5961c2476b996e5758fa5e22b60af085adca41164cac0d8f68a1d3b49d4e4f1 cvs_1.12.13.orig.tar.gz -sha256 d52a9232d9cf36302a150d782fc7e5b6f92f8115505ae8a7dc6acfc83e809d2f cvs_1.12.13-12+squeeze1.diff.gz +sha256 b5961c2476b996e5758fa5e22b60af085adca41164cac0d8f68a1d3b49d4e4f1 cvs_1.12.13.orig.tar.gz +sha256 d52a9232d9cf36302a150d782fc7e5b6f92f8115505ae8a7dc6acfc83e809d2f cvs_1.12.13-12+squeeze1.diff.gz + +# Hash for license files, locally computed +sha256 569c5b876327d899cf444b2277fe910128a38ca71d90755fe4125dd44f8ece02 COPYING +sha256 da0e282103fb508894e78db519aab255e36971ce0bc87de585e3b05014b83b1e COPYING.LIB +sha256 ee9a2fbdb626c0ac57fd8e569f357eb2e6d6c80cc6f41efa8bd126d5ea589d72 lib/glob-libc.h diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index 6f28b4dbec..bd1e04eee0 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -8,9 +8,15 @@ CVS_VERSION = 1.12.13 CVS_SOURCE = cvs_$(CVS_VERSION).orig.tar.gz CVS_PATCH = cvs_$(CVS_VERSION)-12+squeeze1.diff.gz CVS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cvs +CVS_LICENSE = GPL-1.0+, LGPL-2.0+, LGPL-2.1+ (glob) +CVS_LICENSE_FILES = COPYING COPYING.LIB lib/glob-libc.h +CVS_CPE_ID_VENDOR = gnu +CVS_SELINUX_MODULES = apache cvs CVS_DEPENDENCIES = ncurses -CVS_CONF_ENV = cvs_cv_func_printf_ptr=yes +CVS_CONF_ENV = \ + ac_cv_func_working_mktime=yes \ + cvs_cv_func_printf_ptr=yes CVS_CONFIGURE_ARGS = --disable-old-info-format-support ifeq ($(BR2_PACKAGE_CVS_SERVER),y) diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 9dab5d1070..e03248c722 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -7,11 +7,12 @@ config BR2_PACKAGE_CWIID depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime help A collection of Linux tools written in C for interfacing to the Nintendo Wiimote. - http://abstrakraft.org/cwiid/ + https://github.com/abstrakraft/cwiid if BR2_PACKAGE_CWIID config BR2_PACKAGE_CWIID_WMGUI diff --git a/package/czmq/czmq.hash b/package/czmq/czmq.hash index 4738c9c434..19e2053a0a 100644 --- a/package/czmq/czmq.hash +++ b/package/czmq/czmq.hash @@ -1,6 +1,6 @@ # From https://github.com/zeromq/czmq/releases -md5 7e09997db6ac3b25e8ed104053040722 czmq-4.2.0.tar.gz -sha1 42165b3eede517708814e5a1b6972d8bde417f7a czmq-4.2.0.tar.gz +md5 471e9ec120fc66a2fe2aae14359e3cfa czmq-4.2.1.tar.gz +sha1 75ced09c143f93fae65238375e3a799c40eaed4c czmq-4.2.1.tar.gz # Locally calculated -sha256 cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb czmq-4.2.0.tar.gz +sha256 5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377daa6ac39 czmq-4.2.1.tar.gz sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENSE diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk index 1c9493cb76..8ddd9e8f95 100644 --- a/package/czmq/czmq.mk +++ b/package/czmq/czmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -CZMQ_VERSION = 4.2.0 +CZMQ_VERSION = 4.2.1 CZMQ_SITE = https://github.com/zeromq/czmq/releases/download/v$(CZMQ_VERSION) CZMQ_INSTALL_STAGING = YES diff --git a/package/daemon/daemon.hash b/package/daemon/daemon.hash index ad8637ee81..c490f71548 100644 --- a/package/daemon/daemon.hash +++ b/package/daemon/daemon.hash @@ -1,4 +1,5 @@ -# md5 from http://www.libslack.org/daemon/; sha256 locally calculated -md5 6cd0a28630a29ac279bc501f39baec66 daemon-0.6.4.tar.gz -sha256 c4b9ea4aa74d55ea618c34f1e02c080ddf368549037cb239ee60c83191035ca1 daemon-0.6.4.tar.gz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE +# From http://www.libslack.org/daemon/ +sha256 74f12e6d4b3c85632489bd08431d3d997bc17264bf57b7202384f2e809cff596 daemon-0.8.tar.gz +# Locally calculated +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE +sha256 91329bb9be4ae0b7800081fa054e9bb760c60005b26958c1fb8461bc66bcd998 COPYING diff --git a/package/daemon/daemon.mk b/package/daemon/daemon.mk index 79cf3f7aab..96a163e597 100644 --- a/package/daemon/daemon.mk +++ b/package/daemon/daemon.mk @@ -4,17 +4,16 @@ # ################################################################################ -DAEMON_VERSION = 0.6.4 +DAEMON_VERSION = 0.8 DAEMON_SITE = http://libslack.org/daemon/download DAEMON_LICENSE = GPL-2.0+ -DAEMON_LICENSE_FILES = LICENSE +DAEMON_LICENSE_FILES = LICENSE COPYING define DAEMON_CONFIGURE_CMDS - (cd $(@D); ./config) + (cd $(@D); ./configure) endef define DAEMON_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) ready $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef diff --git a/package/dahdi-linux/Config.in b/package/dahdi-linux/Config.in index f2a370917c..7b6ce79422 100644 --- a/package/dahdi-linux/Config.in +++ b/package/dahdi-linux/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_DAHDI_LINUX - bool "dhadi-linux" + bool "dahdi-linux" depends on BR2_LINUX_KERNEL help DAHDI (Digium/Asterisk Hardware Device Interface) is the open @@ -11,9 +11,5 @@ config BR2_PACKAGE_DAHDI_LINUX http://www.asterisk.org/downloads/dahdi - Note: DAHDI Linux drivers won't build on a kernel v4.0 or more - recent, because they use internals that have been removed in - v4.0. - comment "dahdi-linux needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL diff --git a/package/dahdi-linux/dahdi-linux.hash b/package/dahdi-linux/dahdi-linux.hash index 1847a4da4c..7a4c688061 100644 --- a/package/dahdi-linux/dahdi-linux.hash +++ b/package/dahdi-linux/dahdi-linux.hash @@ -1,7 +1,5 @@ -# sha1 from: http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases -# sha256 locally computed -sha1 9827f0afc625e293021b81daf94ec054145c975b dahdi-linux-3.0.0.tar.gz -sha256 02a8a680d20a3e243f37259edc3554ab9a488595a28562c45c33da3792d12caa dahdi-linux-3.0.0.tar.gz +# Locally computed +sha256 3faf127ee3f1fad0195c56d00b7bf2708ec8a54bf3c31edd827fd9beb47e0a51 dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8-br1.tar.gz # Firmware files have no upstream hash, so sha56 locally computed sha256 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1 dahdi-fwload-vpmadt032-1.25.0.tar.gz diff --git a/package/dahdi-linux/dahdi-linux.mk b/package/dahdi-linux/dahdi-linux.mk index 4d2c7e7177..b9d5911953 100644 --- a/package/dahdi-linux/dahdi-linux.mk +++ b/package/dahdi-linux/dahdi-linux.mk @@ -4,10 +4,10 @@ # ################################################################################ -DAHDI_LINUX_VERSION = 3.0.0 -DAHDI_LINUX_SITE = http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases +DAHDI_LINUX_VERSION = 5c840cf43838e0690873e73409491c392333b3b8 +DAHDI_LINUX_SITE = git://git.asterisk.org/dahdi/linux.git -# We need to download all thoe firmware blobs ourselves, otherwise +# We need to download all those firmware blobs ourselves, otherwise # dahdi-linux will try to download them at install time. DAHDI_LINUX_FW_SITE = http://downloads.digium.com/pub/telephony/firmware/releases DAHDI_LINUX_FW_FILES = \ @@ -60,6 +60,10 @@ define DAHDI_LINUX_EXTRACT_FW endef DAHDI_LINUX_POST_EXTRACT_HOOKS += DAHDI_LINUX_EXTRACT_FW +define DAHDI_LINUX_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CRC_CCITT) +endef + # Need to pass the same options as for building the modules, because # it wants to scan Linux' .config file to check whether some options # are set or not (like CONFIG_FW_LOADER). diff --git a/package/dante/dante.mk b/package/dante/dante.mk index 6e950b119e..2c6ddad7ad 100644 --- a/package/dante/dante.mk +++ b/package/dante/dante.mk @@ -8,6 +8,7 @@ DANTE_VERSION = 1.4.2 DANTE_SITE = http://www.inet.no/dante/files DANTE_LICENSE = BSD-3-Clause DANTE_LICENSE_FILES = LICENSE +DANTE_SELINUX_MODULES = dante # Needed so that our libtool patch applies properly DANTE_AUTORECONF = YES diff --git a/package/daq/daq.hash b/package/daq/daq.hash index 6a0cb5ed07..0fa1edecc2 100644 --- a/package/daq/daq.hash +++ b/package/daq/daq.hash @@ -1,5 +1,7 @@ +# From https://www.snort.org/downloads/snort/md5s +md5 ea796f001d1b00302e4e69e337ab2460 daq-2.0.7.tar.gz # Locally computed: -sha256 d41da5f7793e66044e6927dd868c0525e7ee4ec1a3515bf74ef9a30cd9273af0 daq-2.0.6.tar.gz +sha256 bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e daq-2.0.7.tar.gz # Hash for license files: -sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING +sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING diff --git a/package/daq/daq.mk b/package/daq/daq.mk index f0f996ba2c..8a5394a63c 100644 --- a/package/daq/daq.mk +++ b/package/daq/daq.mk @@ -4,16 +4,15 @@ # ################################################################################ -DAQ_VERSION = 2.0.6 +DAQ_VERSION = 2.0.7 DAQ_SITE = https://www.snort.org/downloads/snort DAQ_LICENSE = GPL-2.0 DAQ_LICENSE_FILES = COPYING DAQ_INSTALL_STAGING = YES DAQ_DEPENDENCIES = host-bison host-flex - -# package does not build in parallel due to improper make rules -# related to the generation of the tokdefs.h header file -DAQ_MAKE = $(MAKE1) +# 0002-parallel-grammar.patch +# 2.0.7 needs autoreconf due to configure being older than configure.ac +DAQ_AUTORECONF = YES # disable ipq module as libipq is deprecated DAQ_CONF_OPTS += --disable-ipq-module diff --git a/package/darkhttpd/darkhttpd.hash b/package/darkhttpd/darkhttpd.hash index 39152e3cb9..af5a2bf8c9 100644 --- a/package/darkhttpd/darkhttpd.hash +++ b/package/darkhttpd/darkhttpd.hash @@ -1,2 +1,3 @@ # Locally generated -sha256 a50417b622b32b5f421b3132cb94ebeff04f02c5fb87fba2e31147d23de50505 darkhttpd-1.12.tar.bz2 +sha256 1d88c395ac79ca9365aa5af71afe4ad136a4ed45099ca398168d4a2014dc0fc2 darkhttpd-1.13.tar.gz +sha256 44e784df460954c7760e2eeae69aecb12a3d23ca1c0a4f6047c3c6452b2e2f49 darkhttpd.c diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index f4831a9426..56e5a6ecd6 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -4,10 +4,10 @@ # ################################################################################ -DARKHTTPD_VERSION = 1.12 -DARKHTTPD_SITE = https://unix4lyfe.org/darkhttpd -DARKHTTPD_SOURCE = darkhttpd-$(DARKHTTPD_VERSION).tar.bz2 +DARKHTTPD_VERSION = 1.13 +DARKHTTPD_SITE = $(call github,emikulic,darkhttpd,v$(DARKHTTPD_VERSION)) DARKHTTPD_LICENSE = MIT +DARKHTTPD_LICENSE_FILES = darkhttpd.c define DARKHTTPD_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) diff --git a/package/dash/dash.hash b/package/dash/dash.hash index a2e131536a..1803bcdb2c 100644 --- a/package/dash/dash.hash +++ b/package/dash/dash.hash @@ -1,4 +1,4 @@ -# From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.10.2.tar.gz.sha256sum -sha256 3c663919dc5c66ec991da14c7cf7e0be8ad00f3db73986a987c118862b5f6071 dash-0.5.10.2.tar.gz +# From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.5.tar.gz.sha512sum +sha512 5387e213820eeb44d812bb4697543023fd4662b51a9ffd52a702810fed8b28d23fbe35a7f371e6686107de9f81902eff109458964b4622f4c5412d60190a66bf dash-0.5.11.5.tar.gz # Locally calculated -sha256 254a7894923ff62e69184a991dcbccae97edee58a1105e8efbe78caf10595d72 COPYING +sha256 254a7894923ff62e69184a991dcbccae97edee58a1105e8efbe78caf10595d72 COPYING diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 3014aafe92..fed3a99551 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -4,7 +4,7 @@ # ################################################################################ -DASH_VERSION = 0.5.10.2 +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 diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index b91ae0710a..0a8b2cc3a1 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7fcfb4d2e43681f99faaad29d2a81c0ecc42d6e2b94eb4d1fded4e9dcb3661f1 dav1d-0.6.0.tar.bz2 +sha256 e0cb645f170e7a087bc76e501324177be51a8db21df22ad37b43d289d7d1f7b5 dav1d-0.9.0.tar.bz2 sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 4dc1e46826..251330929f 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 0.6.0 +DAV1D_VERSION = 0.9.0 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause diff --git a/package/davfs2/davfs2.hash b/package/davfs2/davfs2.hash index 7e2078bec5..88a314d1c2 100644 --- a/package/davfs2/davfs2.hash +++ b/package/davfs2/davfs2.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 587c6a25ad78109995a7ccb8e60aa1c491b149f2c99d47033f3d5e648430ad2f davfs2-1.5.5.tar.gz +sha256 2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50 davfs2-1.6.0.tar.gz # License file, locally calculated -sha256 0ae0485a5bd37a63e63603596417e4eb0e653334fa6c7f932ca3a0e85d4af227 COPYING +sha256 0ae0485a5bd37a63e63603596417e4eb0e653334fa6c7f932ca3a0e85d4af227 COPYING diff --git a/package/davfs2/davfs2.mk b/package/davfs2/davfs2.mk index 90f73f4df0..9b96140fd8 100644 --- a/package/davfs2/davfs2.mk +++ b/package/davfs2/davfs2.mk @@ -4,10 +4,11 @@ # ################################################################################ -DAVFS2_VERSION = 1.5.5 +DAVFS2_VERSION = 1.6.0 DAVFS2_SITE = http://download.savannah.nongnu.org/releases/davfs2 DAVFS2_LICENSE = GPL-3.0+ DAVFS2_LICENSE_FILES = COPYING +DAVFS2_CPE_ID_VENDOR = werner_baumann DAVFS2_DEPENDENCIES = \ neon \ @@ -18,4 +19,8 @@ DAVFS2_CONF_ENV += \ ac_cv_path_NEON_CONFIG=$(STAGING_DIR)/usr/bin/neon-config \ LIBS=$(TARGET_NLS_LIBS) +define DAVFS2_USERS + davfs2 -1 davfs2 -1 * - - - davfs user +endef + $(eval $(autotools-package)) diff --git a/package/davici/davici.mk b/package/davici/davici.mk index 5c08bbe0da..6c8df48b6a 100644 --- a/package/davici/davici.mk +++ b/package/davici/davici.mk @@ -8,6 +8,7 @@ DAVICI_VERSION = 1.3 DAVICI_SITE = $(call github,strongswan,davici,v$(DAVICI_VERSION)) DAVICI_LICENSE = LGPL-2.1+ DAVICI_LICENSE_FILES = COPYING +DAVICI_CPE_ID_VENDOR = strongswan DAVICI_DEPENDENCIES = strongswan DAVICI_INSTALL_STAGING = YES DAVICI_AUTORECONF = YES diff --git a/package/dbus-glib/dbus-glib.hash b/package/dbus-glib/dbus-glib.hash index 098832431e..072dde3d69 100644 --- a/package/dbus-glib/dbus-glib.hash +++ b/package/dbus-glib/dbus-glib.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825 dbus-glib-0.110.tar.gz +sha256 7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a dbus-glib-0.112.tar.gz # Locally calculated -sha256 ef1634fc21d9112dca08f2557313584719d534d05213cf14f3c77938506266b4 COPYING +sha256 589bc300214a8b9ecd121f51570fe6342617487fd8fc0fb1f4ec26a13d5b96f8 COPYING diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 372942e1c3..0d247e1d89 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -4,11 +4,12 @@ # ################################################################################ -DBUS_GLIB_VERSION = 0.110 +DBUS_GLIB_VERSION = 0.112 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib DBUS_GLIB_INSTALL_STAGING = YES DBUS_GLIB_LICENSE = AFL-2.1 or GPL-2.0+ DBUS_GLIB_LICENSE_FILES = COPYING +DBUS_GLIB_CPE_ID_VENDOR = freedesktop DBUS_GLIB_CONF_ENV = \ ac_cv_have_abstract_sockets=yes \ diff --git a/package/dbus-python/dbus-python.hash b/package/dbus-python/dbus-python.hash index 58b0a75908..8d1609dec7 100644 --- a/package/dbus-python/dbus-python.hash +++ b/package/dbus-python/dbus-python.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -sha256 cdd4de2c4f5e58f287b12013ed7b41dee81d503c8d0d2397c5bd2fb01badf260 dbus-python-1.2.12.tar.gz +sha256 92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260 dbus-python-1.2.18.tar.gz # Locally calculated -sha256 1e4562245383fdb5203b1769789e5b28bba21af4923aea7e8b2614f7f93623c0 COPYING -sha256 064523e3ab64d6f03904132b2cc4a1bd8500586edb4cd050c2ff2b96aed4c33b dbus-gmain/COPYING +sha256 1e4562245383fdb5203b1769789e5b28bba21af4923aea7e8b2614f7f93623c0 COPYING +sha256 064523e3ab64d6f03904132b2cc4a1bd8500586edb4cd050c2ff2b96aed4c33b dbus-gmain/COPYING diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index cf4882d8ee..3e28aed25c 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_PYTHON_VERSION = 1.2.12 +DBUS_PYTHON_VERSION = 1.2.18 DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python DBUS_PYTHON_INSTALL_STAGING = YES DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain) diff --git a/package/dbus-triggerd/dbus-triggerd.hash b/package/dbus-triggerd/dbus-triggerd.hash index b7ed89abf7..956a577ca4 100644 --- a/package/dbus-triggerd/dbus-triggerd.hash +++ b/package/dbus-triggerd/dbus-triggerd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3c6d865427bf1b93b16323c796ed6957ce6b2b6fd53f518b1b082d03b939102c dbus-triggerd-ba3dbec805cb707c94c54de21666bf18b79bcc09.tar.gz +sha256 930cccfe8bdff98cab0cff003d90f9421858850d2d00143108191b62b4ef5e5a dbus-triggerd-ba3dbec805cb707c94c54de21666bf18b79bcc09-br1.tar.gz sha256 30d135650639af9019633690fc1aecbfc150aeeef9446347d4286a58338d10b0 dbus-triggerd.c diff --git a/package/dbus/Config.in b/package/dbus/Config.in index 653f7482f6..5650b5777b 100644 --- a/package/dbus/Config.in +++ b/package/dbus/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_DBUS help The D-Bus message bus system. - http://www.freedesktop.org/wiki/Software/dbus + https://www.freedesktop.org/wiki/Software/dbus comment "dbus needs a toolchain w/ threads" depends on BR2_USE_MMU diff --git a/package/dbus/S30dbus b/package/dbus/S30dbus index 52646cea2f..26772755d7 100644 --- a/package/dbus/S30dbus +++ b/package/dbus/S30dbus @@ -7,11 +7,11 @@ # and other messages. See http://www.freedesktop.org/software/dbus/ # # processname: dbus-daemon -# pidfile: /var/run/messagebus.pid +# pidfile: /run/messagebus.pid # # Create needed directories. -[ -d /var/run/dbus ] || mkdir -p /var/run/dbus +[ -d /run/dbus ] || mkdir -p /run/dbus [ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys [ -d /tmp/dbus ] || mkdir -p /tmp/dbus @@ -38,7 +38,7 @@ stop() { echo "done" if [ $RETVAL -eq 0 ]; then rm -f /var/lock/subsys/dbus-daemon - rm -f /var/run/messagebus.pid + rm -f /run/messagebus.pid fi } diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 9529d2e04f..06512e5656 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,6 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.16.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80 dbus-1.12.16.tar.gz +sha256 f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe dbus-1.12.20.tar.gz + # Locally calculated -sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING +sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index a4043864d1..d78e102427 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,31 +4,34 @@ # ################################################################################ -DBUS_VERSION = 1.12.16 +DBUS_VERSION = 1.12.20 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING +DBUS_CPE_ID_VENDOR = d-bus_project +DBUS_CPE_ID_PRODUCT = d-bus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS - /usr/libexec/dbus-daemon-launch-helper f 4755 0 0 - - - - - + /usr/libexec/dbus-daemon-launch-helper f 4750 0 dbus - - - - - endef define DBUS_USERS - dbus -1 dbus -1 * /var/run/dbus - dbus DBus messagebus user + dbus -1 dbus -1 * /run/dbus - dbus DBus messagebus user endef DBUS_DEPENDENCIES = host-pkgconf expat +DBUS_SELINUX_MODULES = dbus + DBUS_CONF_OPTS = \ --with-dbus-user=dbus \ --disable-tests \ --disable-asserts \ --disable-xml-docs \ --disable-doxygen-docs \ - --with-xml=expat \ - --with-system-socket=/var/run/dbus/system_bus_socket \ - --with-system-pid-file=/var/run/messagebus.pid + --with-system-socket=/run/dbus/system_bus_socket \ + --with-system-pid-file=/run/messagebus.pid ifeq ($(BR2_STATIC_LIBS),y) DBUS_CONF_OPTS += LIBS='-pthread' @@ -107,8 +110,8 @@ HOST_DBUS_CONF_OPTS = \ --disable-selinux \ --disable-xml-docs \ --disable-doxygen-docs \ - --without-x \ - --with-xml=expat + --disable-systemd \ + --without-x # dbus for the host DBUS_HOST_INTROSPECT = $(HOST_DBUS_DIR)/introspect.xml diff --git a/package/dc3dd/Config.in b/package/dc3dd/Config.in index 0383897cd5..bd181b7065 100644 --- a/package/dc3dd/Config.in +++ b/package/dc3dd/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_DC3DD bool "dc3dd" + depends on !BR2_RISCV_32 + depends on !BR2_arc depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL help @@ -11,5 +13,7 @@ config BR2_PACKAGE_DC3DD https://sourceforge.net/projects/dc3dd/ comment "dc3dd needs a glibc or uClibc toolchain w/ threads" + depends on !BR2_RISCV_32 + depends on !BR2_arc depends on !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_TOOLCHAIN_USES_MUSL diff --git a/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch b/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch index c838063e03..6abc3105e4 100644 --- a/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch +++ b/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch @@ -4,6 +4,7 @@ Date: Sat, 20 Jul 2019 00:27:31 -0300 Subject: [PATCH] main.c: add newline to logfile openning error message Signed-off-by: Carlos Santos +[Upstream status: https://github.com/dubiousjim/dcron/pull/22] --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dcron/dcron.hash b/package/dcron/dcron.hash index 3e53ddc25f..35b02eb78b 100644 --- a/package/dcron/dcron.hash +++ b/package/dcron/dcron.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9e50edb6f5bd8153b16bad05087d985e5153ce45cc01ae77e7f842213fb4a824 dcron-4.5.tar.gz +sha256 5a53930ba27b57c06c3b03635788cf569990283bde8ea9c1ee820e13f988288d dcron-1ba33c3325df48de46263276a43ed76cf9d81518.tar.gz +sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 COPYING diff --git a/package/dcron/dcron.mk b/package/dcron/dcron.mk index 51ebb18745..f0c3efbf8f 100644 --- a/package/dcron/dcron.mk +++ b/package/dcron/dcron.mk @@ -4,10 +4,10 @@ # ################################################################################ -DCRON_VERSION = 4.5 -DCRON_SITE = http://www.jimpryor.net/linux/releases -# The source code does not specify the version of the GPL that is used. -DCRON_LICENSE = GPL +DCRON_VERSION = 1ba33c3325df48de46263276a43ed76cf9d81518 +DCRON_SITE = $(call github,dubiousjim,dcron,$(DCRON_VERSION)) +DCRON_LICENSE = GPL-2.0+ +DCRON_LICENSE_FILES = COPYING define DCRON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) diff --git a/package/debianutils/debianutils.hash b/package/debianutils/debianutils.hash index e07f405ee9..16a45d4ea1 100644 --- a/package/debianutils/debianutils.hash +++ b/package/debianutils/debianutils.hash @@ -1,4 +1,4 @@ -# From http://snapshot.debian.org/archive/debian/20190828T161440Z/pool/main/d/debianutils/debianutils_4.8.6.3.dsc -sha256 2cc7de3afc6df1cf6d00af9938efac7ee8f739228e548e512ddc186b6a7be221 debianutils_4.8.6.3.tar.xz +# From http://snapshot.debian.org/archive/debian/20200525T145753Z/pool/main/d/debianutils/debianutils_4.11.dsc +sha256 bb5ce6290696b0d623377521ed217f484aa98f7346c5f7c48f9ae3e1acfb7151 debianutils_4.11.tar.xz # Locally calculated -sha256 a8698f078cd21fc501e66d070e12cf2f23ec1eaf5841bbc87629de76858ef7a7 debian/copyright +sha256 3c8b5112cb8f74ba959233291908d73f527afa6f1d96f93649aeb912b5884567 debian/copyright diff --git a/package/debianutils/debianutils.mk b/package/debianutils/debianutils.mk index a91383c17a..d2c41130fb 100644 --- a/package/debianutils/debianutils.mk +++ b/package/debianutils/debianutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -DEBIANUTILS_VERSION = 4.8.6.3 +DEBIANUTILS_VERSION = 4.11 DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.xz -DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20190828T161440Z/pool/main/d/debianutils +DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20200525T145753Z/pool/main/d/debianutils DEBIANUTILS_CONF_OPTS = --exec-prefix=/ DEBIANUTILS_LICENSE = GPL-2.0+, SMAIL (savelog) DEBIANUTILS_LICENSE_FILES = debian/copyright diff --git a/package/dfu-util/Config.in b/package/dfu-util/Config.in index 201c8a7cfd..2eddbf0521 100644 --- a/package/dfu-util/Config.in +++ b/package/dfu-util/Config.in @@ -1,13 +1,16 @@ config BR2_PACKAGE_DFU_UTIL bool "dfu-util" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help - Dfu-util is the host side implementation of the DFU 1.0 - specification of the USB forum. DFU is intended to download - and upload firmware to devices connected over USB. + Dfu-util is the host side implementation of the DFU 1.0 and + DFU 1.1 specification of the USB forum. + DFU is intended to download and upload firmware to devices + connected over USB. http://dfu-util.sourceforge.net/ -comment "dfu-util needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "dfu-util needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/dfu-util/Config.in.host b/package/dfu-util/Config.in.host index ea47a36c7b..5ce0da0372 100644 --- a/package/dfu-util/Config.in.host +++ b/package/dfu-util/Config.in.host @@ -1,8 +1,13 @@ config BR2_PACKAGE_HOST_DFU_UTIL bool "host dfu-util" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help - Dfu-util is the host side implementation of the DFU 1.0 - specification of the USB forum. DFU is intended to download - and upload firmware to devices connected over USB. + Dfu-util is the host side implementation of the DFU 1.0 and + DFU 1.1 specification of the USB forum. + DFU is intended to download and upload firmware to devices + connected over USB. http://dfu-util.sourceforge.net/ + +comment "host dfu-util needs a toolchain w/ host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/dfu-util/dfu-util.hash b/package/dfu-util/dfu-util.hash index 7c66a93376..a99e67565d 100644 --- a/package/dfu-util/dfu-util.hash +++ b/package/dfu-util/dfu-util.hash @@ -1,6 +1,6 @@ -# From http://dfu-util.sourceforge.net/releases/dfu-util-0.9.tar.gz.md5 -md5 233bb1e08ef4b405062445d84e28fde6 dfu-util-0.9.tar.gz +# From http://dfu-util.sourceforge.net/releases/dfu-util-0.10.tar.gz.md5 +md5 8cf55663703cdc6b40f377f999eb8d3d dfu-util-0.10.tar.gz # Locally computed -sha256 36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833 dfu-util-0.9.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 a03dc58dfc79c056819c0544b2a5970537566460102b3d82cfb038c60e619b42 dfu-util-0.10.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/dfu-util/dfu-util.mk b/package/dfu-util/dfu-util.mk index 5e8ba5a8f2..4c9c9662c6 100644 --- a/package/dfu-util/dfu-util.mk +++ b/package/dfu-util/dfu-util.mk @@ -4,9 +4,9 @@ # ################################################################################ -DFU_UTIL_VERSION = 0.9 +DFU_UTIL_VERSION = 0.10 DFU_UTIL_SITE = http://dfu-util.sourceforge.net/releases -DFU_UTIL_LICENSE = GPL-2.0+ +DFU_UTIL_LICENSE = GPL-2.0+, LGPL-3.0 DFU_UTIL_LICENSE_FILES = COPYING DFU_UTIL_DEPENDENCIES = libusb diff --git a/package/dhcp/dhcp.hash b/package/dhcp/dhcp.hash index df07a32557..ec7c4fe58d 100644 --- a/package/dhcp/dhcp.hash +++ b/package/dhcp/dhcp.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/dhcp/4.4.1/dhcp-4.4.1.tar.gz.sha256.asc -sha256 2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608 dhcp-4.4.1.tar.gz +# Verified from https://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz.sha256.asc +sha256 b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a dhcp-4.4.2-P1.tar.gz # Locally calculated -sha256 18add1790d1ed47d6ef6f3ed5945aa0cb2f7785fa8bc7fd859f8ae2f9f78567d LICENSE +sha256 9961fce0d83a6229b9084cdadedfa723a53274c63af610c9adb61b607e0f5a76 LICENSE diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 335c631119..1edb3c5e99 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -4,12 +4,13 @@ # ################################################################################ -DHCP_VERSION = 4.4.1 +DHCP_VERSION = 4.4.2-P1 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES DHCP_LICENSE = MPL-2.0 DHCP_LICENSE_FILES = LICENSE -DHCP_DEPENDENCIES = bind +DHCP_DEPENDENCIES = bind host-gawk +DHCP_CPE_ID_VENDOR = isc # use libtool-enabled configure.ac define DHCP_LIBTOOL_AUTORECONF @@ -21,6 +22,8 @@ DHCP_CONF_ENV = \ -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \ CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1' +DHCP_CONF_ENV += ac_cv_prog_AWK=$(HOST_DIR)/bin/gawk + DHCP_CONF_OPTS = \ --with-libbind=$(STAGING_DIR)/usr \ --with-randomdev=/dev/random \ diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash index c0d68036f3..413f5c842b 100644 --- a/package/dhcpcd/dhcpcd.hash +++ b/package/dhcpcd/dhcpcd.hash @@ -1,4 +1,4 @@ -# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-8.0.3.tar.xz.distinfo -sha256 9674971fcd5acd5a3401a0ad8eba7f0b816fec9abb4a2520332b4d8dae068f1d dhcpcd-8.0.3.tar.xz +# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-9.4.0.tar.xz.distinfo +sha256 41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513 dhcpcd-9.4.0.tar.xz # Locally calculated -sha256 213fc1a704cecdb322276fa7c95891fd1c23137d9ab572af1fc5e91b48762303 LICENSE +sha256 9cce1077bad23544349788ec750ec6e5aee106fc437fd6b5d73c0d8510426578 LICENSE diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index 63dbbee86c..1af019fd9e 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,32 +4,60 @@ # ################################################################################ -DHCPCD_VERSION = 8.0.3 +DHCPCD_VERSION = 9.4.0 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd DHCPCD_DEPENDENCIES = host-pkgconf DHCPCD_LICENSE = BSD-2-Clause DHCPCD_LICENSE_FILES = LICENSE +DHCPCD_CPE_ID_VENDOR = dhcpcd_project + +DHCPCD_CONFIG_OPTS = \ + --libexecdir=/lib/dhcpcd \ + --os=linux \ + --privsepuser=dhcpcd + +# AUDIT_ARCH_{OPENRISC,SH,SHEL,SH64,SHEL64} are only available with kernel >= 3.7 +ifeq ($(BR2_or1k)$(BR2_sh):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7),y:) +DHCPCD_CONFIG_OPTS += --disable-privsep +endif + +# AUDIT_ARCH_MICROBLAZE is only available with kernel >= 3.18 +ifeq ($(BR2_microblazeel)$(BR2_microblazebe):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18),y:) +DHCPCD_CONFIG_OPTS += --disable-privsep +endif + +# AUDIT_ARCH_XTENSA is only available with kernel >= 5.0 +ifeq ($(BR2_xtensa):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0),y:) +DHCPCD_CONFIG_OPTS += --disable-privsep +endif + +# AUDIT_ARCH_{ARCOMPACT,ARCV2,NDS32,NIOS2} are only available with kernel >= 5.2 +ifeq ($(BR2_arceb)$(BR2_arcle)$(BR2_nds32)$(BR2_nios2):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2),y:) +DHCPCD_CONFIG_OPTS += --disable-privsep +endif + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +DHCPCD_CONFIG_OPTS += --with-udev +DHCPCD_DEPENDENCIES += udev +else +DHCPCD_CONFIG_OPTS += --without-udev +endif ifeq ($(BR2_STATIC_LIBS),y) DHCPCD_CONFIG_OPTS += --enable-static endif ifeq ($(BR2_USE_MMU),) -DHCPCD_CONFIG_OPTS += --disable-fork +DHCPCD_CONFIG_OPTS += --disable-fork --disable-privsep endif define DHCPCD_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) ./configure \ - --os=linux \ - --libexecdir=/lib/dhcpcd \ - $(DHCPCD_CONFIG_OPTS) ) + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(DHCPCD_CONFIG_OPTS)) endef define DHCPCD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all endef define DHCPCD_INSTALL_TARGET_CMDS @@ -51,6 +79,10 @@ define DHCPCD_INSTALL_INIT_SYSTEMD endef endif +define DHCPCD_USERS + dhcpcd -1 dhcpcd -1 * - - - dhcpcd user +endef + # NOTE: Even though this package has a configure script, it is not generated # using the autotools, so we have to use the generic package infrastructure. diff --git a/package/dhcpcd/dhcpcd.service b/package/dhcpcd/dhcpcd.service index 0552b5c73a..e648092c9b 100644 --- a/package/dhcpcd/dhcpcd.service +++ b/package/dhcpcd/dhcpcd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking EnvironmentFile=-/etc/default/dhcpcd -PIDFile=/var/run/dhcpcd.pid +PIDFile=/run/dhcpcd.pid ExecStart=/sbin/dhcpcd $DAEMON_ARGS Restart=always diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk index 2413812880..ec9571c0af 100644 --- a/package/dhcpdump/dhcpdump.mk +++ b/package/dhcpdump/dhcpdump.mk @@ -20,7 +20,7 @@ DHCPDUMP_CFLAGS = $(TARGET_CFLAGS) -DHAVE_STRSEP define DHCPDUMP_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(DHCPDUMP_CFLAGS) \ - -D_GNU_SOURCE" LIBS="$(DHCPDUMP_LIBS)" + -D_GNU_SOURCE" LIBS="$(DHCPDUMP_LIBS)" dhcpdump endef define DHCPDUMP_INSTALL_TARGET_CMDS diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index e1768588d8..2286590b66 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 10f7c02ee5dea311e61b0d3e29eb6e18bcedd6fb6672411484c1a37729cbd7a6 dialog-1.3-20191210.tgz +sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz # Locally computed -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index f3b66bae09..1c98d354e3 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20191210 +DIALOG_VERSION = 1.3-20200327 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ diff --git a/package/dieharder/dieharder.mk b/package/dieharder/dieharder.mk index c3eee64553..cbf28922fd 100644 --- a/package/dieharder/dieharder.mk +++ b/package/dieharder/dieharder.mk @@ -36,4 +36,9 @@ endif # parallel build fail, disable it DIEHARDER_MAKE = $(MAKE1) +# Too many fixes needed to build with -fno-common which is default since gcc 10 +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) +DIEHARDER_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fcommon" +endif + $(eval $(autotools-package)) diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 586b81ace8..107de79383 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -18,3 +18,4 @@ DIFFUTILS_CONF_ENV += gl_cv_func_getopt_gnu=yes endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/directfb/Config.in b/package/directfb/Config.in index 20481f56da..f4d6b8cbd1 100644 --- a/package/directfb/Config.in +++ b/package/directfb/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DIRECTFB bool "directfb" + depends on !BR2_RISCV_32 depends on !BR2_STATIC_LIBS # static link issues depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP @@ -161,6 +162,7 @@ config BR2_PACKAGE_DIRECTFB_TESTS endif # BR2_PACKAGE_DIRECTFB comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5, dynamic library" + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL || \ diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 38b2c02027..749c35359c 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -13,9 +13,15 @@ DMALLOC_LICENSE = MIT-like DMALLOC_LICENSE_FILES = dmalloc.h.1 DMALLOC_INSTALL_STAGING = YES -DMALLOC_CONF_OPTS = --enable-shlib DMALLOC_CFLAGS = $(TARGET_CFLAGS) +ifeq ($(BR2_STATIC_LIBS),y) +DMALLOC_CONF_OPTS += --disable-shlib +else +DMALLOC_CONF_OPTS += --enable-shlib +DMALLOC_CFLAGS += -fPIC +endif + ifeq ($(BR2_INSTALL_LIBSTDCPP),y) DMALLOC_CONF_OPTS += --enable-cxx else diff --git a/package/dmidecode/dmidecode.hash b/package/dmidecode/dmidecode.hash index c6edf4bcac..ba72295cae 100644 --- a/package/dmidecode/dmidecode.hash +++ b/package/dmidecode/dmidecode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 077006fa2da0d06d6383728112f2edef9684e9c8da56752e97cd45a11f838edd dmidecode-3.2.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 82c737a780614c38a783e8055340d295e332fb12c7f418b5d21a0797d3fb1455 dmidecode-3.3.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk index 811565d8e4..3f09cc956d 100644 --- a/package/dmidecode/dmidecode.mk +++ b/package/dmidecode/dmidecode.mk @@ -4,11 +4,12 @@ # ################################################################################ -DMIDECODE_VERSION = 3.2 +DMIDECODE_VERSION = 3.3 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode DMIDECODE_LICENSE = GPL-2.0+ DMIDECODE_LICENSE_FILES = LICENSE +DMIDECODE_SELINUX_MODULES = dmidecode define DMIDECODE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in index d7f3d74bd4..ef3a9b8341 100644 --- a/package/dnsmasq/Config.in +++ b/package/dnsmasq/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DNSMASQ bool "dnsmasq" + depends on BR2_USE_MMU # fork() help A lightweight DNS and DHCP server. It is intended to provide coupled DNS and DHCP service to a LAN. diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 18a539277e..2a7cda4a04 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,7 +1,6 @@ # Locally calculated after checking pgp signature -# http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.79.tar.xz.asc -sha256 78ad74f5ca14fd85a8bac93f764cd9d60b27579e90eabd3687ca7b030e67861f dnsmasq-2.79.tar.xz -sha256 cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb dnsmasq-2.80.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.85.tar.xz.asc +sha256 ad98d3803df687e5b938080f3d25c628fe41c878752d03fbc6199787fee312fa dnsmasq-2.85.tar.xz # Locally calculated -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 3f25ac0885..972be10935 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.80 +DNSMASQ_VERSION = 2.85 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" @@ -14,9 +14,8 @@ DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ DNSMASQ_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 - -# 0004-Fix-memory-leak-in-helper-c.patch -DNSMASQ_IGNORE_CVES += CVE-2019-14834 +DNSMASQ_CPE_ID_VENDOR = thekelleys +DNSMASQ_SELINUX_MODULES = dnsmasq DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) @@ -80,13 +79,7 @@ DNSMASQ_DEPENDENCIES += ubus DNSMASQ_COPTS += -DHAVE_UBUS endif -define DNSMASQ_FIX_PKGCONFIG - $(SED) 's^PKG_CONFIG = pkg-config^PKG_CONFIG = $(PKG_CONFIG_HOST_BINARY)^' \ - $(DNSMASQ_DIR)/Makefile -endef - define DNSMASQ_BUILD_CMDS - $(DNSMASQ_FIX_PKGCONFIG) $(DNSMASQ_TWEAK_LIBLUA) $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N) endef diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 44f13c8bfc..6eb9413a11 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 00d06baf4793794c0fd9ecad5b7e95aed6eb942f24c8b6e2d7c7f7564b9743ad docker-cli-19.03.5.tar.gz -sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE +sha256 d91010813824070dd2380013c8f343e61e6dda170f7853f024bda39b432b64ba docker-cli-20.10.9.tar.gz +sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 4ad30e0278..3a344bca36 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,21 +4,24 @@ # ################################################################################ -DOCKER_CLI_VERSION = 19.03.5 +DOCKER_CLI_VERSION = 20.10.9 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) -DOCKER_CLI_WORKSPACE = gopath DOCKER_CLI_LICENSE = Apache-2.0 DOCKER_CLI_LICENSE_FILES = LICENSE DOCKER_CLI_DEPENDENCIES = host-pkgconf +DOCKER_CLI_CPE_ID_VENDOR = docker +DOCKER_CLI_CPE_ID_PRODUCT = docker + DOCKER_CLI_TAGS = autogen DOCKER_CLI_BUILD_TARGETS = cmd/docker +DOCKER_CLI_GOMOD = github.com/docker/cli DOCKER_CLI_LDFLAGS = \ - -X github.com/docker/cli/cli.GitCommit=$(DOCKER_CLI_VERSION) \ - -X github.com/docker/cli/cli.Version=$(DOCKER_CLI_VERSION) + -X $(DOCKER_CLI_GOMOD)/cli/version.GitCommit=$(DOCKER_CLI_VERSION) \ + -X $(DOCKER_CLI_GOMOD)/cli/version.Version=$(DOCKER_CLI_VERSION) ifeq ($(BR2_PACKAGE_DOCKER_CLI_STATIC),y) DOCKER_CLI_LDFLAGS += -extldflags '-static' diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 74af8e03d5..8e16b60521 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -1,15 +1,12 @@ config BR2_PACKAGE_DOCKER_COMPOSE bool "docker-compose" + depends on !BR2_PACKAGE_PYTHON # python-paramiko -> python-bcrypt depends on BR2_USE_MMU # python depends on BR2_USE_WCHAR # python depends on BR2_TOOLCHAIN_HAS_THREADS # python depends on !BR2_STATIC_LIBS # python depends on BR2_INSTALL_LIBSTDCPP # python-paramiko -> python-cryptography - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME \ - if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CACHED_PROPERTY # runtime select BR2_PACKAGE_PYTHON_DOCOPT # runtime select BR2_PACKAGE_PYTHON_PARAMIKO # runtime diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1fd229fcbb..911cbfe428 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -3,9 +3,10 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_USES_UCLIBC # docker-containerd -> runc - depends on BR2_USE_MMU # docker-containerd - select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency + depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd -> runc + depends on BR2_USE_MMU # containerd + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + select BR2_PACKAGE_CONTAINERD # runtime dependency select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency select BR2_PACKAGE_SQLITE # runtime dependency @@ -33,9 +34,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 depends on BR2_USE_MMU # lvm2 depends on !BR2_STATIC_LIBS # lvm2 - depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 select BR2_PACKAGE_LVM2 - select BR2_PACKAGE_LVM2_APP_LIBRARY help Build the devicemapper filesystem driver for Docker. @@ -44,6 +43,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS depends on BR2_USE_WCHAR # gvfs depends on BR2_USE_MMU # gvfs depends on BR2_TOOLCHAIN_HAS_THREADS # gvfs + depends on !BR2_STATIC_LIBS # gvfs select BR2_PACKAGE_GVFS help Build the vfs filesystem driver for Docker. diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 1f1643d377..5e15842859 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bc5d1ac503e44593be8003ed0ad9c75bf0da535db19837a9338429c438bd4637 docker-engine-19.03.5.tar.gz -sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE +sha256 359e8854d0d51bc884d434f182f64ca62f25fbbe7b9c6a336eb09f212fe8cc9a docker-engine-20.10.9.tar.gz +sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index eb3a7fd29f..84366d9334 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,22 +4,33 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 19.03.5 -DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION)) +DOCKER_ENGINE_VERSION = 20.10.9 +DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE DOCKER_ENGINE_DEPENDENCIES = host-pkgconf -DOCKER_ENGINE_SRC_SUBDIR = github.com/docker/docker +DOCKER_ENGINE_GOMOD = github.com/docker/docker + +DOCKER_ENGINE_CPE_ID_VENDOR = docker +DOCKER_ENGINE_CPE_ID_PRODUCT = docker DOCKER_ENGINE_LDFLAGS = \ - -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ - -X main.Version=$(DOCKER_ENGINE_VERSION) + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.BuildTime="" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.GitCommit="buildroot" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.IAmStatic="false" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.InitCommitID="" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" -DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen +DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +DOCKER_ENGINE_DEPENDENCIES += libapparmor +DOCKER_ENGINE_TAGS += apparmor +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) DOCKER_ENGINE_TAGS += seccomp DOCKER_ENGINE_DEPENDENCIES += libseccomp @@ -53,16 +64,6 @@ endif DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) -define DOCKER_ENGINE_RUN_AUTOGEN - cd $(@D) && \ - BUILDTIME="$$(date)" \ - VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \ - bash ./hack/make/.go-autogen -endef - -DOCKER_ENGINE_POST_CONFIGURE_HOOKS += DOCKER_ENGINE_RUN_AUTOGEN - define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ $(TARGET_DIR)/usr/lib/systemd/system/docker.service @@ -79,4 +80,59 @@ define DOCKER_ENGINE_USERS - - docker -1 * - - - Docker Application Container Framework endef +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) +define DOCKER_ENGINE_DRIVER_BTRFS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS_POSIX_ACL) +endef +endif + +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER),y) +define DOCKER_ENGINE_DRIVER_DM_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_MD) + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_DM) + $(call KCONFIG_ENABLE_OPT,CONFIG_MD_THIN_PROVISIONING) +endef +endif + +# based on contrib/check-config.sh +define DOCKER_ENGINE_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) + $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) + $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) + $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) + $(call KCONFIG_ENABLE_OPT,CONFIG_IPVLAN) + $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) + $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) + $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) + $(DOCKER_ENGINE_DRIVER_BTRFS_LINUX_CONFIG_FIXUPS) + $(DOCKER_ENGINE_DRIVER_DM_LINUX_CONFIG_FIXUPS) +endef + $(eval $(golang-package)) diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk index 8843266c30..6600b24ed9 100644 --- a/package/docker-proxy/docker-proxy.mk +++ b/package/docker-proxy/docker-proxy.mk @@ -12,8 +12,6 @@ DOCKER_PROXY_LICENSE_FILES = LICENSE DOCKER_PROXY_DEPENDENCIES = host-pkgconf -DOCKER_PROXY_WORKSPACE = gopath - DOCKER_PROXY_BUILD_TARGETS = cmd/proxy define DOCKER_PROXY_INSTALL_TARGET_CMDS diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index c713ac58b1..4324d13cee 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -1,19 +1,22 @@ config BR2_PACKAGE_DOMOTICZ bool "domoticz" - depends on BR2_USE_MMU # mosquitto - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto - depends on !BR2_STATIC_LIBS # mosquitto - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # sleep_for + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14 # pthread_condattr_setclock - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mosquitto depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_PACKAGE_LUA_5_3 + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME 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_MOSQUITTO @@ -29,11 +32,11 @@ config BR2_PACKAGE_DOMOTICZ http://domoticz.com -comment "domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 4.8, NPTL, wchar, dynamic library" +comment "domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 6, NPTL, wchar, dynamic library" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ !BR2_PACKAGE_LUA_5_3 diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index 4f095c33a7..dcd5bead1e 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d0c17b2082dad8a8caeed888b7d4c191975e74a2808b5d078305f5327b82442d domoticz-2020.1.tar.gz +sha256 d8e99e0f96873aa105b57f73656ef7a14c89e0acf2649b2d4ef1167b14bab4b2 domoticz-2021.1-br1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 5efe86a784..ee5a41b8c1 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,12 +4,17 @@ # ################################################################################ -DOMOTICZ_VERSION = 2020.1 -DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) +DOMOTICZ_VERSION = 2021.1 +DOMOTICZ_SITE = https://github.com/domoticz/domoticz +DOMOTICZ_SITE_METHOD = git +DOMOTICZ_GIT_SUBMODULES = YES DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt +DOMOTICZ_CPE_ID_VENDOR = domoticz DOMOTICZ_DEPENDENCIES = \ boost \ + cereal \ + fmt \ host-pkgconf \ jsoncpp \ libcurl \ @@ -29,15 +34,18 @@ DOMOTICZ_CONF_OPTS += \ -DUSE_OPENSSL_STATIC=OFF # Do not use any built-in libraries which are enabled by default for -# jsoncpp, lua, sqlite and mqtt +# jsoncpp, fmt, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ - -DUSE_BUILTIN_LUA=OFF \ + -DUSE_BUILTIN_LIBFMT=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF ifeq ($(BR2_PACKAGE_LIBUSB),y) DOMOTICZ_DEPENDENCIES += libusb +DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=ON +else +DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=OFF endif ifeq ($(BR2_PACKAGE_OPENZWAVE),y) diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash index 41fb23429b..493011fce4 100644 --- a/package/dos2unix/dos2unix.hash +++ b/package/dos2unix/dos2unix.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.4.1.tar.gz.asc -sha256 1cd58a60b03ed28fa39046102a185c5e88c4f7665e1e0417c25de7f8b9f78623 dos2unix-7.4.1.tar.gz -sha256 af32dca9450e90b9a7a0f6408da1554466382cc81960108c59512f78a666a276 COPYING.txt +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.4.2.tar.gz.asc +sha256 6035c58df6ea2832e868b599dfa0d60ad41ca3ecc8aa27822c4b7a9789d3ae01 dos2unix-7.4.2.tar.gz +sha256 db8888b7d1454348aca0c6ca851327245ef60e57afa8a6555761c8b95d24af77 COPYING.txt diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 5064b7e5bb..1f3e79ec4e 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOS2UNIX_VERSION = 7.4.1 +DOS2UNIX_VERSION = 7.4.2 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt diff --git a/package/dosfstools/dosfstools.hash b/package/dosfstools/dosfstools.hash index d5f396f69f..840bb4d563 100644 --- a/package/dosfstools/dosfstools.hash +++ b/package/dosfstools/dosfstools.hash @@ -1,5 +1,6 @@ -# Locally calculated after checking pgp signature -sha256 e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173 dosfstools-4.1.tar.xz +# Locally calculated after checking pgp signature from +# https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz.sig +sha256 64926eebf90092dca21b14259a5301b7b98e7b1943e8a201c7d726084809b527 dosfstools-4.2.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk index fdf973af9d..77b560ee9b 100644 --- a/package/dosfstools/dosfstools.mk +++ b/package/dosfstools/dosfstools.mk @@ -4,11 +4,11 @@ # ################################################################################ -DOSFSTOOLS_VERSION = 4.1 -DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz +DOSFSTOOLS_VERSION = 4.2 DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION) DOSFSTOOLS_LICENSE = GPL-3.0+ DOSFSTOOLS_LICENSE_FILES = COPYING +DOSFSTOOLS_CPE_ID_VENDOR = dosfstools_project DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks --exec-prefix=/ HOST_DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index 28a49b13d6..58444ab7e8 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 36da68aae5157b83e21383f711b8977e5b6f5477f369f71e7e22e76a738bbd05 dovecot-2.3-pigeonhole-0.5.9.tar.gz -sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING +sha256 e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0 dovecot-2.3-pigeonhole-0.5.15.tar.gz +sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 95bfa6fc4a..c0bef6bedc 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,13 +4,23 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.9 +DOVECOT_PIGEONHOLE_VERSION = 0.5.15 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 DOVECOT_PIGEONHOLE_LICENSE_FILES = COPYING +DOVECOT_PIGEONHOLE_CPE_ID_VENDOR = dovecot +DOVECOT_PIGEONHOLE_CPE_ID_PRODUCT = pigeonhole DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG + $(SED) 's,$(PER_PACKAGE_DIR)/dovecot/,$(PER_PACKAGE_DIR)/dovecot-pigeonhole/,g' \ + $(STAGING_DIR)/usr/lib/dovecot-config +endef +DOVECOT_PIGEONHOLE_PRE_CONFIGURE_HOOKS = DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG +endif + $(eval $(autotools-package)) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index e61937495a..cd314cf0dd 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 f89fb69423fc5bdc05955c8fc0607eab9e33511f9a643b721763db6156c49651 dovecot-2.3.9.3.tar.gz -sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT +sha256 21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590 dovecot-2.3.15.tar.gz +sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 9f89ce6354..ceec26a2db 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,19 +5,21 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).9.3 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).15 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT +DOVECOT_CPE_ID_VENDOR = dovecot +DOVECOT_SELINUX_MODULES = dovecot DOVECOT_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ openssl -# 0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch -DOVECOT_AUTORECONF = YES -# add host-gettext for AM_ICONV macro -DOVECOT_DEPENDENCIES += host-gettext + +# CVE-2016-4983 is an issue in a postinstall script in the dovecot rpm, which +# is part of the Red Hat packaging and not part of upstream dovecot +DOVECOT_IGNORE_CVES += CVE-2016-4983 DOVECOT_CONF_ENV = \ RPCGEN=__disable_RPCGEN_rquota \ diff --git a/package/doxygen/doxygen.hash b/package/doxygen/doxygen.hash index 90d4e978bc..ff2fac7b9c 100644 --- a/package/doxygen/doxygen.hash +++ b/package/doxygen/doxygen.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 2cba988af2d495541cbbe5541b3bee0ee11144dcb23a81eada19f5501fd8b599 doxygen-1.8.17.src.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 18173d9edc46d2d116c1f92a95d683ec76b6b4b45b817ac4f245bb1073d00656 doxygen-1.8.18.src.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/doxygen/doxygen.mk b/package/doxygen/doxygen.mk index 52e96f3807..b24c527a20 100644 --- a/package/doxygen/doxygen.mk +++ b/package/doxygen/doxygen.mk @@ -4,11 +4,14 @@ # ################################################################################ -DOXYGEN_VERSION = 1.8.17 +DOXYGEN_VERSION = 1.8.18 DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz DOXYGEN_SITE = http://doxygen.nl/files DOXYGEN_LICENSE = GPL-2.0 DOXYGEN_LICENSE_FILES = LICENSE +DOXYGEN_CPE_ID_VENDOR = doxygen HOST_DOXYGEN_DEPENDENCIES = host-flex host-bison +HOST_DOXYGEN_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF + $(eval $(host-cmake-package)) diff --git a/package/drbd-utils/drbd-utils.hash b/package/drbd-utils/drbd-utils.hash index 79914af508..47f6f6ecf5 100644 --- a/package/drbd-utils/drbd-utils.hash +++ b/package/drbd-utils/drbd-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 16a6d000aac7f746419839a2c2afcb71fa8779fe0b5898e967767791cb8f4bc7 drbd-utils-9.12.0.tar.gz +sha256 e89be59e60fc33534481a5dcae90de242e35867512d85cef2878ca757bfb074a drbd-utils-9.15.0.tar.gz sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING diff --git a/package/drbd-utils/drbd-utils.mk b/package/drbd-utils/drbd-utils.mk index a24cc4ade6..6482cf70b6 100644 --- a/package/drbd-utils/drbd-utils.mk +++ b/package/drbd-utils/drbd-utils.mk @@ -4,10 +4,11 @@ # ################################################################################ -DRBD_UTILS_VERSION = 9.12.0 +DRBD_UTILS_VERSION = 9.15.0 DRBD_UTILS_SITE = http://www.linbit.com/downloads/drbd/utils DRBD_UTILS_LICENSE = GPL-2.0+ DRBD_UTILS_LICENSE_FILES = COPYING +DRBD_UTILS_SELINUX_MODULES = drbd DRBD_UTILS_DEPENDENCIES = host-flex DRBD_UTILS_CONF_OPTS = --with-distro=generic --without-manual diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash index aa0e80a20a..82ff454f0a 100644 --- a/package/dropbear/dropbear.hash +++ b/package/dropbear/dropbear.hash @@ -1,5 +1,7 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4 dropbear-2019.78.tar.bz2 +sha256 48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b dropbear-2020.81.tar.bz2 # License file, locally computed -sha256 cfa32d49e9022265375e533a4a5ef9e37d4aaa604119d612c46816aa1e59fe52 LICENSE +sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE +sha256 8f196cb13afd271f5e267fd29543fc454596382ad580e7592709492843996ac8 libtomcrypt/LICENSE +sha256 2fa64b163659f41965c9815882a8296d3d03ff546b76153e11445f9bdecf955a libtommath/LICENSE diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 1070a410b9..1cbe63682c 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,13 +4,15 @@ # ################################################################################ -DROPBEAR_VERSION = 2019.78 +DROPBEAR_VERSION = 2020.81 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 -DROPBEAR_LICENSE = MIT, BSD-2-Clause, BSD-3-Clause +DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain DROPBEAR_LICENSE_FILES = LICENSE DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) +DROPBEAR_CPE_ID_VENDOR = dropbear_ssh_project +DROPBEAR_CPE_ID_PRODUCT = dropbear_ssh # Disable hardening flags added by dropbear configure.ac, and let # Buildroot add them when the relevant options are enabled. This @@ -56,11 +58,15 @@ endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PASSWORD_AUTH endif -ifneq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y) +ifeq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y) +define DROPBEAR_ENABLE_LEGACY_CRYPTO + echo '#define DROPBEAR_3DES 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_ENABLE_CBC_MODE 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_SHA1_96_HMAC 1' >> $(@D)/localoptions.h +endef +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO +else define DROPBEAR_DISABLE_LEGACY_CRYPTO - echo '#define DROPBEAR_3DES 0' >> $(@D)/localoptions.h - echo '#define DROPBEAR_ENABLE_CBC_MODE 0' >> $(@D)/localoptions.h - echo '#define DROPBEAR_SHA1_96_HMAC 0' >> $(@D)/localoptions.h echo '#define DROPBEAR_DSS 0' >> $(@D)/localoptions.h echo '#define DROPBEAR_DH_GROUP1 0' >> $(@D)/localoptions.h endef @@ -75,6 +81,8 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS endif ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y) +DROPBEAR_LICENSE += , Unlicense, WTFPL +DROPBEAR_LICENSE_FILES += libtommath/LICENSE libtomcrypt/LICENSE DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom else define DROPBEAR_BUILD_FEATURED diff --git a/package/dropwatch/dropwatch.hash b/package/dropwatch/dropwatch.hash index e4b687ae75..867a7f12fb 100644 --- a/package/dropwatch/dropwatch.hash +++ b/package/dropwatch/dropwatch.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a2049a68d2cc2f81df977c7a732f50de3ec71283bc7bd94389ba33574af9aaa6 dropwatch-1.5.2.tar.gz -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 b748b66a816c1f94531446c0451da5461a4a31b0949244bb867d741c6ac0148b dropwatch-1.5.3.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk index 4cebe041db..36608ad8b3 100644 --- a/package/dropwatch/dropwatch.mk +++ b/package/dropwatch/dropwatch.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPWATCH_VERSION = 1.5.2 +DROPWATCH_VERSION = 1.5.3 DROPWATCH_SITE = $(call github,nhorman,dropwatch,v$(DROPWATCH_VERSION)) DROPWATCH_DEPENDENCIES = libnl readline libpcap host-pkgconf $(TARGET_NLS_DEPENDENCIES) DROPWATCH_LICENSE = GPL-2.0+ diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash index 3610fe164f..74819158bb 100644 --- a/package/dt-utils/dt-utils.hash +++ b/package/dt-utils/dt-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 61440ab222543268923175eb5c7425076d2b8bce4c1dfc177f2eb3873449af7c dt-utils-v2019.01.0.tar.gz -sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING +sha256 8b29d3a8799170afdb1b077e655528bf4e6afe0c789107b1eec8fff9d4482771 dt-utils-v2021.03.0-br1.tar.gz +sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk index 25c287d434..bc7fd90631 100644 --- a/package/dt-utils/dt-utils.mk +++ b/package/dt-utils/dt-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DT_UTILS_VERSION = v2019.01.0 +DT_UTILS_VERSION = v2021.03.0 DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils DT_UTILS_SITE_METHOD = git DT_UTILS_LICENSE = GPL-2.0 diff --git a/package/dtc/dtc.hash b/package/dtc/dtc.hash index e4d6c02544..29b7e0b121 100644 --- a/package/dtc/dtc.hash +++ b/package/dtc/dtc.hash @@ -1,7 +1,7 @@ # from https://www.kernel.org/pub/software/utils/dtc/sha256sums.asc -sha256 660b74039690fc37013660544d09191834efb58503c73c555c5513ba75ab031f dtc-1.5.1.tar.xz +sha256 65cec529893659a49a89740bb362f507a3b94fc8cd791e76a8d6a2b6f3203473 dtc-1.6.1.tar.xz # Hash for license files -sha256 78e1e1ce5728a990d59c7de61d4741c49185d5129daf783b386380a214328d68 README.license -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 GPL -sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd BSD-2-Clause +sha256 78e1e1ce5728a990d59c7de61d4741c49185d5129daf783b386380a214328d68 README.license +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 GPL +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd BSD-2-Clause diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk index d532487dd1..53f9c9c8df 100644 --- a/package/dtc/dtc.mk +++ b/package/dtc/dtc.mk @@ -4,11 +4,12 @@ # ################################################################################ -DTC_VERSION = 1.5.1 +DTC_VERSION = 1.6.1 DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz DTC_SITE = https://www.kernel.org/pub/software/utils/dtc DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library) DTC_LICENSE_FILES = README.license GPL BSD-2-Clause +DTC_CPE_ID_VENDOR = dtc_project DTC_INSTALL_STAGING = YES DTC_DEPENDENCIES = host-bison host-flex host-pkgconf HOST_DTC_DEPENDENCIES = host-bison host-flex host-pkgconf diff --git a/package/dtv-scan-tables/dtv-scan-tables.hash b/package/dtv-scan-tables/dtv-scan-tables.hash index 73e0e7d19a..a57409978f 100644 --- a/package/dtv-scan-tables/dtv-scan-tables.hash +++ b/package/dtv-scan-tables/dtv-scan-tables.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 76cb6131df1b35ed71b0f6c87cfafc188d614cfbd9973e7832a65ba63e85c504 dtv-scan-tables-6d019038cd04e837d9dd58701202c15924c1c654.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 4fd46f32582c29007657e2daad8d0a6d954cf4e9d2e47bae8f8d8c32765fc987 COPYING.LGPL +sha256 fc65b1f85195ab3d877f7ce802dc62b8c70b3a1815fa6e6a69de19a9d354c19a dtv-scan-tables-6d019038cd04e837d9dd58701202c15924c1c654-br1.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 4fd46f32582c29007657e2daad8d0a6d954cf4e9d2e47bae8f8d8c32765fc987 COPYING.LGPL diff --git a/package/dtv-scan-tables/dtv-scan-tables.mk b/package/dtv-scan-tables/dtv-scan-tables.mk index 5933f16776..5fad615b6b 100644 --- a/package/dtv-scan-tables/dtv-scan-tables.mk +++ b/package/dtv-scan-tables/dtv-scan-tables.mk @@ -5,7 +5,7 @@ ################################################################################ DTV_SCAN_TABLES_VERSION = 6d019038cd04e837d9dd58701202c15924c1c654 -DTV_SCAN_TABLES_SITE = http://git.linuxtv.org/cgit.cgi/dtv-scan-tables.git +DTV_SCAN_TABLES_SITE = https://git.linuxtv.org/dtv-scan-tables.git DTV_SCAN_TABLES_SITE_METHOD = git # This package only contains the transponders data. This is not a 'work' diff --git a/package/duktape/duktape.hash b/package/duktape/duktape.hash index b50ae7329c..4c55e39888 100644 --- a/package/duktape/duktape.hash +++ b/package/duktape/duktape.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 810e1dab50dfd3040cac4bb18b96d749a5fdebfd898a7bfe74512044c1a89880 duktape-2.5.0.tar.gz -sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt +sha256 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 duktape-2.6.0.tar.xz +sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk index 0047571883..89a6e451f5 100644 --- a/package/duktape/duktape.mk +++ b/package/duktape/duktape.mk @@ -4,8 +4,10 @@ # ################################################################################ -DUKTAPE_VERSION = 2.5.0 -DUKTAPE_SITE = $(call github,svaarala,duktape-releases,v$(DUKTAPE_VERSION)) +DUKTAPE_VERSION = 2.6.0 +DUKTAPE_SOURCE = duktape-$(DUKTAPE_VERSION).tar.xz +DUKTAPE_SITE = \ + https://github.com/svaarala/duktape/releases/download/v$(DUKTAPE_VERSION) DUKTAPE_LICENSE = MIT DUKTAPE_LICENSE_FILES = LICENSE.txt DUKTAPE_INSTALL_STAGING = YES @@ -17,6 +19,10 @@ endef define DUKTAPE_INSTALL_STAGING_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f Makefile.sharedlibrary \ INSTALL_PREFIX=$(STAGING_DIR)/usr install + $(INSTALL) -D -m 0644 $(DUKTAPE_PKGDIR)/duktape.pc.in \ + $(STAGING_DIR)/usr/lib/pkgconfig/duktape.pc + $(SED) 's/@VERSION@/$(DUKTAPE_VERSION)/g;' \ + $(STAGING_DIR)/usr/lib/pkgconfig/duktape.pc endef define DUKTAPE_INSTALL_TARGET_CMDS diff --git a/package/duma/duma.mk b/package/duma/duma.mk index 0e8a623bde..906db872d5 100644 --- a/package/duma/duma.mk +++ b/package/duma/duma.mk @@ -21,7 +21,7 @@ define DUMA_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ OS=linux \ DUMA_OPTIONS="$(DUMA_OPTIONS)" \ - $(DUMA_CPP) -C $(@D) + CPPFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -C $(@D) endef define DUMA_INSTALL_STAGING_CMDS diff --git a/package/dump1090/Config.in b/package/dump1090/Config.in index c796faef91..8f17929235 100644 --- a/package/dump1090/Config.in +++ b/package/dump1090/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_DUMP1090 bool "dump1090" depends on BR2_TOOLCHAIN_HAS_THREADS # librtlsdr + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # librtlsdr -> libusb select BR2_PACKAGE_LIBRTLSDR help Dump1090 is a simple Mode S decoder for RTLSDR devices https://github.com/MalcolmRobb/dump1090 -comment "dump1090 needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "dump1090 needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk index ffab0db682..161c1f8495 100644 --- a/package/dvb-apps/dvb-apps.mk +++ b/package/dvb-apps/dvb-apps.mk @@ -11,7 +11,7 @@ DVB_APPS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+ DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL ifeq ($(BR2_ENABLE_LOCALE),) -DVB_APPS_DEPENDENCIES = libiconv +DVB_APPS_DEPENDENCIES += libiconv DVB_APPS_LDLIBS += -liconv endif diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in index b3d12b4a63..23c4ef30b3 100644 --- a/package/e2fsprogs/Config.in +++ b/package/e2fsprogs/Config.in @@ -31,6 +31,19 @@ config BR2_PACKAGE_E2FSPROGS_E2IMAGE help Save critical ext2/ext3/ext4 filesystem metadata to a file +config BR2_PACKAGE_E2FSPROGS_E2SCRUB + bool "e2scrub" + depends on BR2_PACKAGE_BASH # runtime + depends on BR2_PACKAGE_COREUTILS # runtime + depends on BR2_PACKAGE_LVM2 # runtime + depends on BR2_PACKAGE_UTIL_LINUX # runtime + help + Check the contents of a mounted ext[234] filesystem + +comment "e2scrub needs bash, coreutils, lvm2, and util-linux" + depends on !BR2_PACKAGE_BASH || !BR2_PACKAGE_COREUTILS \ + || !BR2_PACKAGE_LVM2 || !BR2_PACKAGE_UTIL_LINUX + config BR2_PACKAGE_E2FSPROGS_E4DEFRAG bool "e4defrag" depends on !BR2_nios2 # fallocate not implemented diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 3ecbe4eaa7..909394ba44 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.5/sha256sums.asc -sha256 f9faccc0d90f73556e797dc7cc5979b582bd50d3f8609c0f2ad48c736d44aede e2fsprogs-1.45.5.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/sha256sums.asc +sha256 23aa093295c94e71ef1be490c4004871c5b01d216a8cb4d111fa6c0aac354168 e2fsprogs-1.46.2.tar.xz # Locally calculated sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index fd59f701d6..bd147e737e 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,11 +4,12 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.45.5 +E2FSPROGS_VERSION = 1.46.2 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h +E2FSPROGS_CPE_ID_VENDOR = e2fsprogs_project E2FSPROGS_INSTALL_STAGING = YES # Use libblkid and libuuid from util-linux for host and target packages. @@ -17,6 +18,8 @@ E2FSPROGS_INSTALL_STAGING = YES E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux +E2FSPROGS_SELINUX_MODULES = fstools + # e4defrag doesn't build on older systems like RHEL5.x, and we don't # need it on the host anyway. # Disable fuse2fs as well to avoid carrying over deps, and it's unused @@ -24,12 +27,15 @@ HOST_E2FSPROGS_CONF_OPTS = \ --disable-defrag \ --disable-e2initrd-helper \ --disable-fuse2fs \ + --disable-fsck \ --disable-libblkid \ --disable-libuuid \ --disable-testio-debug \ --enable-symlink-install \ --enable-elf-shlibs \ - --with-crond-dir=no + --with-crond-dir=no \ + --with-udev-rules-dir=no \ + --with-systemd-unit-dir=no # Set the binary directories to "/bin" and "/sbin", as busybox does, # so that we do not end up with two versions of e2fs tools. @@ -69,6 +75,16 @@ E2FSPROGS_INSTALL_STAGING_OPTS = \ DESTDIR=$(STAGING_DIR) \ install-libs +# e2scrub has no associated --enable/disable option +ifneq ($(BR2_PACKAGE_E2FSPROGS_E2SCRUB),y) +E2FSPROGS_MAKE_OPTS += E2SCRUB_DIR= +endif + +E2FSPROGS_INSTALL_TARGET_OPTS = \ + $(E2FSPROGS_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) \ + install + # Package does not build in parallel due to improper make rules define HOST_E2FSPROGS_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) install install-libs diff --git a/package/easy-rsa/easy-rsa.hash b/package/easy-rsa/easy-rsa.hash index 5f5a490cbc..e363e570df 100644 --- a/package/easy-rsa/easy-rsa.hash +++ b/package/easy-rsa/easy-rsa.hash @@ -1,6 +1,6 @@ # Locally computed: (after verifying gpg sig) -sha512 1e0eb08fb343345c2bc079d622474f1b34dda3a0517b119efc7cb09113ab467f1346a6678e67d65e535bd404c2abb350d47a00c8f24e4541d54dbeb5600fab72 EasyRSA-unix-v3.0.6.tgz +sha512 fd2cde4725cffd60c6af1b6aeaff0dbf15f31f0f322c9df75c22838e2297ba9dc3bba610d956464c8227bd74b3e63840e2a3da41fbc5ee1c79c1e7f5350adc94 EasyRSA-3.0.8.tgz # Hash for license files -sha256 7c4a4fc71745d93a87278801f1bca555562ca23f21e18293add64b9e6f6b7bf1 COPYING.md -sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 gpl-2.0.txt +sha256 7c4a4fc71745d93a87278801f1bca555562ca23f21e18293add64b9e6f6b7bf1 COPYING.md +sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 gpl-2.0.txt diff --git a/package/easy-rsa/easy-rsa.mk b/package/easy-rsa/easy-rsa.mk index b3c57439a7..4ec011e179 100644 --- a/package/easy-rsa/easy-rsa.mk +++ b/package/easy-rsa/easy-rsa.mk @@ -4,8 +4,8 @@ # ################################################################################ -EASY_RSA_VERSION = 3.0.6 -EASY_RSA_SOURCE = EasyRSA-unix-v$(EASY_RSA_VERSION).tgz +EASY_RSA_VERSION = 3.0.8 +EASY_RSA_SOURCE = EasyRSA-$(EASY_RSA_VERSION).tgz EASY_RSA_SITE = https://github.com/OpenVPN/easy-rsa/releases/download/v$(EASY_RSA_VERSION) EASY_RSA_LICENSE = GPL-2.0 EASY_RSA_LICENSE_FILES = COPYING.md gpl-2.0.txt diff --git a/package/easydbus/Config.in b/package/easydbus/Config.in index 1fe8689ccd..5f2f3a22be 100644 --- a/package/easydbus/Config.in +++ b/package/easydbus/Config.in @@ -3,12 +3,13 @@ config BR2_PACKAGE_EASYDBUS depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_LIBGLIB2 help Easy to use DBus library for Lua. https://github.com/mniestroj/easydbus -comment "easydbus needs a toolchain w/ wchar, threads" +comment "easydbus needs a toolchain w/ wchar, threads, Lua <= 5.3" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PACKAGE_LUA_5_4 diff --git a/package/easydbus/easydbus.hash b/package/easydbus/easydbus.hash index 49245709f6..08a4f038d7 100644 --- a/package/easydbus/easydbus.hash +++ b/package/easydbus/easydbus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4626d6af3d9000d7e6ee9723abba7cd5f01d1c52420a80d8259dfa2d884faa11 easydbus-b86721147b265dfefc9a857669408cb6eb3d6560.tar.gz -sha256 dec3b3103cd6889045da86fc7da22bd25545966e5bd7c214791b922dec19588b LICENSE +sha256 8cec24bff40f056d4874ed9d6fb73c9f1efbc5eff14528e1b49f1a162b197f26 easydbus-0.1.0.tar.gz +sha256 dec3b3103cd6889045da86fc7da22bd25545966e5bd7c214791b922dec19588b LICENSE diff --git a/package/easydbus/easydbus.mk b/package/easydbus/easydbus.mk index 5e6de73c31..57d0c22392 100644 --- a/package/easydbus/easydbus.mk +++ b/package/easydbus/easydbus.mk @@ -4,8 +4,8 @@ # ################################################################################ -EASYDBUS_VERSION = b86721147b265dfefc9a857669408cb6eb3d6560 -EASYDBUS_SITE = $(call github,mniestroj,easydbus,$(EASYDBUS_VERSION)) +EASYDBUS_VERSION = 0.1.0 +EASYDBUS_SITE = $(call github,mniestroj,easydbus,v$(EASYDBUS_VERSION)) EASYDBUS_DEPENDENCIES = luainterpreter libglib2 EASYDBUS_LICENSE = MIT EASYDBUS_LICENSE_FILES = LICENSE diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in index 4fc4b30dec..703e55a3c3 100644 --- a/package/ebtables/Config.in +++ b/package/ebtables/Config.in @@ -10,17 +10,14 @@ if BR2_PACKAGE_EBTABLES config BR2_PACKAGE_EBTABLES_UTILS_SAVE bool "ebtables save" - depends on BR2_PACKAGE_BASH # runtime + select BR2_PACKAGE_BASH # runtime + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash help - Install the ebtables-save tool + Install the ebtables-legacy-save tool config BR2_PACKAGE_EBTABLES_UTILS_RESTORE bool "ebtables restore" - depends on !BR2_STATIC_LIBS help - Install the ebtables-restore tool - -comment "ebtables-restore needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS + Install the ebtables-legacy-restore tool endif diff --git a/package/ebtables/ebtables.hash b/package/ebtables/ebtables.hash index f9222b8896..98106b0d60 100644 --- a/package/ebtables/ebtables.hash +++ b/package/ebtables/ebtables.hash @@ -1,3 +1,4 @@ +# ftp://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz.sha256sum +sha256 b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a ebtables-2.0.11.tar.gz # Locally computed -sha256 dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d ebtables-v2.0.10-4.tar.gz -sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING +sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk index 117cd5e99e..2f9dd5ac4b 100644 --- a/package/ebtables/ebtables.mk +++ b/package/ebtables/ebtables.mk @@ -4,45 +4,46 @@ # ################################################################################ -EBTABLES_VERSION = 2.0.10-4 -EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz +EBTABLES_VERSION = 2.0.11 EBTABLES_SITE = http://ftp.netfilter.org/pub/ebtables EBTABLES_LICENSE = GPL-2.0+ EBTABLES_LICENSE_FILES = COPYING -EBTABLES_STATIC = $(if $(BR2_STATIC_LIBS),static) -EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),-DKERNEL_64_USERSPACE_32) +EBTABLES_CPE_ID_VENDOR = netfilter +EBTABLES_SELINUX_MODULES = iptables -define EBTABLES_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) LIBDIR=/lib/ebtables $(EBTABLES_STATIC) \ - CFLAGS="$(TARGET_CFLAGS) $(EBTABLES_K64U32)" -C $(@D) -endef +# for 0003-configure.ac-add-option-enable-kernel-64-userland-32.patch +EBTABLES_AUTORECONF = YES +ifeq ($(BR2_KERNEL_64_USERLAND_32),y) +EBTABLES_CONF_OPTS += --enable-kernel-64-userland-32 +endif ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_SAVE),y) define EBTABLES_INSTALL_TARGET_UTILS_SAVE - $(INSTALL) -m 0755 -D $(@D)/ebtables-save.sh $(TARGET_DIR)/sbin/ebtables-save -endef -endif -ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_RESTORE),y) -define EBTABLES_INSTALL_TARGET_UTILS_RESTORE - $(INSTALL) -m 0755 -D $(@D)/ebtables-restore $(TARGET_DIR)/sbin/ebtables-restore -endef -endif - -ifeq ($(BR2_STATIC_LIBS),y) -define EBTABLES_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/static $(TARGET_DIR)/sbin/ebtables + $(INSTALL) -m 0755 -D $(@D)/ebtables-save.sh $(TARGET_DIR)/usr/sbin/ebtables-legacy-save endef +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_INSTALL_TARGET_UTILS_SAVE else -define EBTABLES_INSTALL_TARGET_CMDS - $(foreach so,$(wildcard $(@D)/*.so $(@D)/extensions/*.so), \ - $(INSTALL) -m 0755 -D $(so) \ - $(TARGET_DIR)/lib/ebtables/$(notdir $(so)) - ) - $(INSTALL) -m 0755 -D $(@D)/ebtables $(TARGET_DIR)/sbin/ebtables - $(INSTALL) -m 0644 -D $(@D)/ethertypes $(TARGET_DIR)/etc/ethertypes - $(EBTABLES_INSTALL_TARGET_UTILS_RESTORE) - $(EBTABLES_INSTALL_TARGET_UTILS_SAVE) +# ebtables-legacy-save is installed by default, thus remove it from target +define EBTABLES_REMOVE_UTILS_SAVE + $(RM) -f $(TARGET_DIR)/usr/sbin/ebtables-legacy-save endef +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_REMOVE_UTILS_SAVE endif -$(eval $(generic-package)) +# ebtables-legacy-restore is installed by default, thus remove it if not +# selected +ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_RESTORE),) +define EBTABLES_REMOVE_UTILS_RESTORE + $(RM) -f $(TARGET_DIR)/usr/sbin/ebtables-legacy-restore +endef +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_REMOVE_UTILS_RESTORE +endif + +ifeq ($(BR2_PACKAGE_IPTABLES_NFTABLES),) +define EBTABLES_INSTALL_LEGACY_SYMLINK + ln -sf /usr/sbin/ebtables-legacy $(TARGET_DIR)/sbin/ebtables +endef +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_INSTALL_LEGACY_SYMLINK +endif + +$(eval $(autotools-package)) diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk index 326ff4f2dd..f087e81a42 100644 --- a/package/ecryptfs-utils/ecryptfs-utils.mk +++ b/package/ecryptfs-utils/ecryptfs-utils.mk @@ -9,12 +9,14 @@ ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download ECRYPTFS_UTILS_LICENSE = GPL-2.0+ ECRYPTFS_UTILS_LICENSE_FILES = COPYING +ECRYPTFS_UTILS_CPE_ID_VENDOR = ecryptfs ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap #Needed for build system to find pk11func.h and libnss3.so ECRYPTFS_UTILS_CONF_ENV = \ + ac_cv_path_POD2MAN=true \ NSS_CFLAGS="-I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr" \ NSS_LIBS="-lnss3" diff --git a/package/ed/ed.mk b/package/ed/ed.mk index deb900e283..1b299781d0 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -9,6 +9,7 @@ ED_SITE = $(BR2_GNU_MIRROR)/ed ED_SOURCE = ed-$(ED_VERSION).tar.lz ED_LICENSE = GPL-3.0+ ED_LICENSE_FILES = COPYING +ED_CPE_ID_VENDOR = gnu define ED_CONFIGURE_CMDS (cd $(@D); \ diff --git a/package/edid-decode/Config.in b/package/edid-decode/Config.in index 701c70031f..ddf1942c68 100644 --- a/package/edid-decode/Config.in +++ b/package/edid-decode/Config.in @@ -1,6 +1,12 @@ config BR2_PACKAGE_EDID_DECODE bool "edid-decode" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 help Decode EDID data in human-readable format. https://git.linuxtv.org/edid-decode.git/ + +comment "edid-decode needs a toolchain w/ C++, gcc >= 4.7" + depends on !!BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/edid-decode/edid-decode.hash b/package/edid-decode/edid-decode.hash index e0a9c18523..65d6c71079 100644 --- a/package/edid-decode/edid-decode.hash +++ b/package/edid-decode/edid-decode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 27fcf4c8693ec6fe020b18c78c70ddba9a8b3ea8c55fcfad2a38103128ec5e36 edid-decode-6def7bc83dfb0338632e06a8b14c93faa6af8879.tar.gz -sha256 4b4a7e6d7c358bb5b982eaa84d228cd9e99b75a5fefd3af01272957bf2016b5b edid-decode.c +sha256 c1a6222083c59f0499b3e43c159aee7e4c6c07d33b790d490a13fd62942fa9b5 edid-decode-188950472c19492547e298b27f9da0d72cf826df-br1.tar.gz +sha256 9bc7ab961e9a07dc84eaa0210af388def56d024357e79671fb89fe27d073eed7 LICENSE diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk index c43f1ae7da..7e463c02b1 100644 --- a/package/edid-decode/edid-decode.mk +++ b/package/edid-decode/edid-decode.mk @@ -4,18 +4,19 @@ # ################################################################################ -EDID_DECODE_VERSION = 6def7bc83dfb0338632e06a8b14c93faa6af8879 +EDID_DECODE_VERSION = 188950472c19492547e298b27f9da0d72cf826df EDID_DECODE_SITE = git://linuxtv.org/edid-decode.git EDID_DECODE_LICENSE = MIT -EDID_DECODE_LICENSE_FILES = edid-decode.c +EDID_DECODE_LICENSE_FILES = LICENSE define EDID_DECODE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + CFLAGS="$(TARGET_CXXFLAGS) -std=c++11" endef define EDID_DECODE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + DESTDIR="$(TARGET_DIR)" install endef $(eval $(generic-package)) diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index d31f9b13ee..98ff71c996 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhboot/efibootmgr -comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efibootmgr needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ diff --git a/package/efibootmgr/efibootmgr.hash b/package/efibootmgr/efibootmgr.hash index b786a415a8..fdbc9a2732 100644 --- a/package/efibootmgr/efibootmgr.hash +++ b/package/efibootmgr/efibootmgr.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 5a708b9690cdc631fd75d8f598128d20cad007e711b975b0143f9517c2dd1bf4 efibootmgr-15.tar.gz -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 22a95ebe0d5c9fb2915b3a100450f8f37484d1dbb8b296f55b343cc84f10397d efibootmgr-17.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/efibootmgr/efibootmgr.mk b/package/efibootmgr/efibootmgr.mk index 079a9b7281..7e09b5f659 100644 --- a/package/efibootmgr/efibootmgr.mk +++ b/package/efibootmgr/efibootmgr.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFIBOOTMGR_VERSION = 15 +EFIBOOTMGR_VERSION = 17 EFIBOOTMGR_SITE = $(call github,rhboot,efibootmgr,$(EFIBOOTMGR_VERSION)) EFIBOOTMGR_LICENSE = GPL-2.0+ EFIBOOTMGR_LICENSE_FILES = COPYING diff --git a/package/efl/Config.in b/package/efl/Config.in index ff49161163..05ded72cf7 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -1,19 +1,21 @@ config BR2_PACKAGE_EFL bool "efl" - # g++ issue with 4.4.5, tested with g++ 4.7.2 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-efl depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS # luajit depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads depends on BR2_USE_MMU depends on BR2_USE_WCHAR # use wchar_t depends on !BR2_STATIC_LIBS # dlfcn.h + # https://phab.enlightenment.org/T2728 + depends on BR2_PACKAGE_LUAJIT select BR2_PACKAGE_DBUS select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_GIFLIB select BR2_PACKAGE_JPEG # Emile needs libjpeg select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency - # https://phab.enlightenment.org/T2728 - select BR2_PACKAGE_LUAJIT # Lua support broken + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS && BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_LZ4 select BR2_PACKAGE_ZLIB help @@ -24,8 +26,7 @@ config BR2_PACKAGE_EFL if BR2_PACKAGE_EFL config BR2_PACKAGE_EFL_BULLET - bool "Enable bullet support (recommended)" - default y + bool "Enable bullet support" select BR2_PACKAGE_BULLET help If you have chosen to disable physics support, this disables @@ -129,8 +130,7 @@ comment "efl's libmount support needs udev /dev management (eeze)" config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool - default y if BR2_PACKAGE_EFL_BULLET && \ - BR2_PACKAGE_EFL_EEZE && \ + default y if BR2_PACKAGE_EFL_EEZE && \ BR2_PACKAGE_EFL_FONTCONFIG && \ BR2_PACKAGE_EFL_GSTREAMER1 && \ BR2_PACKAGE_EFL_LIBFRIBIDI && \ @@ -143,15 +143,11 @@ comment "Warning: one of the recommended option for EFL is not enabled" config BR2_PACKAGE_EFL_EOLIAN_CPP bool "Enable Eolian C++ bindings" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # Eolian needs C++11 help Eolian is an EO object parser and code generator. With this option enabled Eolian will handle automatic generation of EFL bindings for the C++11 language. -comment "Eolian needs gcc >= 4.8" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - comment "libecore video support" config BR2_PACKAGE_EFL_FB @@ -217,58 +213,36 @@ config BR2_PACKAGE_EFL_OPENGL_NONE endchoice # OpenGL support -config BR2_PACKAGE_EFL_ELPUT - bool "Elput" - depends on BR2_PACKAGE_EFL_EEZE - select BR2_PACKAGE_LIBINPUT - select BR2_PACKAGE_LIBXKBCOMMON - help - The elput library is an efl abstraction for the libinput - library which can be used by various other subsystems - (ecore_fb, ecore_drm, etc) to handle interfacing with - libinput without having to duplicate the code in each - subsystem. - -comment "Elput support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE - config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" depends on BR2_PACKAGE_EFL_EEZE depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBINPUT # For elput select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. + Since efl 1.23.x, the drm option enable the elput library + which is an efl abstraction for the libinput library which + can be used by various other subsystems (ecore_fb, ecore_drm, + etc) to handle interfacing with libinput without having to + duplicate the code in each subsystem. + comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ || !BR2_PACKAGE_EFL_EEZE comment "libevas loaders" -config BR2_PACKAGE_EFL_PNG - bool "libevas png loader" - select BR2_PACKAGE_LIBPNG - help - This enables the loader code that loads png files using - libpng. - config BR2_PACKAGE_EFL_JPEG bool "libevas jpeg loader" + select BR2_PACKAGE_OPENJPEG help This enables the loader code that loads jpeg files using libjpeg. -config BR2_PACKAGE_EFL_GIF - bool "libevas gif loader" - select BR2_PACKAGE_GIFLIB - help - This enables the loader code that loads gif files using - giflib. - config BR2_PACKAGE_EFL_TIFF bool "libevas tiff loader" select BR2_PACKAGE_TIFF @@ -278,33 +252,31 @@ config BR2_PACKAGE_EFL_TIFF config BR2_PACKAGE_EFL_WEBP bool "libevas webp image loader" select BR2_PACKAGE_WEBP + select BR2_PACKAGE_WEBP_DEMUX help This enables the loader code that loads images using WebP. config BR2_PACKAGE_EFL_LIBRAW bool "libraw loader" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libraw select BR2_PACKAGE_LIBRAW help This option enables the Evas generic Libraw loader config BR2_PACKAGE_EFL_SVG bool "SVG loader" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG select BR2_PACKAGE_CAIRO help This option enables the Evas generic SVG loader -comment "SVG loader needs a toolchain w/ gcc >= 4.8" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - endif # BR2_PACKAGE_EFL -comment "efl needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" +comment "efl needs a toolchain w/ C++, dynamic library, gcc >= 4.9, host gcc >= 4.9, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_HOST_GCC_AT_LEAST_4_9 || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR depends on BR2_USE_MMU diff --git a/package/efl/efl.hash b/package/efl/efl.hash index c60495418c..69008cde23 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,11 +1,13 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.3.tar.xz.sha256 -sha256 7e7a4199b1e90d400dab2491db6032f8e0b26bab65ec19c9f8a97a82394331c8 efl-1.22.3.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.25.1.tar.xz.sha256sum +sha256 351ca0211ca000234527a503585f039f985607ec9439e34b49d8b8bbf35a7e6b efl-1.25.1.tar.xz -sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341 COMPLIANCE -sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37 COPYING -sha256 af4ffe7ed1795a6e9cd3b3ce8747fdc45da449ff58cf35b8027c0699a66fd5cf licenses/COPYING.BSD -sha256 e60d07dfb2c5264f9f405fa52bf0d4f85429dd9ae1bc2ffcff8af1924ef720d1 licenses/COPYING.FTL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licenses/COPYING.GPL -sha256 ae2d99bf2a8e8310281bdbe5e8b78cbe5e89bfead8c01e67a8c68b530efcf25a licenses/COPYING.LGPL -sha256 2996a1c43ee757f9c997a829d82bdd584052323e73cf02ff8126c6fbd95c2d87 licenses/COPYING.NGINX-MIT -sha256 d847c749aa38b8d864665fc4e5c80e2f2a505e414fafe9712e85b5154e908218 licenses/COPYING.SMALL +sha256 d666b6b2df9f5b791f85c299c65516cb55528b02a807603de246f65f4918ae22 COMPLIANCE +sha256 5bceb52d65debe420bc520f2992807740dc928b7fdc3c2e9a74b5889177ddf4c COPYING +sha256 e5133b4034a4749a781e2220ffb230b60a282b88861f1124d69a58abd5143994 COPYING.images +sha256 c95bae1d1ce0235ecccd3560b772ec1efb97f348a79f0fbe0a634f0c2ccefe2c licenses/COPYING.ASL +sha256 af4ffe7ed1795a6e9cd3b3ce8747fdc45da449ff58cf35b8027c0699a66fd5cf licenses/COPYING.BSD +sha256 e60d07dfb2c5264f9f405fa52bf0d4f85429dd9ae1bc2ffcff8af1924ef720d1 licenses/COPYING.FTL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licenses/COPYING.GPL +sha256 ae2d99bf2a8e8310281bdbe5e8b78cbe5e89bfead8c01e67a8c68b530efcf25a licenses/COPYING.LGPL +sha256 2996a1c43ee757f9c997a829d82bdd584052323e73cf02ff8126c6fbd95c2d87 licenses/COPYING.NGINX-MIT +sha256 d847c749aa38b8d864665fc4e5c80e2f2a505e414fafe9712e85b5154e908218 licenses/COPYING.SMALL diff --git a/package/efl/efl.mk b/package/efl/efl.mk index f1e69f8a23..cdb05aa551 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,13 +4,15 @@ # ################################################################################ -EFL_VERSION = 1.22.3 +EFL_VERSION = 1.25.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT EFL_LICENSE_FILES = \ COMPLIANCE \ COPYING \ + COPYING.images \ + licenses/COPYING.ASL \ licenses/COPYING.BSD \ licenses/COPYING.FTL \ licenses/COPYING.GPL \ @@ -21,157 +23,146 @@ EFL_LICENSE_FILES = \ EFL_INSTALL_STAGING = YES EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ - jpeg luajit lz4 zlib + giflib jpeg libpng luajit lz4 zlib $(TARGET_NLS_DEPENDENCIES) # Configure options: -# --disable-lua-old: build elua for the target. -# --disable-sdl: disable sdl2 support. -# --disable-spectre: disable spectre image loader. -# --disable-xinput22: disable X11 XInput v2.2+ support. -# --disable-vnc-server: remove libvncserver dependency. -# --enable-liblz4: use liblz4 from lz4 package. -# --with-net-control=none: disable connman networkmanager. -# --with-doxygen: disable doxygen documentation +# elua=true: build elua for the target. +# sdl=false: disable sdl2 support. +# embedded-lz4=false: use liblz4 from lz4 package. +# native-arch-optimization=false: avoid optimization flags added by meson. +# network-backend=none: disable connman networkmanager. EFL_CONF_OPTS = \ - --with-edje-cc=$(HOST_DIR)/bin/edje_cc \ - --with-eet-eet=$(HOST_DIR)/bin/eet \ - --with-eldbus_codegen=$(HOST_DIR)/bin/eldbus-codegen \ - --with-elementary-codegen=$(HOST_DIR)/bin/elementary_codegen \ - --with-elm-prefs-cc=$(HOST_DIR)/bin/elm_prefs_cc \ - --with-elua=$(HOST_DIR)/bin/elua \ - --with-eolian-gen=$(HOST_DIR)/bin/eolian_gen \ - --disable-image-loader-jp2k \ - --with-net-control=none \ - --disable-lua-old \ - --disable-sdl \ - --disable-spectre \ - --disable-xinput22 \ - --disable-vnc-server \ - --enable-liblz4 \ - --with-doxygen=no + -Davahi=false \ + -Dbuild-examples=false \ + -Dbuild-tests=false \ + -Ddotnet=false \ + -Decore-imf-loaders-disabler=ibus,scim,xim \ + -Delua=true \ + -Dembedded-lz4=false \ + -Dlua-interpreter=luajit \ + -Dnative-arch-optimization=false \ + -Dnetwork-backend=none \ + -Dpixman=false \ + -Dsdl=false \ + -Dvnc-server=false + +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +EFL_CONF_OPTS += -Dnls=true +else +EFL_CONF_OPTS += -Dnls=false +endif + +EFL_BINDINGS = lua ifeq ($(BR2_PACKAGE_EFL_EOLIAN_CPP),y) -EFL_CONF_OPTS += --enable-cxx-bindings \ - --with-eolian-cxx=$(HOST_DIR)/bin/eolian_cxx -else -EFL_CONF_OPTS += --disable-cxx-bindings +EFL_BINDINGS += cxx endif +EFL_CONF_OPTS += -Dbindings=$(subst $(space),$(comma),$(EFL_BINDINGS)) + ifeq ($(BR2_PACKAGE_EFL_EEZE),y) EFL_DEPENDENCIES += udev -EFL_CONF_OPTS += --enable-libeeze +EFL_CONF_OPTS += -Deeze=true else -EFL_CONF_OPTS += --disable-libeeze +EFL_CONF_OPTS += -Deeze=false endif ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) EFL_DEPENDENCIES += util-linux -EFL_CONF_OPTS += --enable-libmount +EFL_CONF_OPTS += -Dlibmount=true else -EFL_CONF_OPTS += --disable-libmount +EFL_CONF_OPTS += -Dlibmount=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) -EFL_CONF_OPTS += --enable-systemd +EFL_CONF_OPTS += -Dsystemd=true EFL_DEPENDENCIES += systemd else -EFL_CONF_OPTS += --disable-systemd +EFL_CONF_OPTS += -Dsystemd=false endif ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -EFL_CONF_OPTS += --enable-fontconfig +EFL_CONF_OPTS += -Dfontconfig=true EFL_DEPENDENCIES += fontconfig else -EFL_CONF_OPTS += --disable-fontconfig +EFL_CONF_OPTS += -Dfontconfig=false endif ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) -EFL_CONF_OPTS += --enable-fribidi +EFL_CONF_OPTS += -Dfribidi=true EFL_DEPENDENCIES += libfribidi else -EFL_CONF_OPTS += --disable-fribidi +EFL_CONF_OPTS += -Dfribidi=false endif ifeq ($(BR2_PACKAGE_GSTREAMER1)$(BR2_PACKAGE_GST1_PLUGINS_BASE),yy) -EFL_CONF_OPTS += --enable-gstreamer1 +EFL_CONF_OPTS += -Dgstreamer=true EFL_DEPENDENCIES += gstreamer1 gst1-plugins-base else -EFL_CONF_OPTS += --disable-gstreamer1 +EFL_CONF_OPTS += -Dgstreamer=false endif ifeq ($(BR2_PACKAGE_BULLET),y) -EFL_CONF_OPTS += --enable-physics +EFL_CONF_OPTS += -Dphysics=true EFL_DEPENDENCIES += bullet else -EFL_CONF_OPTS += --disable-physics +EFL_CONF_OPTS += -Dphysics=false endif ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -EFL_CONF_OPTS += --enable-audio +EFL_CONF_OPTS += -Daudio=true EFL_DEPENDENCIES += libsndfile else -EFL_CONF_OPTS += --disable-audio +EFL_CONF_OPTS += -Daudio=false endif ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -EFL_CONF_OPTS += --enable-pulseaudio +EFL_CONF_OPTS += -Dpulseaudio=true EFL_DEPENDENCIES += pulseaudio else -EFL_CONF_OPTS += --disable-pulseaudio +EFL_CONF_OPTS += -Dpulseaudio=false endif ifeq ($(BR2_PACKAGE_HARFBUZZ),y) EFL_DEPENDENCIES += harfbuzz -EFL_CONF_OPTS += --enable-harfbuzz +EFL_CONF_OPTS += -Dharfbuzz=true else -EFL_CONF_OPTS += --disable-harfbuzz +EFL_CONF_OPTS += -Dharfbuzz=false endif ifeq ($(BR2_PACKAGE_TSLIB),y) EFL_DEPENDENCIES += tslib -EFL_CONF_OPTS += --enable-tslib +EFL_CONF_OPTS += -Dtslib=true else -EFL_CONF_OPTS += --disable-tslib +EFL_CONF_OPTS += -Dtslib=false endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) EFL_DEPENDENCIES += libglib2 -EFL_CONF_OPTS += --with-glib=yes +EFL_CONF_OPTS += -Dglib=true else -EFL_CONF_OPTS += --with-glib=no +EFL_CONF_OPTS += -Dglib=false endif # Prefer openssl (the default) over gnutls. ifeq ($(BR2_PACKAGE_OPENSSL),y) EFL_DEPENDENCIES += openssl -EFL_CONF_OPTS += --with-crypto=openssl -else ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy) +EFL_CONF_OPTS += -Dcrypto=openssl +else EFL_DEPENDENCIES += gnutls libgcrypt -EFL_CONF_OPTS += --with-crypto=gnutls \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr -else -EFL_CONF_OPTS += --with-crypto=none -endif # BR2_PACKAGE_OPENSSL - -ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) -EFL_CONF_OPTS += --enable-elput -EFL_DEPENDENCIES += libinput -else -EFL_CONF_OPTS += --disable-elput +EFL_CONF_OPTS += -Dcrypto=gnutls endif ifeq ($(BR2_PACKAGE_EFL_FB),y) -EFL_CONF_OPTS += --enable-fb +EFL_CONF_OPTS += -Dfb=true else -EFL_CONF_OPTS += --disable-fb +EFL_CONF_OPTS += -Dfb=false endif ifeq ($(BR2_PACKAGE_EFL_X_XLIB),y) -EFL_CONF_OPTS += \ - --with-x11=xlib \ - --with-x=$(STAGING_DIR) \ - --x-includes=$(STAGING_DIR)/usr/include \ - --x-libraries=$(STAGING_DIR)/usr/lib +EFL_CONF_OPTS += -Dx11=true \ + -Dxinput2=true \ + -Dxinput22=true EFL_DEPENDENCIES += \ xlib_libX11 \ @@ -185,98 +176,82 @@ EFL_DEPENDENCIES += \ xlib_libXScrnSaver \ xlib_libXtst else -EFL_CONF_OPTS += --with-x11=none +EFL_CONF_OPTS += -Dx11=false endif ifeq ($(BR2_PACKAGE_EFL_OPENGL),y) -EFL_CONF_OPTS += --with-opengl=full +EFL_CONF_OPTS += -Dopengl=full EFL_DEPENDENCIES += libgl # OpenGL ES requires EGL else ifeq ($(BR2_PACKAGE_EFL_OPENGLES),y) -EFL_CONF_OPTS += --with-opengl=es --enable-egl +EFL_CONF_OPTS += -Dopengl=es-egl EFL_DEPENDENCIES += libegl libgles else ifeq ($(BR2_PACKAGE_EFL_OPENGL_NONE),y) -EFL_CONF_OPTS += --with-opengl=none +EFL_CONF_OPTS += -Dopengl=none endif ifeq ($(BR2_PACKAGE_EFL_DRM),y) -EFL_CONF_OPTS += --enable-drm -EFL_DEPENDENCIES += libdrm libegl mesa3d +EFL_CONF_OPTS += -Ddrm=true +EFL_DEPENDENCIES += libdrm libegl libinput mesa3d else -EFL_CONF_OPTS += --disable-drm +EFL_CONF_OPTS += -Ddrm=false endif -# The EFL Wayland support requires Evas GLES DRM engine support -# which depends on wayland-client to build. -# So enable gl_drm only when wayland support is selected. ifeq ($(BR2_PACKAGE_EFL_WAYLAND),y) EFL_DEPENDENCIES += wayland wayland-protocols -EFL_CONF_OPTS += --enable-wayland --enable-gl-drm +EFL_CONF_OPTS += -Dwl=true else -EFL_CONF_OPTS += --disable-wayland --disable-gl-drm +EFL_CONF_OPTS += -Dwl=false endif EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) -# Loaders that need external dependencies needs to be --enable-XXX=yes -# otherwise the default is '=static'. -# All other loaders are statically built-in -ifeq ($(BR2_PACKAGE_EFL_PNG),y) -EFL_CONF_OPTS += --enable-image-loader-png=yes -EFL_DEPENDENCIES += libpng -else -EFL_CONF_OPTS += --disable-image-loader-png -endif +# json evas loader is disabled by default by upstream. +# Disable libspectre (ps). +# Keep all other evas loader enabled or handled below. +EFL_EVAS_LOADERS_DISABLER = avif gst json ps -ifeq ($(BR2_PACKAGE_EFL_JPEG),y) -EFL_CONF_OPTS += --enable-image-loader-jpeg=yes # efl already depends on jpeg. +ifeq ($(BR2_PACKAGE_EFL_JPEG),y) +EFL_DEPENDENCIES += openjpeg else -EFL_CONF_OPTS += --disable-image-loader-jpeg -endif - -ifeq ($(BR2_PACKAGE_EFL_GIF),y) -EFL_CONF_OPTS += --enable-image-loader-gif=yes -EFL_DEPENDENCIES += giflib -else -EFL_CONF_OPTS += --disable-image-loader-gif +EFL_EVAS_LOADERS_DISABLER += jp2k endif ifeq ($(BR2_PACKAGE_EFL_TIFF),y) -EFL_CONF_OPTS += --enable-image-loader-tiff=yes EFL_DEPENDENCIES += tiff else -EFL_CONF_OPTS += --disable-image-loader-tiff +EFL_EVAS_LOADERS_DISABLER += tiff endif ifeq ($(BR2_PACKAGE_EFL_WEBP),y) -EFL_CONF_OPTS += --enable-image-loader-webp=yes EFL_DEPENDENCIES += webp else -EFL_CONF_OPTS += --disable-image-loader-webp +EFL_EVAS_LOADERS_DISABLER += webp endif ifeq ($(BR2_PACKAGE_POPPLER),y) +# poppler needs c++11 +EFL_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" EFL_DEPENDENCIES += poppler -EFL_CONF_OPTS += --enable-poppler else -EFL_CONF_OPTS += --disable-poppler +EFL_EVAS_LOADERS_DISABLER += pdf endif ifeq ($(BR2_PACKAGE_EFL_LIBRAW),y) EFL_DEPENDENCIES += libraw -EFL_CONF_OPTS += --enable-libraw else -EFL_CONF_OPTS += --disable-libraw +EFL_EVAS_LOADERS_DISABLER += raw endif ifeq ($(BR2_PACKAGE_EFL_SVG),y) EFL_DEPENDENCIES += librsvg cairo -EFL_CONF_OPTS += --enable-librsvg else -EFL_CONF_OPTS += --disable-librsvg +EFL_EVAS_LOADERS_DISABLER += rsvg endif +EFL_CONF_OPTS += -Devas-loaders-disabler=$(subst $(space),$(comma),$(EFL_EVAS_LOADERS_DISABLER)) + ifeq ($(BR2_PACKAGE_UPOWER),) # upower ecore system module is only useful if upower # dbus service is available. @@ -293,7 +268,7 @@ ifeq ($(BR2_PACKAGE_LIBUNWIND),y) EFL_DEPENDENCIES += libunwind endif -$(eval $(autotools-package)) +$(eval $(meson-package)) ################################################################################ # @@ -309,73 +284,76 @@ $(eval $(autotools-package)) # * host-dbus: for Eldbus # * host-freetype: for libevas # * host-libglib2: for libecore -# * host-libjpeg, host-libpng: for libevas image loader +# * host-giflib, host-libjpeg, host-libpng: for libevas image loader # * host-luajit for Elua tool for the host +# * host-openssl: cryptography backends. HOST_EFL_DEPENDENCIES = \ host-pkgconf \ host-dbus \ host-freetype \ + host-giflib \ host-libglib2 \ host-libjpeg \ host-libpng \ host-luajit \ + host-openssl \ host-zlib # Configure options: -# --disable-audio, --disable-multisense remove libsndfile dependency. -# --disable-fontconfig: remove dependency on fontconfig. -# --disable-fribidi: remove dependency on libfribidi. -# --disable-gstreamer1: remove dependency on gtreamer 1.0. -# --disable-libeeze: remove libudev dependency. -# --disable-libmount: remove dependency on host-util-linux libmount. -# --disable-lua-old: build elua for the host. -# --disable-physics: remove Bullet dependency. -# --disable-poppler: disable poppler image loader. -# --disable-spectre: disable spectre image loader. -# --disable-systemd: disable systemd dependency. -# --disable-vnc-server: remove libvncserver dependency. -# --enable-image-loader-gif=no: disable Gif dependency. -# --enable-image-loader-tiff=no: disable Tiff dependency. -# --with-crypto=none: remove dependencies on openssl or gnutls. -# --with-doxygen: disable doxygen documentation -# --with-net-control=none: disable connman networkmanager. -# --with-x11=none: remove dependency on X.org. +# audio=false: remove libsndfile dependency. +# eeze=false: remove libudev dependency. +# libmount=false: remove dependency on host-util-linux libmount. +# elua=true: build elua for the host. +# physics=false: remove Bullet dependency. +# network-backend=none: remove network-backend (connman). +# embedded-lz4=true: use lz4 bundled in efl. HOST_EFL_CONF_OPTS += \ - --disable-audio \ - --disable-fontconfig \ - --disable-fribidi \ - --disable-gstreamer1 \ - --disable-libeeze \ - --disable-libmount \ - --disable-libraw \ - --disable-librsvg \ - --disable-lua-old \ - --disable-multisense \ - --disable-physics \ - --disable-poppler \ - --disable-spectre \ - --disable-systemd \ - --disable-xcf \ - --disable-vnc-server \ - --enable-image-loader-gif=no \ - --enable-image-loader-jpeg=yes \ - --enable-image-loader-png=yes \ - --enable-image-loader-tiff=no \ - --with-crypto=none \ - --with-doxygen=no \ - --with-glib=yes \ - --with-net-control=none \ - --with-opengl=none \ - --with-x11=none + -Daudio=false \ + -Davahi=false \ + -Dbuild-examples=false \ + -Dbuild-tests=false \ + -Dcrypto=openssl \ + -Ddotnet=false \ + -Decore-imf-loaders-disabler=ibus,scim,xim \ + -Dedje-sound-and-video=false \ + -Deeze=false \ + -Delua=true \ + -Dembedded-lz4=true \ + -Dfontconfig=false \ + -Dfribidi=false \ + -Dglib=true \ + -Dgstreamer=false \ + -Dharfbuzz=false \ + -Dlibmount=false \ + -Dlua-interpreter=luajit \ + -Dnetwork-backend=none \ + -Dnls=false \ + -Dopengl=none \ + -Dphysics=false \ + -Dpixman=false \ + -Dpulseaudio=false \ + -Dsdl=false \ + -Dsystemd=false \ + -Dv4l2=false \ + -Dvnc-server=false \ + -Dx11=false \ + -Dxinput22=false + +# List of modular image/vector loaders to disable in efl +HOST_EFL_EVAS_LOADERS_DISABLER = avif bmp dds eet generic gst ico json \ + jp2k pdf pmaps ps psd raw rsvg tga tgv tiff wbmp webp xcf xpm + +HOST_EFL_CONF_OPTS += -Devas-loaders-disabler=$(subst $(space),$(comma),$(HOST_EFL_EVAS_LOADERS_DISABLER)) + +HOST_EFL_BINDINGS = lua # Enable Eolian language bindings to provide eolian_cxx tool for the # host which is required to build Eolian language bindings for the # target. ifeq ($(BR2_PACKAGE_EFL_EOLIAN_CPP),y) -HOST_EFL_CONF_OPTS += --enable-cxx-bindings -else -HOST_EFL_CONF_OPTS += --disable-cxx-bindings +HOST_EFL_BINDINGS += cxx endif +HOST_EFL_CONF_OPTS += -Dbindings=$(subst $(space),$(comma),$(HOST_EFL_BINDINGS)) # Always disable upower system module from host as it's # not useful and would try to use the output/host/var @@ -386,4 +364,4 @@ define HOST_EFL_HOOK_REMOVE_UPOWER endef HOST_EFL_POST_INSTALL_HOOKS = HOST_EFL_HOOK_REMOVE_UPOWER -$(eval $(host-autotools-package)) +$(eval $(host-meson-package)) diff --git a/package/eigen/Config.in b/package/eigen/Config.in index 48752e0c8d..ef0a16f2f7 100644 --- a/package/eigen/Config.in +++ b/package/eigen/Config.in @@ -13,13 +13,5 @@ config BR2_PACKAGE_EIGEN http://eigen.tuxfamily.org/ -if BR2_PACKAGE_EIGEN - -config BR2_PACKAGE_EIGEN_UNSUPPORTED_MODULES - bool "unsupported modules" - help - Install eigen unsupported modules -endif - comment "eigen needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/eigen/eigen.hash b/package/eigen/eigen.hash index e5c8404022..5ec561ad10 100644 --- a/package/eigen/eigen.hash +++ b/package/eigen/eigen.hash @@ -1,8 +1,8 @@ # Locally computed -sha256 9f13cf90dedbe3e52a19f43000d71fdf72e986beb9a5436dddcd61ff9d77a3ce 3.3.7.tar.bz2 -sha256 4f877e5ae4672568ef82cfd0023e2cef4a7cf55d867ab249efc9569a7eb9e5b1 COPYING.BSD -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 f5b330efdad110cdd84d585ec61220b0650461fa599e36b13e1726c9346dcfb9 COPYING.MINPACK -sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 COPYING.MPL2 -sha256 c83230b770f17ef1386ea1fd3681271dd98aa93646bdbfb5bff3a1b7050fff9d COPYING.README +sha256 685adf14bd8e9c015b78097c1dc22f2f01343756f196acdc76a678e1ae352e11 eigen-3.3.7.tar.bz2 +sha256 4f877e5ae4672568ef82cfd0023e2cef4a7cf55d867ab249efc9569a7eb9e5b1 COPYING.BSD +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 f5b330efdad110cdd84d585ec61220b0650461fa599e36b13e1726c9346dcfb9 COPYING.MINPACK +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 COPYING.MPL2 +sha256 c83230b770f17ef1386ea1fd3681271dd98aa93646bdbfb5bff3a1b7050fff9d COPYING.README diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk index 5c9e028442..98e6c61e38 100644 --- a/package/eigen/eigen.mk +++ b/package/eigen/eigen.mk @@ -5,38 +5,17 @@ ################################################################################ EIGEN_VERSION = 3.3.7 -EIGEN_SOURCE = $(EIGEN_VERSION).tar.bz2 -EIGEN_SITE = https://bitbucket.org/eigen/eigen/get +EIGEN_SOURCE = eigen-$(EIGEN_VERSION).tar.bz2 +EIGEN_SITE = $(call gitlab,libeigen,eigen,$(EIGEN_VERSION)) EIGEN_LICENSE = MPL2, BSD-3-Clause, LGPL-2.1 EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README EIGEN_INSTALL_STAGING = YES EIGEN_INSTALL_TARGET = NO -EIGEN_DEST_DIR = $(STAGING_DIR)/usr/include/eigen3 +EIGEN_SUPPORTS_IN_SOURCE_BUILD = NO -ifeq ($(BR2_PACKAGE_EIGEN_UNSUPPORTED_MODULES),y) -define EIGEN_INSTALL_UNSUPPORTED_MODULES_CMDS - mkdir -p $(EIGEN_DEST_DIR)/unsupported - cp -a $(@D)/unsupported/Eigen $(EIGEN_DEST_DIR)/unsupported -endef -endif +# Default Eigen CMake installs .pc file in /usr/share/pkgconfig +# change it to /usr/lib/pkgconfig, to be consistent with other packages. +EIGEN_CONF_OPTS = -DPKGCONFIG_INSTALL_DIR=/usr/lib/pkgconfig \ + -DCMAKE_Fortran_COMPILER=$(TARGET_FC) -# Generate the .pc file at build time -define EIGEN_BUILD_CMDS - sed -r -e 's,^Version: .*,Version: $(EIGEN_VERSION),' \ - -e 's,^Cflags: .*,Cflags: -I$$\{prefix\}/include/eigen3,' \ - -e 's,^prefix.*,prefix=/usr,' \ - $(@D)/eigen3.pc.in >$(@D)/eigen3.pc -endef - -# This package only consists of headers that need to be -# copied over to the sysroot for compile time use -define EIGEN_INSTALL_STAGING_CMDS - $(RM) -r $(EIGEN_DEST_DIR) - mkdir -p $(EIGEN_DEST_DIR) - cp -a $(@D)/Eigen $(EIGEN_DEST_DIR) - $(EIGEN_INSTALL_UNSUPPORTED_MODULES_CMDS) - $(INSTALL) -D -m 0644 $(@D)/eigen3.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/eigen3.pc -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch b/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch index 01a5362e5f..ffacb6dafd 100644 --- a/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch +++ b/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch @@ -1,6 +1,6 @@ -From 277103e886c9b3ddfede8b3f5b92d3e94736f404 Mon Sep 17 00:00:00 2001 +From cb583beba1acba55112fbb4636c1c73d9ae691a0 Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Fri, 23 Nov 2018 16:13:21 +0100 +Date: Fri, 20 Nov 2020 00:33:30 +0100 Subject: [PATCH] Makefile.in: do not download or compile dependencies Signed-off-by: Johan Oudinet @@ -9,10 +9,10 @@ Signed-off-by: Johan Oudinet 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 48dca7d8..d2324dae 100644 +index abd64835..06f876bb 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -94,7 +94,7 @@ ifneq ($(INSTALLGROUP),) +@@ -97,7 +97,7 @@ ifneq ($(INSTALLGROUP),) G_USER=-g $(INSTALLGROUP) endif @@ -21,7 +21,7 @@ index 48dca7d8..d2324dae 100644 deps: deps/.got -@@ -108,7 +108,7 @@ deps/.built: deps/.got +@@ -111,7 +111,7 @@ deps/.built: deps/.got $(REBAR) configure-deps $(REBAR) compile && :> deps/.built @@ -31,5 +31,5 @@ index 48dca7d8..d2324dae 100644 update: -- -2.17.1 +2.29.2 diff --git a/package/ejabberd/ejabberd.hash b/package/ejabberd/ejabberd.hash index 145e7401a9..0d57ada5bb 100644 --- a/package/ejabberd/ejabberd.hash +++ b/package/ejabberd/ejabberd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 18ddf61af22fc9b59f8afc6835aae2aee9896eb91cc1030056d6bca6a1fa40d2 ejabberd-19.09.1.tgz -sha256 469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb COPYING +sha256 9e922b938458ae9d72d4e5fdd2d08a1fbad651aae47c9a9d15b79d0bbd1e11f8 ejabberd-20.07.tgz +sha256 469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb COPYING diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 3419c6e59c..2b23701ddf 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -4,11 +4,12 @@ # ################################################################################ -EJABBERD_VERSION = 19.09.1 +EJABBERD_VERSION = 20.07 EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz -EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION) +EJABBERD_SITE = https://static.process-one.net/ejabberd/downloads/$(EJABBERD_VERSION) EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception EJABBERD_LICENSE_FILES = COPYING +EJABBERD_CPE_ID_VENDOR = process-one EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \ erlang-lager erlang-p1-cache-tab erlang-p1-sip \ erlang-p1-stringprep erlang-p1-stun erlang-p1-tls \ diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index e7edd8b9de..3239af1b9a 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -11,6 +11,9 @@ ELF2FLT_LICENSE_FILES = LICENSE.TXT HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib +# 0003-elf2flt-handle-binutils-2.34.patch +HOST_ELF2FLT_AUTORECONF = YES + # It is not exactly a host variant, but more a cross variant, which is # why we pass a special --target option. HOST_ELF2FLT_CONF_OPTS = \ diff --git a/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch b/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch index 36bd462175..bac9bc1245 100644 --- a/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch +++ b/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch @@ -1,4 +1,4 @@ -From dfea82b761b2ea4708fbf9370a5467ae4be525ca Mon Sep 17 00:00:00 2001 +From 73e4da5ca780196d23db8029dcd28f87a0402711 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 29 May 2017 23:03:48 +0300 Subject: [PATCH] Add a --{enable,disable}-progs configure option @@ -18,16 +18,20 @@ Based on the former patch by Thomas Petazzoni. Signed-off-by: Thomas Petazzoni Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls +[Rebased on 0.183] +Signed-off-by: Peter Seiderer +[Fabrice: don't error out if obstack is not found] +Signed-off-by: Fabrice Fontaine --- Makefile.am | 6 +++++- configure.ac | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 2ff444e7bf1d..70443abb4fb6 100644 +index 9c47afa..edf8dfc 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -26,9 +26,13 @@ AM_MAKEFLAGS = --no-print-directory +@@ -26,8 +26,12 @@ AM_MAKEFLAGS = --no-print-directory pkginclude_HEADERS = version.h @@ -35,20 +39,19 @@ index 2ff444e7bf1d..70443abb4fb6 100644 +PROGS_SUBDIR = src +endif + - # Add doc back when we have some real content. - SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \ -- backends src po tests -+ backends $(PROGS_SUBDIR) po tests + SUBDIRS = config lib libelf libcpu backends libebl libdwelf libdwfl libdw \ +- libasm debuginfod src po doc tests ++ libasm debuginfod $(PROGS_SUBDIR) po doc tests EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/configure.ac b/configure.ac -index c2c1d90b2133..7b4c38381cca 100644 +index d345495..0dd4b1e 100644 --- a/configure.ac +++ b/configure.ac -@@ -345,6 +345,12 @@ AC_SUBST([LIBEBL_SUBDIR]) - AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR") - AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.]) +@@ -393,6 +393,12 @@ AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]), + [tests_use_rpath=$enableval], [tests_use_rpath=no]) + AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) +AC_ARG_ENABLE([progs], + AS_HELP_STRING([--enable-progs], [enable progs]), @@ -59,6 +62,15 @@ index c2c1d90b2133..7b4c38381cca 100644 dnl zlib is mandatory. save_LIBS="$LIBS" LIBS= +@@ -579,7 +585,7 @@ saved_LIBS="$LIBS" + AC_SEARCH_LIBS([_obstack_free], [obstack]) + LIBS="$saved_LIBS" + case "$ac_cv_search__obstack_free" in +- no) AC_MSG_FAILURE([failed to find _obstack_free]) ;; ++ no) obstack_LIBS= ;; + -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;; + *) obstack_LIBS= ;; + esac -- -2.11.0 +2.30.1 diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in index f094e7b865..5f45de14ab 100644 --- a/package/elfutils/Config.in +++ b/package/elfutils/Config.in @@ -1,11 +1,13 @@ -comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library" +comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) config BR2_PACKAGE_ELFUTILS bool "elfutils" depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS # Only glibc and uClibc implement the myriad of required GNUisms depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_ZLIB diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash index d8a1ce3915..9148758e29 100644 --- a/package/elfutils/elfutils.hash +++ b/package/elfutils/elfutils.hash @@ -1,8 +1,6 @@ -# From https://sourceware.org/elfutils/ftp/0.177/md5.sum -md5 0b583722f911e1632544718d502aab87 elfutils-0.177.tar.bz2 -# From https://sourceware.org/elfutils/ftp/0.177/sha512.sum -sha512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f elfutils-0.177.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.184/sha512.sum +sha512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8 elfutils-0.184.tar.bz2 # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING-LGPLV3 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING-LGPLV3 diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index c3df7303b7..c64224a90f 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -4,14 +4,15 @@ # ################################################################################ -ELFUTILS_VERSION = 0.177 +ELFUTILS_VERSION = 0.184 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 -ELFUTILS_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) -HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz +ELFUTILS_CPE_ID_VENDOR = elfutils_project +ELFUTILS_DEPENDENCIES = host-pkgconf zlib $(TARGET_NLS_DEPENDENCIES) +HOST_ELFUTILS_DEPENDENCIES = host-pkgconf host-zlib host-bzip2 host-xz # We patch configure.ac ELFUTILS_AUTORECONF = YES @@ -25,6 +26,7 @@ ELFUTILS_CONF_OPTS += \ HOST_ELFUTILS_CONF_OPTS = \ --with-bzlib \ --with-lzma \ + --without-zstd \ --disable-progs # elfutils gets confused when lfs mode is forced, so don't @@ -43,11 +45,19 @@ ELFUTILS_CONF_ENV += \ ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) \ $(TARGET_NLS_LIBS) +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +ELFUTILS_LDFLAGS += -latomic +endif + ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) ELFUTILS_DEPENDENCIES += musl-fts ELFUTILS_LDFLAGS += -lfts endif +# disable for now, needs "distro" support +ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod +HOST_ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod + ELFUTILS_CONF_ENV += \ LDFLAGS="$(ELFUTILS_LDFLAGS)" @@ -70,6 +80,13 @@ else ELFUTILS_CONF_OPTS += --without-lzma endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +ELFUTILS_DEPENDENCIES += zstd +ELFUTILS_CONF_OPTS += --with-zstd +else +ELFUTILS_CONF_OPTS += --without-zstd +endif + ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y) ELFUTILS_CONF_OPTS += --enable-progs ELFUTILS_LICENSE += , GPL-3.0+ (programs) diff --git a/package/elixir/elixir.mk b/package/elixir/elixir.mk index 7a545d43b0..6d935516f4 100644 --- a/package/elixir/elixir.mk +++ b/package/elixir/elixir.mk @@ -8,7 +8,7 @@ ELIXIR_VERSION = 1.9.4 ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION)) ELIXIR_LICENSE = Apache-2.0 ELIXIR_LICENSE_FILES = LICENSE -ELIXIR_DEPENDENCIES = host-erlang +HOST_ELIXIR_DEPENDENCIES = host-erlang define HOST_ELIXIR_BUILD_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile diff --git a/package/ell/Config.in b/package/ell/Config.in index f27d581f98..c7c9164816 100644 --- a/package/ell/Config.in +++ b/package/ell/Config.in @@ -1,13 +1,13 @@ config BR2_PACKAGE_ELL bool "ell" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 depends on BR2_USE_WCHAR help Embedded Linux library (ell) https://01.org/ell -comment "ell needs a toolchain w/ dynamic library, wchar" +comment "ell needs a toolchain w/ wchar, headers >= 4.12" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 58e624baed..2ff8889506 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ -# Locally computed -sha256 15abb7eff187002ce36a27f6752cd4ec815da0ab658608b1cd36a63f7a84237e ell-0.30.tar.gz +# From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc +sha256 4e8dba6c53cf152dbd0fd1dc3d4c7b04abf79e20a948895f85943e586870505c ell-0.41.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 45d3df34ed..ec31e68088 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,20 +4,12 @@ # ################################################################################ -ELL_VERSION = 0.30 -ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git -ELL_SITE_METHOD = git +ELL_VERSION = 0.41 +ELL_SOURCE = ell-$(ELL_VERSION).tar.xz +ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ ELL_LICENSE_FILES = COPYING ELL_INSTALL_STAGING = YES -# sources from git, no configure script provided -ELL_AUTORECONF = YES - -# autoreconf requires an existing build-aux directory -define ELL_MKDIR_BUILD_AUX - mkdir -p $(@D)/build-aux -endef -ELL_POST_PATCH_HOOKS += ELL_MKDIR_BUILD_AUX ELL_DEPENDENCIES = host-pkgconf diff --git a/package/empty/empty.hash b/package/empty/empty.hash index 47e9577070..c5fbc2b4ac 100644 --- a/package/empty/empty.hash +++ b/package/empty/empty.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7e6636e400856984c4405ce7bd0843aaa3329fa3efd20c58df8400a9eaa35f09 empty-0.6.20b.tgz +sha256 2fccd0faa1b3deaec1add679cbde3f34250e45872ad5df463badd4bb4edeb797 empty-0.6.21b.tgz sha256 f01dbe3c624084900b9df1393d9062518b2bc0487acd6a3300ebd6e71352d112 COPYRIGHT diff --git a/package/empty/empty.mk b/package/empty/empty.mk index 5e3ed42bef..a9b8080a8e 100644 --- a/package/empty/empty.mk +++ b/package/empty/empty.mk @@ -4,11 +4,12 @@ # ################################################################################ -EMPTY_VERSION = 0.6.20b +EMPTY_VERSION = 0.6.21b EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION) EMPTY_LICENSE = BSD-3-Clause EMPTY_LICENSE_FILES = COPYRIGHT +EMPTY_STRIP_COMPONENTS = 0 define EMPTY_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all diff --git a/package/enchant/Config.in b/package/enchant/Config.in index 86b2fade8f..4a39d03f86 100644 --- a/package/enchant/Config.in +++ b/package/enchant/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_ENCHANT Enchant is a spell-checking library that provides a consistent API across a number of spell-checking system backends. - http://www.abisource.com/projects/enchant/ + https://abiword.github.io/enchant/ comment "enchant needs a toolchain w/ C++, threads, wchar" depends on BR2_USE_MMU diff --git a/package/enchant/enchant.hash b/package/enchant/enchant.hash index f5709f08ee..9cee2d78e1 100644 --- a/package/enchant/enchant.hash +++ b/package/enchant/enchant.hash @@ -1,4 +1,3 @@ -# From http://www.abisource.com/downloads/enchant/1.6.0/MD5SUM -md5 de11011aff801dc61042828041fb59c7 enchant-1.6.0.tar.gz # locally computed -sha256 d0db934167997c8b8c863af297b3653aa98500bca0a7c05e9c6ec0dabf4f67d4 COPYING.LIB +sha256 3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03 enchant-2.2.15.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk index 69402c1af7..3135550f73 100644 --- a/package/enchant/enchant.mk +++ b/package/enchant/enchant.mk @@ -4,8 +4,9 @@ # ################################################################################ -ENCHANT_VERSION = 1.6.0 -ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION) +ENCHANT_VERSION = 2.2.15 +ENCHANT_SITE = \ + https://github.com/AbiWord/enchant/releases/download/v$(ENCHANT_VERSION) ENCHANT_INSTALL_STAGING = YES ENCHANT_DEPENDENCIES = libglib2 host-pkgconf ENCHANT_LICENSE = LGPL-2.1+ diff --git a/package/enet/enet.hash b/package/enet/enet.hash index ed5231c779..2643878ca9 100644 --- a/package/enet/enet.hash +++ b/package/enet/enet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98f6f57aab0a424469619ed3047728f0d3901ce8f0dea919c11e7966d807e870 enet-1.3.14.tar.gz -sha256 eebe647a9ef7e596b0e8b9216c215f169d762af1a27904a87bc2e05b83735d35 LICENSE +sha256 a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc enet-1.3.17.tar.gz +sha256 77f94e3be39938801163844b8bf9a4f12badcc0da136e9886e7da14a816d74d3 LICENSE diff --git a/package/enet/enet.mk b/package/enet/enet.mk index b12c1b60af..e2feb26b54 100644 --- a/package/enet/enet.mk +++ b/package/enet/enet.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENET_VERSION = 1.3.14 +ENET_VERSION = 1.3.17 ENET_SITE = http://enet.bespin.org/download ENET_LICENSE = MIT ENET_LICENSE_FILES = LICENSE diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index 2cd6512e1e..91cdd896f6 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ENLIGHTENMENT bool "enlightenment" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # efl svg -> librsvg # libevas-generic-loaders-svg -> librsvg -> glib2 / pango depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP @@ -17,7 +18,6 @@ config BR2_PACKAGE_ENLIGHTENMENT select BR2_PACKAGE_EFL_X_XLIB select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start - select BR2_PACKAGE_EFL_PNG # needed at runtime by enlightenment_start select BR2_PACKAGE_EFL_SVG select BR2_PACKAGE_XCB_UTIL_KEYSYMS help @@ -30,6 +30,7 @@ config BR2_PACKAGE_ENLIGHTENMENT http://www.enlightenment.org/ comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads, gcc >= 4.8" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_EFL && BR2_PACKAGE_XORG7 && BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index f692a67aa1..7f0f3f3e7b 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,3 +1,4 @@ -# From https://www.enlightenment.org/news/e23_release -sha256 b8c5d040875576d3d3ad8572644f92a65e21291bcee6b0d62f74fbfd482afdf8 enlightenment-0.23.0.tar.xz -sha256 34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350 COPYING +# From https://www.enlightenment.org/news/e24.2 +sha256 be18e2f18d6c0b058f633e769863d3cbc4c07b629058ae670dec74cd7906dff1 enlightenment-0.24.2.tar.xz +sha256 17dda7902d3e1a743f91cf2545f474be93f612768a9e9022593d788ecc83935a COPYING +sha256 f4ba47ef8f4ff588202e721ab10f0208a3fa678147e7f928e6b2820f2e646e13 src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 43f79d59da..969b391cdc 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,11 +4,13 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.23.0 +ENLIGHTENMENT_VERSION = 0.24.2 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment -ENLIGHTENMENT_LICENSE = BSD-2-Clause -ENLIGHTENMENT_LICENSE_FILES = COPYING +ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) +ENLIGHTENMENT_LICENSE_FILES = COPYING \ + src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt +ENLIGHTENMENT_CPE_ID_VENDOR = enlightenment ENLIGHTENMENT_DEPENDENCIES = \ host-pkgconf \ @@ -20,7 +22,8 @@ ENLIGHTENMENT_CONF_OPTS = \ -Dedje-cc=$(HOST_DIR)/bin/edje_cc \ -Deet=$(HOST_DIR)/bin/eet \ -Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \ - -Dpam=false + -Dpam=false \ + -Dpolkit=false # enlightenment.pc and /usr/lib/enlightenment/modules/*.so ENLIGHTENMENT_INSTALL_STAGING = YES diff --git a/package/enscript/enscript.mk b/package/enscript/enscript.mk index fbc9e69dae..441ae3dad4 100644 --- a/package/enscript/enscript.mk +++ b/package/enscript/enscript.mk @@ -8,6 +8,7 @@ ENSCRIPT_VERSION = 1.6.6 ENSCRIPT_SITE = $(BR2_GNU_MIRROR)/enscript ENSCRIPT_LICENSE = GPL-3.0+ ENSCRIPT_LICENSE_FILES = COPYING +ENSCRIPT_CPE_ID_VENDOR = gnu # Enable pthread threads if toolchain supports threads ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) diff --git a/package/erlang-eimp/erlang-eimp.hash b/package/erlang-eimp/erlang-eimp.hash index a0276beded..28d22be16d 100644 --- a/package/erlang-eimp/erlang-eimp.hash +++ b/package/erlang-eimp/erlang-eimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dfcdc211480f974175af615616c7f8c1e8f9dff5d6be5faa3f20c3eb4c60240e erlang-eimp-1.0.12.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 1a529fa6e8264d3cad43861db417a1e841b28c0601aa847857fa0d6a81935922 erlang-eimp-1.0.17.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-eimp/erlang-eimp.mk b/package/erlang-eimp/erlang-eimp.mk index c8cea0e429..d066961cd3 100644 --- a/package/erlang-eimp/erlang-eimp.mk +++ b/package/erlang-eimp/erlang-eimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_EIMP_VERSION = 1.0.12 +ERLANG_EIMP_VERSION = 1.0.17 ERLANG_EIMP_SITE = $(call github,processone,eimp,$(ERLANG_EIMP_VERSION)) ERLANG_EIMP_LICENSE = Apache-2.0 ERLANG_EIMP_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-jiffy/erlang-jiffy.hash b/package/erlang-jiffy/erlang-jiffy.hash index 1c18142b6e..19e4f96012 100644 --- a/package/erlang-jiffy/erlang-jiffy.hash +++ b/package/erlang-jiffy/erlang-jiffy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c555726f592b79894c253ca1dc3c3aec6a5697271d29364d57f8175f387b86f3 erlang-jiffy-0.14.11.tar.gz -sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE +sha256 7cf67840c58b8732e12c84c8a3b714774da2601ae5e6a57f286273e25b205516 erlang-jiffy-1.0.6.tar.gz +sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE diff --git a/package/erlang-jiffy/erlang-jiffy.mk b/package/erlang-jiffy/erlang-jiffy.mk index 9a688f7c9b..e50a5f598f 100644 --- a/package/erlang-jiffy/erlang-jiffy.mk +++ b/package/erlang-jiffy/erlang-jiffy.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JIFFY_VERSION = 0.14.11 +ERLANG_JIFFY_VERSION = 1.0.6 ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) ERLANG_JIFFY_LICENSE = MIT (core), \ BSD-3-Clause (Google double conversion library), \ diff --git a/package/erlang-p1-acme/erlang-p1-acme.hash b/package/erlang-p1-acme/erlang-p1-acme.hash index 036cb923bd..af13e88b1a 100644 --- a/package/erlang-p1-acme/erlang-p1-acme.hash +++ b/package/erlang-p1-acme/erlang-p1-acme.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 556a9628c323a5a83116ed78599c891f74447b0bac237c095e776c7009089656 erlang-p1-acme-1.0.1.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 e17ba49f45b72200470bc2f176b315bec1028d07a4817859052f98c0a7259632 erlang-p1-acme-1.0.9.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-acme/erlang-p1-acme.mk b/package/erlang-p1-acme/erlang-p1-acme.mk index ae77d4a580..21c155e206 100644 --- a/package/erlang-p1-acme/erlang-p1-acme.mk +++ b/package/erlang-p1-acme/erlang-p1-acme.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ACME_VERSION = 1.0.1 +ERLANG_P1_ACME_VERSION = 1.0.9 ERLANG_P1_ACME_SITE = $(call github,processone,p1_acme,$(ERLANG_P1_ACME_VERSION)) ERLANG_P1_ACME_LICENSE = Apache-2.0 ERLANG_P1_ACME_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash index 605ced2ba7..85a92cf0b2 100644 --- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash +++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 572b6532dca59c561d994bf2bf8eed3637118c64cdd3a9e51d81b506f5b09e2c erlang-p1-cache-tab-1.0.20.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 32cb3a3017f53e66bd1c2b75f60a2c4a14f00f375582a3c511ea39266b2385b9 erlang-p1-cache-tab-1.0.25.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk index 0d53358cfa..f3253d1cd7 100644 --- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk +++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_CACHE_TAB_VERSION = 1.0.20 +ERLANG_P1_CACHE_TAB_VERSION = 1.0.25 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION)) ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0 ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-mqtree/erlang-p1-mqtree.hash b/package/erlang-p1-mqtree/erlang-p1-mqtree.hash index 43e98d0699..cf1a880cb8 100644 --- a/package/erlang-p1-mqtree/erlang-p1-mqtree.hash +++ b/package/erlang-p1-mqtree/erlang-p1-mqtree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 034d564e92ca8e9d66668548ea510d2cf9fdbad40609622a87374aa907110884 erlang-p1-mqtree-1.0.5.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 4f86e272a97152d3f5166dad583dc1b5bda9582f6777f6294fb8328def8b2189 erlang-p1-mqtree-1.0.10.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/erlang-p1-mqtree/erlang-p1-mqtree.mk b/package/erlang-p1-mqtree/erlang-p1-mqtree.mk index bd5f28237c..19e31ef1b2 100644 --- a/package/erlang-p1-mqtree/erlang-p1-mqtree.mk +++ b/package/erlang-p1-mqtree/erlang-p1-mqtree.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_MQTREE_VERSION = 1.0.5 +ERLANG_P1_MQTREE_VERSION = 1.0.10 ERLANG_P1_MQTREE_SITE = $(call github,processone,mqtree,$(ERLANG_P1_MQTREE_VERSION)) ERLANG_P1_MQTREE_LICENSE = Apache-2.0 ERLANG_P1_MQTREE_LICENSE_FILES = LICENSE diff --git a/package/erlang-p1-oauth2/erlang-p1-oauth2.hash b/package/erlang-p1-oauth2/erlang-p1-oauth2.hash index ed5ea55145..a6d00aa96e 100644 --- a/package/erlang-p1-oauth2/erlang-p1-oauth2.hash +++ b/package/erlang-p1-oauth2/erlang-p1-oauth2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55bf54133ce0882fab59f813ddf9ed4dac1e051a53fb4bd1c0565136ebb4d6ac erlang-p1-oauth2-0.6.5.tar.gz -sha256 0ecddd0a5e35b7fcdab451f54c5bb688fac8365cdf6b0da0ac64b7895a0770f3 LICENSE +sha256 c5cf0d2a9f5874c289cc6044945f4771a79007bda812e5269dea3a4c92fc8811 erlang-p1-oauth2-0.6.7.tar.gz +sha256 0ecddd0a5e35b7fcdab451f54c5bb688fac8365cdf6b0da0ac64b7895a0770f3 LICENSE diff --git a/package/erlang-p1-oauth2/erlang-p1-oauth2.mk b/package/erlang-p1-oauth2/erlang-p1-oauth2.mk index ea7c23a517..d7dd45b252 100644 --- a/package/erlang-p1-oauth2/erlang-p1-oauth2.mk +++ b/package/erlang-p1-oauth2/erlang-p1-oauth2.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_OAUTH2_VERSION = 0.6.5 +ERLANG_P1_OAUTH2_VERSION = 0.6.7 ERLANG_P1_OAUTH2_SITE = $(call github,processone,p1_oauth2,$(ERLANG_P1_OAUTH2_VERSION)) ERLANG_P1_OAUTH2_LICENSE = MIT ERLANG_P1_OAUTH2_LICENSE_FILES = LICENSE diff --git a/package/erlang-p1-pkix/erlang-p1-pkix.hash b/package/erlang-p1-pkix/erlang-p1-pkix.hash index b11340b873..b0ee7d58ba 100644 --- a/package/erlang-p1-pkix/erlang-p1-pkix.hash +++ b/package/erlang-p1-pkix/erlang-p1-pkix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 184069d9055991cb8b7bd07dde8737a0a793e66e1ec1020deb680f83260a3e82 erlang-p1-pkix-1.0.4.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 3a39c4ca74f93efa0e4de4c37f9e4d073b1aeb142ad669f12588ad2b3c39724e erlang-p1-pkix-1.0.6.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/erlang-p1-pkix/erlang-p1-pkix.mk b/package/erlang-p1-pkix/erlang-p1-pkix.mk index 9f902d44bb..12ae042138 100644 --- a/package/erlang-p1-pkix/erlang-p1-pkix.mk +++ b/package/erlang-p1-pkix/erlang-p1-pkix.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_PKIX_VERSION = 1.0.4 +ERLANG_P1_PKIX_VERSION = 1.0.6 ERLANG_P1_PKIX_SITE = $(call github,processone,pkix,$(ERLANG_P1_PKIX_VERSION)) ERLANG_P1_PKIX_LICENSE = Apache-2.0 ERLANG_P1_PKIX_LICENSE_FILES = LICENSE diff --git a/package/erlang-p1-sip/erlang-p1-sip.hash b/package/erlang-p1-sip/erlang-p1-sip.hash index 70b20f95dc..e52371e404 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.hash +++ b/package/erlang-p1-sip/erlang-p1-sip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4c8dbba1dfcbb16a300fea5fd75f5ab2a145f011fa1ebff37e31e1672a9bc285 erlang-p1-sip-1.0.30.tar.gz -sha256 6e68ca4488fcdacf80ea0a3f5a6a294d48c2d8dc9de520cc3d6b3f3c1bc12847 LICENSE.txt +sha256 b46349a7077d8e5f36a216ada4a5c0b51ef3d66005606beb0ea3962069f215a7 erlang-p1-sip-1.0.38.tar.gz +sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt diff --git a/package/erlang-p1-sip/erlang-p1-sip.mk b/package/erlang-p1-sip/erlang-p1-sip.mk index f7f10caf94..2d2f0110c3 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.mk +++ b/package/erlang-p1-sip/erlang-p1-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_SIP_VERSION = 1.0.30 +ERLANG_P1_SIP_VERSION = 1.0.38 ERLANG_P1_SIP_SITE = $(call github,processone,esip,$(ERLANG_P1_SIP_VERSION)) ERLANG_P1_SIP_LICENSE = Apache-2.0 ERLANG_P1_SIP_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash index bd1995cb73..e23cc4f38b 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 119b751f569baecc4d911ff3c2a6a33a042f8d0b2e64445072d1af14ed935fc0 erlang-p1-stringprep-1.0.17.tar.gz -sha256 f44415631770cb818de6d92f3961fdfe6e407a5154f84b87cc06ac27323e919c LICENSE.ALL -sha256 42aef2a1337ef1f45ae2832aa5aa268c79b2560fb1f3ebab519629372cb24ffe LICENSE.TCL -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 47f9f8ee901f47b7f62c5140ea09f113efe7fedd5e8ffb92d50f51c5e11fb67f erlang-p1-stringprep-1.0.23.tar.gz +sha256 f44415631770cb818de6d92f3961fdfe6e407a5154f84b87cc06ac27323e919c LICENSE.ALL +sha256 42aef2a1337ef1f45ae2832aa5aa268c79b2560fb1f3ebab519629372cb24ffe LICENSE.TCL +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk index 49ffb77cd3..580f4a9aa9 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STRINGPREP_VERSION = 1.0.17 +ERLANG_P1_STRINGPREP_VERSION = 1.0.23 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION)) ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest) ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt diff --git a/package/erlang-p1-stun/erlang-p1-stun.hash b/package/erlang-p1-stun/erlang-p1-stun.hash index bf569201b8..fb56b8f4e6 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.hash +++ b/package/erlang-p1-stun/erlang-p1-stun.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 87cfd9d75c7b956b4c26c9e94492737a4528abf4b09f4f7d89a40abaa0dc088a erlang-p1-stun-1.0.29.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 05d2f31f172883d2301a93cd141e6b930dfdd01e10b6aacf806becc3674973d8 erlang-p1-stun-1.0.39.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-stun/erlang-p1-stun.mk b/package/erlang-p1-stun/erlang-p1-stun.mk index ff2899ffbe..f762e7f45c 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.mk +++ b/package/erlang-p1-stun/erlang-p1-stun.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STUN_VERSION = 1.0.29 +ERLANG_P1_STUN_VERSION = 1.0.39 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION)) ERLANG_P1_STUN_LICENSE = Apache-2.0 ERLANG_P1_STUN_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-tls/erlang-p1-tls.hash b/package/erlang-p1-tls/erlang-p1-tls.hash index 135a5368d1..475223b986 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.hash +++ b/package/erlang-p1-tls/erlang-p1-tls.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6444e174650054a53624490155a914b8bea31cdefbcd5f87fc1862102dc1db6e erlang-p1-tls-1.1.2.tar.gz -sha256 6e68ca4488fcdacf80ea0a3f5a6a294d48c2d8dc9de520cc3d6b3f3c1bc12847 LICENSE.txt +sha256 97fd0a398751fc63b28df016e92a08ea98d083f7d5e3f32380a92de1ee86ca0e erlang-p1-tls-1.1.9.tar.gz +sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt diff --git a/package/erlang-p1-tls/erlang-p1-tls.mk b/package/erlang-p1-tls/erlang-p1-tls.mk index 824fe41ec1..9e7d4c7c73 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.mk +++ b/package/erlang-p1-tls/erlang-p1-tls.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_TLS_VERSION = 1.1.2 +ERLANG_P1_TLS_VERSION = 1.1.9 ERLANG_P1_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_P1_TLS_VERSION)) ERLANG_P1_TLS_LICENSE = Apache-2.0 ERLANG_P1_TLS_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-utils/erlang-p1-utils.hash b/package/erlang-p1-utils/erlang-p1-utils.hash index f749aabe37..dec7c26039 100644 --- a/package/erlang-p1-utils/erlang-p1-utils.hash +++ b/package/erlang-p1-utils/erlang-p1-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2559967770558dc003bcc3c7efc216f6c57c4f23830d5de33c6bf61d8a3f880c erlang-p1-utils-1.0.16.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 234b88227f61ef03a6177d97ed062c62a22760b6fd189a5a24d2fd1599d95ac9 erlang-p1-utils-1.0.20.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-utils/erlang-p1-utils.mk b/package/erlang-p1-utils/erlang-p1-utils.mk index 5375971d39..084382cd2b 100644 --- a/package/erlang-p1-utils/erlang-p1-utils.mk +++ b/package/erlang-p1-utils/erlang-p1-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_UTILS_VERSION = 1.0.16 +ERLANG_P1_UTILS_VERSION = 1.0.20 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION)) ERLANG_P1_UTILS_LICENSE = Apache-2.0 ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-xml/erlang-p1-xml.hash b/package/erlang-p1-xml/erlang-p1-xml.hash index 07e640341a..f2a4ab83e0 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.hash +++ b/package/erlang-p1-xml/erlang-p1-xml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f3226683ec9c8406147a025beebb5b9ed0adcb28099b7c4bb9435a369e9ac3f9 erlang-p1-xml-1.1.37.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 739f37a161a570071469ab1f3d8fc232f004ea616700fe7e46b6d8afa9d03a60 erlang-p1-xml-1.1.44.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-xml/erlang-p1-xml.mk b/package/erlang-p1-xml/erlang-p1-xml.mk index c66bd25776..5730181ac6 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.mk +++ b/package/erlang-p1-xml/erlang-p1-xml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_XML_VERSION = 1.1.37 +ERLANG_P1_XML_VERSION = 1.1.44 ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION)) ERLANG_P1_XML_LICENSE = Apache-2.0 ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-xmpp/0001-fix-includes.patch b/package/erlang-p1-xmpp/0001-fix-includes.patch index d0a267b721..f02037fdc1 100644 --- a/package/erlang-p1-xmpp/0001-fix-includes.patch +++ b/package/erlang-p1-xmpp/0001-fix-includes.patch @@ -6,11 +6,11 @@ diff --git a/include/xmpp.hrl b/include/xmpp.hrl index afa5f61..678858e 100644 --- a/include/xmpp.hrl +++ b/include/xmpp.hrl -@@ -26,7 +26,7 @@ +@@ -25,7 +25,7 @@ -include("ns.hrl"). -include("jid.hrl"). -include("xmpp_codec.hrl"). ---include("fxml.hrl"). +--include_lib("fast_xml/include/fxml.hrl"). +-include_lib("p1_xml/include/fxml.hrl"). -type stanza() :: iq() | presence() | message(). diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash index 05578f9939..d0a761fcac 100644 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash +++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a192349e256c0c0af46e6d7f46c52e6345e61984a266696bb0346934c434f342 erlang-p1-xmpp-1.4.2.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 65c73ffaf8faab5d6fc7d42ada0b5a380f20f3e46056ad98614d81922322d9a2 erlang-p1-xmpp-1.4.10.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk index 2f74c60df2..f903cb945d 100644 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk +++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_XMPP_VERSION = 1.4.2 +ERLANG_P1_XMPP_VERSION = 1.4.10 ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION)) ERLANG_P1_XMPP_LICENSE = Apache-2.0 ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.hash b/package/erlang-p1-yaml/erlang-p1-yaml.hash index 116363203c..955a000930 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.hash +++ b/package/erlang-p1-yaml/erlang-p1-yaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b915612c06ef190bfed6d0370906b071274ed4ce4143b668cdad66588a9484a0 erlang-p1-yaml-1.0.21.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 8f53308438e4d1613562acb586b4c4540569d8305097508c40e6f261fe4216cd erlang-p1-yaml-1.0.28.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.mk b/package/erlang-p1-yaml/erlang-p1-yaml.mk index 6836c3f557..e42ff5fe38 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.mk +++ b/package/erlang-p1-yaml/erlang-p1-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_YAML_VERSION = 1.0.21 +ERLANG_P1_YAML_VERSION = 1.0.28 ERLANG_P1_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_P1_YAML_VERSION)) ERLANG_P1_YAML_LICENSE = Apache-2.0 ERLANG_P1_YAML_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-yconf/erlang-p1-yconf.hash b/package/erlang-p1-yconf/erlang-p1-yconf.hash index 6d0a9f68a1..97e71f85cd 100644 --- a/package/erlang-p1-yconf/erlang-p1-yconf.hash +++ b/package/erlang-p1-yconf/erlang-p1-yconf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94724bde03c976cdf51d0d43eece73c70381ef60a9dd7e49292d194c0beaeb53 erlang-p1-yconf-1.0.1.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 ab0f7462b8d03d18be1587fa9cfb227923055f765fca4459b4bb42ccef971329 erlang-p1-yconf-1.0.8.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/erlang-p1-yconf/erlang-p1-yconf.mk b/package/erlang-p1-yconf/erlang-p1-yconf.mk index 5d44ec7eec..3e3a10ae15 100644 --- a/package/erlang-p1-yconf/erlang-p1-yconf.mk +++ b/package/erlang-p1-yconf/erlang-p1-yconf.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_YCONF_VERSION = 1.0.1 +ERLANG_P1_YCONF_VERSION = 1.0.8 ERLANG_P1_YCONF_SITE = $(call github,processone,yconf,$(ERLANG_P1_YCONF_VERSION)) ERLANG_P1_YCONF_LICENSE = Apache-2.0 ERLANG_P1_YCONF_LICENSE_FILES = LICENSE diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.hash b/package/erlang-p1-zlib/erlang-p1-zlib.hash index ed803d98d8..7ce58762f8 100644 --- a/package/erlang-p1-zlib/erlang-p1-zlib.hash +++ b/package/erlang-p1-zlib/erlang-p1-zlib.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7d39a3cb92ed7781b6b6ba95704e2591c626d62eddb3c52dcaeac60c339084d7 erlang-p1-zlib-1.0.6.tar.gz -sha256 6e68ca4488fcdacf80ea0a3f5a6a294d48c2d8dc9de520cc3d6b3f3c1bc12847 LICENSE.txt +sha256 f0ac60336b2ddf55ac4f58934580cb8f02dba440d68feb607be312dd35d91269 erlang-p1-zlib-1.0.9.tar.gz +sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.mk b/package/erlang-p1-zlib/erlang-p1-zlib.mk index 46a7d12862..0e6ee298ef 100644 --- a/package/erlang-p1-zlib/erlang-p1-zlib.mk +++ b/package/erlang-p1-zlib/erlang-p1-zlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ZLIB_VERSION = 1.0.6 +ERLANG_P1_ZLIB_VERSION = 1.0.9 ERLANG_P1_ZLIB_SITE = $(call github,processone,ezlib,$(ERLANG_P1_ZLIB_VERSION)) ERLANG_P1_ZLIB_LICENSE = Apache-2.0 ERLANG_P1_ZLIB_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang/Config.in b/package/erlang/Config.in index ab87eab6ff..15931b5896 100644 --- a/package/erlang/Config.in +++ b/package/erlang/Config.in @@ -6,9 +6,11 @@ config BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS config BR2_PACKAGE_ERLANG_ARCH_SUPPORTS bool # see HOWTO/INSTALL.md for Erlang's supported platforms - # when using its native atomic ops implementation + # when using its native atomic ops implementation or gcc's + # __atomic_* builtins default y if BR2_i386 || BR2_x86_64 || BR2_powerpc || \ - BR2_sparc_v9 || BR2_arm || BR2_aarch64 || BR2_mipsel + BR2_sparc_v9 || BR2_arm || BR2_aarch64 || BR2_mipsel || \ + BR2_RISCV_64 # erlang needs host-erlang depends on BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 9cedb62e05..527eb15a00 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -12,8 +12,13 @@ ERLANG_DEPENDENCIES = host-erlang ERLANG_LICENSE = Apache-2.0 ERLANG_LICENSE_FILES = LICENSE.txt +ERLANG_CPE_ID_VENDOR = erlang +ERLANG_CPE_ID_PRODUCT = erlang\/otp ERLANG_INSTALL_STAGING = YES +# windows specific issue: https://nvd.nist.gov/vuln/detail/CVE-2021-29221 +ERLANG_IGNORE_CVES += CVE-2021-29221 + # Remove the leftover deps directory from the ssl app # See https://bugs.erlang.org/browse/ERL-1168 define ERLANG_REMOVE_SSL_DEPS diff --git a/package/erofs-utils/Config.in b/package/erofs-utils/Config.in index 75bcbdaae2..9d9aa159c0 100644 --- a/package/erofs-utils/Config.in +++ b/package/erofs-utils/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_EROFS_UTILS bool "erofs-utils" + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help Userspace utilities for EROFS filesystem @@ -13,4 +15,17 @@ config BR2_PACKAGE_EROFS_UTILS_LZ4 help Support LZ4 compression algorithm +config BR2_PACKAGE_EROFS_UTILS_EROFSFUSE + bool "erofsfuse support" + depends on BR2_USE_MMU # libfuse + depends on !BR2_STATIC_LIBS # libfuse + depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse + select BR2_PACKAGE_LIBFUSE + help + FUSE file system client for EROFS + +comment "erofsfuse needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endif diff --git a/package/erofs-utils/Config.in.host b/package/erofs-utils/Config.in.host index 31ea6eb2ea..c6fbc38887 100644 --- a/package/erofs-utils/Config.in.host +++ b/package/erofs-utils/Config.in.host @@ -1,5 +1,6 @@ config BR2_PACKAGE_HOST_EROFS_UTILS bool "host erofs-utils" + select BR2_PACKAGE_HOST_UTIL_LINUX help Userspace utilities for EROFS filesystem diff --git a/package/erofs-utils/erofs-utils.hash b/package/erofs-utils/erofs-utils.hash index 45d4883a01..8bbb088568 100644 --- a/package/erofs-utils/erofs-utils.hash +++ b/package/erofs-utils/erofs-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 508ee818dc6a02cf986647e37cb991b76f7b3e7ea303ffc9e980772de68f3b10 erofs-utils-1.0.tar.gz -sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING +sha256 132635740039bbe76d743aea72378bfae30dbf034e123929f5d794198d4c0b12 erofs-utils-1.3.tar.gz +sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk index 562e3a427a..e35470b02e 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -4,15 +4,16 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.0 +EROFS_UTILS_VERSION = 1.3 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot EROFS_UTILS_LICENSE = GPL-2.0+ EROFS_UTILS_LICENSE_FILES = COPYING # From a git tree: no generated autotools files -# Also: 0001-erofs-utils-fix-configure.ac.patch EROFS_UTILS_AUTORECONF = YES +EROFS_UTILS_DEPENDENCIES = host-pkgconf util-linux + ifeq ($(BR2_PACKAGE_EROFS_UTILS_LZ4),y) EROFS_UTILS_DEPENDENCIES += lz4 EROFS_UTILS_CONF_OPTS += --enable-lz4 @@ -20,8 +21,22 @@ else EROFS_UTILS_CONF_OPTS += --disable-lz4 endif -HOST_EROFS_UTILS_DEPENDENCIES = host-lz4 -HOST_EROFS_UTILS_CONF_OPTS += --enable-lz4 +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +EROFS_UTILS_CONF_OPTS += --with-selinux +EROFS_UTILS_DEPENDENCIES += libselinux +else +EROFS_UTILS_CONF_OPTS += --without-selinux +endif + +ifeq ($(BR2_PACKAGE_EROFS_UTILS_EROFSFUSE),y) +EROFS_UTILS_CONF_OPTS += --enable-fuse +EROFS_UTILS_DEPENDENCIES += libfuse +else +EROFS_UTILS_CONF_OPTS += --disable-fuse +endif + +HOST_EROFS_UTILS_DEPENDENCIES = host-pkgconf host-util-linux host-lz4 +HOST_EROFS_UTILS_CONF_OPTS += --enable-lz4 --disable-fuse --without-selinux $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/espeak/espeak.mk b/package/espeak/espeak.mk index aa0b5b0716..347fcb607d 100644 --- a/package/espeak/espeak.mk +++ b/package/espeak/espeak.mk @@ -13,11 +13,11 @@ ESPEAK_LICENSE_FILES = License.txt ifeq ($(BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA),y) ESPEAK_AUDIO_BACKEND = portaudio -ESPEAK_DEPENDENCIES = portaudio +ESPEAK_DEPENDENCIES += portaudio endif ifeq ($(BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO),y) ESPEAK_AUDIO_BACKEND = pulseaudio -ESPEAK_DEPENDENCIES = pulseaudio +ESPEAK_DEPENDENCIES += pulseaudio endif define ESPEAK_EXTRACT_CMDS diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 86c71d7380..536579670f 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 22f81e4927d6eb6a13a259d705248a96005fce2005e15257f639f5a1c8c52b6b ethtool-5.4.tar.xz +sha256 f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07 ethtool-5.12.tar.xz # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index ce4f2d862d..f3e950f212 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,12 +4,20 @@ # ################################################################################ -ETHTOOL_VERSION = 5.4 +ETHTOOL_VERSION = 5.12 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 ETHTOOL_LICENSE_FILES = LICENSE COPYING +ETHTOOL_CPE_ID_VENDOR = kernel ETHTOOL_CONF_OPTS = \ $(if $(BR2_PACKAGE_ETHTOOL_PRETTY_PRINT),--enable-pretty-dump,--disable-pretty-dump) +ifeq ($(BR2_PACKAGE_LIBMNL),y) +ETHTOOL_DEPENDENCIES += host-pkgconf libmnl +ETHTOOL_CONF_OPTS += --enable-netlink +else +ETHTOOL_CONF_OPTS += --disable-netlink +endif + $(eval $(autotools-package)) diff --git a/package/eudev/Config.in b/package/eudev/Config.in index b0ce76171a..0e5bd0cee9 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_EUDEV select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_UDEV_GENTOO_SCRIPTS if BR2_INIT_OPENRC select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_KMOD help diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash index e6a319ac44..fda0481351 100644 --- a/package/eudev/eudev.hash +++ b/package/eudev/eudev.hash @@ -1,5 +1,5 @@ # From http://dev.gentoo.org/~blueness/eudev/ -md5 dedfb1964f6098fe9320de827957331f eudev-3.2.9.tar.gz +md5 60b135a189523f333cea5f71a3345c8d eudev-3.2.10.tar.gz # Locally calculated -sha256 89618619084a19e1451d373c43f141b469c9fd09767973d73dd268b92074d4fc eudev-3.2.9.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034 eudev-3.2.10.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 8b677e76b6..5d18b388c7 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -4,7 +4,7 @@ # ################################################################################ -EUDEV_VERSION = 3.2.9 +EUDEV_VERSION = 3.2.10 EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING @@ -18,7 +18,8 @@ EUDEV_CONF_OPTS = \ --enable-kmod \ --enable-blkid -EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod +# eudev requires only the util-linux libraries at build time +EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux-libs kmod EUDEV_PROVIDES = udev ifeq ($(BR2_ROOTFS_MERGED_USR),) @@ -54,13 +55,6 @@ define EUDEV_INSTALL_INIT_OPENRC @: endef -# Required by default rules for input devices -define EUDEV_USERS - - - input -1 * - - - Input device group - - - render -1 * - - - DRI rendering nodes - - - kvm -1 * - - - kvm nodes -endef - HOST_EUDEV_DEPENDENCIES = host-gperf host-pkgconf HOST_EUDEV_SYSCONFDIR = $(if $(BR2_PACKAGE_SYSTEMD),/usr/lib,/etc) diff --git a/package/evtest/Config.in b/package/evtest/Config.in index 1087217ee4..e74bac02fd 100644 --- a/package/evtest/Config.in +++ b/package/evtest/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_EVTEST device. It then monitors the device and displays all the events layer events generated. - http://cgit.freedesktop.org/evtest + https://gitlab.freedesktop.org/libevdev/evtest diff --git a/package/evtest/evtest.hash b/package/evtest/evtest.hash index 566d423fcd..b1ee24371e 100644 --- a/package/evtest/evtest.hash +++ b/package/evtest/evtest.hash @@ -1,5 +1,5 @@ # locally computed -sha256 73d5b604d57551418d282fedee3deae9f851afb3c355dccc87153364c046efd3 evtest-1.34.tar.gz +sha256 0e7a2eeff380af796e5e9b21b6f48fd706c58c931162c151c2c1074bdfeb85c6 evtest-evtest-1.34.tar.gz # License files sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/evtest/evtest.mk b/package/evtest/evtest.mk index d2fd01c2d9..8b8667e045 100644 --- a/package/evtest/evtest.mk +++ b/package/evtest/evtest.mk @@ -5,7 +5,8 @@ ################################################################################ EVTEST_VERSION = 1.34 -EVTEST_SITE = http://cgit.freedesktop.org/evtest/snapshot +EVTEST_SOURCE = evtest-evtest-$(EVTEST_VERSION).tar.gz +EVTEST_SITE = https://gitlab.freedesktop.org/libevdev/evtest/-/archive/evtest-$(EVTEST_VERSION) EVTEST_LICENSE = GPL-2.0+ EVTEST_LICENSE_FILES = COPYING EVTEST_DEPENDENCIES = host-pkgconf diff --git a/package/execline/execline.hash b/package/execline/execline.hash index cef4959bda..706b131afd 100644 --- a/package/execline/execline.hash +++ b/package/execline/execline.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 05205c6869ae65a51c63d0e805572573806f6474aa21e12c49dd5654d3ceed33 execline-2.5.3.0.tar.gz -sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING +sha256 a373f497d2335905d750e2f3be2ba47a028c11c4a7d5595dca9965c161e53aed execline-2.8.0.1.tar.gz +sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING diff --git a/package/execline/execline.mk b/package/execline/execline.mk index 74ad91e4a8..c348d924b7 100644 --- a/package/execline/execline.mk +++ b/package/execline/execline.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXECLINE_VERSION = 2.5.3.0 +EXECLINE_VERSION = 2.8.0.1 EXECLINE_SITE = http://skarnet.org/software/execline EXECLINE_LICENSE = ISC EXECLINE_LICENSE_FILES = COPYING @@ -12,11 +12,11 @@ EXECLINE_INSTALL_STAGING = YES EXECLINE_DEPENDENCIES = skalibs EXECLINE_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ + --prefix=/ \ + --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/include \ + --with-dynlib=$(STAGING_DIR)/lib \ + --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ $(SHARED_STATIC_LIBS_OPTS) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index e8b71a483e..5ea9683053 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 100b3d5b1b3370bc2e31c0978991716c4a4478246a2ac2df6382054a0ae89bc8 exempi-2.5.1.tar.bz2 -sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING +sha256 52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5 exempi-2.5.2.tar.bz2 +sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index 2b6bd4fa81..f481469d2c 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.5.1 +EXEMPI_VERSION = 2.5.2 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES @@ -13,5 +13,6 @@ EXEMPI_DEPENDENCIES = host-pkgconf expat zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) EXEMPI_LICENSE = BSD-3-Clause EXEMPI_LICENSE_FILES = COPYING +EXEMPI_CPE_ID_VENDOR = exempi_project $(eval $(autotools-package)) diff --git a/package/exfat-utils/Config.in b/package/exfat-utils/Config.in index 9dfbbfcfb8..4e8f167db4 100644 --- a/package/exfat-utils/Config.in +++ b/package/exfat-utils/Config.in @@ -4,6 +4,13 @@ config BR2_PACKAGE_EXFAT_UTILS help exFAT filesystem utilities. + This is the set of user-space utilities that go together + with the FUSE-based exfat driver from package/exfat. + + If you're using the exfat driver from the official Linux + kernel (merged as of Linux 5.7), you must use the user-space + utilities from package/exfatprogs. + https://github.com/relan/exfat comment "exfat-utils needs a toolchain w/ wchar" diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk index 16d5aa03db..d13ec6bab8 100644 --- a/package/exfat-utils/exfat-utils.mk +++ b/package/exfat-utils/exfat-utils.mk @@ -6,7 +6,7 @@ EXFAT_UTILS_VERSION = 1.3.0 EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION) -EXFAT_UTILS_LICENSE = GPL-3.0+ +EXFAT_UTILS_LICENSE = GPL-2.0+ EXFAT_UTILS_LICENSE_FILES = COPYING EXFAT_UTILS_CONF_OPTS += --exec-prefix=/ diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk index d8744feb9b..e23495152e 100644 --- a/package/exfat/exfat.mk +++ b/package/exfat/exfat.mk @@ -8,7 +8,7 @@ EXFAT_VERSION = 1.3.0 EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_VERSION) EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz EXFAT_DEPENDENCIES = libfuse host-pkgconf -EXFAT_LICENSE = GPL-3.0+ +EXFAT_LICENSE = GPL-2.0+ EXFAT_LICENSE_FILES = COPYING EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99 diff --git a/package/exim/S86exim b/package/exim/S86exim index bec88fc222..0d09361f65 100644 --- a/package/exim/S86exim +++ b/package/exim/S86exim @@ -3,11 +3,19 @@ # Start/stop exim # -PIDFILE=/var/lock/exim/exim-daemon.pid +PIDFILE=/var/run/exim/exim.pid case "$1" in start) echo "Starting exim..." + if [ ! -d /var/log/exim ]; then + mkdir -p /var/log/exim + chown exim:mail /var/log/exim + fi + if [ ! -d /var/run/exim ]; then + mkdir -p /var/run/exim + chown root:mail /var/run/exim + fi start-stop-daemon -S -x exim -- -bd ;; stop) diff --git a/package/exim/exim.hash b/package/exim/exim.hash index 7cedf1bc88..201f09ebd6 100644 --- a/package/exim/exim.hash +++ b/package/exim/exim.hash @@ -1,6 +1,6 @@ -# From https://ftp.exim.org/pub/exim/exim4/fixes/00-sha256sums.txt -sha256 537d366ee18ed357656f54f255f8f9e11bde9684fcaaecaaa56f84cdbcd3e405 exim-4.93.0.4.tar.xz -# From https://ftp.exim.org/pub/exim/exim4/fixes/00-sha512sums.txt -sha512 84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96 exim-4.93.0.4.tar.xz +# From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt +sha256 051861fc89f06205162f12129fb7ebfe473383bb6194bf8642952bfd50329274 exim-4.94.2.tar.xz +# From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt +sha512 5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc exim-4.94.2.tar.xz # Locally calculated -sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE +sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE diff --git a/package/exim/exim.mk b/package/exim/exim.mk index e4b0bfc1b4..e90419a286 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -4,11 +4,13 @@ # ################################################################################ -EXIM_VERSION = 4.93.0.4 +EXIM_VERSION = 4.94.2 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz -EXIM_SITE = https://ftp.exim.org/pub/exim/exim4/fixes +EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ EXIM_LICENSE_FILES = LICENCE +EXIM_CPE_ID_VENDOR = exim +EXIM_SELINUX_MODULES = exim mta EXIM_DEPENDENCIES = host-berkeleydb host-pcre pcre berkeleydb host-pkgconf # Modify a variable value. It must already exist in the file, either @@ -39,6 +41,8 @@ define EXIM_USE_DEFAULT_CONFIG_FILE $(INSTALL) -m 0644 $(@D)/src/EDITME $(@D)/Local/Makefile $(call exim-config-change,BIN_DIRECTORY,/usr/sbin) $(call exim-config-change,CONFIGURE_FILE,/etc/exim/configure) + $(call exim-config-change,LOG_FILE_PATH,/var/log/exim/exim_%slog) + $(call exim-config-change,PID_FILE_PATH,/var/run/exim/exim.pid) $(call exim-config-change,EXIM_USER,ref:exim) $(call exim-config-change,EXIM_GROUP,mail) $(call exim-config-change,TRANSPORT_LMTP,yes) @@ -118,16 +122,14 @@ endif # We need the host version of macro_predef during the build, before # building it we need to prepare the makefile. -# "The -j (parallel) flag must not be used with make" -# (http://www.exim.org/exim-html-current/doc/html/spec_html/ch04.html) define EXIM_BUILD_CMDS - $(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) makefile - $(HOST_MAKE_ENV) $(MAKE1) -C $(@D)/build-br macro_predef \ - CC=$(HOSTCC) \ - LNCC=$(HOSTCC) \ + $(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) makefile + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build-br macro_predef \ + CC="$(HOSTCC)" \ + LNCC="$(HOSTCC)" \ CFLAGS="-std=c99 $(HOST_CFLAGS)" \ LFLAGS="-fPIC $(HOST_LDFLAGS)" - $(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) \ + $(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \ CFLAGS="-std=c99 $(TARGET_CFLAGS)" endef @@ -135,7 +137,7 @@ endef # something when installing... define EXIM_INSTALL_TARGET_CMDS DESTDIR=$(TARGET_DIR) INSTALL_ARG="-no_chown -no_symlink" build=br \ - $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) \ + $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \ CFLAGS="-std=c99 $(TARGET_CFLAGS)" \ install chmod u+s $(TARGET_DIR)/usr/sbin/exim diff --git a/package/exim/exim.service b/package/exim/exim.service index fe97727ab5..ac3f067de4 100644 --- a/package/exim/exim.service +++ b/package/exim/exim.service @@ -3,6 +3,10 @@ Description=Exim MTA After=syslog.target network.target [Service] +User=exim +Group=mail +LogsDirectory=exim +RuntimeDirectory=exim ExecStart=/usr/sbin/exim -bdf Restart=always diff --git a/package/exiv2/exiv2.hash b/package/exiv2/exiv2.hash index 7937d3f572..a405d2611b 100644 --- a/package/exiv2/exiv2.hash +++ b/package/exiv2/exiv2.hash @@ -1,4 +1,3 @@ # Locally calculated -sha256 3dbcaf01fbc5b98d42f091d1ff0d4b6cd9750dc724de3d9c0d113948570b2934 exiv2-0.27.2.tar.gz -sha256 a7ba75cb966aca374711e2af49e5f3aea6a4443a803440f5d93e73a5a1222f66 COPYING -sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS +sha256 35a58618ab236a901ca4928b0ad8b31007ebdc0386d904409d825024e45ea6e2 exiv2-0.27.5-Source.tar.gz +sha256 a7ba75cb966aca374711e2af49e5f3aea6a4443a803440f5d93e73a5a1222f66 COPYING diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk index 5ca16c4747..2a91c71c8f 100644 --- a/package/exiv2/exiv2.mk +++ b/package/exiv2/exiv2.mk @@ -4,28 +4,17 @@ # ################################################################################ -EXIV2_VERSION = 0.27.2 -EXIV2_SITE = $(call github,Exiv2,exiv2,v$(EXIV2_VERSION)) +EXIV2_VERSION = 0.27.5 +EXIV2_SOURCE = exiv2-$(EXIV2_VERSION)-Source.tar.gz +EXIV2_SITE = https://exiv2.org/builds EXIV2_INSTALL_STAGING = YES -EXIV2_LICENSE = GPL-2.0+, BSD-3-Clause -EXIV2_LICENSE_FILES = COPYING COPYING-CMAKE-SCRIPTS +EXIV2_LICENSE = GPL-2.0+ +EXIV2_LICENSE_FILES = COPYING +EXIV2_CPE_ID_VENDOR = exiv2 -# CVE-2019-13504 is misclassified (by our CVE tracker) as affecting version -# 0.27.2, while in fact both commits that fixed this issue are already in this -# version. -EXIV2_IGNORE_CVES += CVE-2019-13504 - -# 0001-crwimage-Check-offset-and-size-against-total-size.patch -EXIV2_IGNORE_CVES += CVE-2019-17402 - -# 0002-fix_1011_jp2_readmetadata_loop.patch -EXIV2_IGNORE_CVES += CVE-2019-20421 - -EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BUILD_SAMPLES=OFF - -# The following CMake variable disables a TRY_RUN call in the -pthread -# test which is not allowed when cross-compiling. -EXIV2_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF +EXIV2_CONF_OPTS += \ + -DBUILD_WITH_STACK_PROTECTOR=OFF \ + -DEXIV2_BUILD_SAMPLES=OFF ifeq ($(BR2_PACKAGE_EXIV2_LENSDATA),y) EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=ON @@ -41,10 +30,10 @@ EXIV2_CONF_OPTS += -DEXIV2_ENABLE_PNG=OFF endif ifeq ($(BR2_PACKAGE_EXIV2_XMP),y) -EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=ON -DEXIV2_ENABLE_LIBXMP=ON +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=ON EXIV2_DEPENDENCIES += expat else -EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=OFF -DEXIV2_ENABLE_LIBXMP=OFF +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=OFF endif EXIV2_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 588e881d0d..8cf563d8f5 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.2.9/ -md5 d2384fa607223447e713e1b9bd272376 expat-2.2.9.tar.xz -sha1 90a361e4c97f8c469479ffadc0de0b121a911fb5 expat-2.2.9.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.1/ +md5 a4fb91a9441bcaec576d4c4a56fa3aa6 expat-2.4.1.tar.xz +sha1 7988e4df355162500f09837aa95cbb48e6754420 expat-2.4.1.tar.xz # Locally calculated -sha256 1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4 expat-2.2.9.tar.xz -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 COPYING +sha256 cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a expat-2.4.1.tar.xz +sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 38e5dee75d..bb1cfd8c8a 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.2.9 +EXPAT_VERSION = 2.4.1 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES @@ -12,6 +12,8 @@ EXPAT_DEPENDENCIES = host-pkgconf HOST_EXPAT_DEPENDENCIES = host-pkgconf EXPAT_LICENSE = MIT EXPAT_LICENSE_FILES = COPYING +EXPAT_CPE_ID_VENDOR = libexpat_project +EXPAT_CPE_ID_PRODUCT = libexpat EXPAT_CONF_OPTS = --without-docbook HOST_EXPAT_CONF_OPTS = --without-docbook diff --git a/package/f2fs-tools/f2fs-tools.hash b/package/f2fs-tools/f2fs-tools.hash index 4eb4d14709..dedd884957 100644 --- a/package/f2fs-tools/f2fs-tools.hash +++ b/package/f2fs-tools/f2fs-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b39d3ae9224267aab0070b5f17d91d0c5143f6d960166a27f6b11c8c87072c7d f2fs-tools-1.13.0.tar.gz +sha256 619263d4e2022152a1472c1d912eaae104f20bd227ce0bb9d41d1d6608094bd1 f2fs-tools-1.14.0.tar.gz sha256 662abb3a8a80b36ae7036c289dd1e03b361ee5dd2e6fd5211d0d8d029146449f COPYING diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk index a9536dc8e7..ced283d25d 100644 --- a/package/f2fs-tools/f2fs-tools.mk +++ b/package/f2fs-tools/f2fs-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -F2FS_TOOLS_VERSION = 1.13.0 +F2FS_TOOLS_VERSION = 1.14.0 F2FS_TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no F2FS_TOOLS_DEPENDENCIES = host-pkgconf util-linux diff --git a/package/faad2/faad2.hash b/package/faad2/faad2.hash index 1a03bc9b7b..2eb11d73aa 100644 --- a/package/faad2/faad2.hash +++ b/package/faad2/faad2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7fa33cff76abdda5a220ca5de0b2e05a77354f3b97f735193c2940224898aa9a faad2-2.9.1.tar.gz +sha256 0c6d9636c96f95c7d736f097d418829ced8ec6dbd899cc6cc82b728480a84bfb faad2-2.10.0.tar.gz sha256 d3baf3a54943cf12a994c85867a18dec84f810901b2f2878ddfd77efcc3c150f COPYING diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk index 9ec9d8f52c..d085c814bd 100644 --- a/package/faad2/faad2.mk +++ b/package/faad2/faad2.mk @@ -4,10 +4,12 @@ # ################################################################################ -FAAD2_VERSION = 2.9.1 +FAAD2_VERSION = 2.10.0 FAAD2_SITE = $(call github,knik0,faad2,$(subst .,_,$(FAAD2_VERSION))) FAAD2_LICENSE = GPL-2.0 FAAD2_LICENSE_FILES = COPYING +FAAD2_CPE_ID_VENDOR = audiocoding +FAAD2_CPE_ID_PRODUCT = freeware_advanced_audio_decoder_2 # frontend/faad calls frexp() FAAD2_CONF_ENV = LIBS=-lm FAAD2_INSTALL_STAGING = YES diff --git a/package/fail2ban/fail2ban.hash b/package/fail2ban/fail2ban.hash index f807d5a82b..072f0ef961 100644 --- a/package/fail2ban/fail2ban.hash +++ b/package/fail2ban/fail2ban.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d fail2ban-0.11.1.tar.gz +sha256 383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0 fail2ban-0.11.2.tar.gz sha256 a75fec0260742fe6275d63ff6a5d97b924b28766558306b3fa4069763096929b COPYING diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index a0a2dc704b..9202dc1ddd 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -4,12 +4,17 @@ # ################################################################################ -FAIL2BAN_VERSION = 0.11.1 +FAIL2BAN_VERSION = 0.11.2 FAIL2BAN_SITE = $(call github,fail2ban,fail2ban,$(FAIL2BAN_VERSION)) FAIL2BAN_LICENSE = GPL-2.0+ FAIL2BAN_LICENSE_FILES = COPYING +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 + ifeq ($(BR2_PACKAGE_PYTHON3),y) define FAIL2BAN_PYTHON_2TO3 $(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban @@ -27,6 +32,13 @@ define FAIL2BAN_FIX_DEFAULT_CONFIG endef FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_DEFAULT_CONFIG +# fail2ban-python points to host python +define FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK + ln -snf $(if $(BR2_PACKAGE_PYTHON),python,python3) \ + $(TARGET_DIR)/usr/bin/fail2ban-python +endef +FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK + define FAIL2BAN_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/fail2ban/S60fail2ban \ $(TARGET_DIR)/etc/init.d/S60fail2ban diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash index d1d959df6f..1a23d9e8d8 100644 --- a/package/fakeroot/fakeroot.hash +++ b/package/fakeroot/fakeroot.hash @@ -1,6 +1,4 @@ -# From http://snapshot.debian.org/package/fakeroot/1.20.2-1/ -sha1 367040df07043edb630942b21939e493f3fad888 fakeroot_1.20.2.orig.tar.bz2 -# Calculated based on the hash above -sha256 7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c fakeroot_1.20.2.orig.tar.bz2 +# From http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.25.3-1.dsc +sha256 8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c fakeroot_1.25.3.orig.tar.gz # License files, locally calculated -sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 1be99071bf..c3312b777b 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -FAKEROOT_VERSION = 1.20.2 -FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2 -FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot +FAKEROOT_VERSION = 1.25.3 +FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz +FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20201008T205817Z/pool/main/f/fakeroot HOST_FAKEROOT_DEPENDENCIES = host-acl # Force capabilities detection off @@ -15,7 +15,7 @@ HOST_FAKEROOT_DEPENDENCIES = host-acl HOST_FAKEROOT_CONF_ENV = \ ac_cv_header_sys_capability_h=no \ ac_cv_func_capset=no -# 0003-Select-TCP-when-lack-of-SYSV-IPC.patch touches configure.ac +# patching configure.ac in patch 0003 HOST_FAKEROOT_AUTORECONF = YES FAKEROOT_LICENSE = GPL-3.0+ FAKEROOT_LICENSE_FILES = COPYING diff --git a/package/faketime/faketime.hash b/package/faketime/faketime.hash index bdb003aa69..0628ff9ae6 100644 --- a/package/faketime/faketime.hash +++ b/package/faketime/faketime.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 06288237cd5890eca148489e5b904ed852ed0ffa8424bfb479342f4daa8442a3 faketime-0.9.8.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 57d0181150361c0a9b5c8eef05b11392f6134ada2c2d998e92e63daed639647c faketime-0.9.9.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk index 85ce9a90d8..355477ba3b 100644 --- a/package/faketime/faketime.mk +++ b/package/faketime/faketime.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAKETIME_VERSION = 0.9.8 +FAKETIME_VERSION = 0.9.9 FAKETIME_SITE = $(call github,wolfcw,libfaketime,v$(FAKETIME_VERSION)) FAKETIME_LICENSE = GPL-2.0 FAKETIME_LICENSE_FILES = COPYING diff --git a/package/fastd/Config.in b/package/fastd/Config.in index c4f296dd63..5319d68503 100644 --- a/package/fastd/Config.in +++ b/package/fastd/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_FASTD select BR2_PACKAGE_LIBUECC select BR2_PACKAGE_LIBSODIUM select BR2_PACKAGE_LIBSODIUM_FULL - select BR2_PACKAGE_LIBCAP help Fast and Secure Tunneling Daemon diff --git a/package/fastd/fastd.hash b/package/fastd/fastd.hash index accdf087eb..b59085e0ee 100644 --- a/package/fastd/fastd.hash +++ b/package/fastd/fastd.hash @@ -1,5 +1,3 @@ -# from https://projects.universe-factory.net/projects/fastd/files -md5 e53236d3049f64f7955ad9556da099eb fastd-18.tar.xz # computed locally -sha256 714ff09d7bd75f79783f744f6f8c5af2fe456c8cf876feaa704c205a73e043c9 fastd-18.tar.xz -sha256 c3095dd0adffc03eaeba9c7cd81f06962ef4797a836e49468b3dccc2802ff904 COPYRIGHT +sha256 942f33bcd794bcb8e19da4c30c875bdfd4d0f1c24ec4dcdf51237791bbfb0d4c fastd-21.tar.xz +sha256 1f5acece57466eac89108f934a196be09b7676fa2d637e78d6657ee1a7d644ac COPYRIGHT diff --git a/package/fastd/fastd.mk b/package/fastd/fastd.mk index e67acdbf18..c1db1cc472 100644 --- a/package/fastd/fastd.mk +++ b/package/fastd/fastd.mk @@ -4,38 +4,45 @@ # ################################################################################ -FASTD_VERSION = 18 -FASTD_SITE = https://projects.universe-factory.net/attachments/download/86 +FASTD_VERSION = 21 +FASTD_SITE = https://github.com/NeoRaider/fastd/releases/download/v$(FASTD_VERSION) FASTD_SOURCE = fastd-$(FASTD_VERSION).tar.xz FASTD_LICENSE = BSD-2-Clause FASTD_LICENSE_FILES = COPYRIGHT -FASTD_CONF_OPTS = -DENABLE_LIBSODIUM=ON -FASTD_DEPENDENCIES = host-bison host-pkgconf libuecc libsodium libcap +FASTD_CPE_ID_VERSION = $(FASTD_VERSION).0 +FASTD_DEPENDENCIES = host-bison host-pkgconf libuecc libsodium + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +FASTD_CONF_OPTS += -Dcapabilities=enabled +FASTD_DEPENDENCIES += libcap +else +FASTD_CONF_OPTS += -Dcapabilities=disabled +endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -FASTD_CONF_OPTS += -DENABLE_OPENSSL=ON +FASTD_CONF_OPTS += -Dcipher_aes128-ctr=enabled FASTD_DEPENDENCIES += openssl else -FASTD_CONF_OPTS += -DENABLE_OPENSSL=OFF +FASTD_CONF_OPTS += -Dcipher_aes128-ctr=disabled endif ifeq ($(BR2_PACKAGE_FASTD_STATUS_SOCKET),y) -FASTD_CONF_OPTS += -DWITH_STATUS_SOCKET=ON +FASTD_CONF_OPTS += -Dstatus_socket=enabled FASTD_DEPENDENCIES += json-c else -FASTD_CONF_OPTS += -DWITH_STATUS_SOCKET=OFF +FASTD_CONF_OPTS += -Dstatus_socket=disabled endif ifeq ($(BR2_INIT_SYSTEMD),y) -FASTD_CONF_OPTS += -DENABLE_SYSTEMD=ON +FASTD_CONF_OPTS += -Dsystemd=enabled else -FASTD_CONF_OPTS += -DENABLE_SYSTEMD=OFF +FASTD_CONF_OPTS += -Dsystemd=disabled endif ifeq ($(BR2_GCC_ENABLE_LTO),y) -FASTD_CONF_OPTS += -DENABLE_LTO=ON +FASTD_CONF_OPTS += -Db_lto=true else -FASTD_CONF_OPTS += -DENABLE_LTO=OFF +FASTD_CONF_OPTS += -Db_lto=false endif -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/package/fb-test-app/fb-test-app.hash b/package/fb-test-app/fb-test-app.hash index 06611db799..ff7730ef8d 100644 --- a/package/fb-test-app/fb-test-app.hash +++ b/package/fb-test-app/fb-test-app.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6baf6b45968d0bb9a5527c6c4bf18661e9f9eb9be973a6d1952c38168c90d58f fb-test-app-rosetta-1.1.0.tar.gz +sha256 45d490ed78a6e4425d9a760e81e99dc503af01704e17ab5bf186b87a31c5e3db fb-test-app-1.1.1.tar.gz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/fb-test-app/fb-test-app.mk b/package/fb-test-app/fb-test-app.mk index 1ab7b2f219..89d533ab15 100644 --- a/package/fb-test-app/fb-test-app.mk +++ b/package/fb-test-app/fb-test-app.mk @@ -4,8 +4,8 @@ # ################################################################################ -FB_TEST_APP_VERSION = rosetta-1.1.0 -FB_TEST_APP_SITE = $(call github,prpplague,fb-test-app,$(FB_TEST_APP_VERSION)) +FB_TEST_APP_VERSION = 1.1.1 +FB_TEST_APP_SITE = $(call github,andy-shev,fb-test-app,rosetta-$(FB_TEST_APP_VERSION)) FB_TEST_APP_LICENSE = GPL-2.0 FB_TEST_APP_LICENSE_FILES = COPYING @@ -18,6 +18,7 @@ define FB_TEST_APP_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/rect $(TARGET_DIR)/usr/bin/fb-test-rect $(INSTALL) -D -m 0755 $(@D)/fb-test $(TARGET_DIR)/usr/bin/fb-test $(INSTALL) -D -m 0755 $(@D)/offset $(TARGET_DIR)/usr/bin/fb-test-offset + $(INSTALL) -D -m 0755 $(@D)/fb-string $(TARGET_DIR)/usr/bin/fb-test-string endef $(eval $(generic-package)) diff --git a/package/fbgrab/fbgrab.hash b/package/fbgrab/fbgrab.hash index 6cd19dc1d5..8cd1ff1518 100644 --- a/package/fbgrab/fbgrab.hash +++ b/package/fbgrab/fbgrab.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3314a932f830e32feaf36914e1b43326529fe35b7eb7410ff55f16c930ddfbcb fbgrab-1.3.1.tar.gz +sha256 0202a9c4fb430eee4d8f566d09ab5f6e35c50804a192ba106046e54eb886f8f1 fbgrab-1.5.tar.gz sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk index 43fd0ba948..693c4c282d 100644 --- a/package/fbgrab/fbgrab.mk +++ b/package/fbgrab/fbgrab.mk @@ -4,7 +4,7 @@ # ################################################################################ -FBGRAB_VERSION = 1.3.1 +FBGRAB_VERSION = 1.5 FBGRAB_SITE = $(call github,GunnarMonell,fbgrab,$(FBGRAB_VERSION)) FBGRAB_DEPENDENCIES = libpng FBGRAB_LICENSE = GPL-2.0 diff --git a/package/fbset/fbset.hash b/package/fbset/fbset.hash index ca8cc6d1f0..5d9785d90a 100644 --- a/package/fbset/fbset.hash +++ b/package/fbset/fbset.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 40ff4ab0247b75138a0887ed40f81c1a6184f340b77126c16d074b1075b41c20 fbset-2.1.tar.gz +sha256 40ff4ab0247b75138a0887ed40f81c1a6184f340b77126c16d074b1075b41c20 fbset-2.1.tar.gz +sha256 c3285709a0840899a789faefae1704e87f96f757e905a38a1931a9d4fde95ddd fbset.c diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk index 787b4e1dca..8d2a477f8b 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -8,6 +8,7 @@ FBSET_VERSION = 2.1 FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev FBSET_DEPENDENCIES = host-bison host-flex FBSET_LICENSE = GPL-2.0 +FBSET_LICENSE_FILES = fbset.c define FBSET_BUILD_CMDS $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) diff --git a/package/fbterm/fbterm.mk b/package/fbterm/fbterm.mk index 712d4f97fa..9964827801 100644 --- a/package/fbterm/fbterm.mk +++ b/package/fbterm/fbterm.mk @@ -10,12 +10,6 @@ FBTERM_LICENSE = GPL-2.0+ FBTERM_LICENSE_FILES = COPYING FBTERM_DEPENDENCIES = fontconfig liberation -ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy) -# fontconfig uses pthreads if available, but fbterm forgets to link -# with it breaking static builds -FBTERM_CONF_ENV += LIBS='-lpthread' -endif - ifeq ($(BR2_PACKAGE_GPM),y) FBTERM_DEPENDENCIES += gpm FBTERM_CONF_OPTS += --enable-gpm diff --git a/package/fbtft/fbtft.hash b/package/fbtft/fbtft.hash index 894d9794a9..5d08d0ef85 100644 --- a/package/fbtft/fbtft.hash +++ b/package/fbtft/fbtft.hash @@ -1,2 +1,3 @@ # locally computed sha256 0e81de89fdd7ab810716fc0549e767527f342e829309dee5c2cca1e9d1728770 fbtft-274035404701245e7491c0c6471c5b72ade4d491.tar.gz +sha256 a9ca80d65a5ef10fe614a6c1e8c8d4d3b96637e8855a96c7cf0fa438526097a7 fbtft-core.c diff --git a/package/fbtft/fbtft.mk b/package/fbtft/fbtft.mk index b935e741d5..cc11d867fc 100644 --- a/package/fbtft/fbtft.mk +++ b/package/fbtft/fbtft.mk @@ -7,5 +7,6 @@ FBTFT_VERSION = 274035404701245e7491c0c6471c5b72ade4d491 FBTFT_SITE = $(call github,notro,fbtft,$(FBTFT_VERSION)) FBTFT_LICENSE = GPL-2.0 +FBTFT_LICENSE_FILES = fbtft-core.c $(eval $(generic-package)) diff --git a/package/feh/feh.hash b/package/feh/feh.hash index 2bfe5e48a8..3a2296ac23 100644 --- a/package/feh/feh.hash +++ b/package/feh/feh.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 8f9741399b4b184ba28698c0fd7722638e79abac8e6c27eb526cc52b11ee0a1c feh-3.2.1.tar.bz2 -sha256 a289176a74d8e5d071456df5d4ee629aeb86f8eeeb6570076fe126f182c6b91d COPYING +sha256 437420f37f11614e008d066e2a3bdefcfc78144c8212998b2bacdd5d21ea23b4 feh-3.6.3.tar.bz2 +sha256 2c3a31327dc3cc3331aa6e759d378e4f66d0ece7174a0d5aa137f3cba4bf0509 COPYING diff --git a/package/feh/feh.mk b/package/feh/feh.mk index 973eed60b0..f27509330d 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -4,12 +4,13 @@ # ################################################################################ -FEH_VERSION = 3.2.1 +FEH_VERSION = 3.6.3 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 FEH_SITE = http://feh.finalrewind.org FEH_DEPENDENCIES = imlib2 libpng xlib_libXt FEH_LICENSE = MIT FEH_LICENSE_FILES = COPYING +FEH_CPE_ID_VENDOR = feh_project ifeq ($(BR2_PACKAGE_LIBCURL),y) FEH_DEPENDENCIES += libcurl diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 08a7a0ef48..88deb343c4 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,6 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/36773211/ -sha1 1aadf078ed8fb1b6c93e9126cc0375b1f740301a fetchmail-6.4.1.tar.xz -sha256 3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0 fetchmail-6.4.1.tar.xz -sha512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0 fetchmail-6.4.1.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37350119/ +sha256 cc6818bd59435602169fa292d6d163d56b21c7f53112829470a3aceabe612c84 fetchmail-6.4.22.tar.xz # Locally computed: -sha256 89d6efe79c78f965b256e007d6acc367fff982c59b6195fb6ec5895ea0fc9bd5 COPYING +sha256 001d1b8d111a83e3bab8b4d511ea4767d37d3bd0583560fccece630df1ba8f3c COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index b8e3c667e3..77d9733296 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,11 +5,13 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).1 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).22 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING FETCHMAIL_LICENSE_FILES = COPYING +FETCHMAIL_CPE_ID_VENDOR = fetchmail +FETCHMAIL_SELINUX_MODULES = fetchmail mta FETCHMAIL_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index 33baff262e..2efef7dd86 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -67,6 +67,13 @@ config BR2_PACKAGE_FFMPEG_FFPROBE FFprobe is a utility to determine the audio and video characteristics of a container file. +config BR2_PACKAGE_FFMPEG_XCBGRAB + bool "Build X11 screen grabbing" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBXCB + help + X11 screen grabbing using libxcb. + config BR2_PACKAGE_FFMPEG_AVRESAMPLE bool "Build libavresample" help diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index 1f68943fc7..abb397f872 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c ffmpeg-4.2.2.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 -sha256 cad1218c22121b169fb1380178ab7a0b33cb38a3ff6d3915b8533d1d954f3ce7 LICENSE.md +sha256 eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02 ffmpeg-4.4.1.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 b7148bbba2..5a79faed47 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 4.2.2 +FFMPEG_VERSION = 4.4.1 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -16,6 +16,8 @@ FFMPEG_LICENSE += and GPL-2.0+ FFMPEG_LICENSE_FILES += COPYING.GPLv2 endif +FFMPEG_CPE_ID_VENDOR = ffmpeg + FFMPEG_CONF_OPTS = \ --prefix=/usr \ --enable-avfilter \ @@ -84,6 +86,13 @@ else FFMPEG_CONF_OPTS += --disable-ffplay endif +ifeq ($(BR2_PACKAGE_LIBV4L),y) +FFMPEG_DEPENDENCIES += libv4l +FFMPEG_CONF_OPTS += --enable-libv4l2 +else +FFMPEG_CONF_OPTS += --disable-libv4l2 +endif + ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y) FFMPEG_CONF_OPTS += --enable-avresample else @@ -96,6 +105,17 @@ else FFMPEG_CONF_OPTS += --disable-ffprobe endif +ifeq ($(BR2_PACKAGE_FFMPEG_XCBGRAB),y) +FFMPEG_CONF_OPTS += \ + --enable-libxcb \ + --enable-libxcb-shape \ + --enable-libxcb-shm \ + --enable-libxcb-xfixes +FFMPEG_DEPENDENCIES += libxcb +else +FFMPEG_CONF_OPTS += --disable-libxcb +endif + ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y) FFMPEG_CONF_OPTS += --enable-postproc else @@ -271,10 +291,7 @@ endif # To avoid a circular dependency only use opencv if opencv itself does # not depend on ffmpeg. -ifeq ($(BR2_PACKAGE_OPENCV_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV_WITH_FFMPEG),yx) -FFMPEG_CONF_OPTS += --enable-libopencv -FFMPEG_DEPENDENCIES += opencv -else ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),yx) +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),yx) FFMPEG_CONF_OPTS += --enable-libopencv FFMPEG_DEPENDENCIES += opencv3 else @@ -351,13 +368,6 @@ else FFMPEG_CONF_OPTS += --disable-libtheora endif -ifeq ($(BR2_PACKAGE_WAVPACK),y) -FFMPEG_CONF_OPTS += --enable-libwavpack -FFMPEG_DEPENDENCIES += wavpack -else -FFMPEG_CONF_OPTS += --disable-libwavpack -endif - ifeq ($(BR2_PACKAGE_LIBICONV),y) FFMPEG_CONF_OPTS += --enable-iconv FFMPEG_DEPENDENCIES += libiconv @@ -497,10 +507,8 @@ else FFMPEG_CONF_OPTS += --enable-mipsfpu endif -# Fix build failure on "addi opcode not supported" -ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y) +# Fix build failure on several missing assembly instructions FFMPEG_CONF_OPTS += --disable-asm -endif endif # MIPS ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) diff --git a/package/file/file.mk b/package/file/file.mk index 42f9524ed1..c41a8eb3a4 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -12,6 +12,7 @@ FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c +FILE_CPE_ID_VENDOR = file_project # We're patching configure.ac FILE_AUTORECONF = YES HOST_FILE_CONF_OPTS = --disable-libseccomp diff --git a/package/filemq/filemq.hash b/package/filemq/filemq.hash index 611d19208e..cf81eb4f50 100644 --- a/package/filemq/filemq.hash +++ b/package/filemq/filemq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f3764e1adacfbf7fd09fb9c553e796a80d8159f1ace689fb68307afbc1746d4c filemq-8940f34e0f1c8f25c1c693ed8db069f58fbc5ad0.tar.gz +sha256 bdec8584a181e1c9a1d9be567768bcf8c3f7132ea701dd1829f74370c6536991 filemq-af4768dcaf2fcb8083a32bad107a22ecb7a5d954.tar.gz sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d LICENSE diff --git a/package/filemq/filemq.mk b/package/filemq/filemq.mk index 75d8bd992c..665d6da212 100644 --- a/package/filemq/filemq.mk +++ b/package/filemq/filemq.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILEMQ_VERSION = 8940f34e0f1c8f25c1c693ed8db069f58fbc5ad0 +FILEMQ_VERSION = af4768dcaf2fcb8083a32bad107a22ecb7a5d954 FILEMQ_SITE = $(call github,zeromq,filemq,$(FILEMQ_VERSION)) FILEMQ_AUTORECONF = YES diff --git a/package/findutils/findutils.hash b/package/findutils/findutils.hash index 392c62d254..26dbe59181 100644 --- a/package/findutils/findutils.hash +++ b/package/findutils/findutils.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a findutils-4.7.0.tar.xz +sha256 57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164 findutils-4.8.0.tar.xz # Hash for license file -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 13d8271e18..918591c53f 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -4,11 +4,12 @@ # ################################################################################ -FINDUTILS_VERSION = 4.7.0 +FINDUTILS_VERSION = 4.8.0 FINDUTILS_SOURCE = findutils-$(FINDUTILS_VERSION).tar.xz FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils FINDUTILS_LICENSE = GPL-3.0+ FINDUTILS_LICENSE_FILES = COPYING +FINDUTILS_CPE_ID_VENDOR = gnu FINDUTILS_CONF_ENV = \ gl_cv_func_stdin=yes \ ac_cv_func_working_mktime=yes \ diff --git a/package/fio/Config.in b/package/fio/Config.in index 8da227db7c..7825209b4c 100644 --- a/package/fio/Config.in +++ b/package/fio/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FIO bool "fio" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_THREADS # fio uses fallocate() which becomes fallocate64() while compiling with @@ -13,8 +14,9 @@ config BR2_PACKAGE_FIO http://git.kernel.dk/?p=fio.git;a=summary -comment "fio needs a toolchain w/ dynamic library, threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "fio needs a toolchain w/ dynamic library, threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_nios2 depends on BR2_USE_MMU diff --git a/package/fio/fio.hash b/package/fio/fio.hash index 4b6c9b8c1d..891ca4e40e 100644 --- a/package/fio/fio.hash +++ b/package/fio/fio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2aa68326266ef074ecc0892ebfe165e28c981282f345ee05f9d06f11ada3f052 fio-3.17.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 8a240c1ad13d1fe3e58588643d81d0695899be4a669fe6d8fafa76ca6a89db2c MORAL-LICENSE +sha256 859dca5241e5494d86c4aa1531a984cc556789c78e56b30d6070acfbdd193a8c fio-3.28.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8a240c1ad13d1fe3e58588643d81d0695899be4a669fe6d8fafa76ca6a89db2c MORAL-LICENSE diff --git a/package/fio/fio.mk b/package/fio/fio.mk index 5761d1c282..13818b60fd 100644 --- a/package/fio/fio.mk +++ b/package/fio/fio.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIO_VERSION = 3.17 +FIO_VERSION = 3.28 FIO_SITE = http://brick.kernel.dk/snaps FIO_LICENSE = GPL-2.0 FIO_LICENSE_FILES = COPYING MORAL-LICENSE @@ -13,6 +13,10 @@ ifeq ($(BR2_PACKAGE_LIBAIO),y) FIO_DEPENDENCIES += libaio endif +ifeq ($(BR2_PACKAGE_LIBNFS),y) +FIO_DEPENDENCIES += libnfs +endif + ifeq ($(BR2_PACKAGE_NUMACTL),y) FIO_DEPENDENCIES += numactl endif diff --git a/package/flac/flac.mk b/package/flac/flac.mk index f2922ffefc..9aa00b7ffd 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -11,12 +11,13 @@ FLAC_INSTALL_STAGING = YES FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libraries) FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL +FLAC_CPE_ID_VENDOR = flac_project # patch touching configure.ac FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ - --disable-cpplibs \ + $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ --disable-xmms-plugin \ --disable-altivec diff --git a/package/flannel/Config.in b/package/flannel/Config.in index 326361080f..eb8d798f48 100644 --- a/package/flannel/Config.in +++ b/package/flannel/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_FLANNEL Flannel is a virtual network that gives a subnet to each host for use with container runtimes. - https://github.com/coreos/flannel + https://github.com/flannel-io/flannel diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index 57c2daf6dc..0d0f75e6b4 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dbbcb08c0e70713b0c920387a9967e5b30ef833c8118c847edbbca4f68ff0562 v0.5.5.tar.gz +sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca v0.14.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 0af06c7656..231cf90dfd 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -4,14 +4,14 @@ # ################################################################################ -FLANNEL_VERSION = 0.5.5 -FLANNEL_SITE = https://github.com/coreos/flannel/archive +FLANNEL_VERSION = 0.14.0 +FLANNEL_SITE = https://github.com/flannel-io/flannel/archive FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz FLANNEL_LICENSE = Apache-2.0 FLANNEL_LICENSE_FILES = LICENSE -FLANNEL_LDFLAGS = -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) +FLANNEL_LDFLAGS = -X github.com/flannel-io/flannel/version.Version=$(FLANNEL_VERSION) # Install flannel to its well known location. define FLANNEL_INSTALL_TARGET_CMDS diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index cdcb018948..d08b740af3 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FLARE_ENGINE bool "flare-engine" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # SDL2 + select BR2_PACKAGE_LIBPNG # SDL2_IMAGE needs libpng support select BR2_PACKAGE_SDL2 select BR2_PACKAGE_SDL2_IMAGE select BR2_PACKAGE_SDL2_MIXER diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash index e03bcc589e..0e37a71922 100644 --- a/package/flare-engine/flare-engine.hash +++ b/package/flare-engine/flare-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4bbd4674513b643be6294188904665c53f0ef2912e803212c05e8fd22a44d74d flare-engine-1.0.tar.gz +sha256 035ffd936d9e120dc2eb792779a0b7ff64574d4a29a1124946deaf7946d1059d flare-engine-1.11.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index ed9dd19b0e..b91fc16af3 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLARE_ENGINE_VERSION = 1.0 -FLARE_ENGINE_SITE = $(call github,clintbellanger,flare-engine,v$(FLARE_ENGINE_VERSION)) +FLARE_ENGINE_VERSION = 1.11 +FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION)) FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING @@ -14,16 +14,12 @@ FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf # Don't use /usr/games and /usr/share/games FLARE_ENGINE_CONF_OPTS += -DBINDIR=bin -DDATADIR=share/flare -# Don't use the default Debug type as it adds -pg (gprof) -ifeq ($(BR2_ENABLE_DEBUG),y) -FLARE_ENGINE_CONF_OPTS += -DCMAKE_BUILD_TYPE=RelWithDebInfo -endif +# CMAKE_BUILD_TYPE is only used to set optimization and debug flags, all of +# which we want Buildroot to steer explicitly. Explicitly set a fake build type +# to get this control. +FLARE_ENGINE_CONF_OPTS += -DCMAKE_BUILD_TYPE=Buildroot ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) -# CMakeLists.txt sets CMAKE_CXX_FLAGS_ depending on -# BUILD_TYPE, and this comes after the generic CMAKE_CXX_FLAGS. -# Override CMAKE_BUILD_TYPE so no overrides are applied. -FLARE_ENGINE_CONF_OPTS += -DCMAKE_BUILD_TYPE=Buildroot FLARE_ENGINE_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -O0" endif diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash index 51646269a3..983c23200f 100644 --- a/package/flare-game/flare-game.hash +++ b/package/flare-game/flare-game.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5c8e9d72fcbe59f1861f79ac7b76ceffe3ec61d1df241c32d9133fe158fba4c1 flare-game-1.0.tar.gz -sha256 9fce5eb663f136449e11293a871ed96db5ba579116a927fc6a70dd20a4a5b9e6 README +sha256 c13231c7dd021252487f6cf117f7f2bb24bbda40af0a2b2902d72b5e2d4c242a flare-game-1.11.tar.gz +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f LICENSE.txt diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index a70e998d0e..4bebc79595 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLARE_GAME_VERSION = 1.0 -FLARE_GAME_SITE = $(call github,clintbellanger,flare-game,v$(FLARE_GAME_VERSION)) +FLARE_GAME_VERSION = 1.11 +FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) FLARE_GAME_LICENSE_FILES = README diff --git a/package/flashbench/flashbench.hash b/package/flashbench/flashbench.hash index f82d7f0eed..9906af02e5 100644 --- a/package/flashbench/flashbench.hash +++ b/package/flashbench/flashbench.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 12e2dcb6f041ef1a303fc5bc84642ed637c24d77ed6c667a2187f21d54555731 flashbench-2e30b1968a66147412f21002ea844122a0d5e2f0.tar.gz +sha256 422860966ad3528a7fd1dc88e4aa0b2bd91f11fa6429523b9acd21dc5beb6a19 flashbench-2e30b1968a66147412f21002ea844122a0d5e2f0-br1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index c333c29730..182a3f454a 100644 --- a/package/flashrom/Config.in +++ b/package/flashrom/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS bool default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arc default y if BR2_arm || BR2_armeb default y if BR2_i386 || BR2_x86_64 default y if BR2_m68k diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index 6622758a55..97df4fe9a4 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,4 +1,4 @@ # Locally computed after checking pgp signature -# https://download.flashrom.org/releases/flashrom-v1.1.tar.bz2.asc -sha256 aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19 flashrom-v1.1.tar.bz2 -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +# https://download.flashrom.org/releases/flashrom-v1.2.tar.bz2.asc +sha256 e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b flashrom-v1.2.tar.bz2 +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 6b9e6dde94..5554082bca 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLASHROM_VERSION = 1.1 +FLASHROM_VERSION = 1.2 FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases FLASHROM_LICENSE = GPL-2.0+ @@ -28,13 +28,6 @@ else FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=no endif -ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) -FLASHROM_DEPENDENCIES += host-pkgconf libusb-compat -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=yes -else -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no -endif - ifeq ($(BR2_PACKAGE_PCIUTILS),y) FLASHROM_DEPENDENCIES += pciutils FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes diff --git a/package/flatbuffers/flatbuffers.hash b/package/flatbuffers/flatbuffers.hash index 82ef942799..b05b9e7b4b 100644 --- a/package/flatbuffers/flatbuffers.hash +++ b/package/flatbuffers/flatbuffers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 62f2223fb9181d1d6338451375628975775f7522185266cd5296571ac152bc45 flatbuffers-1.12.0.tar.gz +sha256 9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4 flatbuffers-2.0.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk index 6a71ea9c79..280834c2d4 100644 --- a/package/flatbuffers/flatbuffers.mk +++ b/package/flatbuffers/flatbuffers.mk @@ -4,10 +4,11 @@ # ################################################################################ -FLATBUFFERS_VERSION = 1.12.0 +FLATBUFFERS_VERSION = 2.0.0 FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) FLATBUFFERS_LICENSE = Apache-2.0 FLATBUFFERS_LICENSE_FILES = LICENSE.txt +FLATBUFFERS_CPE_ID_VENDOR = google FLATBUFFERS_INSTALL_STAGING = YES FLATBUFFERS_CONF_OPTS += \ diff --git a/package/flatcc/flatcc.mk b/package/flatcc/flatcc.mk index c27809b86a..fcace691c0 100644 --- a/package/flatcc/flatcc.mk +++ b/package/flatcc/flatcc.mk @@ -10,6 +10,8 @@ FLATCC_LICENSE = Apache-2.0 FLATCC_LICENSE_FILES = LICENSE FLATCC_INSTALL_STAGING = YES FLATCC_DEPENDENCIES = host-flatcc +FLATCC_CONF_OPTS = -DFLATCC_ALLOW_WERROR=OFF +HOST_FLATCC_CONF_OPTS = -DFLATCC_ALLOW_WERROR=OFF # Disable build of tests and samples FLATCC_CONF_OPTS += -DFLATCC_TEST=OFF diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 6ce768c318..85da5ddae8 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -9,6 +9,10 @@ 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 +# 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 FLEX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-m4 HOST_FLEX_DEPENDENCIES = host-m4 diff --git a/package/fluidsynth/Config.in b/package/fluidsynth/Config.in index c1cb923489..5726e235e4 100644 --- a/package/fluidsynth/Config.in +++ b/package/fluidsynth/Config.in @@ -3,6 +3,9 @@ config BR2_PACKAGE_FLUIDSYNTH depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 + # the .pc file installed by fluidsynth does not mention its + # indirect dependencies in Libs.private. + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBGLIB2 help FluidSynth is a real-time software synthesizer based on the @@ -86,6 +89,16 @@ comment "pulseaudio support needs a toolchain w/ dynamic library, wchar, threads depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC depends on BR2_STATIC_LIBS || !BR2_USE_MMU || !BR2_TOOLCHAIN_HAS_THREADS +config BR2_PACKAGE_FLUIDSYNTH_SDL2 + bool "sdl2" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_SDL2 + help + Enable SDL2 audio support. + +comment "SDL2 audio support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + comment "Misc options" config BR2_PACKAGE_FLUIDSYNTH_DBUS @@ -115,6 +128,7 @@ config BR2_PACKAGE_FLUIDSYNTH_READLINE endif # BR2_PACKAGE_FLUIDSYNTH -comment "fluidsynth needs a toolchain w/ threads, wchar" +comment "fluidsynth needs a toolchain w/ threads, wchar, dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index f7b1b6696a..08a19e23f8 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9206d83b8d2f7e1ec259ee01e943071de67e419aabe142b51312f8edb39c5503 fluidsynth-2.1.2.tar.gz +sha256 1c56660f23f6c406b36646cc619fc2d2a5265d1d3290e79bcef4505bcd985fdd fluidsynth-2.2.1.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 2bd792dbaf..1355c06c4a 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,10 +4,11 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.1.2 +FLUIDSYNTH_VERSION = 2.2.1 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE +FLUIDSYNTH_CPE_ID_VENDOR = fluidsynth FLUIDSYNTH_INSTALL_STAGING = YES FLUIDSYNTH_DEPENDENCIES = libglib2 @@ -66,4 +67,18 @@ else FLUIDSYNTH_CONF_OPTS += -Denable-readline=0 endif +ifeq ($(BR2_PACKAGE_FLUIDSYNTH_SDL2),y) +FLUIDSYNTH_CONF_OPTS += -Denable-sdl2=1 +FLUIDSYNTH_DEPENDENCIES += sdl2 +else +FLUIDSYNTH_CONF_OPTS += -Denable-sdl2=0 +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +FLUIDSYNTH_CONF_OPTS += -Denable-systemd=1 +FLUIDSYNTH_DEPENDENCIES += systemd +else +FLUIDSYNTH_CONF_OPTS += -Denable-systemd=0 +endif + $(eval $(cmake-package)) diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index d31bb5e794..fed33091cd 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a91e0c9b7c7f238634c64a755c05671f33f2acdb6ae2d09cad4d683b364ee8e4 fmc-fsl-sdk-v2.0.tar.gz +sha256 cb896ec1fac2fe9a3a9bb8be2221b79acf5f9b75841609a681db0d9e7bec02a0 fmc-fsl-sdk-v2.0-br1.tar.gz sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk index 2a95fec0b7..b385730138 100644 --- a/package/fmc/fmc.mk +++ b/package/fmc/fmc.mk @@ -5,7 +5,8 @@ ################################################################################ FMC_VERSION = fsl-sdk-v2.0 -FMC_SITE = git://git.freescale.com/ppc/sdk/fmc.git +FMC_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmc +FMC_SITE_METHOD = git FMC_LICENSE = MIT FMC_LICENSE_FILES = COPYING FMC_DEPENDENCIES = libxml2 tclap fmlib diff --git a/package/fmlib/fmlib.hash b/package/fmlib/fmlib.hash index 9143ac2c37..47460d091c 100644 --- a/package/fmlib/fmlib.hash +++ b/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e5870756c7432b15f7a48b860625808f3c95d5f7fa5e251552eb2324ca51b0fa fmlib-fsl-sdk-v2.0.tar.gz +sha256 59415d346af1d22f510f2785be4c7e3606dc3181476a666e832270550f7d44a6 fmlib-fsl-sdk-v2.0-br1.tar.gz sha256 837559e20d83910a005e7883b876cc5c42805fe4abcf7e5c5b3c8d036b7f61c8 COPYING diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index e67ab1e5de..8cb779201d 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -5,7 +5,8 @@ ################################################################################ FMLIB_VERSION = fsl-sdk-v2.0 -FMLIB_SITE = git://git.freescale.com/ppc/sdk/fmlib.git +FMLIB_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmlib +FMLIB_SITE_METHOD = git FMLIB_LICENSE = BSD-3-Clause, GPL-2.0+ FMLIB_LICENSE_FILES = COPYING FMLIB_DEPENDENCIES = linux diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index 24d05e7789..7947a17456 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365 fmt-6.1.2.tar.gz -sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst +sha256 5d98c504d0205f912e22449ecdea776b78ce0bb096927334f80781e720084c9f fmt-7.1.3.zip +sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index 5dc3088e89..332957982f 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,14 +4,20 @@ # ################################################################################ -FMT_VERSION = 6.1.2 -FMT_SITE = $(call github,fmtlib,fmt,$(FMT_VERSION)) +FMT_VERSION = 7.1.3 +FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) +FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception FMT_LICENSE_FILES = LICENSE.rst +FMT_CPE_ID_VENDOR = fmt FMT_INSTALL_STAGING = YES FMT_CONF_OPTS = \ -DFMT_INSTALL=ON \ -DFMT_TEST=OFF +define FMT_EXTRACT_CMDS + $(UNZIP) -d $(BUILD_DIR) $(FMT_DL_DIR)/$(FMT_SOURCE) +endef + $(eval $(cmake-package)) diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 7387452b0f..e34acde534 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -7,12 +7,18 @@ FONTCONFIG_VERSION = 2.13.1 FONTCONFIG_SITE = http://fontconfig.org/release FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2 +# 0002-add-pthread-as-a-dependency-of-a-static-lib.patch +FONTCONFIG_AUTORECONF = YES FONTCONFIG_INSTALL_STAGING = YES -FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf util-linux +FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \ + $(TARGET_NLS_DEPENDENCIES) HOST_FONTCONFIG_DEPENDENCIES = \ - host-freetype host-expat host-pkgconf host-gperf host-util-linux + host-freetype host-expat host-pkgconf host-gperf host-util-linux \ + host-gettext FONTCONFIG_LICENSE = fontconfig license FONTCONFIG_LICENSE_FILES = COPYING +FONTCONFIG_CPE_ID_VENDOR = fontconfig_project FONTCONFIG_CONF_OPTS = \ --with-arch=$(GNU_TARGET_NAME) \ diff --git a/package/fping/fping.hash b/package/fping/fping.hash index 0aa0330b5a..0b2233f379 100644 --- a/package/fping/fping.hash +++ b/package/fping/fping.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7d339674b6a95aae1d8ad487ff5056fd95b474c3650938268f6a905c3771b64a fping-4.2.tar.gz +sha256 ed38c0b9b64686a05d1b3bc1d66066114a492e04e44eef1821d43b1263cd57b8 fping-5.0.tar.gz # Hash for license file -sha256 6051b27e4b4a648f7bc8b329024da53a6e95ce88fcf0ccc259c371a74b741757 COPYING +sha256 6051b27e4b4a648f7bc8b329024da53a6e95ce88fcf0ccc259c371a74b741757 COPYING diff --git a/package/fping/fping.mk b/package/fping/fping.mk index 5d3ad59e56..0a03c1dfdc 100644 --- a/package/fping/fping.mk +++ b/package/fping/fping.mk @@ -4,9 +4,10 @@ # ################################################################################ -FPING_VERSION = 4.2 +FPING_VERSION = 5.0 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING +FPING_SELINUX_MODULES = netutils $(eval $(autotools-package)) diff --git a/package/freerdp/Config.in b/package/freerdp/Config.in index 5705ce0e0c..14c5f98671 100644 --- a/package/freerdp/Config.in +++ b/package/freerdp/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_FREERDP depends on BR2_USE_MMU # libglib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBGLIB2 help diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 7a6859551f..637e57e8b0 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,3 +1,5 @@ +# From https://pub.freerdp.com/releases/freerdp-2.4.1.tar.gz.sha256 +sha256 ef75c87926643a0d0041f6556e343ac037380d4260c64885e7cdd20da0147edf freerdp-2.4.1.tar.gz + # Locally calculated -sha256 3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49 freerdp-2.0.0-rc4.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index a477e74cb7..40a3904024 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,11 +4,12 @@ # ################################################################################ -FREERDP_VERSION = 2.0.0-rc4 -FREERDP_SITE = $(call github,FreeRDP,FreeRDP,$(FREERDP_VERSION)) +FREERDP_VERSION = 2.4.1 +FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 FREERDP_LICENSE_FILES = LICENSE +FREERDP_CPE_ID_VENDOR = freerdp FREERDP_INSTALL_STAGING = YES @@ -42,6 +43,13 @@ else FREERDP_CONF_OPTS += -DWITH_ALSA=OFF endif +ifeq ($(BR2_PACKAGE_LIBUSB),y) +FREERDP_CONF_OPTS += -DCHANNEL_URBDRC=ON +FREERDP_DEPENDENCIES += libusb +else +FREERDP_CONF_OPTS += -DCHANNEL_URBDRC=OFF +endif + ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) FREERDP_CONF_OPTS += -DWITH_PULSE=ON FREERDP_DEPENDENCIES += pulseaudio diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 0a5be9c75a..bedd05a471 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -49,6 +49,12 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM bool "imx8mm" +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + bool "imx8mn" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + bool "imx8mp" + config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X bool "imx8x" endchoice @@ -68,6 +74,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 default "IMX8MQ" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM + default "IMX8MN" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + default "IMX8MP" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU bool @@ -79,7 +87,8 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO bool default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU bool @@ -89,6 +98,8 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X source "package/freescale-imx/imx-alsa-plugins/Config.in" diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 56d5b80741..0bd8000b50 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -4,7 +4,87 @@ config BR2_PACKAGE_FIRMWARE_IMX help Firmware blobs for the Freescale i.MX SoCs. - It contains blobs for SDMA and VPU. + It contains blobs for SDMA, VPU, HDMI, EDPC, and DDR + training. This library is provided by Freescale as-is and doesn't have an upstream. + +if BR2_PACKAGE_FIRMWARE_IMX + +config BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME + string + default "imx25" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK + default "imx51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 + default "imx53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 + default "imx6q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q + default "imx6q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S + default "imx6q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + +config BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME + string + default "imx27" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS + default "imx51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 + default "imx53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 + default "imx6" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q + default "imx8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + default "imx8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + +config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_HDMI_FW + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + +config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EPDC_FW + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S + +config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + +if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW + +choice + bool "DDR training binaries" + default BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 + help + Choose the DDR training binaries to be used depending on the + kind of memory that is available on the target board (DDR4, + LPDDR4, etc...). + +config BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 + bool "lpddr4" + help + Use LPDDR4 binaries (i.e.: lpddr4_pmu_train_*.bin) + +config BR2_PACKAGE_FIRMWARE_IMX_DDR4 + bool "DDR4" + help + Use DDR4 binaries (i.e.: ddr4_*_201810.bin). + +endchoice # DDR training FW + +config BR2_PACKAGE_FIRMWARE_IMX_IMEM_LEN + hex "(LP)DDR IMEM padding length" + default 0x8000 + help + The IMEM firmware will be padded to this length + +config BR2_PACKAGE_FIRMWARE_IMX_DMEM_LEN + hex "(LP)DDR DMEM padding length" + default 0x4000 + help + The DMEM firmware will be padded to this length + +endif # BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW + +endif # BR2_PACKAGE_FIRMWARE_IMX diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash index e49ce085bf..c434ce7ebd 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 45b0a7392e7a4b2e6c7e1cb988dd660ff3f8cd465afdf796ff840a00db08389d firmware-imx-8.5.bin -sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING +sha256 1a7aaab69cd8c48d10ffb0118c938f4b3daf4c7fd86f0342f4d352906f8e0ecb firmware-imx-8.11.bin +sha256 4f3cc2dcbe3b7369bd4a51df749f432b69d8189fc2bde88f9fadbec73c686683 COPYING +sha256 a07e8df685161553d7e0b78b8b93ebe9086d95bb8635abff0ed3247992181e85 EULA diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 246bfdfaa1..1076cf85f1 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = 8.5 +FIRMWARE_IMX_VERSION = 8.11 FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin @@ -12,56 +12,127 @@ FIRMWARE_IMX_LICENSE = NXP Semiconductor Software License Agreement FIRMWARE_IMX_LICENSE_FILES = EULA COPYING FIRMWARE_IMX_REDISTRIBUTE = NO -FIRMWARE_IMX_BLOBS = sdma vpu +FIRMWARE_IMX_INSTALL_IMAGES = YES define FIRMWARE_IMX_EXTRACT_CMDS $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM),y) -FIRMWARE_IMX_INSTALL_IMAGES = YES -FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys -define FIRMWARE_IMX_PREPARE_LPDDR4_FW - $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_imem.bin \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_imem_pad.bin - $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_dmem.bin \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_dmem_pad.bin - cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_imem_pad.bin \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_dmem_pad.bin > \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_fw.bin +# +# DDR firmware +# + +define FIRMWARE_IMX_PREPARE_DDR_FW + $(TARGET_OBJCOPY) -I binary -O binary \ + --pad-to $(BR2_PACKAGE_FIRMWARE_IMX_IMEM_LEN) --gap-fill=0x0 \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(1)).bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(1))_pad.bin + $(TARGET_OBJCOPY) -I binary -O binary \ + --pad-to $(BR2_PACKAGE_FIRMWARE_IMX_DMEM_LEN) --gap-fill=0x0 \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(2)).bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(2))_pad.bin + cat $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(1))_pad.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(2))_pad.bin > \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(3)).bin endef -define FIRMWARE_IMX_INSTALL_IMAGES_CMDS +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) +FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys + +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW # Create padded versions of lpddr4_pmu_* and generate lpddr4_pmu_train_fw.bin. # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin # which is done in post-image script. - $(call FIRMWARE_IMX_PREPARE_LPDDR4_FW,1d) - $(call FIRMWARE_IMX_PREPARE_LPDDR4_FW,2d) + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_pmu_train_1d_imem,lpddr4_pmu_train_1d_dmem,lpddr4_pmu_train_1d_fw) + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_pmu_train_2d_imem,lpddr4_pmu_train_2d_dmem,lpddr4_pmu_train_2d_fw) cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_1d_fw.bin \ $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_2d_fw.bin > \ $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin + ln -sf $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin $(BINARIES_DIR)/ddr_fw.bin +endef +endif + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) +FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys + +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW + # Create padded versions of ddr4_* and generate ddr4_fw.bin. + # ddr4_fw.bin is needed when generating imx8-boot-sd.bin + # which is done in post-image script. + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + ddr4_imem_1d_201810,ddr4_dmem_1d_201810,ddr4_1d_201810_fw) + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + ddr4_imem_2d_201810,ddr4_dmem_2d_201810,ddr4_2d_201810_fw) + cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_1d_201810_fw.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_2d_201810_fw.bin > \ + $(BINARIES_DIR)/ddr4_201810_fw.bin + ln -sf $(BINARIES_DIR)/ddr4_201810_fw.bin $(BINARIES_DIR)/ddr_fw.bin +endef +endif + +# +# HDMI firmware +# + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_HDMI_FW),y) +define FIRMWARE_IMX_INSTALL_IMAGE_HDMI_FW cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \ $(BINARIES_DIR)/signed_hdmi_imx8m.bin endef -else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) -define FIRMWARE_IMX_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_dec.bin \ - $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_dec.bin - $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_enc.bin \ - $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_enc.bin -endef -else -define FIRMWARE_IMX_INSTALL_TARGET_CMDS +endif + +# +# EPDC firmware +# + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EPDC_FW),y) +define FIRMWARE_IMX_INSTALL_TARGET_EPDC_FW mkdir -p $(TARGET_DIR)/lib/firmware/imx - for blobdir in $(FIRMWARE_IMX_BLOBS); do \ - cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \ - done cp -r $(@D)/firmware/epdc $(TARGET_DIR)/lib/firmware/imx mv $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \ $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw endef endif +# +# SDMA firmware +# + +FIRMWARE_IMX_SDMA_FW_NAME = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME)) +ifneq ($(FIRMWARE_IMX_SDMA_FW_NAME),) +define FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW + mkdir -p $(TARGET_DIR)/lib/firmware/imx/sdma + cp -r $(@D)/firmware/sdma/sdma-$(FIRMWARE_IMX_SDMA_FW_NAME)*.bin \ + $(TARGET_DIR)/lib/firmware/imx/sdma/ +endef +endif + +# +# VPU firmware +# + +FIRMWARE_IMX_VPU_FW_NAME = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME)) +ifneq ($(FIRMWARE_IMX_VPU_FW_NAME),) +define FIRMWARE_IMX_INSTALL_TARGET_VPU_FW + mkdir -p $(TARGET_DIR)/lib/firmware/vpu + for i in $$(find $(@D)/firmware/vpu/vpu_fw_$(FIRMWARE_IMX_VPU_FW_NAME)*.bin); do \ + cp $$i $(TARGET_DIR)/lib/firmware/vpu/ ; \ + ln -sf vpu/$$(basename $$i) $(TARGET_DIR)/lib/firmware/$$(basename $$i) ; \ + done +endef +endif + +define FIRMWARE_IMX_INSTALL_IMAGES_CMDS + $(FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW) + $(FIRMWARE_IMX_INSTALL_IMAGE_HDMI_FW) +endef + +define FIRMWARE_IMX_INSTALL_TARGET_CMDS + $(FIRMWARE_IMX_INSTALL_TARGET_EPDC_FW) + $(FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW) + $(FIRMWARE_IMX_INSTALL_TARGET_VPU_FW) +endef + $(eval $(generic-package)) diff --git a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash index b0f47080ce..bb7beede9d 100644 --- a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash +++ b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 e76a71e9166fbedeaa535fd7ebc07edc30a1e87f529ab2aa733e3603d3183ed0 imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga.tar.gz +sha256 a9a5ef408a7329c2c5fa2a084ae7824afbfbebed68612bd72509488ccb0b94b3 imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash index 8ecfbfe40f..4f05ca78b0 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6d6d02d035d988cbdb2014794f2efe970a3f5ac277202882bbf553bb7fd789d2 imx-gpu-g2d-6.4.0.p1.0-aarch32.bin -sha256 35885f435dbe951d2c0f439a376ed8a59a50b67a1b7e1e14fa2ab03995abb1ad imx-gpu-g2d-6.4.0.p1.0-aarch64.bin -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING -sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA +sha256 9fd1b2c05ecabb3cc1468c357fc85f024a736de54abb9942e17230f24fa280c0 imx-gpu-g2d-6.4.3.p1.2-arm.bin +sha256 1b0369e9f75bf8fff7b8a86ade8d0d1748a52579b02ef72e53ad5565eee4dc60 imx-gpu-g2d-6.4.3.p1.2-aarch64.bin +sha256 4f3cc2dcbe3b7369bd4a51df749f432b69d8189fc2bde88f9fadbec73c686683 COPYING +sha256 a07e8df685161553d7e0b78b8b93ebe9086d95bb8635abff0ed3247992181e85 EULA diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index 6598e4c32b..12f881105d 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_G2D_VERSION = 6.4.0.p1.0-aarch64 +IMX_GPU_G2D_VERSION = 6.4.3.p1.2-aarch64 else -IMX_GPU_G2D_VERSION = 6.4.0.p1.0-aarch32 +IMX_GPU_G2D_VERSION = 6.4.3.p1.2-arm endif IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index a2deaf2e12..f465167acd 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -12,8 +12,12 @@ config BR2_PACKAGE_IMX_GPU_VIV depends on (BR2_arm && BR2_ARM_EABIHF) || BR2_aarch64 # Library binaries are linked against libc.so.6 depends on BR2_TOOLCHAIN_USES_GLIBC + # Library binaries are linked against libdrm.so.2, except framebuffer + # output on ARM + select BR2_PACKAGE_LIBDRM if !(BR2_arm && BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB) select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_HAS_LIBOPENCL select BR2_PACKAGE_HAS_LIBOPENVG help Userspace libraries for Vivante GPU on i.MX platforms @@ -55,8 +59,6 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL bool "Wayland" - # libdrm needed by gbm_viv.so - select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_HAS_LIBEGL_WAYLAND @@ -66,7 +68,7 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT string default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB - default "wl" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL + default "wayland" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_PROVIDES_LIBEGL default "imx-gpu-viv" @@ -74,16 +76,24 @@ config BR2_PACKAGE_PROVIDES_LIBEGL config BR2_PACKAGE_PROVIDES_LIBGLES default "imx-gpu-viv" +config BR2_PACKAGE_PROVIDES_LIBOPENCL + default "imx-gpu-viv" + config BR2_PACKAGE_PROVIDES_LIBOPENVG default "imx-gpu-viv" config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES bool "install examples" + # example binaries are linked against libstdc++.so.6 + depends on BR2_INSTALL_LIBSTDCPP help Copy the Vivante examples to the target. Warning: examples take approximately 150 MB of disk space. +comment "imx-gpu-viv-examples need a toolchain w/ C++ support" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO bool "install gmem_info tool" help diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index 1a67b53ac5..6c0dacba60 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b5c94b56a9f7c84aa084603a6ca21b5f3941b400e4f6ee8558b58c9b9f1aab36 imx-gpu-viv-6.4.0.p1.0-aarch32.bin -sha256 45852a5c3c61a9215a2ffb7387a6e1cce7ddac6f12513fc77459ad7e1f1b3a27 imx-gpu-viv-6.4.0.p1.0-aarch64.bin -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING -sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA +sha256 0f139f5544250a3059c0a0266d44f70e89632694861de3e186272b170b37c464 imx-gpu-viv-6.4.3.p1.2-aarch32.bin +sha256 3de60afb1f54c0888d9849c5a27f938ba229f9f35675456a173bdf00e3538c5d imx-gpu-viv-6.4.3.p1.2-aarch64.bin +sha256 4f3cc2dcbe3b7369bd4a51df749f432b69d8189fc2bde88f9fadbec73c686683 COPYING +sha256 a07e8df685161553d7e0b78b8b93ebe9086d95bb8635abff0ed3247992181e85 EULA diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 646d4e3673..103c0341e3 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_VIV_VERSION = 6.4.0.p1.0-aarch64 +IMX_GPU_VIV_VERSION = 6.4.3.p1.2-aarch64 else -IMX_GPU_VIV_VERSION = 6.4.0.p1.0-aarch32 +IMX_GPU_VIV_VERSION = 6.4.3.p1.2-aarch32 endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin @@ -18,7 +18,7 @@ IMX_GPU_VIV_LICENSE = NXP Semiconductor Software License Agreement IMX_GPU_VIV_LICENSE_FILES = EULA COPYING IMX_GPU_VIV_REDISTRIBUTE = NO -IMX_GPU_VIV_PROVIDES = libegl libgles libopenvg +IMX_GPU_VIV_PROVIDES = libegl libgles libopencl libopenvg IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) @@ -29,8 +29,13 @@ ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes endif -ifeq ($(IMX_GPU_VIV_LIB_TARGET),wl) -IMX_GPU_VIV_DEPENDENCIES += libdrm wayland +# Libraries are linked against libdrm, except framebuffer output on ARM +ifneq ($(IMX_GPU_VIV_LIB_TARGET)$(BR2_arm),fby) +IMX_GPU_VIV_DEPENDENCIES += libdrm +endif + +ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) +IMX_GPU_VIV_DEPENDENCIES += wayland endif define IMX_GPU_VIV_EXTRACT_CMDS @@ -38,42 +43,22 @@ define IMX_GPU_VIV_EXTRACT_CMDS endef # Instead of building, we fix up the inconsistencies that exist -# in the upstream archive here. +# in the upstream archive here. We also remove unused backend files. # Make sure these commands are idempotent. define IMX_GPU_VIV_BUILD_CMDS - $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/gpu-core/usr/include/*/*.h - $(if $(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11)$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL), - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1 - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1.2 - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1.2.0 - ) - ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so - ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1 - ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1.0 - ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so - ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2 - ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0 - ln -sf libGAL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so - ln -sf libVDK-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVDK.so + cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIB_TARGET)/* $(@D)/gpu-core/usr/lib/ + for backend in fb x11 wayland; do \ + $(RM) -r $(@D)/gpu-core/usr/lib/$$backend ; \ + done endef -ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) -define IMX_GPU_VIV_FIXUP_FB_HEADERS - $(SED) '39i\ - #if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\ - #define EGL_API_FB \n\ - #endif' $(STAGING_DIR)/usr/include/EGL/eglplatform.h -endef -endif - ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc endef endif -ifeq ($(IMX_GPU_VIV_LIB_TARGET),wl) +ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc endef @@ -89,7 +74,6 @@ endif define IMX_GPU_VIV_INSTALL_STAGING_CMDS cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr - $(IMX_GPU_VIV_FIXUP_FB_HEADERS) $(IMX_GPU_VIV_FIXUP_PKGCONFIG) for lib in egl gbm glesv1_cm glesv2 vg; do \ $(INSTALL) -m 0644 -D \ @@ -111,21 +95,11 @@ define IMX_GPU_VIV_INSTALL_GMEM_INFO endef endif -# On the target, remove the unused libraries. -# Note that this is _required_, else ldconfig may create symlinks -# to the wrong library define IMX_GPU_VIV_INSTALL_TARGET_CMDS $(IMX_GPU_VIV_INSTALL_EXAMPLES) $(IMX_GPU_VIV_INSTALL_GMEM_INFO) cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr - for lib in EGL GAL GLESv2 VDK; do \ - for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \ - case $$f in \ - *-$(IMX_GPU_VIV_LIB_TARGET).so) : ;; \ - *) $(RM) $$f ;; \ - esac; \ - done; \ - done + $(INSTALL) -D -m 0644 $(@D)/gpu-core/etc/Vivante.icd $(TARGET_DIR)/etc/OpenCL/vendors/Vivante.icd endef $(eval $(generic-package)) diff --git a/package/freescale-imx/imx-lib/imx-lib.hash b/package/freescale-imx/imx-lib/imx-lib.hash index c16dc7f9a9..f7d907b99d 100644 --- a/package/freescale-imx/imx-lib/imx-lib.hash +++ b/package/freescale-imx/imx-lib/imx-lib.hash @@ -1,3 +1,3 @@ # locally computed -sha256 ced5ad0a179887ef1dd93e8103a9ab7372017cc1c241d28cded164cdece4b918 imx-lib-3f777974c0c146817e2ff5cb0340ca66a1f99e57.tar.gz +sha256 cad7823568cbd367ed8525e01c8c11a2393fc2dc481425273cb7919385367c61 imx-lib-3f777974c0c146817e2ff5cb0340ca66a1f99e57-br1.tar.gz sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING-LGPL-2.1 diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash index bd8de5b869..ed83e757af 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 5a28180217975f3d78fcfac15e46b0a942910fadf078e4af76deb6dc498136ed imx-sc-firmware-1.2.7.1.bin -sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING +sha256 24a647237c0077ce0172563d67fcbc5e8f231bad7cf55a2436848c89579c5a06 imx-sc-firmware-1.8.0.bin +sha256 a07e8df685161553d7e0b78b8b93ebe9086d95bb8635abff0ed3247992181e85 EULA +sha256 4f3cc2dcbe3b7369bd4a51df749f432b69d8189fc2bde88f9fadbec73c686683 COPYING diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk index 954cfc4072..bbb7310306 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_SC_FIRMWARE_VERSION = 1.2.7.1 +IMX_SC_FIRMWARE_VERSION = 1.8.0 IMX_SC_FIRMWARE_SITE = $(FREESCALE_IMX_SITE) IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION).bin diff --git a/package/freescale-imx/imx-seco/Config.in b/package/freescale-imx/imx-seco/Config.in index 1877664a0c..867ffe1bb0 100644 --- a/package/freescale-imx/imx-seco/Config.in +++ b/package/freescale-imx/imx-seco/Config.in @@ -7,3 +7,47 @@ config BR2_PACKAGE_IMX_SECO This library is provided by Freescale as-is and doesn't have an upstream. + +if BR2_PACKAGE_IMX_SECO + +choice + prompt "i.MX Seco Firmware Release" + default BR2_PACKAGE_IMX_SECO_MX8QMB0 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + default BR2_PACKAGE_IMX_SECO_MX8QXC0 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + help + Select the appropriate ahab container image to install + to match the iMX asics revision. + + Note - mismatches result in a failure to boot + +config BR2_PACKAGE_IMX_SECO_MX8DXLA0 + bool "imx-seco-mx8dxla0" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + +config BR2_PACKAGE_IMX_SECO_MX8DXLA1 + bool "imx-seco-mx8dxla1" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + +config BR2_PACKAGE_IMX_SECO_MX8QMB0 + bool "imx-seco-mx8qmb0" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + +config BR2_PACKAGE_IMX_SECO_MX8QXB0 + bool "imx-seco-mx8qxb0" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + +config BR2_PACKAGE_IMX_SECO_MX8QXC0 + bool "imx-seco-mx8qxc0" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + +endchoice + +config BR2_PACKAGE_IMX_SECO_AHAB_CONTAINER_IMAGE + string + default "mx8dxla0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8DXLA0 + default "mx8dxla1-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8DXLA1 + default "mx8qmb0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8QMB0 + default "mx8qxb0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8QXB0 + default "mx8qxc0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8QXC0 + +endif diff --git a/package/freescale-imx/imx-seco/imx-seco.hash b/package/freescale-imx/imx-seco/imx-seco.hash index 56f56369d4..378c24bc54 100644 --- a/package/freescale-imx/imx-seco/imx-seco.hash +++ b/package/freescale-imx/imx-seco/imx-seco.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b429ac58b2ea1771b3fdf7ae87bf1d37ccaf596bde01a5ecccae27b2145f6824 imx-seco-2.3.1.bin -sha256 69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c EULA -sha256 6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46 COPYING +sha256 08cf25a4be6841ca7264a50b29c311b386eae1c02fced8a3b55fd04213acb4bc imx-seco-3.7.5.bin +sha256 72edc2072c86d93aa1993d15d4d19d96270af3749b0108995ad50c81d1461f52 EULA +sha256 9c16421e7c702f56756650b8ac954d34556327e598a8666e6e8f4eb3a1aa95f1 COPYING diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk index d06bf4c5cc..79c9722c43 100644 --- a/package/freescale-imx/imx-seco/imx-seco.mk +++ b/package/freescale-imx/imx-seco/imx-seco.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_SECO_VERSION = 2.3.1 +IMX_SECO_VERSION = 3.7.5 IMX_SECO_SITE = $(FREESCALE_IMX_SITE) IMX_SECO_SOURCE = imx-seco-$(IMX_SECO_VERSION).bin @@ -20,16 +20,11 @@ IMX_SECO_INSTALL_IMAGES = YES # SECO firmware is needed when generating imx8-boot-sd.bin which # is done in post-image script. -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) +IMX_SECO_AHAB_CONTAINER_IMAGE = $(call qstrip,$(BR2_PACKAGE_IMX_SECO_AHAB_CONTAINER_IMAGE)) + define IMX_SECO_INSTALL_IMAGES_CMDS - cp $(@D)/firmware/seco/mx8qx-ahab-container.img \ + cp $(@D)/firmware/seco/$(IMX_SECO_AHAB_CONTAINER_IMAGE) \ $(BINARIES_DIR)/ahab-container.img endef -else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y) -define IMX_SECO_INSTALL_IMAGES_CMDS - cp $(@D)/firmware/seco/mx8qm-ahab-container.img \ - $(BINARIES_DIR)/ahab-container.img -endef -endif $(eval $(generic-package)) diff --git a/package/freescale-imx/imx-uuc/Config.in b/package/freescale-imx/imx-uuc/Config.in index 0e257bde17..6c3d4a6361 100644 --- a/package/freescale-imx/imx-uuc/Config.in +++ b/package/freescale-imx/imx-uuc/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_IMX_UUC bool "imx-uuc" depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_arm # Only relevant for i.MX + depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # usb_functionfs_descs_head_v2 select BR2_PACKAGE_HOST_DOSFSTOOLS diff --git a/package/freescale-imx/imx-uuc/imx-uuc.hash b/package/freescale-imx/imx-uuc/imx-uuc.hash index 57a5098597..5d95463903 100644 --- a/package/freescale-imx/imx-uuc/imx-uuc.hash +++ b/package/freescale-imx/imx-uuc/imx-uuc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2784e0826074335893fdad20e9a4faaedced2f206565c383043fbd169e9273a4 imx-uuc-fc48b497fe961d601b4bcced807f562090854ec9.tar.gz +sha256 7f4d4838d4bf489932ef4a242677db30ad8d9ffd76065e07f4ddee3e6c35db82 imx-uuc-d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/freescale-imx/imx-uuc/imx-uuc.mk b/package/freescale-imx/imx-uuc/imx-uuc.mk index 2ed910cb84..4e065c19ea 100644 --- a/package/freescale-imx/imx-uuc/imx-uuc.mk +++ b/package/freescale-imx/imx-uuc/imx-uuc.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_UUC_VERSION = fc48b497fe961d601b4bcced807f562090854ec9 +IMX_UUC_VERSION = d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc IMX_UUC_SITE = $(call github,NXPmicro,imx-uuc,$(IMX_UUC_VERSION)) IMX_UUC_LICENSE = GPL-2.0+ IMX_UUC_LICENSE_FILES = COPYING diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash index 7f02f92467..e9df63bfca 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash @@ -1,3 +1,4 @@ -sha256 8d189156d713f12b255f16badd0093aaacd16859aa3191603908de07567485a5 imx-vpu-hantro-1.15.0.bin -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING -sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA +# Locally computed: +sha256 419725f0c09f5939c88cd234b729c3943cbd37e53db7352b02c8d6cc05b939b9 imx-vpu-hantro-1.21.0.bin +sha256 4f3cc2dcbe3b7369bd4a51df749f432b69d8189fc2bde88f9fadbec73c686683 COPYING +sha256 a07e8df685161553d7e0b78b8b93ebe9086d95bb8635abff0ed3247992181e85 EULA diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk index dbdbd4dc7b..0d075c49c0 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_HANTRO_VERSION = 1.15.0 +IMX_VPU_HANTRO_VERSION = 1.21.0 IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin IMX_VPU_HANTRO_DEPENDENCIES = linux diff --git a/package/freescale-imx/imx-vpu/imx-vpu.hash b/package/freescale-imx/imx-vpu/imx-vpu.hash index 81ea35a7fb..e3a53e3fb6 100644 --- a/package/freescale-imx/imx-vpu/imx-vpu.hash +++ b/package/freescale-imx/imx-vpu/imx-vpu.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b7bb67b00daf436fd91a2760c2db375a962e2c919045ce8bf81bd54b95d999c5 imx-vpu-5.4.39.1.bin -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING -sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA +sha256 87cb799a57df654db29403cb74a75ca5185a1517022d3a4a16b8d69056c36127 imx-vpu-5.4.39.3.bin +sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING +sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk index e61b9f829a..14a1a7a9f0 100644 --- a/package/freescale-imx/imx-vpu/imx-vpu.mk +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_VERSION = 5.4.39.1 +IMX_VPU_VERSION = 5.4.39.3 IMX_VPU_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash index fe40692a6b..ab021b6849 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d747c39f900315f2f46b8397f55d199c7ece7328ae91ce21a2f5eb0895603865 kernel-module-imx-gpu-viv-4cc1368dc05073b368cfdbadfdf5de3a3d3b15f4.tar.gz +sha256 fbf400adbeaa52af0be234a5dcd96059615db4535cda2bd101d65d468e49e288 kernel-module-imx-gpu-viv-3588f2f6e64082153baae116dd393aa15061473d.tar.gz sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk index e087ccaa12..3afcc9d228 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KERNEL_MODULE_IMX_GPU_VIV_VERSION = 4cc1368dc05073b368cfdbadfdf5de3a3d3b15f4 +KERNEL_MODULE_IMX_GPU_VIV_VERSION = 3588f2f6e64082153baae116dd393aa15061473d KERNEL_MODULE_IMX_GPU_VIV_SITE = \ $(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION)) KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPL-2.0 @@ -16,5 +16,9 @@ KERNEL_MODULE_IMX_GPU_VIV_MODULE_MAKE_OPTS = \ KERNEL_MODULE_IMX_GPU_VIV_MODULE_SUBDIRS = kernel-module-imx-gpu-viv-src +define KERNEL_MODULE_IMX_GPU_VIV_LINUX_CONFIG_FIXUPS + $(call KCONFIG_DISABLE_OPT,CONFIG_MXC_GPU_VIV) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash b/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash index a863dbfcf7..d7fb58fb6d 100644 --- a/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash +++ b/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0dec5b78f655e175936806396b89b4997c8e543a1c84683a19ea2b6f36e01d7e freeswitch-mod-bcg729-1.0.4.tar.gz -sha256 bb4680b13c3190429464a8308a07d7d891e6454349fb7be856e02405b25b1195 LICENSE +sha256 ada0640094b5b3b4a767ec360213bfed624e698c9932b2f9ceb76eb1c0f5a246 freeswitch-mod-bcg729-1.0.5.tar.gz +sha256 bb4680b13c3190429464a8308a07d7d891e6454349fb7be856e02405b25b1195 LICENSE diff --git a/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk b/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk index f92a490051..d820756c0f 100644 --- a/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk +++ b/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_MOD_BCG729_VERSION = 1.0.4 +FREESWITCH_MOD_BCG729_VERSION = 1.0.5 FREESWITCH_MOD_BCG729_SITE = $(call github,xadhoom,mod_bcg729,v$(FREESWITCH_MOD_BCG729_VERSION)) FREESWITCH_MOD_BCG729_LICENSE = MPL-1.1 FREESWITCH_MOD_BCG729_LICENSE_FILES = LICENSE diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in index bd961314e7..bad101486c 100644 --- a/package/freeswitch/Config.in +++ b/package/freeswitch/Config.in @@ -11,11 +11,13 @@ config BR2_PACKAGE_FREESWITCH select BR2_PACKAGE_JPEG # src/mod/applications/mod_cv/mod_cv.cpp includes # highgui.h, imgproc.hpp & objdetect.hpp - select BR2_PACKAGE_OPENCV_LIB_HIGHGUI if BR2_PACKAGE_OPENCV - select BR2_PACKAGE_OPENCV_LIB_IMGPROC if BR2_PACKAGE_OPENCV - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT if BR2_PACKAGE_OPENCV + select BR2_PACKAGE_OPENCV3_LIB_HIGHGUI if BR2_PACKAGE_OPENCV3 + select BR2_PACKAGE_OPENCV3_LIB_IMGPROC if BR2_PACKAGE_OPENCV3 + select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT if BR2_PACKAGE_OPENCV3 select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE + select BR2_PACKAGE_SOFIA_SIP + select BR2_PACKAGE_SPANDSP select BR2_PACKAGE_SPEEX select BR2_PACKAGE_SPEEXDSP select BR2_PACKAGE_SQLITE diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index f300e69bf4..dc5a67980f 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,19 +1,12 @@ -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.md5 -md5 89d66f87f0f6c2471aa95aee48f55fdc freeswitch-1.10.2.-release.tar.xz -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.sha1 -sha1 90dac82cb4fb8fc11e399fd4bdac7163fb40259b freeswitch-1.10.2.-release.tar.xz -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.sha256 -sha256 1fd46dee82ecc52ac90ebab6bd454e34c64950fae7d6dc0589c8daa14bfc7d34 freeswitch-1.10.2.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.6.-release.tar.xz.sha256 +sha256 9a08d4e184e6d715e1c12c43a0f901597151752ef236f0a37e40996272b5c38d freeswitch-1.10.6.-release.tar.xz # Locally computed -sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING -sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt -sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE -sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/apr-util/LICENSE -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c -sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 libs/sofia-sip/COPYING -sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 libs/sofia-sip/COPYRIGHTS -sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a libs/spandsp/COPYING -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE +sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING +sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt +sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE +sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/apr-util/LICENSE +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE +sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 5985df4a6e..63f6324af2 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.2 +FREESWITCH_VERSION = 1.10.6 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -12,17 +12,12 @@ FREESWITCH_INSTALL_STAGING = YES FREESWITCH_LICENSE = MPL-1.1, \ GPL-3.0+ with font exception (fonts), \ Apache-2.0 (apr, apr-util), \ - LGPL-2.0+ (sofia-sip), \ - LGPL-2.1, GPL-2.0 (spandsp), \ BSD-3-Clause (libsrtp) FREESWITCH_LICENSE_FILES = \ COPYING \ libs/apr/LICENSE \ libs/apr-util/LICENSE \ - libs/sofia-sip/COPYING \ - libs/sofia-sip/COPYRIGHTS \ - libs/spandsp/COPYING \ libs/srtp/LICENSE # required dependencies @@ -32,6 +27,8 @@ FREESWITCH_DEPENDENCIES = \ libcurl \ openssl \ pcre \ + spandsp \ + sofia-sip \ speex \ sqlite \ tiff \ @@ -277,8 +274,8 @@ FREESWITCH_DEPENDENCIES += libsoundtouch FREESWITCH_ENABLED_MODULES += applications/mod_soundtouch endif -ifeq ($(BR2_PACKAGE_OPENCV),y) -FREESWITCH_DEPENDENCIES += opencv +ifeq ($(BR2_PACKAGE_OPENCV3),y) +FREESWITCH_DEPENDENCIES += opencv3 FREESWITCH_ENABLED_MODULES += applications/mod_cv endif diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index c4e75c327c..36571b51af 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,9 +1,8 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.1/ -md5 bd42e75127f8431923679480efb5ba8f freetype-2.10.1.tar.xz -sha1 79874ef4eaa52025126b71d836453b8279bdd331 freetype-2.10.1.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ +sha1 0181862673f7216ad2b5074f95fc131209e30b27 freetype-2.10.4.tar.xz # Locally calculated -sha256 16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f freetype-2.10.1.tar.xz -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT -sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT -sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT +sha256 86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784 freetype-2.10.4.tar.xz +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT +sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT +sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 8b3a4ca09c..59d6dc0eb8 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,18 +4,28 @@ # ################################################################################ -FREETYPE_VERSION = 2.10.1 +FREETYPE_VERSION = 2.10.4 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_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT +FREETYPE_CPE_ID_VENDOR = freetype FREETYPE_DEPENDENCIES = host-pkgconf FREETYPE_CONFIG_SCRIPTS = freetype-config +# harfbuzz already depends on freetype so disable harfbuzz in freetype to avoid +# a circular dependency +FREETYPE_CONF_OPTS = --without-harfbuzz + HOST_FREETYPE_DEPENDENCIES = host-pkgconf -HOST_FREETYPE_CONF_OPTS = --without-zlib --without-bzip2 --without-png +HOST_FREETYPE_CONF_OPTS = \ + --without-brotli \ + --without-bzip2 \ + --without-harfbuzz \ + --without-png \ + --without-zlib # since 2.9.1 needed for freetype-config install FREETYPE_CONF_OPTS += --enable-freetype-config @@ -28,6 +38,13 @@ else FREETYPE_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_BROTLI),y) +FREETYPE_DEPENDENCIES += brotli +FREETYPE_CONF_OPTS += --with-brotli +else +FREETYPE_CONF_OPTS += --without-brotli +endif + ifeq ($(BR2_PACKAGE_BZIP2),y) FREETYPE_DEPENDENCIES += bzip2 FREETYPE_CONF_OPTS += --with-bzip2 @@ -37,9 +54,7 @@ endif ifeq ($(BR2_PACKAGE_LIBPNG),y) FREETYPE_DEPENDENCIES += libpng -FREETYPE_CONF_OPTS += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \ - LIBPNG_LDFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --ldflags`" -FREETYPE_LIBPNG_LIBS = "`$(STAGING_DIR)/usr/bin/libpng-config --libs`" +FREETYPE_CONF_OPTS += --with-png else FREETYPE_CONF_OPTS += --without-png endif @@ -52,14 +67,5 @@ define FREETYPE_FIX_CONFIG_FILE endef FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE -# libpng isn't included in freetype-config & freetype2.pc :-/ -define FREETYPE_FIX_CONFIG_FILE_LIBS - $(SED) "s,^Libs.private:,& $(FREETYPE_LIBPNG_LIBS)," \ - $(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc - $(SED) "s,-lfreetype,& $(FREETYPE_LIBPNG_LIBS)," \ - $(STAGING_DIR)/usr/bin/freetype-config -endef -FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE_LIBS - $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/fwts/0001-build-do-not-use-Werror.patch b/package/fwts/0001-build-do-not-use-Werror.patch index c3ea2efc22..715c4f63a5 100644 --- a/package/fwts/0001-build-do-not-use-Werror.patch +++ b/package/fwts/0001-build-do-not-use-Werror.patch @@ -1,7 +1,10 @@ -From 4c202c0fd7e5bd3264c720d715f05573047d9cf5 Mon Sep 17 00:00:00 2001 +From e481c2f990ffa71f205d4b9daf0823e71269a7f3 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Fri, 12 Aug 2016 23:11:56 +0200 Subject: [PATCH] fwts: do not use -Werror +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Warnings come and go with various compiler versions, so using -Werror is prone to cause build failures with various compiler versions, especially @@ -10,8 +13,10 @@ newer versions that introduce new warnings. Remove use of -Werror. Signed-off-by: Erico Nunes -[Fabrice: updated for 19.09.00] +[Fabrice: updated for 20.08.00] Signed-off-by: Fabrice Fontaine +[Vincent: rebased onto V21.05.00] +Signed-off-by: Vincent Stehlé --- configure.ac | 2 +- src/Makefile.am | 2 +- @@ -20,7 +25,7 @@ Signed-off-by: Fabrice Fontaine 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 0109d644..3ca599e1 100644 +index f40c3678..0ff5025b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ @@ -31,23 +36,23 @@ index 0109d644..3ca599e1 100644 AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/Makefile.am b/src/Makefile.am -index 52c637dd..d9d73f1c 100644 +index cdabb386..7c2e5730 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -14,7 +14,7 @@ AM_CPPFLAGS = \ - `pkg-config --silence-errors --cflags json` \ - `pkg-config --silence-errors --cflags json-c` \ +@@ -12,7 +12,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src/acpica/source/compiler \ + -I$(top_srcdir)/efi_runtime \ -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ - -Wall -Werror -Wextra \ + -Wall -Wextra \ - -Wno-address-of-packed-member - - bin_PROGRAMS = fwts + -Wno-address-of-packed-member \ + -Wfloat-equal -Wmissing-declarations \ + -Wno-long-long -Wredundant-decls -Wshadow \ diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am -index 54de7f44..e129ed16 100644 +index 55c52b41..50efa97a 100644 --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am -@@ -24,7 +24,7 @@ AM_CPPFLAGS = \ +@@ -25,7 +25,7 @@ AM_CPPFLAGS = \ `pkg-config --silence-errors --cflags json-c` \ `pkg-config --cflags glib-2.0 gio-2.0` \ -DDATAROOTDIR=\"$(datarootdir)\" \ @@ -57,18 +62,18 @@ index 54de7f44..e129ed16 100644 pkglib_LTLIBRARIES = libfwts.la diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am -index aa37de55..4d5297cc 100644 +index 1fc0fc02..53614e33 100644 --- a/src/utilities/Makefile.am +++ b/src/utilities/Makefile.am @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # --AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ -+AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ - `pkg-config --silence-errors --cflags json` \ - `pkg-config --silence-errors --cflags json-c` +-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ ++AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ + -I$(srcdir)/../lib/include + bin_PROGRAMS = kernelscan -- -2.17.1 +2.30.2 diff --git a/package/fwts/Config.in b/package/fwts/Config.in index 269f065fd5..ac9a2e3909 100644 --- a/package/fwts/Config.in +++ b/package/fwts/Config.in @@ -2,13 +2,12 @@ config BR2_PACKAGE_FWTS bool "fwts" depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c depends on BR2_USE_MMU # libglib2 depends on BR2_USE_WCHAR # libglib2, libbsd depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libbsd + depends on !BR2_STATIC_LIBS # libbsd depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBBSD help Firmware Test Suite (FWTS) is a test suite that performs @@ -33,10 +32,9 @@ comment "efi_runtime module needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL endif -comment "fwts needs a glibc toolchain w/ wchar, threads" +comment "fwts needs a glibc toolchain w/ wchar, threads, dynamic library" depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd - depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_USES_GLIBC + !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index 6338077732..fc79a0b812 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,5 +1,5 @@ # Hash from: http://fwts.ubuntu.com/release/SHA256SUMS -sha256 91075982d067deef86d2830d622c27ed5f5c0b04dfd712902343a67fee753bfd fwts-V19.09.00.tar.gz +sha256 e2d6e8b0704eba859a567fb8764e5dc5385793fc26bd00ecc70e7af03fd2568d fwts-V21.05.00.tar.gz # Hash for license file -sha256 9cfdcde669bcdbd2eb640dca6ed3f9b5ae381d100ac208f9dca6e12e61ad639c debian/copyright +sha256 2003f5c8a1e40d7882f1499bd7adb7bc748c9656851abb28647a3d297c2e8e23 debian/copyright diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index 853f27af49..402a9e0b8f 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,14 +4,14 @@ # ################################################################################ -FWTS_VERSION = 19.09.00 +FWTS_VERSION = 21.05.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = http://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 FWTS_LICENSE = GPL-2.0, LGPL-2.1, Custom FWTS_LICENSE_FILES = debian/copyright FWTS_AUTORECONF = YES -FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf json-c libglib2 libbsd \ +FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) diff --git a/package/fwup/Config.in b/package/fwup/Config.in index fd40cf3261..0e3c57d33d 100644 --- a/package/fwup/Config.in +++ b/package/fwup/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_FWUP # required by libarchive to include zip compression select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBCONFUSE - select BR2_PACKAGE_LIBSODIUM help Fwup is a scriptable embedded Linux firmware update creator and runner. diff --git a/package/fwup/fwup.hash b/package/fwup/fwup.hash index 337883f9a8..87263192e4 100644 --- a/package/fwup/fwup.hash +++ b/package/fwup/fwup.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 20302dc96cef88438034e15551e178bb0652c28d99aa7ca5260100cb3bebbc2a fwup-1.2.5.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 9890f0328796f4315e6c1188df5c103855c530fbc14fbc8c12f4b24066c975f1 fwup-1.8.0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/fwup/fwup.mk b/package/fwup/fwup.mk index e1e5467765..77eaa528f3 100644 --- a/package/fwup/fwup.mk +++ b/package/fwup/fwup.mk @@ -4,12 +4,12 @@ # ################################################################################ -FWUP_VERSION = 1.2.5 +FWUP_VERSION = 1.8.0 FWUP_SITE = $(call github,fhunleth,fwup,v$(FWUP_VERSION)) FWUP_LICENSE = Apache-2.0 FWUP_LICENSE_FILES = LICENSE -FWUP_DEPENDENCIES = host-pkgconf libconfuse libarchive libsodium -HOST_FWUP_DEPENDENCIES = host-pkgconf host-libconfuse host-libarchive host-libsodium +FWUP_DEPENDENCIES = host-pkgconf libconfuse libarchive +HOST_FWUP_DEPENDENCIES = host-pkgconf host-libconfuse host-libarchive FWUP_AUTORECONF = YES FWUP_CONF_ENV = ac_cv_path_HELP2MAN="" diff --git a/package/gauche/gauche.hash b/package/gauche/gauche.hash index 600c46fbdc..dea23c1e33 100644 --- a/package/gauche/gauche.hash +++ b/package/gauche/gauche.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/gauche/files/Gauche/ -sha1 ff7878ab19c56b49b4b6d77009300a3592cc903c Gauche-0.9.8.tgz -md5 efd1b12cd5708d9e1e4358ab2d2e1e32 Gauche-0.9.8.tgz +sha1 ad5e15021764b733ec913cca8b77c9a53d4ee997 Gauche-0.9.9.tgz +md5 20d8ed835ae0bc97cceed78a71f9857b Gauche-0.9.9.tgz # Locally calculated -sha256 3eb30d1051d8b48999fe46511c9f6983057735312c9832b7db13f9db140db74b Gauche-0.9.8.tgz -sha256 d537f80c0bb3cc203bc2675b766b9de9573243026fa3e8ad78368abd4b14aac8 COPYING +sha256 4ca9325322a7efadb9680d156eb7b53521321c9ca4955c4cbe738bc2e1d7f7fb Gauche-0.9.9.tgz +sha256 13cb582677dbcdc5b34313c59b4a014e74ef2f5fd80e514a0bd98fd8a4e45bed COPYING diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index 2a30a2b39a..2520379369 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAUCHE_VERSION = 0.9.8 +GAUCHE_VERSION = 0.9.9 GAUCHE_SOURCE = Gauche-$(GAUCHE_VERSION).tgz GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash index f80f2b202a..91e506607e 100644 --- a/package/gawk/gawk.hash +++ b/package/gawk/gawk.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/gawk/gawk-5.0.1.tar.xz.sig +# https://ftp.gnu.org/gnu/gawk/gawk-5.1.0.tar.xz.sig # Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 -sha256 8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794 gawk-5.0.1.tar.xz +sha256 cf5fea4ac5665fd5171af4716baab2effc76306a9572988d5ba1078f196382bd gawk-5.1.0.tar.xz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 1a5f87f603..ae2bbe5422 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 5.0.1 +GAWK_VERSION = 5.1.0 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk @@ -39,5 +39,11 @@ endef GAWK_POST_INSTALL_TARGET_HOOKS += GAWK_CREATE_SYMLINK +define HOST_GAWK_CREATE_SYMLINK + ln -sf gawk $(HOST_DIR)/usr/bin/awk +endef + +HOST_GAWK_POST_INSTALL_HOOKS += HOST_GAWK_CREATE_SYMLINK + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 034dfb5463..2b7f88154e 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -4,12 +4,13 @@ choice prompt "GCC compiler Version" default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_CSKY if BR2_csky - default BR2_GCC_VERSION_8_X + default BR2_GCC_VERSION_POWERPC_SPE if BR2_powerpc_SPE + default BR2_GCC_VERSION_10_X help Select the version of gcc you wish to use. config BR2_GCC_VERSION_ARC - bool "gcc arc (9.x)" + bool "gcc arc (10.x)" # Only supported architecture depends on BR2_arc select BR2_TOOLCHAIN_GCC_AT_LEAST_9 @@ -20,27 +21,16 @@ config BR2_GCC_VERSION_CSKY depends on BR2_csky select BR2_TOOLCHAIN_GCC_AT_LEAST_6 -config BR2_GCC_VERSION_7_X - bool "gcc 7.x" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 - # Broken or unsupported architectures - depends on !BR2_or1k - select BR2_TOOLCHAIN_GCC_AT_LEAST_7 - -config BR2_GCC_VERSION_8_X - bool "gcc 8.x" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_9 - # Broken or unsupported architectures - depends on !BR2_or1k +config BR2_GCC_VERSION_POWERPC_SPE + bool "gcc powerpc spe" # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html - depends on !BR2_powerpc_SPE + depends on BR2_powerpc_SPE select BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_GCC_VERSION_9_X bool "gcc 9.x" - # or1k needs binutils >= 2.32 - depends on !(BR2_or1k && BR2_BINUTILS_VERSION_2_31_X) + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_10 # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_powerpc_SPE @@ -50,6 +40,33 @@ config BR2_GCC_VERSION_9_X depends on !BR2_csky select BR2_TOOLCHAIN_GCC_AT_LEAST_9 +config BR2_GCC_VERSION_10_X + bool "gcc 10.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + # powerpc spe support has been deprecated since gcc 8.x. + # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html + depends on !BR2_powerpc_SPE + # C-SKY sk610 needs abiv1, which is not supported in + # upstream gcc. C-SKY gcc upstream support not tested + # with upstream binutils and glibc. + depends on !BR2_csky + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + +config BR2_GCC_VERSION_11_X + bool "gcc 11.x" + # powerpc spe support has been deprecated since gcc 8.x. + # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html + depends on !BR2_powerpc_SPE + # C-SKY sk610 needs abiv1, which is not supported in + # upstream gcc. C-SKY gcc upstream support not tested + # with upstream binutils and glibc. + depends on !BR2_csky + # uClibc-ng broken on sparc due to recent gcc changes + # that need to be reverted since gcc 8.4, 9.3 and 10.1. + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 + depends on !BR2_sparc + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + endchoice # libcilkrts was introduced in gcc 4.9 and removed in gcc 8.x @@ -72,10 +89,11 @@ config BR2_GCC_SUPPORTS_DLANG config BR2_GCC_VERSION string - default "7.5.0" if BR2_GCC_VERSION_7_X - default "8.4.0" if BR2_GCC_VERSION_8_X - default "9.3.0" if BR2_GCC_VERSION_9_X - default "arc-2019.09-release" if BR2_GCC_VERSION_ARC + default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE + default "9.4.0" if BR2_GCC_VERSION_9_X + default "10.3.0" if BR2_GCC_VERSION_10_X + default "11.2.0" if BR2_GCC_VERSION_11_X + default "arc-2020.09-release" if BR2_GCC_VERSION_ARC default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 321b3767ab..b37307ebe3 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -1,12 +1,14 @@ -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.5.0/sha512.sum -sha512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60 gcc-7.5.0.tar.xz # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.4.0/sha512.sum sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 gcc-8.4.0.tar.xz -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-9.3.0/sha512.sum -sha512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de gcc-9.3.0.tar.xz +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-9.4.0/sha512.sum +sha512 dfd3500bf21784b8351a522d53463cf362ede66b0bc302edf350bb44e94418497a8b4b797b6af8ca9b2eeb746b3b115d9c3698381b989546e9151b4496415624 gcc-9.4.0.tar.xz +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-10.3.0/sha512.sum +sha512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86 gcc-10.3.0.tar.xz +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-11.2.0/sha512.sum +sha512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf gcc-11.2.0.tar.xz # Locally calculated (fetched from Github) -sha512 84648d13f174102733e06ccdf7b351150babe06af0f2b99b8dfb2b2d3c3f13e424547349939806fe19932ad347977cad79cd8b37be9cbb03e6a4d03cdf95a72e gcc-arc-2019.09-release.tar.gz +sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz # Locally calculated (fetched from Github) sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz # Locally calculated (fetched from https://github.com/c-sky/gcc) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index fe7167b2f3..ed9b93e50f 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -32,14 +32,6 @@ endef # Apply patches # -ifeq ($(ARCH),powerpc) -ifneq ($(BR2_SOFT_FLOAT),) -define HOST_GCC_APPLY_POWERPC_PATCH - $(APPLY_PATCHES) $(@D) package/gcc/$(GCC_VERSION) 1000-powerpc-link-with-math-lib.patch.conditional -endef -endif -endif - # gcc is a special package, not named gcc, but gcc-initial and # gcc-final, but patches are nonetheless stored in package/gcc in the # tree, and potentially in BR2_GLOBAL_PATCH_DIR directories as well. @@ -90,7 +82,8 @@ HOST_GCC_COMMON_CONF_OPTS = \ --with-mpc=$(HOST_DIR) \ --with-mpfr=$(HOST_DIR) \ --with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \ - --with-bugurl="http://bugs.buildroot.net/" + --with-bugurl="http://bugs.buildroot.net/" \ + --without-zstd # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work @@ -100,11 +93,17 @@ HOST_GCC_COMMON_CONF_ENV = \ GCC_COMMON_TARGET_CFLAGS = $(TARGET_CFLAGS) GCC_COMMON_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) -# used to fix ../../../../libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21: error: ‘st.st_mode’ may be used uninitialized in this function [-Werror=maybe-uninitialized] +# 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)" @@ -123,7 +122,7 @@ endif ifeq ($(BR2_USE_WCHAR)$(BR2_TOOLCHAIN_HAS_LIBQUADMATH),yy) HOST_GCC_COMMON_CONF_OPTS += --enable-libquadmath else -HOST_GCC_COMMON_CONF_OPTS += --disable-libquadmath +HOST_GCC_COMMON_CONF_OPTS += --disable-libquadmath --disable-libquadmath-support endif # libsanitizer requires wordexp, not in default uClibc config. Also @@ -138,6 +137,14 @@ ifeq ($(BR2_sparc)$(BR2_sparc64),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 +# __sync builtins, so help the configure script a bit. +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),) +HOST_GCC_COMMON_CONF_ENV += target_configargs="libbacktrace_cv_sys_sync=no" +endif + # TLS support is not needed on uClibc/no-thread and # uClibc/linux-threads, otherwise, for all other situations (glibc, # musl and uClibc/NPTL), we need it. @@ -216,10 +223,18 @@ endif # Enable proper double/long double for SPE ABI ifeq ($(BR2_powerpc_SPE),y) HOST_GCC_COMMON_CONF_OPTS += \ + --enable-obsolete \ --enable-e500_double \ --with-long-double-128 endif +# Set default to Secure-PLT to prevent run-time +# generation of PLT stubs (supports RELRO and +# SELinux non-exemem capabilities) +ifeq ($(BR2_powerpc)$(BR2_powerpc64),y) +HOST_GCC_COMMON_CONF_OPTS += --enable-secureplt +endif + # PowerPC64 big endian by default uses the elfv1 ABI, and PowerPC 64 # little endian by default uses the elfv2 ABI. However, musl has # decided to use the elfv2 ABI for both, so we force the elfv2 ABI for @@ -238,6 +253,11 @@ HOST_GCC_COMMON_CONF_OPTS += \ --with-long-double-128 endif +ifeq ($(BR2_s390x),y) +HOST_GCC_COMMON_CONF_OPTS += \ + --with-long-double-128 +endif + HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"' # For gcc-initial, we need to tell gcc that the C library will be @@ -268,11 +288,6 @@ HOST_GCC_COMMON_CCACHE_HASH_FILES += \ ifeq ($(BR2_xtensa),y) HOST_GCC_COMMON_CCACHE_HASH_FILES += $(ARCH_XTENSA_OVERLAY_TAR) endif -ifeq ($(ARCH),powerpc) -ifneq ($(BR2_SOFT_FLOAT),) -HOST_GCC_COMMON_CCACHE_HASH_FILES += package/gcc/$(GCC_VERSION)/1000-powerpc-link-with-math-lib.patch.conditional -endif -endif # _CONF_OPTS contains some references to the absolute path of $(HOST_DIR) # and a reference to the Buildroot git revision (BR2_VERSION_FULL), diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash index e753f944a3..e3efc82fc5 100644 --- a/package/gcnano-binaries/gcnano-binaries.hash +++ b/package/gcnano-binaries/gcnano-binaries.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 255db9c58627f5f54fd15263647cc97a55927363fec42e7c8d7486170a65d84d gcnano-binaries-c01642ed5e18cf09ecd905af193e935cb3be95ed.tar.gz +sha256 afec2ba2f524821452d561b56afd2fc241293ea4a6e8598d1663f58e5d16800f gcnano-binaries-1534c3eaabb5ae545a8f97e95f853531365a13fc.tar.gz sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk index b27571a08c..af5fdd1b7e 100644 --- a/package/gcnano-binaries/gcnano-binaries.mk +++ b/package/gcnano-binaries/gcnano-binaries.mk @@ -4,10 +4,12 @@ # ################################################################################ -GCNANO_BINARIES_LIB_VERSION = 6.2.4 -GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION).p4 -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION).p4-20190626 -GCNANO_BINARIES_VERSION = c01642ed5e18cf09ecd905af193e935cb3be95ed +GCNANO_BINARIES_LIB_VERSION = 6.4 +GCNANO_BINARIES_LIB_REVISION = 3 +GCNANO_BINARIES_LIB_FULL_VERSION = $(GCNANO_BINARIES_LIB_VERSION).$(GCNANO_BINARIES_LIB_REVISION) +GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_FULL_VERSION) +GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_FULL_VERSION)-20200902 +GCNANO_BINARIES_VERSION = 1534c3eaabb5ae545a8f97e95f853531365a13fc GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms @@ -43,7 +45,7 @@ GCNANO_BINARIES_MODULE_MAKE_OPTS = \ DEBUG=0 GCNANO_BINARIES_LIBRARIES = \ - gbm_viv libEGL libGAL libgbm libGLESv1_CM \ + libgbm_viv libEGL libGAL libgbm libGLESv1_CM \ libGLESv2 libGLSLC libOpenVG libVSC GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION) diff --git a/package/gcr/gcr.hash b/package/gcr/gcr.hash index 7d5786db9e..e6074a9991 100644 --- a/package/gcr/gcr.hash +++ b/package/gcr/gcr.hash @@ -1,3 +1,3 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.34/gcr-3.34.0.sha256sum -sha256 29df50974a90987af694c0fb8926a6b366e68cacd8abd813817cfe1eb5d54524 gcr-3.34.0.tar.xz -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING +# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.40/gcr-3.40.0.sha256sum +sha256 b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 gcr-3.40.0.tar.xz +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk index 56bfe1110a..d51e853f3f 100644 --- a/package/gcr/gcr.mk +++ b/package/gcr/gcr.mk @@ -4,7 +4,7 @@ # ################################################################################ -GCR_VERSION_MAJOR = 3.34 +GCR_VERSION_MAJOR = 3.40 GCR_VERSION = $(GCR_VERSION_MAJOR).0 GCR_SITE = http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(GCR_VERSION_MAJOR) GCR_SOURCE = gcr-$(GCR_VERSION).tar.xz @@ -15,27 +15,27 @@ GCR_DEPENDENCIES = \ p11-kit \ $(TARGET_NLS_DEPENDENCIES) GCR_INSTALL_STAGING = YES -GCR_CONF_ENV = ac_cv_path_GNUPG=/usr/bin/gpg2 GCR_CONF_OPTS = \ - --disable-gtk-doc \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr + -Dgpg_path=/usr/bin/gpg2 \ + -Dgtk_doc=false # Even though COPYING is v2 the code states v2.1+ GCR_LICENSE = LGPL-2.1+ GCR_LICENSE_FILES = COPYING +GCR_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -GCR_DEPENDENCIES += gobject-introspection -GCR_CONF_OPTS += --with-introspection +GCR_DEPENDENCIES += gobject-introspection host-libxslt host-vala +GCR_CONF_OPTS += -Dintrospection=true else -GCR_CONF_OPTS += --without-introspection +GCR_CONF_OPTS += -Dintrospection=false endif # Only the X11 backend is supported for the simple GUI ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) GCR_DEPENDENCIES += libgtk3 -GCR_CONF_OPTS += --with-gtk +GCR_CONF_OPTS += -Dgtk=true else -GCR_CONF_OPTS += --without-gtk +GCR_CONF_OPTS += -Dgtk=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/gd/gd.hash b/package/gd/gd.hash index 1cd9e56b18..d0b1e97675 100644 --- a/package/gd/gd.hash +++ b/package/gd/gd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8c302ccbf467faec732f0741a859eef4ecae22fea2d2ab87467be940842bde51 libgd-2.2.5.tar.xz -sha256 d02dae2141d49b8a6b09b2b73e68a8f17d7bbeaaf02b3b841ee11fea2d9e328d COPYING +sha256 3fe822ece20796060af63b7c60acb151e5844204d289da0ce08f8fdf131e5a61 libgd-2.3.3.tar.xz +sha256 005f4b6b0141d1bd11d371bbf7d4f67947f85a4906b7f5465f942204cf918ba3 COPYING diff --git a/package/gd/gd.mk b/package/gd/gd.mk index e2a46dca3c..55c12e6968 100644 --- a/package/gd/gd.mk +++ b/package/gd/gd.mk @@ -4,13 +4,14 @@ # ################################################################################ -GD_VERSION = 2.2.5 +GD_VERSION = 2.3.3 GD_SOURCE = libgd-$(GD_VERSION).tar.xz GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION) GD_INSTALL_STAGING = YES GD_LICENSE = GD license GD_LICENSE_FILES = COPYING -GD_CONFIG_SCRIPTS = gdlib-config +GD_CPE_ID_VENDOR = libgd +GD_CPE_ID_PRODUCT = libgd GD_CONF_OPTS = --without-x --disable-rpath --disable-werror GD_DEPENDENCIES = host-pkgconf @@ -34,9 +35,8 @@ endif ifeq ($(BR2_PACKAGE_LIBICONV),y) GD_DEPENDENCIES += libiconv -# not strictly needed for gd, but ensures -liconv ends up in -# gdlib-config --libs output -GD_CONF_ENV += LIBS="-liconv" +# not strictly needed for gd, but ensures -liconv ends up in gdlib.pc +GD_CONF_ENV += LIBS_PRIVATES="-liconv" endif ifeq ($(BR2_PACKAGE_JPEG),y) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 4c787d49a1..246748131e 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_GDB_ARCH_SUPPORTS default y depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT) depends on !BR2_microblaze - depends on !BR2_nios2 depends on !BR2_or1k depends on !BR2_nds32 @@ -20,8 +19,6 @@ 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 - # no gdbserver on riscv - select BR2_PACKAGE_GDB_DEBUGGER if BR2_riscv # 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. @@ -48,12 +45,6 @@ if BR2_PACKAGE_GDB config BR2_PACKAGE_GDB_SERVER bool "gdbserver" depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY - depends on !BR2_riscv - # Simultaneous build of gdbserver and full gdb is not possible - # with arc-2019.09. This bug comes from upstream GDB. So - # simultaneous usage of full gdb and gdbserver is temporaly - # disabled for ARC until a fix becomes available. - depends on !(BR2_arc && BR2_PACKAGE_GDB_DEBUGGER) help Build the gdbserver stub to run on the target. A full gdb is needed to debug the progam. @@ -85,8 +76,7 @@ config BR2_PACKAGE_GDB_TUI config BR2_PACKAGE_GDB_PYTHON bool "Python support" - # Only Python 2.x is supported by gdb for now - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help This option enables Python support in the target gdb. diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 2db73b10d6..142bf1458a 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -3,9 +3,7 @@ config BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS default y depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT) depends on !BR2_microblaze - depends on !BR2_nios2 depends on !BR2_or1k - depends on !BR2_riscv depends on !BR2_nds32 comment "Host GDB Options" @@ -32,10 +30,28 @@ config BR2_PACKAGE_HOST_GDB_TUI help This option enables terminal user interface (TUI) for gdb -config BR2_PACKAGE_HOST_GDB_PYTHON - bool "Python support" +choice + prompt "Python support" + default BR2_PACKAGE_HOST_GDB_NOPYTHON help - This option enables the Python support in the cross gdb. + Select the version of Python you wish to use + +config BR2_PACKAGE_HOST_GDB_NOPYTHON + bool "None" + help + This option disables Python support in the cross gdb. + +config BR2_PACKAGE_HOST_GDB_PYTHON + bool "Python 2" + help + This option enables the Python 2 support in the cross gdb. + +config BR2_PACKAGE_HOST_GDB_PYTHON3 + bool "Python 3" + help + This option enables the Python 3 support in the cross gdb. + +endchoice config BR2_PACKAGE_HOST_GDB_SIM bool "Simulator support" @@ -45,31 +61,44 @@ config BR2_PACKAGE_HOST_GDB_SIM choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_8_2 + default BR2_GDB_VERSION_9_2 depends on !BR2_arc depends on !BR2_csky help Select the version of gdb you wish to use. -config BR2_GDB_VERSION_8_1 - bool "gdb 8.1.x" - -config BR2_GDB_VERSION_8_2 - bool "gdb 8.2.x" - config BR2_GDB_VERSION_8_3 bool "gdb 8.3.x" + # gdbserver support missing + depends on !BR2_riscv + +config BR2_GDB_VERSION_9_2 + bool "gdb 9.2.x" + # gdbserver support missing + depends on !BR2_riscv + +config BR2_GDB_VERSION_10 + bool "gdb 10.x" endchoice endif -# If cross-gdb is not enabled, the latest working version is chosen. +# If cross-gdb is not enabled, the latest stable version is chosen. config BR2_GDB_VERSION string - default "arc-2019.09-release-gdb" if BR2_arc + default "arc-2020.09-release-gdb" if BR2_arc default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky - default "8.1.1" if BR2_GDB_VERSION_8_1 - default "8.2.1" if BR2_GDB_VERSION_8_2 || !BR2_PACKAGE_HOST_GDB default "8.3.1" if BR2_GDB_VERSION_8_3 + default "9.2" if BR2_GDB_VERSION_9_2 || (!BR2_PACKAGE_HOST_GDB && !BR2_riscv) + default "10.2" if BR2_GDB_VERSION_10 || (!BR2_PACKAGE_HOST_GDB && BR2_riscv) + depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB + +# recent gdb versions (>= 10) have gdbserver moved at the top-level, +# which requires a different build logic. +config BR2_PACKAGE_GDB_TOPLEVEL + bool + default y if BR2_arc + default y if BR2_GDB_VERSION_10 + default y if !BR2_PACKAGE_HOST_GDB && BR2_riscv depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb-python-config b/package/gdb/gdb-python-config index 0f002281d7..640c358305 100755 --- a/package/gdb/gdb-python-config +++ b/package/gdb/gdb-python-config @@ -17,20 +17,25 @@ if [ $# -ne 2 ] ; then exit 1 fi +if [ -z "${BR_PYTHON_VERSION}" ]; then + echo "Environment variable BR_PYTHON_VERSION not set." >&2 + exit 1 +fi + # The first argument is the path to python-config.py, ignore it. case "$2" in --includes) - echo "-I${STAGING_DIR}/usr/include/python2.7" - ;; + echo "-I${STAGING_DIR}/usr/include/python${BR_PYTHON_VERSION}" + ;; --ldflags) - echo "-lpthread -ldl -lutil -lm -lpython2.7" - ;; + echo "-lpthread -ldl -lutil -lm -lpython${BR_PYTHON_VERSION}" + ;; --exec-prefix) - echo "/usr" - ;; + echo "/usr" + ;; *) - echo "Bad arg $2." >&2 - exit 1 - ;; + echo "Bad arg $2." >&2 + exit 1 + ;; esac diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 60b0954ff9..c45ee7329f 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,10 +1,10 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 7dcd5e8c90de92f577834d887b5f54edb93a07083bfe661bc46c270a6cc4919f0b348e7e2fe8ae4511298a570ef150eeefdc667ef7cf527f0cf60943177ab6c9 gdb-8.1.1.tar.xz -sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz sha512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz +sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz +sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz # Locally calculated (fetched from Github) -sha512 c33818f8679d99d5315220578864b04b87f69c46ebe62472809ee6e1d260e5ec84d598f38d80c127a2045d6624f28803c2720d89434204acbd94e988a45870f1 gdb-arc-2019.09-release-gdb.tar.gz +sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz # Locally calculated (fetched from https://github.com/c-sky/binutils-gdb) sha512 c421e1f3c0d6cfb3c04544573c0c4b0075c8d8e3d563c6c234fcc1e4c2167ab203d1e57aec3b58abd348dc46f8cf9b47b753d3a43dba3ea970c9c9a6bd78c07b gdb-4ecb98fbc2f94dbe01b69384afbc515107de73df.tar.gz diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 01f7e14460..4ead75289e 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -22,14 +22,24 @@ endif GDB_LICENSE = GPL-2.0+, LGPL-2.0+, GPL-3.0+, LGPL-3.0+ GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB +GDB_CPE_ID_VENDOR = gnu -# We only want gdbserver and not the entire debugger. -ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),) +# On gdb < 10, if you want to build only gdbserver, you need to +# configure only gdb/gdbserver. +ifeq ($(BR2_PACKAGE_GDB_DEBUGGER)$(BR2_PACKAGE_GDB_TOPLEVEL),) GDB_SUBDIR = gdb/gdbserver -HOST_GDB_SUBDIR = . + +# When we want to build the full gdb, or for very recent versions of +# gdb with gdbserver at the top-level, out of tree build is mandatory, +# so we create a 'build' subdirectory in the gdb sources, and build +# from there. else -GDB_DEPENDENCIES = ncurses \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) +GDB_SUBDIR = build +define GDB_CONFIGURE_SYMLINK + mkdir -p $(@D)/$(GDB_SUBDIR) + ln -sf ../configure $(@D)/$(GDB_SUBDIR)/configure +endef +GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK endif # For the host variant, we really want to build with XML support, @@ -69,7 +79,8 @@ GDB_DISABLE_BINUTILS_CONF_OPTS = \ --disable-binutils \ --disable-install-libbfd \ --disable-ld \ - --disable-gas + --disable-gas \ + --disable-gprof GDB_CONF_ENV = \ ac_cv_type_uintptr_t=yes \ @@ -127,13 +138,29 @@ GDB_CONF_OPTS = \ --without-x \ --disable-sim \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) \ - $(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver,--disable-gdbserver) \ - --with-curses \ --without-included-gettext \ --disable-werror \ --enable-static \ --without-mpfr +ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y) +GDB_CONF_OPTS += \ + --enable-gdb \ + --with-curses +GDB_DEPENDENCIES += ncurses \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) +else +GDB_CONF_OPTS += \ + --disable-gdb \ + --without-curses +endif + +ifeq ($(BR2_PACKAGE_GDB_SERVER),y) +GDB_CONF_OPTS += --enable-gdbserver +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. @@ -159,8 +186,18 @@ GDB_CONF_OPTS += --disable-tui endif ifeq ($(BR2_PACKAGE_GDB_PYTHON),y) -GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config +ifeq ($(BR2_PACKAGE_PYTHON3),y) +# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. +GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) +GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) +GDB_DEPENDENCIES += python3 +else +# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. +GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) +GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) GDB_DEPENDENCIES += python +endif +GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config else GDB_CONF_OPTS += --without-python endif @@ -238,6 +275,9 @@ endif ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 HOST_GDB_DEPENDENCIES += host-python +else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) +HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 +HOST_GDB_DEPENDENCIES += host-python3 else HOST_GDB_CONF_OPTS += --without-python endif @@ -248,6 +288,17 @@ else HOST_GDB_CONF_OPTS += --disable-sim endif +# Since gdb 9, in-tree builds for GDB are not allowed anymore, +# so we create a 'build' subdirectory in the gdb sources, and +# build from there. +HOST_GDB_SUBDIR = build + +define HOST_GDB_CONFIGURE_SYMLINK + mkdir -p $(@D)/build + ln -sf ../configure $(@D)/build/configure +endef +HOST_GDB_PRE_CONFIGURE_HOOKS += HOST_GDB_CONFIGURE_SYMLINK + # legacy $arch-linux-gdb symlink define HOST_GDB_ADD_SYMLINK cd $(HOST_DIR)/bin && \ diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in index 44942ac4f6..0ba6dda8af 100644 --- a/package/gdk-pixbuf/Config.in +++ b/package/gdk-pixbuf/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_GDK_PIXBUF Gdk-Pixbuf is an image loader and scaler. It uses GObject and the GLib, to integrate well with GNOME applications. - http://www.gtk.org/ + https://www.gtk.org/ comment "gdk-pixbuf needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU diff --git a/package/gdk-pixbuf/gdk-pixbuf.hash b/package/gdk-pixbuf/gdk-pixbuf.hash index 9cb947f195..5e7dc7e03b 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.hash +++ b/package/gdk-pixbuf/gdk-pixbuf.hash @@ -1,4 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.10.sha256sum -sha256 f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace gdk-pixbuf-2.36.10.tar.xz -# Locally calculated -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.4.sha256sum +sha256 fe9c5dd88f486194ea2bc09b8814c1ed895bb6c530f37cbbf259757c4e482e4d gdk-pixbuf-2.42.4.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 59e0d5f454..cd30d450d5 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -4,57 +4,66 @@ # ################################################################################ -GDK_PIXBUF_VERSION_MAJOR = 2.36 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).10 +GDK_PIXBUF_VERSION_MAJOR = 2.42 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).4 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) -GDK_PIXBUF_LICENSE = LGPL-2.0+ +GDK_PIXBUF_LICENSE = LGPL-2.1+ GDK_PIXBUF_LICENSE_FILES = COPYING +GDK_PIXBUF_CPE_ID_VENDOR = gnome GDK_PIXBUF_INSTALL_STAGING = YES GDK_PIXBUF_DEPENDENCIES = \ host-gdk-pixbuf host-libglib2 host-pkgconf \ libglib2 $(if $(BR2_ENABLE_LOCALE),,libiconv) HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng host-pkgconf host-libglib2 -GDK_PIXBUF_CONF_ENV = \ - ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) \ - gio_can_sniff=no - -HOST_GDK_PIXBUF_CONF_ENV = \ - gio_can_sniff=no - GDK_PIXBUF_CONF_OPTS = \ - --disable-glibtest \ - --disable-introspection -HOST_GDK_PIXBUF_CONF_OPTS = --disable-introspection + -Dgio_sniffing=false \ + -Dinstalled_tests=false \ + -Dman=false -ifneq ($(BR2_PACKAGE_LIBPNG),y) -GDK_PIXBUF_CONF_OPTS += --without-libpng -else -GDK_PIXBUF_DEPENDENCIES += libpng +HOST_GDK_PIXBUF_CONF_OPTS = \ + -Dgio_sniffing=false \ + -Dinstalled_tests=false \ + -Dintrospection=disabled \ + -Dman=false + +ifeq ($(BR2_STATIC_LIBS),y) +GDK_PIXBUF_CONF_OPTS += -Dbuiltin_loaders=all endif -ifneq ($(BR2_PACKAGE_JPEG),y) -HOST_GDK_PIXBUF_CONF_OPTS += --without-libjpeg -GDK_PIXBUF_CONF_OPTS += --without-libjpeg +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GDK_PIXBUF_CONF_OPTS += -Dintrospection=enabled +GDK_PIXBUF_DEPENDENCIES += gobject-introspection else +GDK_PIXBUF_CONF_OPTS += -Dintrospection=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +GDK_PIXBUF_CONF_OPTS += -Dpng=true +GDK_PIXBUF_DEPENDENCIES += libpng +else +GDK_PIXBUF_CONF_OPTS += -Dpng=false +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +GDK_PIXBUF_CONF_OPTS += -Djpeg=true +HOST_GDK_PIXBUF_CONF_OPTS += -Djpeg=true GDK_PIXBUF_DEPENDENCIES += jpeg HOST_GDK_PIXBUF_DEPENDENCIES += host-libjpeg -endif - -ifneq ($(BR2_PACKAGE_TIFF),y) -GDK_PIXBUF_CONF_OPTS += --without-libtiff -HOST_GDK_PIXBUF_CONF_OPTS += --without-libtiff else -GDK_PIXBUF_DEPENDENCIES += tiff -GDK_PIXBUF_CONF_ENV += \ - LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`" -HOST_GDK_PIXBUF_DEPENDENCIES += host-tiff +GDK_PIXBUF_CONF_OPTS += -Djpeg=false +HOST_GDK_PIXBUF_CONF_OPTS += -Djpeg=false endif -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -GDK_PIXBUF_CONF_OPTS += --with-x11 -GDK_PIXBUF_DEPENDENCIES += xlib_libX11 +ifeq ($(BR2_PACKAGE_TIFF),y) +GDK_PIXBUF_CONF_OPTS += -Dtiff=true +HOST_GDK_PIXBUF_CONF_OPTS += -Dtiff=true +GDK_PIXBUF_DEPENDENCIES += tiff +HOST_GDK_PIXBUF_DEPENDENCIES += host-tiff +else +GDK_PIXBUF_CONF_OPTS += -Dtiff=false +HOST_GDK_PIXBUF_CONF_OPTS += -Dtiff=false endif # gdk-pixbuf requires the loaders.cache file populated to work properly @@ -73,12 +82,6 @@ endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE endif -# Tests don't build correctly with uClibc -define GDK_PIXBUF_DISABLE_TESTS - $(SED) 's/ tests//' $(@D)/Makefile.in -endef -GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS - # Target gdk-pixbuf needs loaders.cache populated to build for the # thumbnailer. Use the host-built since it matches the target options # regarding mime types (which is the used information). @@ -88,5 +91,5 @@ define GDK_PIXBUF_COPY_LOADERS_CACHE endef GDK_PIXBUF_PRE_BUILD_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/genext2fs/genext2fs.hash b/package/genext2fs/genext2fs.hash index add44c4c4e..20bb1c641b 100644 --- a/package/genext2fs/genext2fs.hash +++ b/package/genext2fs/genext2fs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 404dbbfa7a86a6c3de8225c8da254d026b17fd288e05cec4df2cc7e1f4feecfc genext2fs-1.4.1.tar.gz +sha256 d3861e4fe89131bd21fbd25cf0b683b727b5c030c4c336fadcd738ada830aab0 genext2fs-1.5.0.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk index dd907c8b12..adfa412e66 100644 --- a/package/genext2fs/genext2fs.mk +++ b/package/genext2fs/genext2fs.mk @@ -4,10 +4,12 @@ # ################################################################################ -GENEXT2FS_VERSION = 1.4.1 -GENEXT2FS_SITE = http://downloads.sourceforge.net/project/genext2fs/genext2fs/$(GENEXT2FS_VERSION) +GENEXT2FS_VERSION = 1.5.0 +GENEXT2FS_SITE = $(call github,bestouff,genext2fs,v$(GENEXT2FS_VERSION)) GENEXT2FS_LICENSE = GPL-2.0 GENEXT2FS_LICENSE_FILES = COPYING +# From git +GENEXT2FS_AUTORECONF = YES $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/genimage/genimage.hash b/package/genimage/genimage.hash index fb5d235508..9f60261b53 100644 --- a/package/genimage/genimage.hash +++ b/package/genimage/genimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e9b43d1288f4e216d6c79de2a0c53ce1bd41f93cec750d8ab057aa2d0b0ee4a genimage-12.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 9d1d53b33309fe24ea367ea057eb689bdb8ea33cb99d796de31127ca44ccf44c genimage-14.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk index 8960393904..1934223b23 100644 --- a/package/genimage/genimage.mk +++ b/package/genimage/genimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENIMAGE_VERSION = 12 +GENIMAGE_VERSION = 14 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION) HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse diff --git a/package/gensio/gensio.hash b/package/gensio/gensio.hash index 202548bc40..03bd85cd0f 100644 --- a/package/gensio/gensio.hash +++ b/package/gensio/gensio.hash @@ -1,7 +1,7 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 d6b0665266f738973b13450c53d83032 gensio-1.5.3.tar.gz -sha1 8d041babe8d29f8acb48c6cb0fa543e6f9f63238 gensio-1.5.3.tar.gz +md5 3d1135a7bd7a3aca48493997fed1f1a0 gensio-2.2.4.tar.gz +sha1 3c59d94e48c0a8ec5ed57ebb4ea95f3709d108ac gensio-2.2.4.tar.gz # Locally computed: -sha256 f5097add3f269594e7a81016af93c147e8f5e8312f27f3d0bfbeeb3aad1ace53 gensio-1.5.3.tar.gz +sha256 36cadbc790e03e4150a12bca14b20215afdff0a0f8deaf85c10434dca54d0493 gensio-2.2.4.tar.gz sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING sha256 dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89 COPYING.LIB diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 06e55875c0..7b3d2a8980 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -4,13 +4,11 @@ # ################################################################################ -GENSIO_VERSION = 1.5.3 +GENSIO_VERSION = 2.2.4 GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GENSIO_LICENSE_FILES = COPYING.LIB COPYING GENSIO_INSTALL_STAGING = YES -# We're patching configure.ac -GENSIO_AUTORECONF = YES GENSIO_CONF_OPTS = \ --without-openipmi \ --without-swig \ @@ -23,6 +21,10 @@ else GENSIO_CONF_OPTS += --without-openssl endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +GENSIO_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) GENSIO_CONF_OPTS += --with-pthreads else diff --git a/package/gerbera/Config.in b/package/gerbera/Config.in index e10f78b77e..46a163ec78 100644 --- a/package/gerbera/Config.in +++ b/package/gerbera/Config.in @@ -3,12 +3,16 @@ config BR2_PACKAGE_GERBERA depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 optional + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_PACKAGE_LIBUPNP # libupnp18 - select BR2_PACKAGE_EXPAT + depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR # fmt + select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_LIBUPNP18 + select BR2_PACKAGE_LIBUPNP if !BR2_PACKAGE_LIBNPUPNP + select BR2_PACKAGE_PUGIXML + select BR2_PACKAGE_PUGIXML_XPATH_SUPPORT + select BR2_PACKAGE_SPDLOG select BR2_PACKAGE_SQLITE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID @@ -17,11 +21,14 @@ config BR2_PACKAGE_GERBERA A free media server. Stream your media to devices on your home network. + Select BR2_PACKAGE_DUKTAPE if you want to enable JavaScript + for scripting. + https://gerbera.io -comment "gerbera needs a toolchain w/ C++, threads, gcc >= 7" +comment "gerbera needs a toolchain w/ C++, dynamic library, threads, wchar, gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_PACKAGE_LIBUPNP - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/gerbera/S99gerbera b/package/gerbera/S99gerbera index d1c74c887c..e5a70e78a8 100644 --- a/package/gerbera/S99gerbera +++ b/package/gerbera/S99gerbera @@ -8,6 +8,9 @@ GERBERA_ARGS="-c /etc/gerbera/config.xml -l /var/log/gerbera.log" # shellcheck source=/dev/null [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" +# (Re)create home directory +mkdir -p /var/lib/$DAEMON + start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting diff --git a/package/gerbera/config.xml b/package/gerbera/config.xml index fa990d1502..30d70e21f7 100644 --- a/package/gerbera/config.xml +++ b/package/gerbera/config.xml @@ -1,12 +1,13 @@ + - + Gerbera @@ -28,23 +29,6 @@ gerbera.db - - - - - * @@ -55,84 +39,96 @@ - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - audio/L16 + + audio/mpeg no yes no - - + + video/mpeg yes yes yes - - + + diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 533a903882..ed856bbf62 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c7fbb6104dd03ed22d114c7b1fbe95eb7f90893148630e16b0a4c23f1f631341 gerbera-1.3.4.tar.gz -sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md +sha256 b1e5591515f05a46de052ef4d95a2bb3387e96f565a5ce7abb6a77dbe581f09a gerbera-1.8.2.tar.gz +sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index 21c6836952..d6251912ac 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,24 +4,34 @@ # ################################################################################ -GERBERA_VERSION = 1.3.4 +GERBERA_VERSION = 1.8.2 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md GERBERA_DEPENDENCIES = \ - expat \ + fmt \ host-pkgconf \ - libupnp18 \ + pugixml \ + spdlog \ sqlite \ util-linux \ zlib -GERBERA_CONF_OPTS = \ - -DWITH_DEBUG=OFF \ - -DWITH_JS=OFF +GERBERA_CONF_OPTS = -DWITH_DEBUG=OFF + +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_9)$(BR2_OPTIMIZE_S),yy) +GERBERA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -O2" +endif # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -GERBERA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +GERBERA_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ifeq ($(BR2_PACKAGE_DUKTAPE),y) +GERBERA_DEPENDENCIES += duktape +GERBERA_CONF_OPTS += -DWITH_JS=ON +else +GERBERA_CONF_OPTS += -DWITH_JS=OFF endif ifeq ($(BR2_PACKAGE_EXIV2),y) @@ -63,6 +73,22 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) GERBERA_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_LIBMATROSKA),y) +GERBERA_DEPENDENCIES += libmatroska +GERBERA_CONF_OPTS += -DWITH_MATROSKA=ON +else +GERBERA_CONF_OPTS += -DWITH_MATROSKA=OFF +endif + +# Either libupnp or libnpupnp are guranteed to be enabled +ifeq ($(BR2_PACKAGE_LIBNPUPNP),y) +GERBERA_DEPENDENCIES += libnpupnp +GERBERA_CONF_OPTS += -DWITH_NPUPNP=ON +else +GERBERA_DEPENDENCIES += libupnp +GERBERA_CONF_OPTS += -DWITH_NPUPNP=OFF +endif + ifeq ($(BR2_PACKAGE_MYSQL),y) GERBERA_DEPENDENCIES += mysql GERBERA_CONF_OPTS += -DWITH_MYSQL=ON diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index ff7ce768ae..20ad92d25a 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -12,6 +12,8 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors +GESFTPSERVER_CPE_ID_VENDOR = green_end +GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling GESFTPSERVER_CONF_ENV = LIBS=-lpthread @@ -21,6 +23,10 @@ GESFTPSERVER_DEPENDENCIES += \ $(if $(BR2_ENABLE_LOCALE),,libiconv) \ $(if $(BR2_PACKAGE_OPENSSH),openssh) +# Python on the host is only used for tests, which we don't use in +# Buildroot +GESFTPSERVER_CONF_ENV += rjk_cv_python24=false + # openssh/dropbear looks here define GESFTPSERVER_ADD_SYMLINK ln -sf gesftpserver $(TARGET_DIR)/usr/libexec/sftp-server diff --git a/package/gettext-gnu/0001-error_print_progname.patch b/package/gettext-gnu/0001-error_print_progname.patch index 189d28b576..7e1d3c55cf 100644 --- a/package/gettext-gnu/0001-error_print_progname.patch +++ b/package/gettext-gnu/0001-error_print_progname.patch @@ -1,6 +1,11 @@ ---- gettext-0.16.1.oorig/gettext-tools/gnulib-lib/error.h 2006-11-27 18:14:50.000000000 +0100 -+++ gettext-0.16.1/gettext-tools/gnulib-lib/error.h 2007-06-20 13:29:32.000000000 +0200 -@@ -50,7 +50,10 @@ extern void error_at_line (int __status, +[Updated to apply cleanly with 0.20.1] +Signed-off-by: Adam Duskett +--- +diff --git a/gettext-tools/gnulib-lib/error.h b/gettext-tools/gnulib-lib/error.h +index 61771cc..4221684 100644 +--- a/gettext-tools/gnulib-lib/error.h ++++ b/gettext-tools/gnulib-lib/error.h +@@ -68,7 +68,10 @@ extern void error_at_line (int __status, int __errnum, const char *__fname, /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this function without parameters instead. */ @@ -10,5 +15,6 @@ +#endif +void (*error_print_progname) (void); - /* This variable is incremented each time `error' is called. */ + /* This variable is incremented each time 'error' is called. */ extern DLL_VARIABLE unsigned int error_message_count; +-- diff --git a/package/gettext-gnu/gettext-gnu.hash b/package/gettext-gnu/gettext-gnu.hash index 5a621ae2d3..4c17fb3e04 100644 --- a/package/gettext-gnu/gettext-gnu.hash +++ b/package/gettext-gnu/gettext-gnu.hash @@ -1,6 +1,7 @@ -# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html -md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz -# License files, locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz + +# Locally calculated +sha256 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 gettext-0.20.1.tar.xz +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING sha256 3fe5361f24b7c49ba12911c08f5a33f9cb18871d95d9fb881f5b8a4793e04288 gettext-runtime/intl/COPYING.LIB diff --git a/package/gettext-gnu/gettext-gnu.mk b/package/gettext-gnu/gettext-gnu.mk index 28662e0dec..9a1eabd0df 100644 --- a/package/gettext-gnu/gettext-gnu.mk +++ b/package/gettext-gnu/gettext-gnu.mk @@ -4,19 +4,22 @@ # ################################################################################ -GETTEXT_GNU_VERSION = 0.19.8.1 +# Please keep in sync with package/libtextstyle/libtextstyle.mk +GETTEXT_GNU_VERSION = 0.20.1 GETTEXT_GNU_SITE = $(BR2_GNU_MIRROR)/gettext GETTEXT_GNU_SOURCE = gettext-$(GETTEXT_GNU_VERSION).tar.xz GETTEXT_GNU_INSTALL_STAGING = YES GETTEXT_GNU_LICENSE = LGPL-2.1+ (libintl), GPL-3.0+ (the rest) GETTEXT_GNU_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB -# 0002-Update-after-gnulib-changed.patch +GETTEXT_GNU_CPE_ID_VENDOR = gnu +GETTEXT_GNU_CPE_ID_PRODUCT = gettext +# 0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch GETTEXT_GNU_AUTORECONF = YES GETTEXT_GNU_PROVIDES = gettext GETTEXT_GNU_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) # Avoid using the bundled subset of libxml2 -HOST_GETTEXT_GNU_DEPENDENCIES = host-libxml2 +HOST_GETTEXT_GNU_DEPENDENCIES = host-libxml2 host-libtextstyle GETTEXT_GNU_CONF_OPTS += \ --disable-libasprintf \ @@ -38,7 +41,8 @@ HOST_GETTEXT_GNU_CONF_OPTS = \ --disable-native-java \ --disable-csharp \ --disable-relocatable \ - --without-emacs + --without-emacs \ + --with-installed-libtextstyle # Force the build of libintl, even if the C library provides a stub # gettext implementation diff --git a/package/gettext-tiny/gettext-tiny.hash b/package/gettext-tiny/gettext-tiny.hash index 9232fe8530..5155b41910 100644 --- a/package/gettext-tiny/gettext-tiny.hash +++ b/package/gettext-tiny/gettext-tiny.hash @@ -1,7 +1,6 @@ # Locally Computed: -sha256 efc740007c82a9b3a0d382fb50d212fa7dc0beddb9695409ee79684f9f2124b2 gettext-tiny-adaa9c64921e80f2b8dd3610ffb508618b9204f3.tar.gz -sha256 b57aa4fdc1c614c28d41c1e2d5c4090935964c5f86291ba7d1c99ffd1d698b34 LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 extra/COPYING -# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html -md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz +sha256 29cc165e27e83d2bb3760118c2368eadab550830d962d758e51bd36eb860f383 gettext-tiny-0.3.2.tar.gz +sha256 4c938aa3d8fa3c184bba5e87a8a2febc89560627c9d0567536879e3eca1a7b4f LICENSE +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b extra/COPYING +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz diff --git a/package/gettext-tiny/gettext-tiny.mk b/package/gettext-tiny/gettext-tiny.mk index 09a98f99b4..c297cb1fe5 100644 --- a/package/gettext-tiny/gettext-tiny.mk +++ b/package/gettext-tiny/gettext-tiny.mk @@ -4,8 +4,8 @@ # ################################################################################ -GETTEXT_TINY_VERSION = adaa9c64921e80f2b8dd3610ffb508618b9204f3 -GETTEXT_TINY_SITE = $(call github,sabotage-linux,gettext-tiny,$(GETTEXT_TINY_VERSION)) +GETTEXT_TINY_VERSION = 0.3.2 +GETTEXT_TINY_SITE = $(call github,sabotage-linux,gettext-tiny,v$(GETTEXT_TINY_VERSION)) GETTEXT_TINY_LICENSE = MIT, GPL-3.0+ (extra gettext) GETTEXT_TINY_INSTALL_STAGING = YES GETTEXT_TINY_LICENSE_FILES = LICENSE @@ -14,12 +14,11 @@ HOST_GETTEXT_TINY_LICENSE_FILES = LICENSE extra/COPYING GETTEXT_TINY_PROVIDES = gettext # needed for gettextize -GETTEXT_TINY_ARCHIVE_VERSION = 0.19.8 +GETTEXT_TINY_ARCHIVE_VERSION = 0.20.1 GETTEXT_TINY_EXTRA_GETTEXT_FILES = \ gettext-tools/misc/gettextize.in \ gettext-tools/po/Makevars.template \ - gettext-runtime/m4/lock.m4 \ gettext-runtime/po/boldquot.sed \ gettext-runtime/po/en@boldquot.header \ gettext-runtime/po/en@quot.header \ @@ -83,7 +82,6 @@ define HOST_GETTEXT_TINY_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/gettextize $(HOST_DIR)/bin/gettextize $(INSTALL) -m 0644 -D $(@D)/build-aux/config.rpath $(HOST_DIR)/share/gettext-tiny/config.rpath - $(INSTALL) -m 0644 -D $(@D)/extra/lock.m4 $(HOST_DIR)/share/gettext-tiny/m4/lock.m4 $(INSTALL) -m 0644 -D $(@D)/extra/Makefile.in.in $(HOST_DIR)/share/gettext-tiny/po/Makefile.in.in $(INSTALL) -m 0644 -D $(@D)/extra/boldquot.sed $(HOST_DIR)/share/gettext-tiny/po/boldquot.sed $(INSTALL) -m 0644 -D $(@D)/extra/en@boldquot.header $(HOST_DIR)/share/gettext-tiny/po/en@boldquot.header diff --git a/package/gflags/gflags.mk b/package/gflags/gflags.mk index c4fce45b3e..f32869f70d 100644 --- a/package/gflags/gflags.mk +++ b/package/gflags/gflags.mk @@ -10,8 +10,12 @@ GFLAGS_INSTALL_STAGING = YES GFLAGS_LICENSE = BSD-3-Clause GFLAGS_LICENSE_FILES = COPYING.txt +# Force Release otherwise libraries will be suffixed by _debug which will raise +# unexpected build failures with packages that use gflags (e.g. rocksdb) +GFLAGS_CONF_OPTS = -DCMAKE_BUILD_TYPE=Release + ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -GFLAGS_CONF_OPTS = -DBUILD_gflags_LIB=OFF \ +GFLAGS_CONF_OPTS += -DBUILD_gflags_LIB=OFF \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -DNO_THREADS" endif diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 51b3a2a094..f6cedc6198 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs950/SHA512SUMS -sha512 3c1e5db519a427f4b6bfb8d93f3c3dfb67d5ec9ccd19c7afa7670deb768515f3fc617c5588e54934bbfbedfdf8609ce2ffa36dd7da3cb618937fe034f64f43ee ghostscript-9.50.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/SHA512SUMS +sha512 c142ef9d83896aa8fd18c8e412220fe8f4950614be00d327d27ab051fe85e16524bf2ee00f46c2aca7a352ce47bc3acf2c4de0f7bbea7e4c55474b8af6cdc0a6 ghostscript-9.53.3.tar.gz # Hash for license file: -sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2 LICENSE +sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2 LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 1d6f8d04a0..ca24c61678 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,13 +4,11 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 9.50 +GHOSTSCRIPT_VERSION = 9.53.3 GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) -GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_LICENSE = AGPL-3.0 GHOSTSCRIPT_LICENSE_FILES = LICENSE -# 0001-Fix-cross-compilation-issue.patch -GHOSTSCRIPT_AUTORECONF = YES +GHOSTSCRIPT_CPE_ID_VENDOR = artifex GHOSTSCRIPT_DEPENDENCIES = \ host-lcms2 \ host-libjpeg \ @@ -23,6 +21,9 @@ GHOSTSCRIPT_DEPENDENCIES = \ libpng \ tiff +# 0002-Bug-704342-Include-device-specifier-strings-in-acces.patch +GHOSTSCRIPT_IGNORE_CVES += CVE-2021-3781 + # Ghostscript includes (old) copies of several libraries, delete them. # Inspired by linuxfromscratch: # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html @@ -35,11 +36,11 @@ GHOSTSCRIPT_POST_PATCH_HOOKS += GHOSTSCRIPT_REMOVE_LIBS GHOSTSCRIPT_CONF_ENV = \ CCAUX="$(HOSTCC)" \ - CFLAGSAUX="$(HOST_CFLAGS) $(HOST_LDFLAGS)" + CFLAGSAUX="$(HOST_CFLAGS) $(HOST_LDFLAGS)" \ + PKGCONFIG="$(PKG_CONFIG_HOST_BINARY)" GHOSTSCRIPT_CONF_OPTS = \ --disable-compile-inits \ - --disable-cups \ --enable-fontconfig \ --with-fontpath=/usr/share/fonts \ --enable-freetype \ @@ -68,6 +69,15 @@ else GHOSTSCRIPT_CONF_OPTS += --disable-openjpeg endif +ifeq ($(BR2_PACKAGE_CUPS),y) +GHOSTSCRIPT_DEPENDENCIES += cups +GHOSTSCRIPT_CONF_OPTS += \ + CUPSCONFIG=$(STAGING_DIR)/usr/bin/cups-config \ + --enable-cups +else +GHOSTSCRIPT_CONF_OPTS += --disable-cups +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) GHOSTSCRIPT_DEPENDENCIES += xlib_libX11 GHOSTSCRIPT_CONF_OPTS += --with-x diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index 3dd17972e0..d47edfaa8b 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -9,6 +9,7 @@ GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib GIFLIB_INSTALL_STAGING = YES GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING +GIFLIB_CPE_ID_VENDOR = giflib_project ifeq ($(BR2_STATIC_LIBS),y) GIFLIB_BUILD_LIBS = static-lib diff --git a/package/git/git.hash b/package/git/git.hash index 74bf334b78..1db29ac457 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,4 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 723f24dce8fdd621a308b6187553fce7d5244205c065fe0a3aebd0b7c3f88562 git-2.24.1.tar.xz -sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING -sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 +sha256 9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680 git-2.31.1.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 dd79c41e4a..556921a9fc 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,12 +4,16 @@ # ################################################################################ -GIT_VERSION = 2.24.1 +GIT_VERSION = 2.31.1 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 +GIT_CPE_ID_VENDOR = git-scm +GIT_SELINUX_MODULES = apache git GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) +# We're patching configure.ac +GIT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) GIT_DEPENDENCIES += host-pkgconf openssl @@ -22,12 +26,8 @@ endif ifeq ($(BR2_PACKAGE_PCRE2),y) GIT_DEPENDENCIES += pcre2 GIT_CONF_OPTS += --with-libpcre2 -else ifeq ($(BR2_PACKAGE_PCRE),y) -GIT_DEPENDENCIES += pcre -GIT_CONF_OPTS += --with-libpcre1 -GIT_MAKE_OPTS += NO_LIBPCRE1_JIT=1 else -GIT_CONF_OPTS += --without-libpcre +GIT_CONF_OPTS += --without-libpcre2 endif ifeq ($(BR2_PACKAGE_LIBCURL),y) diff --git a/package/gli/gli.mk b/package/gli/gli.mk index 6a332d0e08..9b9990910a 100644 --- a/package/gli/gli.mk +++ b/package/gli/gli.mk @@ -14,4 +14,6 @@ GLI_LICENSE_FILES = manual.md GLI_INSTALL_STAGING = YES GLI_INSTALL_TARGET = NO +GLI_CONF_OPTS = -DGLI_TEST_ENABLE=OFF + $(eval $(cmake-package)) diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 061b7af695..976a19f25e 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.61/glib-networking-2.61.1.sha256sum -sha256 a3acbe8953ba80e408bdc4a3e8c240fd9447181c7e800a175c3105604c38bad5 glib-networking-2.61.1.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.66/glib-networking-2.66.0.sha256sum +sha256 c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099 glib-networking-2.66.0.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index 39133371f5..65630c7fed 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -4,8 +4,8 @@ # ################################################################################ -GLIB_NETWORKING_VERSION_MAJOR = 2.61 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1 +GLIB_NETWORKING_VERSION_MAJOR = 2.66 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES @@ -20,6 +20,7 @@ GLIB_NETWORKING_CONF_OPTS = \ GLIB_NETWORKING_LICENSE = LGPL-2.0+ GLIB_NETWORKING_LICENSE_FILES = COPYING +GLIB_NETWORKING_CPE_ID_VENDOR = gnome GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \ GIO_MODULE_DIR=/usr/lib/gio/modules install diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 2ca73343b3..1eff245588 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -4,20 +4,14 @@ # ################################################################################ -ifeq ($(BR2_arc),y) -GLIBC_VERSION = arc-2019.09-release -GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION)) -else ifeq ($(BR2_RISCV_32),y) -GLIBC_VERSION = 06983fe52cfe8e4779035c27e8cc5d2caab31531 -GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION)) -else ifeq ($(BR2_csky),y) +ifeq ($(BR2_csky),y) GLIBC_VERSION = 7630ed2fa60caea98f500e4a7a51b88f9bf1e176 GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION)) else # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91 +GLIBC_VERSION = 2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f # 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. @@ -29,6 +23,7 @@ endif GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library) GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES +GLIBC_CPE_ID_VENDOR = gnu # glibc is part of the toolchain so disable the toolchain dependency GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO @@ -130,10 +125,9 @@ define GLIBC_CONFIGURE_CMDS --enable-shared \ $(if $(BR2_x86_64),--enable-lock-elision) \ --with-pkgversion="Buildroot" \ - --without-cvs \ --disable-profile \ + --disable-werror \ --without-gd \ - --enable-obsolete-rpc \ --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ --with-headers=$(STAGING_DIR)/usr/include) $(GLIBC_ADD_MISSING_STUB_H) diff --git a/package/glibmm/glibmm.hash b/package/glibmm/glibmm.hash index 021b77ef0a..389ee5c369 100644 --- a/package/glibmm/glibmm.hash +++ b/package/glibmm/glibmm.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.62/glibmm-2.62.0.sha256sum -sha256 36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe glibmm-2.62.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.66/glibmm-2.66.0.sha256sum +sha256 9e1db7d43d2e2d4dfa2771354e21a69a6beec7c446b711619cf8c779e13a581e glibmm-2.66.0.tar.xz # License files, locally calculated -sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools +sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk index c31c794ca2..30fbe65f6e 100644 --- a/package/glibmm/glibmm.mk +++ b/package/glibmm/glibmm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLIBMM_VERSION_MAJOR = 2.62 +GLIBMM_VERSION_MAJOR = 2.66 GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).0 GLIBMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GLIBMM_LICENSE_FILES = COPYING COPYING.tools @@ -12,6 +12,7 @@ GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz GLIBMM_SITE = http://ftp.gnome.org/pub/gnome/sources/glibmm/$(GLIBMM_VERSION_MAJOR) GLIBMM_INSTALL_STAGING = YES GLIBMM_DEPENDENCIES = libglib2 libsigc host-pkgconf +GLIBMM_CONF_OPTS = -Dbuild-examples=false GLIBMM_CXXFLAGS = $(TARGET_CXXFLAGS) @@ -19,6 +20,4 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) GLIBMM_CXXFLAGS += -O0 endif -GLIBMM_CONF_ENV += CXXFLAGS="$(GLIBMM_CXXFLAGS)" - -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in index 153eb3b0af..40d0adcc8a 100644 --- a/package/glmark2/Config.in +++ b/package/glmark2/Config.in @@ -24,6 +24,7 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2 depends on BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_WAYLAND select BR2_PACKAGE_GLMARK2_FLAVOR_ANY + select BR2_PACKAGE_WAYLAND_PROTOCOLS config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL bool @@ -32,6 +33,7 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL depends on BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_WAYLAND select BR2_PACKAGE_GLMARK2_FLAVOR_ANY + select BR2_PACKAGE_WAYLAND_PROTOCOLS config BR2_PACKAGE_GLMARK2_FLAVOR_X11_GLESV2 bool diff --git a/package/glmark2/glmark2.hash b/package/glmark2/glmark2.hash index ffd1ba2d50..33a99de12a 100644 --- a/package/glmark2/glmark2.hash +++ b/package/glmark2/glmark2.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 6a9de46c098406895411b629fe8fadfdce92360500f0f10e4cc60a889a1692eb glmark2-9e01aef1a786b28aca73135a5b00f85c357e8f5e.tar.gz +sha256 9ad57e4eec0049c47a367b57f5f8d3e31e4c488b1d5d6673a75f1b2282e40888 glmark2-c493520253fbfe3676c8b34b6f91a7c9a838fc8e.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 16fbc228292bd774b263b212ae422c524cbf3b2078bcf21b22f8bdd4373be617 COPYING.SGI diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index 3d31003d06..9e47b426fe 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLMARK2_VERSION = 9e01aef1a786b28aca73135a5b00f85c357e8f5e +GLMARK2_VERSION = c493520253fbfe3676c8b34b6f91a7c9a838fc8e GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION)) GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI @@ -31,12 +31,12 @@ GLMARK2_FLAVORS += x11-gl endif ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2),y) -GLMARK2_DEPENDENCIES += libgles wayland +GLMARK2_DEPENDENCIES += libgles wayland wayland-protocols GLMARK2_FLAVORS += wayland-glesv2 endif ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL),y) -GLMARK2_DEPENDENCIES += libgl wayland +GLMARK2_DEPENDENCIES += libgl wayland wayland-protocols GLMARK2_FLAVORS += wayland-gl endif diff --git a/package/glorytun/glorytun.hash b/package/glorytun/glorytun.hash index 30e8fd34ae..9d1b797787 100644 --- a/package/glorytun/glorytun.hash +++ b/package/glorytun/glorytun.hash @@ -1,2 +1,2 @@ -sha256 457552232c72d5fec7ba46382784685c2e8167d49d8182ab3afbfb2b0bce1b01 glorytun-0.2.2.tar.gz -sha256 02e492aa724ce3a64800ed9429cbabf811935ad1be95d667fae9187baa94e359 LICENSE +sha256 137d9c525a05bb605163df0465367d36e943715ca773ce43d5ea66f0597600a3 glorytun-0.3.4.tar.gz +sha256 3d9ddddb8807c305287d9dbab58473e5307e9c91651c43c654a0828855d2b373 LICENSE diff --git a/package/glorytun/glorytun.mk b/package/glorytun/glorytun.mk index 9207388d7e..d128ae835d 100644 --- a/package/glorytun/glorytun.mk +++ b/package/glorytun/glorytun.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLORYTUN_VERSION = 0.2.2 +GLORYTUN_VERSION = 0.3.4 GLORYTUN_SITE = https://github.com/angt/glorytun/releases/download/v$(GLORYTUN_VERSION) GLORYTUN_DEPENDENCIES = libsodium host-pkgconf GLORYTUN_LICENSE = BSD-2-clause diff --git a/package/gmp/gmp.hash b/package/gmp/gmp.hash index 417b9d17bf..d55e312bbb 100644 --- a/package/gmp/gmp.hash +++ b/package/gmp/gmp.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -sha256 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 gmp-6.1.2.tar.xz +sha256 fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2 gmp-6.2.1.tar.xz # Locally calculated -sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index d124463a98..5e16ef1916 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -4,12 +4,13 @@ # ################################################################################ -GMP_VERSION = 6.1.2 +GMP_VERSION = 6.2.1 GMP_SITE = $(BR2_GNU_MIRROR)/gmp GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz GMP_INSTALL_STAGING = YES GMP_LICENSE = LGPL-3.0+ or GPL-2.0+ GMP_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 +GMP_CPE_ID_VENDOR = gmplib GMP_DEPENDENCIES = host-m4 HOST_GMP_DEPENDENCIES = host-m4 diff --git a/package/gmrender-resurrect/Config.in b/package/gmrender-resurrect/Config.in index e7424e3b22..db655ad7f4 100644 --- a/package/gmrender-resurrect/Config.in +++ b/package/gmrender-resurrect/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_GMRENDER_RESURRECT depends on BR2_USE_MMU # gstreamer1 select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GST1_PLUGINS_BASE # run-time only - select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP + select BR2_PACKAGE_LIBUPNP help UPnP (DLNA) media renderer based on gstreamer diff --git a/package/gmrender-resurrect/gmrender-resurrect.mk b/package/gmrender-resurrect/gmrender-resurrect.mk index e25be39493..3500ab3760 100644 --- a/package/gmrender-resurrect/gmrender-resurrect.mk +++ b/package/gmrender-resurrect/gmrender-resurrect.mk @@ -13,6 +13,6 @@ GMRENDER_RESURRECT_LICENSE = GPL-2.0+ GMRENDER_RESURRECT_LICENSE_FILES = COPYING GMRENDER_RESURRECT_DEPENDENCIES = \ gstreamer1 \ - $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18) + libupnp $(eval $(autotools-package)) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index 9342fc3eb7..b68eb6e0ee 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 9a99e963355706cab32099d140b698eda9de164ebce40a5420b1b9772dd04802 gnuchess-6.2.5.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 4d91706de4..29d3590849 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,10 +4,12 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.5 +GNUCHESS_VERSION = 6.2.8 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING +GNUCHESS_CPE_ID_VENDOR = gnu +GNUCHESS_CPE_ID_PRODUCT = chess GNUCHESS_DEPENDENCIES = host-flex flex GNUCHESS_DEPENDENCIES += $(if $(BR2_PACKAGE_READLINE),readline) \ diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk index 617def884e..9729441bd2 100644 --- a/package/gnupg/gnupg.mk +++ b/package/gnupg/gnupg.mk @@ -10,6 +10,7 @@ GNUPG_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG_LICENSE = GPL-3.0+ GNUPG_LICENSE_FILES = COPYING GNUPG_DEPENDENCIES = zlib $(if $(BR2_PACKAGE_LIBICONV),libiconv) +GNUPG_CPE_ID_VENDOR = gnupg GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no GNUPG_CONF_OPTS = \ --disable-rpath \ diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index 2dee44283b..caf5dcc883 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2019q4/000443.html -sha1 e24a1208ffe69d7436b2f27e99542a85f34d0ac0 gnupg-2.2.19.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2021q2/000460.html +sha1 81684626720c91060ae9920936c768df9fc8b2f6 gnupg-2.2.32.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.19.tar.bz2.sig -# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 242554c0e06f3a83c420b052f750b65ead711cc3fddddb5e7274fcdbb4e9dec0 gnupg-2.2.19.tar.bz2 -sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.32.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA +sha256 b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614 gnupg-2.2.32.tar.bz2 +sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 28e946b400..32c22b8257 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,11 +4,13 @@ # ################################################################################ -GNUPG2_VERSION = 2.2.19 +GNUPG2_VERSION = 2.2.32 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ GNUPG2_LICENSE_FILES = COPYING +GNUPG2_CPE_ID_VENDOR = gnupg +GNUPG2_CPE_ID_PRODUCT = gnupg GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf diff --git a/package/gnuplot/0001-configure-add-without-demo-option.patch b/package/gnuplot/0001-configure-add-without-demo-option.patch index a50e6c2c1b..a557e279bc 100644 --- a/package/gnuplot/0001-configure-add-without-demo-option.patch +++ b/package/gnuplot/0001-configure-add-without-demo-option.patch @@ -3,14 +3,16 @@ Add options to enable/disable docs and demos Originally written by Anthony Viallard . -[Vincent: adapt patch to 5.0.5 version] - Signed-off-by: Thomas Petazzoni +[Vincent: adapt patch to 5.0.5 version] Signed-off-by: Vicente Olivert Riera +[Michael: adapt patch to 5.4.0 version] +Signed-off-by: Michael Fischer ---- a/configure.ac 2019-11-27 23:52:29.000000000 +0100 -+++ b/configure.ac 2020-02-13 10:24:50.801842269 +0100 -@@ -755,6 +755,16 @@ if test "$with_cwdrc" = yes; then +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2020-07-12 02:29:47.000000000 +0200 ++++ b/configure.ac 2020-08-06 14:21:17.918756893 +0200 +@@ -713,6 +713,17 @@ [ Define if you want to read .gnuplot from current directory (SECURITY RISK!).]) fi @@ -24,10 +26,11 @@ Signed-off-by: Vicente Olivert Riera +AC_ARG_ENABLE(demo,dnl +[ --disable-demo do not build demo files]) + - dnl Disable experimental support for nonlinear axes - AC_ARG_WITH(nonlinear-axes,dnl - [ --without-nonlinear-axes disable support for nonlinear axes]) -@@ -1236,6 +1246,24 @@ if test -n "${DIST_CONTACT}"; then ++ + dnl Sort help/subtopic tables by row or column + AC_ARG_WITH(row-help,dnl + [ --with-row-help format help and subtopic tables by row (default) +@@ -1095,6 +1106,24 @@ AC_DEFINE_UNQUOTED([DIST_CONTACT],["$DIST_CONTACT"],[Contact address for modified and binary distributed gnuplot versions]) fi @@ -52,14 +55,15 @@ Signed-off-by: Vicente Olivert Riera dnl Substitute variables AC_SUBST(PACKAGE) AC_SUBST(VERSION_MAJOR) ---- a/Makefile.am 2019-11-19 22:57:18.000000000 +0100 -+++ b/Makefile.am 2020-02-13 10:17:55.753012739 +0100 +diff -Naur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2020-03-31 19:28:16.000000000 +0200 ++++ b/Makefile.am 2020-08-06 14:34:12.995097799 +0200 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- AUTOMAKE_OPTIONS = foreign --SUBDIRS = config m4 term src docs man demo tutorial share -+SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) tutorial share +-SUBDIRS = config m4 term src docs man demo share ++SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) share - EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \ + EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \ + PATCHLEVEL PGPKEYS README RELEASE_NOTES \ diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index ef80a29d3d..fc166205d0 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.2.8/ -md5 2df8767c7399bee57a96296d46b4d5fb gnuplot-5.2.8.tar.gz -sha1 dc018b1e0a31b770d4635958badff13498babc4d gnuplot-5.2.8.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.2/ +md5 2050ca477199a591543bc968aba7d899 gnuplot-5.4.2.tar.gz +sha1 2e076b29f38bfcb841cb5eb3377fd1a469ced1ac gnuplot-5.4.2.tar.gz # Locally computed -sha256 60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37 gnuplot-5.2.8.tar.gz +sha256 e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba gnuplot-5.4.2.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 694b6cb886..436d3e5f92 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,10 +4,11 @@ # ################################################################################ -GNUPLOT_VERSION = 5.2.8 +GNUPLOT_VERSION = 5.4.2 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright +GNUPLOT_CPE_ID_VENDOR = gnuplot_project GNUPLOT_AUTORECONF = YES @@ -31,9 +32,7 @@ endif ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) GNUPLOT_CONF_OPTS += --with-gd -GNUPLOT_DEPENDENCIES += gd -GNUPLOT_CONF_ENV += \ - ac_cv_path_GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config +GNUPLOT_DEPENDENCIES += host-pkgconf gd else GNUPLOT_CONF_OPTS += --without-gd endif diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 6d438bcd6f..c10e0fa3f5 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -1,5 +1,6 @@ comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS @@ -13,6 +14,7 @@ config BR2_PACKAGE_GNURADIO depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # use fork() depends on BR2_USE_WCHAR # boost + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_ATOMIC @@ -54,6 +56,14 @@ config BR2_PACKAGE_GNURADIO_CTRLPORT help GNU Radio ctrlport block +config BR2_PACKAGE_GNURADIO_DTV + bool "gr-dtv support" + select BR2_PACKAGE_GNURADIO_ANALOG + select BR2_PACKAGE_GNURADIO_FEC + select BR2_PACKAGE_GNURADIO_FILTER + help + various digital television standards blocks + config BR2_PACKAGE_GNURADIO_FEC bool "gr-fec support" select BR2_PACKAGE_GNURADIO_BLOCKS @@ -63,7 +73,7 @@ config BR2_PACKAGE_GNURADIO_FEC config BR2_PACKAGE_GNURADIO_PYTHON bool "python support" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_BOOST_PYTHON @@ -120,11 +130,19 @@ config BR2_PACKAGE_GNURADIO_FILTER help Filter signal processing blocks -config BR2_PACKAGE_GNURADIO_PAGER - bool "gr-flex support" - select BR2_PACKAGE_GNURADIO_ANALOG +config BR2_PACKAGE_GNURADIO_QTGUI + bool "gr-qtgui" + depends on BR2_PACKAGE_GNURADIO_PYTHON + depends on BR2_PACKAGE_QT5 + select BR2_PACKAGE_GNURADIO_FFT + select BR2_PACKAGE_GNURADIO_FILTER + select BR2_PACKAGE_PYTHON_PYQT5 + select BR2_PACKAGE_QT5BASE_FONTCONFIG # runtime + select BR2_PACKAGE_QT5BASE_GUI # runtime + select BR2_PACKAGE_QT5BASE_WIDGETS # runtime + select BR2_PACKAGE_QWT help - FLEX pager decoder implementation blocks + GNU Radio Qt scopes config BR2_PACKAGE_GNURADIO_TRELLIS bool "gr-trellis support" @@ -132,4 +150,13 @@ config BR2_PACKAGE_GNURADIO_TRELLIS help Trellis coded modulation blocks +config BR2_PACKAGE_GNURADIO_UHD + bool "gr-uhd support" + select BR2_PACKAGE_UHD + select BR2_PACKAGE_GNURADIO_ANALOG + select BR2_PACKAGE_GNURADIO_BLOCKS + select BR2_PACKAGE_GNURADIO_FILTER + help + UHD support + endif diff --git a/package/gnuradio/gnuradio.hash b/package/gnuradio/gnuradio.hash index 7c38110772..e47c5faaba 100644 --- a/package/gnuradio/gnuradio.hash +++ b/package/gnuradio/gnuradio.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3a9c90111f22f2f6f30450731dc671ad28ce824fc1a7bc8ea0783da9b95a7092 gnuradio-3.8.0.0.tar.gz +sha256 3e293541a9ac8d78660762bae8b80c0f6195b3494e1c50c01a9fd79cc60bb624 gnuradio-3.8.2.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 41d4619f72..36d7ee65cf 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -4,13 +4,20 @@ # ################################################################################ -GNURADIO_VERSION = 3.8.0.0 -GNURADIO_SITE = https://gnuradio.org/releases/gnuradio +GNURADIO_VERSION = 3.8.2.0 +GNURADIO_SITE = https://github.com/gnuradio/gnuradio/releases/download/v$(GNURADIO_VERSION) GNURADIO_LICENSE = GPL-3.0+ GNURADIO_LICENSE_FILES = COPYING GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO +# needed to determine site-packages path +ifeq ($(BR2_PACKAGE_PYTHON),y) +GNURADIO_PYVER = $(PYTHON_VERSION_MAJOR) +else ifeq ($(BR2_PACKAGE_PYTHON3),y) +GNURADIO_PYVER = $(PYTHON3_VERSION_MAJOR) +endif + # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \ @@ -27,7 +34,6 @@ GNURADIO_CONF_OPTS = \ -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ -DENABLE_TESTING=OFF \ - -DENABLE_GR_QTGUI=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND # For third-party blocks, the gnuradio libraries are mandatory at @@ -87,6 +93,12 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_DTV),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_DTV=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_DTV=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_FEC),y) GNURADIO_DEPENDENCIES += gsl GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=ON @@ -108,16 +120,21 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) -GNURADIO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +GNURADIO_DEPENDENCIES += python3 GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON +# mandatory to install python modules in site-packages and to use +# correct path for python libraries +GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ + -DGR_PYTHON_DIR=lib/python$(GNURADIO_PYVER)/site-packages else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif -ifeq ($(BR2_PACKAGE_GNURADIO_PAGER),y) -GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=ON +ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y) +GNURADIO_DEPENDENCIES += qt5base python-pyqt5 qwt +GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON else -GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=OFF +GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y) @@ -126,6 +143,13 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_UHD),y) +GNURADIO_DEPENDENCIES += uhd +GNURADIO_CONF_OPTS += -DENABLE_GR_UHD=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_UHD=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_UTILS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=ON else diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index 15b930b6bd..cd83b375aa 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_GNUTLS GnuTLS is a secure communications library implementing the SSL and TLS protocols and technologies around them. - http://www.gnutls.org + https://www.gnutls.org/ if BR2_PACKAGE_GNUTLS @@ -23,8 +23,6 @@ config BR2_PACKAGE_GNUTLS_OPENSSL config BR2_PACKAGE_GNUTLS_TOOLS bool "install tools" - select BR2_PACKAGE_ARGP_STANDALONE \ - if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL help Install GnuTLS command line tools for various cryptographic tasks. diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 99279bfb6b..5d4fd1a0dc 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.6/gnutls-3.6.13.tar.xz.sig -sha256 32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38 gnutls-3.6.13.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz.sig +sha256 646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 gnutls-3.7.2.tar.xz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index a1dfce62a2..11c2d81e7d 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -4,8 +4,8 @@ # ################################################################################ -GNUTLS_VERSION_MAJOR = 3.6 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).13 +GNUTLS_VERSION_MAJOR = 3.7 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) @@ -17,11 +17,13 @@ GNUTLS_LICENSE_FILES += doc/COPYING endif GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre +GNUTLS_CPE_ID_VENDOR = gnu GNUTLS_CONF_OPTS = \ --disable-doc \ --disable-guile \ --disable-libdane \ --disable-rpath \ + --disable-tests \ --enable-local-libopts \ --enable-openssl-compatibility \ --with-librt-prefix=$(STAGING_DIR) \ @@ -46,20 +48,6 @@ GNUTLS_CONF_OPTS += \ --with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \ --with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`" -# Consider crywrap as part of tools because it needs WCHAR, and it's so too -ifeq ($(BR2_PACKAGE_GNUTLS_TOOLS),) -GNUTLS_CONF_OPTS += --disable-crywrap -endif - -# Prerequisite for crywrap -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -GNUTLS_LIBS += -largp -GNUTLS_DEPENDENCIES += argp-standalone -endif - -# libidn support for nommu must exclude the crywrap wrapper (uses fork) -GNUTLS_CONF_OPTS += $(if $(BR2_USE_MMU),,--disable-crywrap) - ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) GNUTLS_CONF_OPTS += --enable-cryptodev GNUTLS_DEPENDENCIES += cryptodev-linux diff --git a/package/go-bootstrap/go-bootstrap.hash b/package/go-bootstrap/go-bootstrap.hash index 03fd7d571f..0f186a5d55 100644 --- a/package/go-bootstrap/go-bootstrap.hash +++ b/package/go-bootstrap/go-bootstrap.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 go1.4.3.src.tar.gz +sha256 f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52 go1.4-bootstrap-20171003.tar.gz sha256 dd26a7abddd02e2d0aba97805b31f248ef7835d9e10da289b22e3b8ab78b324d LICENSE diff --git a/package/go-bootstrap/go-bootstrap.mk b/package/go-bootstrap/go-bootstrap.mk index 6710e31561..71696a1540 100644 --- a/package/go-bootstrap/go-bootstrap.mk +++ b/package/go-bootstrap/go-bootstrap.mk @@ -4,9 +4,11 @@ # ################################################################################ -GO_BOOTSTRAP_VERSION = 1.4.3 -GO_BOOTSTRAP_SITE = https://storage.googleapis.com/golang -GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).src.tar.gz +# 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 diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 3f16dbaec3..e82ab6e81a 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,11 +2,10 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_20006 depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ - || BR2_mips64 || BR2_mips64el + || BR2_mips64 || BR2_mips64el || BR2_s390x depends on !BR2_ARM_CPU_ARMV4 # MIPS R6 support in Go has not yet been developed. depends on !BR2_MIPS_CPU_MIPS64R6 diff --git a/package/go/go.hash b/package/go/go.hash index dc966e85d2..10bbb741e0 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34 go1.13.8.src.tar.gz -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE +sha256 a905472011585e403d00d2a41de7ced29b8884309d73482a307f689fd0f320b5 go1.16.10.src.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 376c3db7f0..8a65e20380 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,18 +4,32 @@ # ################################################################################ -GO_VERSION = 1.13.8 +GO_VERSION = 1.16.10 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE +GO_CPE_ID_VENDOR = golang HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_GOPATH = $(HOST_DIR)/usr/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/usr/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go HOST_GO_TARGET_CACHE = $(HOST_DIR)/usr/share/go-cache +# We pass an empty GOBIN, otherwise "go install: cannot install +# cross-compiled binaries when GOBIN is set" +HOST_GO_COMMON_ENV = \ + GO111MODULE=on \ + GOFLAGS=-mod=vendor \ + GOROOT="$(HOST_GO_ROOT)" \ + GOPATH="$(HOST_GO_GOPATH)" \ + GOPROXY=off \ + PATH=$(BR_PATH) \ + GOBIN= \ + CGO_ENABLED=$(HOST_GO_CGO_ENABLED) + ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) ifeq ($(BR2_arm),y) @@ -26,11 +40,19 @@ else ifeq ($(BR2_ARM_CPU_ARMV6),y) GO_GOARM = 6 else ifeq ($(BR2_ARM_CPU_ARMV7A),y) GO_GOARM = 7 +else ifeq ($(BR2_ARM_CPU_ARMV8A),y) +# Go doesn't support 32-bit GOARM=8 (https://github.com/golang/go/issues/29373) +# but can still benefit from armv7 optimisations +GO_GOARM = 7 endif else ifeq ($(BR2_aarch64),y) GO_GOARCH = arm64 else ifeq ($(BR2_i386),y) GO_GOARCH = 386 +# i386: use softfloat if no SSE2: https://golang.org/doc/go1.16#386 +ifneq ($(BR2_X86_CPU_HAS_SSE2),y) +GO_GO386 = softfloat +endif else ifeq ($(BR2_x86_64),y) GO_GOARCH = amd64 else ifeq ($(BR2_powerpc64),y) @@ -41,17 +63,21 @@ else ifeq ($(BR2_mips64),y) GO_GOARCH = mips64 else ifeq ($(BR2_mips64el),y) GO_GOARCH = mips64le +else ifeq ($(BR2_s390x),y) +GO_GOARCH = s390x endif # For the convienience of target packages. HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH) HOST_GO_TARGET_ENV = \ - GO111MODULE=off \ + $(HOST_GO_COMMON_ENV) \ GOARCH=$(GO_GOARCH) \ GOCACHE="$(HOST_GO_TARGET_CACHE)" \ - GOROOT="$(HOST_GO_ROOT)" \ CC="$(TARGET_CC)" \ CXX="$(TARGET_CXX)" \ + CGO_CFLAGS="$(TARGET_CFLAGS)" \ + CGO_CXXFLAGS="$(TARGET_CXXFLAGS)" \ + CGO_LDFLAGS="$(TARGET_LDFLAGS)" \ GOTOOLDIR="$(HOST_GO_TOOLDIR)" # The go compiler's cgo support uses threads. If BR2_TOOLCHAIN_HAS_THREADS is @@ -68,6 +94,7 @@ HOST_GO_CROSS_ENV = \ CC_FOR_TARGET="$(TARGET_CC)" \ CXX_FOR_TARGET="$(TARGET_CXX)" \ GOARCH=$(GO_GOARCH) \ + $(if $(GO_GO386),GO386=$(GO_GO386)) \ $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ GO_ASSUME_CROSSCOMPILING=1 @@ -77,6 +104,17 @@ else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS HOST_GO_CGO_ENABLED = 1 endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +# For the convenience of host golang packages +HOST_GO_HOST_ENV = \ + $(HOST_GO_COMMON_ENV) \ + GOARCH="" \ + GOCACHE="$(HOST_GO_HOST_CACHE)" \ + CC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" \ + CGO_CFLAGS="$(HOST_CFLAGS)" \ + CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ + CGO_LDFLAGS="$(HOST_LDFLAGS)" + # The go build system is not compatible with ccache, so use # HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. HOST_GO_MAKE_ENV = \ diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch index c75c7512d9..01b11998bd 100644 --- a/package/gobject-introspection/0001-disable-tests.patch +++ b/package/gobject-introspection/0001-disable-tests.patch @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build index eed4d6b..5058664 100644 --- a/meson.build +++ b/meson.build -@@ -214,12 +214,6 @@ if get_option('build_introspection_data') == true +@@ -222,12 +222,6 @@ if get_option('build_introspection_data') == true endif subdir('docs') diff --git a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch index 08835d3ecc..9b9ae99779 100644 --- a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch +++ b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch @@ -15,7 +15,7 @@ diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py index a8bd5b1..51bb9bc 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py -@@ -229,6 +229,8 @@ class CCompiler(object): +@@ -231,6 +231,8 @@ class CCompiler(object): for envvar in runtime_path_envvar: if envvar in os.environ: diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in index e312852cf2..bacf44363c 100644 --- a/package/gobject-introspection/Config.in +++ b/package/gobject-introspection/Config.in @@ -1,7 +1,12 @@ +config BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + config BR2_PACKAGE_GOBJECT_INTROSPECTION bool "gobject-introspection" depends on BR2_USE_MMU # python3, libglib2 - depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # While gcc 4.8 might be compatible with gobject-introspection, # The autobuilders use some toolchains from codesourcery which # have gcc 4.8 and a very old version of glibc, which will cause @@ -34,9 +39,10 @@ config BR2_PACKAGE_GOBJECT_INTROSPECTION comment "gobject-introspection needs python3" depends on !BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS comment "gobject-introspection needs a glibc toolchain, gcc >= 4.9" depends on BR2_USE_MMU - depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index c6923f8599..e859ba1d3b 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,4 +1,5 @@ -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.64/gobject-introspection-1.64.0.sha256sum -sha256 eac05a63091c81adfdc8ef34820bcc7e7778c5b9e34734d344fc9e69ddf4fc82 gobject-introspection-1.64.0.tar.xz -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.sha256sum +sha256 d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27 gobject-introspection-1.68.0.tar.xz +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +sha256 ad35e98ae9342a3539c36f2171e84d175394ddcff625887290c751302cb02983 giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 0a395b814c..f34dca7278 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.64 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.68 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz @@ -43,7 +43,7 @@ HOST_GOBJECT_INTROSPECTION_NINJA_ENV += \ # Use the host gi-scanner to prevent the scanner from generating incorrect # elf classes. GOBJECT_INTROSPECTION_CONF_OPTS = \ - -Dgi_cross_use_host_gi=true \ + -Dgi_cross_use_prebuilt_gi=true \ -Dgi_cross_binary_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \ -Dgi_cross_ldd_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \ -Dbuild_introspection_data=true \ @@ -64,8 +64,8 @@ HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ GI_SCANNER_DISABLE_CACHE=1 # Make sure g-ir-tool-template uses the host python. -define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH - $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in +define GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH + $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python3%' $(@D)/tools/g-ir-tool-template.in endef HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH @@ -75,7 +75,7 @@ HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOL # - Create a safe modules directory which does not exist so we don't load random things # which may then get deleted (or their dependencies) and potentially segfault define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS - $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in + $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python3%' $(@D)/tools/g-ir-tool-template.in $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \ $(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper @@ -116,23 +116,29 @@ define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS # Gobject-introspection installs Makefile.introspection in # $(STAGING_DIR)/usr/share which is needed for autotools-based programs to - # build .gir and .typelib files. Unfortuantly, gobject-introspection-1.0.pc + # build .gir and .typelib files. Unfortunately, gobject-introspection-1.0.pc # uses $(prefix)/share as the directory, which # causes the host /usr/share being used instead of $(STAGING_DIR)/usr/share. - # Change datarootdir to $(libdir)/../share which will prefix $(STAGING_DIR) + # Change datadir to $(libdir)/../share which will prefix $(STAGING_DIR) # to the correct location. - $(SED) "s%datarootdir=.*%datarootdir=\$${libdir}/../share%g" \ + $(SED) "s%^datadir=.*%datadir=\$${libdir}/../share%g" \ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc # By default, girdir and typelibdir use datadir and libdir as their prefix, # of which pkg-config appends the sysroot directory. This results in files # being installed in $(STAGING_DIR)/$(STAGING_DIR)/path/to/files. - # Changing the prefix to exec_prefix prevents this error. - $(SED) "s%girdir=.*%girdir=\$${exec_prefix}/share/gir-1.0%g" \ + # Changing the prefix to prefix prevents this error. + $(SED) "s%girdir=.*%girdir=\$${prefix}/share/gir-1.0%g" \ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc - $(SED) "s%typelibdir=.*%typelibdir=\$${exec_prefix}/lib/girepository-1.0%g" \ + $(SED) "s%typelibdir=.*%typelibdir=\$${prefix}/lib/girepository-1.0%g" \ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc + + # Set includedir to $(STAGING_DIR)/usr/share/gir-1.0 instead of . or + # g-ir-compiler won't find .gir files resulting in a build failure for + # autotools-based based programs + $(SED) "s%includedir=.%includedir=$(STAGING_DIR)/usr/share/gir-1.0%g" \ + $(STAGING_DIR)/usr/share/gobject-introspection-1.0/Makefile.introspection endef GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS diff --git a/package/google-breakpad/google-breakpad.hash b/package/google-breakpad/google-breakpad.hash index 81715ec573..09f9a0cf91 100644 --- a/package/google-breakpad/google-breakpad.hash +++ b/package/google-breakpad/google-breakpad.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6f444233e88957c30cc2d5497ee9d72d104122ce2c25a7ef7f6be3af1b3f7353 google-breakpad-7515ab13768c7edc09f0f2ec2354dc6c928239a6.tar.gz +sha256 3504639ee5d7536e7f7939b80520dfcb98863e9b50673dd577d0ab2a07105acb google-breakpad-7515ab13768c7edc09f0f2ec2354dc6c928239a6-br1.tar.gz sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 LICENSE diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk index 4b928a0ebd..c2f042c464 100644 --- a/package/gperf/gperf.mk +++ b/package/gperf/gperf.mk @@ -8,6 +8,8 @@ GPERF_VERSION = 3.1 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf GPERF_LICENSE = GPL-3.0+ GPERF_LICENSE_FILES = COPYING +GPERF_CPE_ID_VENDOR = gperftools_project +GPERF_CPE_ID_PRODUCT = gperftools $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/gpm/gpm.mk b/package/gpm/gpm.mk index f59d059a41..695264348c 100644 --- a/package/gpm/gpm.mk +++ b/package/gpm/gpm.mk @@ -9,6 +9,7 @@ GPM_SOURCE = gpm-$(GPM_VERSION).tar.lzma GPM_SITE = http://www.nico.schottelius.org/software/gpm/archives GPM_LICENSE = GPL-2.0+ GPM_LICENSE_FILES = COPYING +GPM_SELINUX_MODULES = gpm GPM_INSTALL_STAGING = YES GPM_DEPENDENCIES = host-bison diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index ea0dea3ba6..1da9a5ce2a 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -44,9 +44,6 @@ config BR2_PACKAGE_GPSD_PROFILING comment "profiling support not available with uClibc-based toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC -config BR2_PACKAGE_GPSD_PPS - bool "PPS time syncing support" - config BR2_PACKAGE_GPSD_USER bool "GPSD privilege revocation user" @@ -63,14 +60,6 @@ config BR2_PACKAGE_GPSD_GROUP_VALUE default "nobody" depends on BR2_PACKAGE_GPSD_GROUP -config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED - bool "compile with fixed serial port speed" - -config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE - int "serial port speed" - default "9600" - depends on BR2_PACKAGE_GPSD_FIXED_PORT_SPEED - config BR2_PACKAGE_GPSD_MAX_CLIENT bool "compile with limited maximum clients" @@ -87,17 +76,20 @@ config BR2_PACKAGE_GPSD_MAX_DEV_VALUE default "2" depends on BR2_PACKAGE_GPSD_MAX_DEV -config BR2_PACKAGE_GPSD_RECONFIGURE - bool "allow gpsd to change device settings" - default y - -config BR2_PACKAGE_GPSD_CONTROLSEND - bool "allow gpsctl/gpsmon to change device settings" - default y - config BR2_PACKAGE_GPSD_SQUELCH bool "squelch gpsd_report and gpsd_hexdump to save cpu" +config BR2_PACKAGE_GPSD_PYTHON + bool "build Python support and modules" + depends on BR2_USE_WCHAR # python + select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + help + Python libraries and tools for the gpsd service daemon + including gpsfake test harness. + +comment "GPSD python support not available with toolchain w/o wide characters support" + depends on !BR2_USE_WCHAR + comment "Protocols" config BR2_PACKAGE_GPSD_AIVDM diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash index 40f2b7c990..6d93e7b553 100644 --- a/package/gpsd/gpsd.hash +++ b/package/gpsd/gpsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39 gpsd-3.19.tar.gz -sha256 13ba6fe5b2f41f03b854f9ac5f271e116d5ed55890cc20f5fe44dcfa0dc5958b COPYING +sha256 0b991ce9a46538c4ea450f7a8ee428ff44fb4f8d665fddf2ffe40fe0ae9a6c09 gpsd-3.23.1.tar.gz +sha256 fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716 COPYING diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 49de4b256c..ff924c49e0 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,16 +4,19 @@ # ################################################################################ -GPSD_VERSION = 3.19 +GPSD_VERSION = 3.23.1 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING +GPSD_CPE_ID_VENDOR = gpsd_project +GPSD_SELINUX_MODULES = gpsd GPSD_INSTALL_STAGING = YES GPSD_DEPENDENCIES = host-python3 host-scons host-pkgconf GPSD_LDFLAGS = $(TARGET_LDFLAGS) GPSD_CFLAGS = $(TARGET_CFLAGS) +GPSD_CXXFLAGS = $(TARGET_CXXFLAGS) GPSD_SCONS_ENV = $(TARGET_CONFIGURE_OPTS) @@ -23,9 +26,7 @@ GPSD_SCONS_OPTS = \ prefix=/usr \ sysroot=$(STAGING_DIR) \ strip=no \ - python=no \ qt=no \ - ntpshm=yes \ systemd=$(if $(BR2_INIT_SYSTEMD),yes,no) ifeq ($(BR2_PACKAGE_NCURSES),y) @@ -46,6 +47,7 @@ endif ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) GPSD_CFLAGS += -O0 +GPSD_CXXFLAGS += -O0 endif # If libusb is available build it before so the package can use it @@ -163,18 +165,9 @@ GPSD_SCONS_OPTS += ublox=no endif # Features -ifneq ($(BR2_PACKAGE_GPSD_PPS),y) -GPSD_SCONS_OPTS += pps=no -endif ifeq ($(BR2_PACKAGE_GPSD_SQUELCH),y) GPSD_SCONS_OPTS += squelch=yes endif -ifneq ($(BR2_PACKAGE_GPSD_RECONFIGURE),y) -GPSD_SCONS_OPTS += reconfigure=no -endif -ifneq ($(BR2_PACKAGE_GPSD_CONTROLSEND),y) -GPSD_SCONS_OPTS += controlsend=no -endif ifneq ($(BR2_PACKAGE_GPSD_OLDSTYLE),y) GPSD_SCONS_OPTS += oldstyle=no endif @@ -190,9 +183,6 @@ endif ifeq ($(BR2_PACKAGE_GPSD_GROUP),y) GPSD_SCONS_OPTS += gpsd_group=$(BR2_PACKAGE_GPSD_GROUP_VALUE) endif -ifeq ($(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED),y) -GPSD_SCONS_OPTS += fixed_port_speed=$(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE) -endif ifeq ($(BR2_PACKAGE_GPSD_MAX_CLIENT),y) GPSD_SCONS_OPTS += max_clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE) endif @@ -200,7 +190,23 @@ ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y) GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE) endif -GPSD_SCONS_ENV += LDFLAGS="$(GPSD_LDFLAGS)" CFLAGS="$(GPSD_CFLAGS)" +ifeq ($(BR2_PACKAGE_PYTHON3),y) +GPSD_SCONS_OPTS += \ + python=yes \ + python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" +else ifeq ($(BR2_PACKAGE_PYTHON),y) +GPSD_SCONS_OPTS += \ + python=yes \ + python_libdir="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" +else +GPSD_SCONS_OPTS += python=no +endif + +GPSD_SCONS_ENV += \ + LDFLAGS="$(GPSD_LDFLAGS)" \ + CFLAGS="$(GPSD_CFLAGS)" \ + CCFLAGS="$(GPSD_CFLAGS)" \ + CXXFLAGS="$(GPSD_CXXFLAGS)" define GPSD_BUILD_CMDS (cd $(@D); \ diff --git a/package/gptfdisk/gptfdisk.hash b/package/gptfdisk/gptfdisk.hash index 0e52d9917f..caded358ec 100644 --- a/package/gptfdisk/gptfdisk.hash +++ b/package/gptfdisk/gptfdisk.hash @@ -1,6 +1,5 @@ -# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.4/ -md5 5ecc3c44913bb6b53d3708d1ac7ac295 gptfdisk-1.0.4.tar.gz -sha1 4c2d60bedd4eac1014727e3b126de96966205410 gptfdisk-1.0.4.tar.gz +# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.8/ +sha1 c8824e779056158fa32887e415f5399a8646c3c5 gptfdisk-1.0.8.tar.gz # Locally computed -sha256 b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c7ba78d gptfdisk-1.0.4.tar.gz -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df gptfdisk-1.0.8.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index afe4a72886..9869975f51 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPTFDISK_VERSION = 1.0.4 +GPTFDISK_VERSION = 1.0.8 GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk GPTFDISK_LICENSE = GPL-2.0+ GPTFDISK_LICENSE_FILES = COPYING diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index d873c6a4d4..60942c36c8 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -1,8 +1,9 @@ comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library" depends on BR2_USE_MMU # gnuradio depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || !BR2_STATIC_LIBS + !BR2_USE_WCHAR || BR2_STATIC_LIBS comment "gqrx needs qt5" depends on !BR2_PACKAGE_QT5 @@ -19,6 +20,7 @@ config BR2_PACKAGE_GQRX depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_QT5 + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # gnuradio -> boost-atomic depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # gnuradio select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS diff --git a/package/gqrx/gqrx.hash b/package/gqrx/gqrx.hash index 8f5f2ca433..1991dfea82 100644 --- a/package/gqrx/gqrx.hash +++ b/package/gqrx/gqrx.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 7c626db9f22c3edbe30299a08f7f549b4f30dd83c883595468029a27c3e8fda9 gqrx-2.12.1.tar.gz +sha256 aec35c77ebde9c71a5f973c509eec3d6aa2f18a6e052b180fcd9029d88273e5b gqrx-2.14.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk index b3438ac1fd..4d464298ca 100644 --- a/package/gqrx/gqrx.mk +++ b/package/gqrx/gqrx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GQRX_VERSION = 2.12.1 +GQRX_VERSION = 2.14.4 GQRX_SITE = $(call github,csete,gqrx,v$(GQRX_VERSION)) GQRX_LICENSE = GPL-3.0+, Apache-2.0 GQRX_LICENSE_FILES = COPYING LICENSE-CTK diff --git a/package/gr-osmosdr/Config.in b/package/gr-osmosdr/Config.in index 1e80137f35..04fa10be80 100644 --- a/package/gr-osmosdr/Config.in +++ b/package/gr-osmosdr/Config.in @@ -14,6 +14,7 @@ if BR2_PACKAGE_GR_OSMOSDR config BR2_PACKAGE_GR_OSMOSDR_PYTHON bool "python support" depends on BR2_PACKAGE_GNURADIO_PYTHON + depends on BR2_PACKAGE_PYTHON3 help Enable Python support @@ -24,10 +25,14 @@ config BR2_PACKAGE_GR_OSMOSDR_IQFILE config BR2_PACKAGE_GR_OSMOSDR_RTLSDR bool "Osmocom RTLSDR support" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # librtlsdr -> libusb select BR2_PACKAGE_LIBRTLSDR help Enable Osmocom RTLSDR support +comment "Osmocom RTLSDR support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + config BR2_PACKAGE_GR_OSMOSDR_RTLSDR_TCP bool "RTLSDR TCP Client support" help diff --git a/package/gr-osmosdr/gr-osmosdr.hash b/package/gr-osmosdr/gr-osmosdr.hash index 4a1e56abae..95f1137e38 100644 --- a/package/gr-osmosdr/gr-osmosdr.hash +++ b/package/gr-osmosdr/gr-osmosdr.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 48f92dc02b86ce6d299b35db249f2c8099bb45326c979b6225a020a4188e4204 gr-osmosdr-46698a67e7e06419eefaf45c95129c0c12669045.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 11b1eb13725ced5ded9121a10aaf7bccf2430c5c69d020791408219968665b71 gr-osmosdr-0.2.3.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index fcc817fe85..870db60c55 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -4,15 +4,15 @@ # ################################################################################ -GR_OSMOSDR_VERSION = 46698a67e7e06419eefaf45c95129c0c12669045 -GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,$(GR_OSMOSDR_VERSION)) +GR_OSMOSDR_VERSION = 0.2.3 +GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,v$(GR_OSMOSDR_VERSION)) GR_OSMOSDR_LICENSE = GPL-3.0+ GR_OSMOSDR_LICENSE_FILES = COPYING # gr-osmosdr prevents doing an in-source-tree build GR_OSMOSDR_SUPPORTS_IN_SOURCE_BUILD = NO -GR_OSMOSDR_DEPENDENCIES = gnuradio host-python-cheetah +GR_OSMOSDR_DEPENDENCIES = gnuradio host-python3 GR_OSMOSDR_CONF_OPTS = \ -DENABLE_DEFAULT=OFF \ @@ -24,7 +24,7 @@ GR_OSMOSDR_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_GR_OSMOSDR_PYTHON),y) GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON -GR_OSMOSDR_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +GR_OSMOSDR_DEPENDENCIES += python3 else GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=OFF endif diff --git a/package/granite/Config.in b/package/granite/Config.in index fef5e27add..726bde1b2d 100644 --- a/package/granite/Config.in +++ b/package/granite/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_GRANITE An extension to GTK+ that provides several useful widgets and classes to ease application development. - https://launchpad.net/granite + https://github.com/elementary/granite comment "granite needs libgtk3 and a toolchain w/ wchar, threads" depends on BR2_USE_MMU diff --git a/package/granite/granite.hash b/package/granite/granite.hash index 48f62604fa..a91f468b49 100644 --- a/package/granite/granite.hash +++ b/package/granite/granite.hash @@ -1,6 +1,3 @@ -# From https://launchpad.net/granite/0.4/0.4.1/+download/granite-0.4.1.tar.xz/+md5 -md5 b1002c0488bb9ade0ef89730c4f84393 granite-0.4.1.tar.xz -# Calculated based on the hash above -sha256 8bb411523e6cd5685c928dbfe08893892189cedf9fad5f537aa76182032cf09c granite-0.4.1.tar.xz # Locally computed +sha256 c62d8d29e8bb59a5fa2d9006a9c13196aea9159410a7c86e3d51fa10d0f9dcc0 granite-6.0.0.tar.gz sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/granite/granite.mk b/package/granite/granite.mk index f824ba7fda..71dfbf4c03 100644 --- a/package/granite/granite.mk +++ b/package/granite/granite.mk @@ -4,13 +4,25 @@ # ################################################################################ -GRANITE_VERSION_MAJOR = 0.4 -GRANITE_VERSION = $(GRANITE_VERSION_MAJOR).1 -GRANITE_SITE = https://launchpad.net/granite/$(GRANITE_VERSION_MAJOR)/$(GRANITE_VERSION)/+download -GRANITE_SOURCE = granite-$(GRANITE_VERSION).tar.xz -GRANITE_DEPENDENCIES = host-pkgconf host-vala libgee libglib2 libgtk3 +GRANITE_VERSION = 6.0.0 +GRANITE_SITE = $(call github,elementary,granite,$(GRANITE_VERSION)) +GRANITE_DEPENDENCIES = \ + host-pkgconf \ + host-vala \ + libgee \ + libglib2 \ + libgtk3 \ + $(TARGET_NLS_DEPENDENCIES) GRANITE_INSTALL_STAGING = YES GRANITE_LICENSE = LGPL-3.0+ GRANITE_LICENSE_FILES = COPYING +GRANITE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) -$(eval $(cmake-package)) +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GRANITE_CONF_OPTS += -Dintrospection=true +GRANITE_DEPENDENCIES += gobject-introspection +else +GRANITE_CONF_OPTS += -Dintrospection=false +endif + +$(eval $(meson-package)) diff --git a/package/grantlee/grantlee.hash b/package/grantlee/grantlee.hash index 2be423bd95..6508aa70cc 100644 --- a/package/grantlee/grantlee.hash +++ b/package/grantlee/grantlee.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478 grantlee-5.1.0.tar.gz +# Locally calculated +sha256 139acee5746b957bdf1327ec0d97c604d4c0b9be42aec5d584297cb5ed6a990a grantlee-5.2.0.tar.gz # Hash for license file -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk index 575b63fef5..7079679ca4 100644 --- a/package/grantlee/grantlee.mk +++ b/package/grantlee/grantlee.mk @@ -4,8 +4,8 @@ # ################################################################################ -GRANTLEE_VERSION = 5.1.0 -GRANTLEE_SITE = http://downloads.grantlee.org +GRANTLEE_VERSION = 5.2.0 +GRANTLEE_SITE = $(call github,steveire,grantlee,v$(GRANTLEE_VERSION)) GRANTLEE_INSTALL_STAGING = YES GRANTLEE_LICENSE = LGPL-2.1+ GRANTLEE_LICENSE_FILES = COPYING.LIB diff --git a/package/graphite2/Config.in b/package/graphite2/Config.in index 5499e17e27..ec92ff7be0 100644 --- a/package/graphite2/Config.in +++ b/package/graphite2/Config.in @@ -1,13 +1,12 @@ config BR2_PACKAGE_GRAPHITE2 bool "graphite2" depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS help Graphite is a project within SIL's scripts and software dev groups to provide cross-platform rendering for complex writing systems. - http://graphite.sil.org/ + https://github.com/silnrsi/graphite -comment "graphite2 needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "graphite2 needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/graphite2/graphite2.hash b/package/graphite2/graphite2.hash index e0c1aae670..e005375f8a 100644 --- a/package/graphite2/graphite2.hash +++ b/package/graphite2/graphite2.hash @@ -1,6 +1,4 @@ -# From http://sourceforge.net/projects/silgraphite/files/graphite2 -md5 b39d5ed21195f8b709bcee548c87e2b5 graphite2-1.3.10.tgz -sha1 668f3bce96fc02d90ea875b401ed36b2e8957d2f graphite2-1.3.10.tgz +# From https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-1.3.14.sha256sum +sha256 f99d1c13aa5fa296898a181dff9b82fb25f6cc0933dbaa7a475d8109bd54209d graphite2-1.3.14.tgz # Locally computed -sha256 90fde3b2f9ea95d68ffb19278d07d9b8a7efa5ba0e413bebcea802ce05cda1ae graphite2-1.3.10.tgz sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE diff --git a/package/graphite2/graphite2.mk b/package/graphite2/graphite2.mk index 2bb4f463b0..7f9e3c516e 100644 --- a/package/graphite2/graphite2.mk +++ b/package/graphite2/graphite2.mk @@ -4,12 +4,14 @@ # ################################################################################ -GRAPHITE2_VERSION = 1.3.10 +GRAPHITE2_VERSION = 1.3.14 GRAPHITE2_SOURCE = graphite2-$(GRAPHITE2_VERSION).tgz -GRAPHITE2_SITE = http://downloads.sourceforge.net/project/silgraphite/graphite2 +GRAPHITE2_SITE = \ + https://github.com/silnrsi/graphite/releases/download/$(GRAPHITE2_VERSION) GRAPHITE2_INSTALL_STAGING = YES GRAPHITE2_LICENSE = LGPL-2.1+ GRAPHITE2_LICENSE_FILES = LICENSE +GRAPHITE2_CPE_ID_VENDOR = sil # Avoid building docs and tests to save time define GRAPHITE2_DISABLE_TESTS_DOC diff --git a/package/grep/grep.hash b/package/grep/grep.hash index 4aa7b4ecb8..9dfe2f2c23 100644 --- a/package/grep/grep.hash +++ b/package/grep/grep.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -# http://ftp.gnu.org/gnu/grep/grep-3.3.tar.xz.sig +# http://ftp.gnu.org/gnu/grep/grep-3.6.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514 grep-3.3.tar.xz -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING +sha256 667e15e8afe189e93f9f21a7cd3a7b3f776202f417330b248c2ad4f997d9373e grep-3.6.tar.xz +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/grep/grep.mk b/package/grep/grep.mk index cc80553eb9..27d204d4ce 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,11 +4,12 @@ # ################################################################################ -GREP_VERSION = 3.3 +GREP_VERSION = 3.6 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPL-3.0+ GREP_LICENSE_FILES = COPYING +GREP_CPE_ID_VENDOR = gnu GREP_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # install into /bin like busybox grep GREP_CONF_OPTS = --exec-prefix=/ diff --git a/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch b/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch index 86586d850b..32493ac1a0 100644 --- a/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch +++ b/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch @@ -17,12 +17,12 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 89e834b..c7bd2ad 100644 +index 45c2fcb..0b2be4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -97,6 +97,12 @@ endif() - - set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) +@@ -208,6 +208,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) + endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") +include(CheckSymbolExists) +check_symbol_exists(pthread_setname_np pthread.h HAVE_PTHREAD_SETNAME_NP) @@ -30,14 +30,14 @@ index 89e834b..c7bd2ad 100644 + add_definitions(-DHAVE_PTHREAD_SETNAME_NP) +endif () + - if (MSVC) + if(MSVC) include(cmake/msvc_static_runtime.cmake) add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h -index 031c0c3..a29a9dc 100644 +index 4f213ff..55ecd9d 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h -@@ -181,7 +181,9 @@ +@@ -168,7 +168,9 @@ #endif /* _LP64 */ #ifdef __GLIBC__ #define GPR_POSIX_CRASH_HANDLER 1 @@ -48,5 +48,4 @@ index 031c0c3..a29a9dc 100644 #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 -- -2.14.4 - +2.26.63 diff --git a/package/grpc/Config.in b/package/grpc/Config.in index 43f446d8dc..d1bf0d078d 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -1,14 +1,18 @@ config BR2_PACKAGE_GRPC bool "grpc" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf + depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf - depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # protobuf, re2, libabseil-cpp + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libabseil-cpp + depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS select BR2_PACKAGE_C_ARES + select BR2_PACKAGE_LIBABSEIL_CPP select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_RE2 select BR2_PACKAGE_ZLIB help A language-neutral, platform-neutral, open source, remote @@ -16,8 +20,10 @@ config BR2_PACKAGE_GRPC http://github.com/grpc/grpc -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9, host gcc >= 4.9" + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 5201f72106..01dc9ca240 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ffbe61269160ea745e487f79b0fd06b6edd3d50c6d9123f053b5634737cf2f69 grpc-1.25.0.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 f60e5b112913bf776a22c16a3053cc02cf55e60bf27a959fd54d7aaf8e2da6e8 grpc-1.38.1.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 39f6123792..f3975316ae 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,28 +4,38 @@ # ################################################################################ -GRPC_VERSION = 1.25.0 +GRPC_VERSION = 1.38.1 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0 GRPC_LICENSE_FILES = LICENSE +GRPC_CPE_ID_VENDOR = grpc GRPC_INSTALL_STAGING = YES # Need to use host grpc_cpp_plugin during cross compilation. -GRPC_DEPENDENCIES = c-ares host-grpc openssl protobuf zlib -HOST_GRPC_DEPENDENCIES = host-c-ares host-openssl host-protobuf host-zlib +GRPC_DEPENDENCIES = c-ares host-grpc libabseil-cpp openssl protobuf re2 zlib +HOST_GRPC_DEPENDENCIES = host-c-ares host-libabseil-cpp host-openssl host-protobuf \ + host-re2 host-zlib # gRPC_CARES_PROVIDER=package won't work because it requires c-ares to have # installed a cmake config file, but buildroot uses c-ares' autotools build, # which doesn't do this. These CARES settings trick the gRPC cmake code into # not looking for c-ares at all and yet still linking with the library. GRPC_CONF_OPTS = \ + -DgRPC_ABSL_PROVIDER=package \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ -DgRPC_PROTOBUF_PROVIDER=package \ + -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package \ - -DgRPC_NATIVE_CPP_PLUGIN=$(HOST_DIR)/bin/grpc_cpp_plugin + -DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF # grpc can use __atomic builtins, so we need to link with # libatomic when available @@ -61,9 +71,11 @@ GRPC_CONF_OPTS += \ -DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)" HOST_GRPC_CONF_OPTS = \ + -DgRPC_ABSL_PROVIDER=package \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ -DgRPC_PROTOBUF_PROVIDER=package \ + -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package diff --git a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash index c37b7377de..d530517cd1 100644 --- a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash +++ b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.33/gsettings-desktop-schemas-3.33.1.sha256sum -sha256 bd337f13955856140fdbd3073c56d4adca20333f8bdac41e429c3dca4730cdff gsettings-desktop-schemas-3.33.1.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.36/gsettings-desktop-schemas-3.36.1.sha256sum +sha256 004bdbe43cf8290f2de7d8537e14d8957610ca479a4fa368e34dbd03f03ec9d9 gsettings-desktop-schemas-3.36.1.tar.xz # Hash for license file -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk index 98d16745b2..8573c75fde 100644 --- a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk +++ b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.33 +GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.36 GSETTINGS_DESKTOP_SCHEMAS_VERSION = $(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR).1 GSETTINGS_DESKTOP_SCHEMAS_SOURCE = gsettings-desktop-schemas-$(GSETTINGS_DESKTOP_SCHEMAS_VERSION).tar.xz GSETTINGS_DESKTOP_SCHEMAS_SITE = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR) diff --git a/package/gsl/gsl.hash b/package/gsl/gsl.hash index 8a979d6e8b..0d40a75497 100644 --- a/package/gsl/gsl.hash +++ b/package/gsl/gsl.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d gsl-2.5.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8 gsl-2.6.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk index d3c764787d..416955b72c 100644 --- a/package/gsl/gsl.mk +++ b/package/gsl/gsl.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSL_VERSION = 2.5 +GSL_VERSION = 2.6 GSL_SITE = $(BR2_GNU_MIRROR)/gsl GSL_INSTALL_STAGING = YES GSL_LICENSE = GPL-3.0 diff --git a/package/gssdp/gssdp.hash b/package/gssdp/gssdp.hash index 8e00e7e56b..2f13c0a847 100644 --- a/package/gssdp/gssdp.hash +++ b/package/gssdp/gssdp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.2/gssdp-1.2.2.sha256sum: -sha256 cabb9e3b456b8354a55e23eb0207545d974643cda6d623523470ebbc4188b0a4 gssdp-1.2.2.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.3/gssdp-1.3.0.sha256sum: +sha256 e739cf33f813403a53973cd8f2882dcd7208bad9582269f7066fc9e8ea3a52cc gssdp-1.3.0.tar.xz # Hash for license file: -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gssdp/gssdp.mk b/package/gssdp/gssdp.mk index 14eec0b5fd..9e67d35db1 100644 --- a/package/gssdp/gssdp.mk +++ b/package/gssdp/gssdp.mk @@ -4,15 +4,15 @@ # ################################################################################ -GSSDP_VERSION_MAJOR = 1.2 -GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).2 +GSSDP_VERSION_MAJOR = 1.3 +GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).0 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR) -GSSDP_LICENSE = LGPL-2.0+ +GSSDP_LICENSE = LGPL-2.1+ GSSDP_LICENSE_FILES = COPYING GSSDP_INSTALL_STAGING = YES GSSDP_DEPENDENCIES = host-pkgconf libglib2 libsoup -GSSDP_CONF_OPTS = -Dexamples=false +GSSDP_CONF_OPTS = -Dexamples=false -Dsniffer=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) GSSDP_CONF_OPTS += -Dintrospection=true -Dvapi=true @@ -21,11 +21,4 @@ else GSSDP_CONF_OPTS += -Dintrospection=false -Dvapi=false endif -ifeq ($(BR2_PACKAGE_LIBGTK3),y) -GSSDP_DEPENDENCIES += libgtk3 -GSSDP_CONF_OPTS += -Dsniffer=true -else -GSSDP_CONF_OPTS += -Dsniffer=false -endif - $(eval $(meson-package)) diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in index 0e47d78e68..4a8111333e 100644 --- a/package/gstreamer1/Config.in +++ b/package/gstreamer1/Config.in @@ -8,13 +8,13 @@ source "package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in" source "package/gstreamer1/gst1-plugins-good/Config.in" source "package/gstreamer1/gst1-plugins-bad/Config.in" source "package/gstreamer1/gst1-plugins-ugly/Config.in" +source "package/gstreamer1/gst1-devtools/Config.in" source "package/gstreamer1/gst1-imx/Config.in" source "package/gstreamer1/gst1-interpipe/Config.in" source "package/gstreamer1/gst1-libav/Config.in" source "package/gstreamer1/gst1-python/Config.in" source "package/gstreamer1/gst1-rtsp-server/Config.in" source "package/gstreamer1/gst1-shark/Config.in" -source "package/gstreamer1/gst1-validate/Config.in" source "package/gstreamer1/gst1-vaapi/Config.in" source "package/gstreamer1/gst-omx/Config.in" source "package/gstreamer1/gstreamer1-editing-services/Config.in" diff --git a/package/gstreamer1/gst-omx/Config.in b/package/gstreamer1/gst-omx/Config.in index d2e477648b..efe3d211d6 100644 --- a/package/gstreamer1/gst-omx/Config.in +++ b/package/gstreamer1/gst-omx/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_GST_OMX help GStreamer plug-in to use OpenMAX API. - http://cgit.freedesktop.org/gstreamer/gst-omx + https://cgit.freedesktop.org/gstreamer/gst-omx comment "gst-omx requires a OpenMAX implementation" depends on !BR2_PACKAGE_HAS_LIBOPENMAX diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 85487f3491..9040393506 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.16.2.tar.xz.sha256sum -sha256 11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439 gst-omx-1.16.2.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.5.tar.xz.sha256sum +sha256 2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 gst-omx-1.18.5.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 5ed9e3ce2c..f7be1d59ef 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,33 +4,27 @@ # ################################################################################ -GST_OMX_VERSION = 1.16.2 +GST_OMX_VERSION = 1.18.5 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx GST_OMX_LICENSE = LGPL-2.1 GST_OMX_LICENSE_FILES = COPYING +GST_OMX_CONF_OPTS = \ + -Dexamples=disabled \ + -Dtests=disabled \ + -Dtools=disabled \ + -Ddoc=disabled + ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) GST_OMX_VARIANT = rpi -GST_OMX_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) \ - -I$(STAGING_DIR)/usr/include/IL \ - -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" -else ifeq ($(BR2_PACKAGE_BELLAGIO),y) -GST_OMX_VARIANT = bellagio -GST_OMX_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) \ - -DOMX_VERSION_MAJOR=1 \ - -DOMX_VERSION_MINOR=1 \ - -DOMX_VERSION_REVISION=2 \ - -DOMX_VERSION_STEP=0" +GST_OMX_CONF_OPTS += -Dheader_path=$(STAGING_DIR)/usr/include/IL else GST_OMX_VARIANT = generic endif -GST_OMX_CONF_OPTS += --with-omx-target=$(GST_OMX_VARIANT) +GST_OMX_CONF_OPTS += -Dtarget=$(GST_OMX_VARIANT) GST_OMX_DEPENDENCIES = gstreamer1 gst1-plugins-base libopenmax @@ -42,4 +36,4 @@ endef GST_OMX_POST_PATCH_HOOKS += GST_OMX_FIXUP_CONFIG_PATHS -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/gstreamer1/gst1-imx/gst1-imx.hash b/package/gstreamer1/gst1-imx/gst1-imx.hash index 0ef01d71e9..0a701a058f 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.hash +++ b/package/gstreamer1/gst1-imx/gst1-imx.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 3fcf1046ab8c6c7cd94218f4d2bc31ad7b5efa8a6b8f9fd5d93dc182f98ce026 gst1-imx-0.13.0.tar.gz +sha256 21feb24130c18e4a1f8cc4f72d575903d1f9134dd0604e41e91b5e783d81e320 gst1-imx-0.13.1.tar.gz sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 LICENSE diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk index 1156077274..f091b4f983 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_IMX_VERSION = 0.13.0 +GST1_IMX_VERSION = 0.13.1 GST1_IMX_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX_VERSION)) GST1_IMX_LICENSE = LGPL-2.0+ diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 0ce6ad460d..b3fc8ef018 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 6dc2c9d5ff4c3777d40712199a0cafa6bc0058327bca5a20e31d743a46e1ad21 gst1-interpipe-9af5b40d106f35ce75f8baa5efc8c59fc5f7eda1.tar.gz +sha256 00d3a91625f6cc5d263f35b9330b4ba6eb40781be2e823231e5b2be9281e1fb4 gst1-interpipe-1.1.6-br1.tar.gz # Hashes for license files: -sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING +sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index 87e5f2e5d2..80e5b577f6 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 9af5b40d106f35ce75f8baa5efc8c59fc5f7eda1 +GST1_INTERPIPE_VERSION = 1.1.6 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module @@ -13,9 +13,10 @@ GST1_INTERPIPE_GIT_SUBMODULES = YES GST1_INTERPIPE_LICENSE = LGPL-2.1 GST1_INTERPIPE_LICENSE_FILES = COPYING -# from git source -GST1_INTERPIPE_AUTORECONF = YES - GST1_INTERPIPE_DEPENDENCIES = host-pkgconf gstreamer1 gst1-plugins-base -$(eval $(autotools-package)) +GST1_INTERPIPE_CONF_OPTS = \ + -Dtests=disabled \ + -Denable-gtk-doc=false + +$(eval $(meson-package)) diff --git a/package/gstreamer1/gst1-libav/Config.in b/package/gstreamer1/gst1-libav/Config.in index 23d78b6ad1..e58a3532f0 100644 --- a/package/gstreamer1/gst1-libav/Config.in +++ b/package/gstreamer1/gst1-libav/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_GST1_LIBAV The codecs, muxers, bitstreams and filters to build can be selected in the ffmpeg package. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 15e4d859ee..040a6e33f3 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.16.2.tar.xz.sha256sum -sha256 c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2 gst-libav-1.16.2.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.5.tar.xz.sha256sum +sha256 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 gst-libav-1.18.5.tar.xz +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index fdd4d6cc2e..01ec4d2c98 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,39 +4,12 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.16.2 +GST1_LIBAV_VERSION = 1.18.5 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav - -GST1_LIBAV_DEPENDENCIES = \ - host-pkgconf ffmpeg gstreamer1 gst1-plugins-base \ - $(if $(BR2_PACKAGE_BZIP2),bzip2) \ - $(if $(BR2_PACKAGE_XZ),xz) -GST1_LIBAV_LICENSE = GPL-2.0+ +GST1_LIBAV_LICENSE = LGPL-2.0+ GST1_LIBAV_LICENSE_FILES = COPYING -GST1_LIBAV_CONF_EXTRA_OPTS = --cross-prefix=$(TARGET_CROSS) --target-os=linux +GST1_LIBAV_DEPENDENCIES = host-pkgconf ffmpeg gstreamer1 gst1-plugins-base +GST1_LIBAV_CONF_OPTS = -Ddoc=disabled -# fixes arm build: https://bugzilla.gnome.org/show_bug.cgi?id=694416 -ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be),y) -GST1_LIBAV_CONF_ENV = AS="$(TARGET_CROSS)gcc" -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GST1_LIBAV_CONF_EXTRA_OPTS += --enable-zlib -GST1_LIBAV_DEPENDENCIES += zlib -else -GST1_LIBAV_CONF_EXTRA_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -GST1_LIBAV_CONF_EXTRA_OPTS += --enable-bzlib -GST1_LIBAV_DEPENDENCIES += bzip2 -else -GST1_LIBAV_CONF_EXTRA_OPTS += --disable-bzlib -endif - -GST1_LIBAV_CONF_OPTS = \ - --with-system-libav \ - --with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPTS)" - -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 08de5d2188..1204a65681 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -5,7 +5,7 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD A set of plug-ins for GStreamer that may be of poor quality or lacking some features. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ if BR2_PACKAGE_GST1_PLUGINS_BAD @@ -87,8 +87,13 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS Collection of elements that may or may not be useful for debugging +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBENC + bool "dvbsubenc" + help + DVB subpicture encoding support + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY - bool "dvdsuboverlay" + bool "dvbsuboverlay" help DVB subtitle renderer plugin @@ -232,6 +237,21 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE help Removes silence from an audio stream +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RIST + bool "rist" + help + RIST streaming + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP2 + bool "rtmp2" + help + RTMP sink/source (rtmp2sink, rtmp2src) + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP2 + bool "rtp" + help + RTP (rtpsrc/rtpsink) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP bool "rtmp" select BR2_PACKAGE_RTMPDUMP @@ -268,6 +288,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC help subtitle encoders +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SWITCHBIN + bool "switchbin" + help + Switching between paths based on input caps + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE bool "timecode" @@ -297,17 +322,20 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M help Demuxes/decodes YUV4MPEG streams -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF - bool "yadif" - help - YADIF deinterlacing filter - comment "plugins with external dependencies" config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER bool "assrender" + depends on BR2_INSTALL_LIBSTDCPP # libass -> harfbuzz + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libass -> harfbuzz select BR2_PACKAGE_LIBASS +comment "assrender plugin needs a toolchain w/ C++, gcc => 4.8" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ bool "bluez" depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 @@ -317,6 +345,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO # runtime help Bluetooth audio A2DP/AVDTP sink, AVDTP source plugin @@ -395,6 +424,7 @@ comment "fdk-aac needs a toolchain w/ C++" config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH bool "fluidsynth" + depends on !BR2_STATIC_LIBS # fluidsynth depends on BR2_USE_WCHAR # fluidsynth depends on BR2_TOOLCHAIN_HAS_THREADS # fluidsynth depends on BR2_USE_MMU # fluidsynth @@ -402,9 +432,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH help Fluidsynth MIDI decoder plugin -comment "fluidsynth needs a toolchain w/ threads, wchar" +comment "fluidsynth needs a toolchain w/ threads, wchar, dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL bool "gl" @@ -489,14 +520,16 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENAL bool "openal" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PAKCAGE_OPENAL_ARCH_SUPPORTS select BR2_PACKAGE_OPENAL -comment "openal plugin needs a toolchain w/ NPTL, C++" +comment "openal plugin needs a toolchain w/ NPTL, C++, gcc >= 4.9" depends on BR2_PAKCAGE_OPENAL_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_INSTALL_LIBSTDCPP + || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264 bool "openh264" @@ -527,6 +560,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # librsvg -> pango -> harfbuzz @@ -535,6 +569,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG RSVG plugin library comment "rsvg plugin needs a toolchain w/ C++, gcc >= 4.8" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_SYNC_4 @@ -543,6 +578,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SBC bool "sbc" select BR2_PACKAGE_SBC +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCTP + bool "sctp" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrinsics + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM bool "shm" help @@ -608,11 +647,24 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WPE default y depends on BR2_PACKAGE_WPEWEBKIT depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL + depends on !BR2_PACKAGE_WPEWEBKIT_MEDIA_STREAM comment "wpe needs the gst1-plugins-base opengl library and wpewebkit" depends on !BR2_PACKAGE_WPEWEBKIT \ || !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL +comment "wpe is incompatible w/ wpewebkit media-stream support" + depends on BR2_PACKAGE_WPEWEBKIT + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL + depends on BR2_PACKAGE_WPEWEBKIT_MEDIA_STREAM + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS + bool "v4l2codecs" + depends on BR2_PACKAGE_HAS_UDEV # libgudev + select BR2_PACKAGE_LIBGUDEV + help + Video4Linux Stateless CODECs support + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 bool "x265" depends on BR2_INSTALL_LIBSTDCPP diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 7b59b4dbec..cbb2729dab 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,4 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz.sha256sum -sha256 f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74 gst-plugins-bad-1.16.2.tar.xz -sha256 0b12e4d1cd5db5f8a0c04fc98a1d8c3acc533097b6198d6644420da78d460223 COPYING -sha256 cf9b86bcf2d298e8cf5b9d8982f9dab296465b002fdfa0347357a0732f961e03 COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz.sha256sum +sha256 a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e gst-plugins-bad-1.18.5.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 e020c587d3..d3f089bfed 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,15 +4,18 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.16.2 +GST1_PLUGINS_BAD_VERSION = 1.18.5 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 # Additional plugin licenses will be appended to GST1_PLUGINS_BAD_LICENSE and # GST1_PLUGINS_BAD_LICENSE_FILES if enabled. -GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB -GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BAD_LICENSE_FILES = COPYING +GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+ +GST1_PLUGINS_BAD_CPE_ID_VENDOR = freedesktop +GST1_PLUGINS_BAD_CPE_ID_PRODUCT = gst-plugins-bad +GST1_PLUGINS_BAD_CFLAGS = $(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE GST1_PLUGINS_BAD_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_PLUGINS_BAD_CONF_OPTS = \ @@ -25,16 +28,20 @@ GST1_PLUGINS_BAD_CONF_OPTS = \ -Dapplemedia=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ - -Dglib-checks=disabled + -Dglib-checks=disabled \ + -Dextra-checks=disabled \ + -Ddoc=disabled # Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ + -Davtp=disabled \ -Dopensles=disabled \ -Duvch264=disabled \ -Dmsdk=disabled \ -Dvoamrwbenc=disabled \ -Dbs2b=disabled \ -Dchromaprint=disabled \ + -Dd3d11=disabled \ -Ddc1394=disabled \ -Ddts=disabled \ -Dresindvd=disabled \ @@ -44,19 +51,25 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dkate=disabled \ -Dladspa=disabled \ -Dlv2=disabled \ + -Dmediafoundation=disabled \ + -Dmicrodns=disabled \ -Dlibde265=disabled \ -Dmodplug=disabled \ -Dmplex=disabled \ -Dofa=disabled \ -Dopenexr=disabled \ -Dopenni2=disabled \ - -Dteletextdec=disabled \ + -Dteletext=disabled \ -Dwildmidi=disabled \ -Dsmoothstreaming=disabled \ -Dsoundtouch=disabled \ -Dgme=disabled \ - -Dvdpau=disabled \ -Dspandsp=disabled \ + -Dsvthevcenc=disabled \ + -Dtranscode=disabled \ + -Dwasapi2=disabled \ + -Dzxing=disabled \ + -Dmagicleap=disabled \ -Diqa=disabled \ -Dopencv=disabled @@ -180,6 +193,12 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Ddebugutils=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBENC),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsubenc=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsubenc=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y) GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsuboverlay=enabled else @@ -368,6 +387,24 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dremovesilence=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RIST),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Drist=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Drist=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP2),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp2=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp2=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP2),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Drtp=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Drtp=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP),y) GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += rtmpdump @@ -411,6 +448,12 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dsubenc=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SWITCHBIN),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dswitchbin=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dswitchbin=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dtimecode=enabled else @@ -453,13 +496,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dy4m=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y) -GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=enabled -GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y -else -GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=disabled -endif - # Plugins with dependencies ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) @@ -656,6 +692,16 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dsbc=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCTP),y) +GST1_PLUGINS_BAD_CONF_OPTS += \ + -Dsctp=enabled \ + -Dsctp-internal-usrsctp=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += \ + -Dsctp=disabled \ + -Dsctp-internal-usrsctp=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dshm=enabled else @@ -711,6 +757,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dwpe=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dv4l2codecs=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += libgudev +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dv4l2codecs=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dx265=enabled GST1_PLUGINS_BAD_DEPENDENCIES += x265 diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in index db916ed219..ceed55890c 100644 --- a/package/gstreamer1/gst1-plugins-base/Config.in +++ b/package/gstreamer1/gst1-plugins-base/Config.in @@ -6,7 +6,7 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE help A basic set of well-supported plug-ins for GStreamer. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ if BR2_PACKAGE_GST1_PLUGINS_BASE @@ -69,6 +69,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO help GIO elements +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_TYPEFINDER + bool "gio-typefinder" + help + GIO typefinder elements + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OVERLAYCOMPOSITION bool "overlaycomposition" help diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 2074c0272b..200ba0fe5d 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.16.2.tar.xz.sha256sum -sha256 b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a gst-plugins-base-1.16.2.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum +sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index fe80f4751c..76757fd6a8 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.16.2 +GST1_PLUGINS_BASE_VERSION = 1.18.5 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 @@ -17,7 +17,7 @@ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ - -Dgtk_doc=disabled + -Ddoc=disabled # Options which require currently unpackaged libraries GST1_PLUGINS_BASE_CONF_OPTS += \ @@ -51,19 +51,22 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API),y) +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API)$(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM)$(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW),yyy) GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=enabled +else +GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL),y) GST1_PLUGINS_BASE_GL_API_LIST = opengl GST1_PLUGINS_BASE_DEPENDENCIES += libgl libglu endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y) GST1_PLUGINS_BASE_GL_API_LIST += gles2 GST1_PLUGINS_BASE_DEPENDENCIES += libgles endif -else -GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled -endif + GST1_PLUGINS_BASE_CONF_OPTS += -Dgl_api='$(subst $(space),$(comma),$(GST1_PLUGINS_BASE_GL_API_LIST))' ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX),y) @@ -153,6 +156,12 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dgio=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_TYPEFINDER),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dgio-typefinder=enabled +else +GST1_PLUGINS_BASE_CONF_OPTS += -Dgio-typefinder=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OVERLAYCOMPOSITION),y) GST1_PLUGINS_BASE_CONF_OPTS += -Doverlaycomposition=enabled else diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash index 129be67c34..cfb62b062a 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8d317b892bf1c99e9999a6d9b027a22c4ea2940f1ac504c03560b3d476e1c9c8 gst-bayer2rgb-neon-v0.3.tar.bz2 +sha256 307725640203083df7dfb7f9c2b8bb9583accf7b8c06238dd92d6150a9fd8b04 gst-bayer2rgb-neon-0.4.tar.bz2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk index 734800a74b..5139463ca1 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk @@ -4,8 +4,8 @@ # ################################################################################ -GST1_PLUGINS_BAYER2RGB_NEON_VERSION = 0.3 -GST1_PLUGINS_BAYER2RGB_NEON_SOURCE = gst-bayer2rgb-neon-v$(GST1_PLUGINS_BAYER2RGB_NEON_VERSION).tar.bz2 +GST1_PLUGINS_BAYER2RGB_NEON_VERSION = 0.4 +GST1_PLUGINS_BAYER2RGB_NEON_SOURCE = gst-bayer2rgb-neon-$(GST1_PLUGINS_BAYER2RGB_NEON_VERSION).tar.bz2 GST1_PLUGINS_BAYER2RGB_NEON_SITE = https://git.phytec.de/gst-bayer2rgb-neon/snapshot GST1_PLUGINS_BAYER2RGB_NEON_LICENSE = GPL-3.0 GST1_PLUGINS_BAYER2RGB_NEON_LICENSE_FILES = COPYING diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index 20aebc473e..67df206eea 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -8,7 +8,7 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_GOOD A set of well-supported plug-ins for GStreamer under the preferred license. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ if BR2_PACKAGE_GST1_PLUGINS_GOOD @@ -279,6 +279,7 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL bool "qmlgl (qt5)" depends on BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK @@ -286,6 +287,9 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL help QT5 plugin which includes elements qmlglsrc and qmlglsink +comment "qmlgl (qt5) needs the gst1-plugins-base opengl library" + depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHOUT2 bool "shout2" select BR2_PACKAGE_LIBSHOUT @@ -295,6 +299,7 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHOUT2 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2 bool "v4l2" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # multi planar api + select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV help elements for Video 4 Linux diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 075338b14b..ea9f43bfd2 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.16.2.tar.xz.sha256sum -sha256 40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319 gst-plugins-good-1.16.2.tar.xz -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.5.tar.xz.sha256sum +sha256 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b gst-plugins-good-1.18.5.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 6709f14cca..44da3c3c30 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.16.2 +GST1_PLUGINS_GOOD_VERSION = 1.18.5 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 @@ -15,12 +15,18 @@ GST1_PLUGINS_GOOD_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_PLUGINS_GOOD_CONF_OPTS = \ -Dexamples=disabled \ -Dtests=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \ + -Dasm=disabled \ -Ddirectsound=disabled \ -Dwaveform=disabled \ + -Drpicamsrc=disabled \ -Dosxaudio=disabled \ -Dosxvideo=disabled \ -Daalib=disabled \ - -Dlibcaca=disabled + -Dlibcaca=disabled \ + -Ddoc=disabled # Options which require currently unpackaged libraries GST1_PLUGINS_GOOD_CONF_OPTS += \ @@ -354,6 +360,13 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2=enabled +# Enable use of gudev if available, for device probing and monitoring. +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) +GST1_PLUGINS_GOOD_DEPENDENCIES += libgudev +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-gudev=enabled +else +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-gudev=disabled +endif else GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2=disabled endif diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in index c24ec7ae7b..ba19989892 100644 --- a/package/gstreamer1/gst1-plugins-ugly/Config.in +++ b/package/gstreamer1/gst1-plugins-ugly/Config.in @@ -5,7 +5,7 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_UGLY A set of well-supported plug-ins for GStreamer, but might pose problems for distributors. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ if BR2_PACKAGE_GST1_PLUGINS_UGLY diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index e5df44ab90..93945cdecd 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.16.2.tar.xz.sha256sum -sha256 5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca gst-plugins-ugly-1.16.2.tar.xz -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz.sha256sum +sha256 df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 gst-plugins-ugly-1.18.5.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 284516f7d1..a25110264e 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.16.2 +GST1_PLUGINS_UGLY_VERSION = 1.18.5 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 @@ -14,8 +14,8 @@ GST1_PLUGINS_UGLY_LICENSE = LGPL-2.1+ GST1_PLUGINS_UGLY_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_PLUGINS_UGLY_CONF_OPTS += \ - -Dexamples=disabled \ - -Dtests=disabled + -Dtests=disabled \ + -Ddoc=disabled GST1_PLUGINS_UGLY_CONF_OPTS += \ -Da52dec=disabled \ @@ -64,10 +64,6 @@ GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y) -# configure does not use pkg-config to detect libdvdread -ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy) -GST1_PLUGINS_UGLY_LDFLAGS += "-ldvdcss" -endif GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y @@ -93,7 +89,7 @@ endif # Add GPL license if GPL plugins enabled. ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y) -GST1_PLUGINS_UGLY_LICENSE += GPL-2.0 +GST1_PLUGINS_UGLY_LICENSE += , GPL-2.0 endif # Use the following command to extract license info for plugins. diff --git a/package/gstreamer1/gst1-python/Config.in b/package/gstreamer1/gst1-python/Config.in index 9149703354..2f34984020 100644 --- a/package/gstreamer1/gst1-python/Config.in +++ b/package/gstreamer1/gst1-python/Config.in @@ -1,11 +1,12 @@ config BR2_PACKAGE_GST1_PYTHON bool "gst1-python" depends on BR2_USE_MMU # libglib2, gobject-introspection - depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS # gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection depends on BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_GOBJECT_INTROSPECTION + select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PYTHON_GOBJECT help @@ -19,6 +20,6 @@ comment "gst1-python needs python3" comment "gst1-python needs a glibc toolchain, gcc >= 4.9" depends on BR2_USE_MMU - depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 1d3c687dd4..2035c81fea 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.16.2.tar.xz.sha256sum -sha256 208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8 gst-python-1.16.2.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz.sha256sum +sha256 533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 gst-python-1.18.5.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 122c3dd997..614cb22396 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.16.2 +GST1_PYTHON_VERSION = 1.18.5 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES @@ -12,6 +12,7 @@ GST1_PYTHON_LICENSE_FILES = COPYING GST1_PYTHON_LICENSE = LGPL-2.1+ GST1_PYTHON_DEPENDENCIES = \ + gst1-plugins-base \ gstreamer1 \ python-gobject diff --git a/package/gstreamer1/gst1-rtsp-server/Config.in b/package/gstreamer1/gst1-rtsp-server/Config.in index 5869952f58..f0294795a1 100644 --- a/package/gstreamer1/gst1-rtsp-server/Config.in +++ b/package/gstreamer1/gst1-rtsp-server/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_GST1_RTSP_SERVER help RTSP server library based on GStreamer. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index f3dca615cf..627a451d04 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.16.2.tar.xz.sha256sum -sha256 de07a2837b3b04820ce68264a4909f70c221b85dbff0cede7926e9cdbb1dc26e gst-rtsp-server-1.16.2.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.5.tar.xz.sha256sum +sha256 04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f gst-rtsp-server-1.18.5.tar.xz +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a 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 13653565bd..37942423a5 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,11 +4,13 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.16.2 +GST1_RTSP_SERVER_VERSION = 1.18.5 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB +GST1_RTSP_SERVER_CPE_ID_VENDOR = gstreamer_project +GST1_RTSP_SERVER_CPE_ID_PRODUCT = gst-rtsp-server GST1_RTSP_SERVER_INSTALL_STAGING = YES GST1_RTSP_SERVER_DEPENDENCIES = \ host-pkgconf \ @@ -20,7 +22,8 @@ GST1_RTSP_SERVER_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_RTSP_SERVER_CONF_OPTS = \ -Dexamples=disabled \ - -Dtests=disabled + -Dtests=disabled \ + -Ddoc=disabled GST1_RTSP_SERVER_CONF_OPTS += \ -Dexamples=disabled \ diff --git a/package/gstreamer1/gst1-shark/gst1-shark.hash b/package/gstreamer1/gst1-shark/gst1-shark.hash index 6bf4739abc..caa9107bd8 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.hash +++ b/package/gstreamer1/gst1-shark/gst1-shark.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 3c1f865533750f9fe511336e673e89bc93ac05e896bd3f4fc68d3cc0c142a861 gst1-shark-v0.6.1.tar.gz +sha256 b141312603af82f600981dd7231e2ecc5a42b3550fadd2450965a0a85f62cbb2 gst1-shark-v0.7.2-br1.tar.gz # Hashes for license files: -sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING +sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING diff --git a/package/gstreamer1/gst1-shark/gst1-shark.mk b/package/gstreamer1/gst1-shark/gst1-shark.mk index 6dc702b482..ea0c5a29cd 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.mk +++ b/package/gstreamer1/gst1-shark/gst1-shark.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_SHARK_VERSION = v0.6.1 +GST1_SHARK_VERSION = v0.7.2 GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git GST1_SHARK_SITE_METHOD = git GST1_SHARK_GIT_SUBMODULES = YES diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index f9bec2483a..b0c19fc600 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.16.2.tar.xz.sha256sum -sha256 191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601 gstreamer-vaapi-1.16.2.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.5.tar.xz.sha256sum +sha256 4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b gstreamer-vaapi-1.18.5.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 00a6ec5e0e..9810b12cf7 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.16.2 +GST1_VAAPI_VERSION = 1.18.5 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+ @@ -18,16 +18,19 @@ GST1_VAAPI_DEPENDENCIES += \ libdrm GST1_VAAPI_CONF_OPTS += \ - --disable-x11 \ - --disable-glx \ - --disable-wayland \ - --disable-egl \ - --disable-gtk-doc-html + -Dwith_drm=yes \ + -Dwith_x11=no \ + -Dwith_glx=no \ + -Dwith_wayland=no \ + -Dwith_egl=no \ + -Dexamples=disabled \ + -Dtests=disabled \ + -Ddoc=disabled ifeq ($(BR2_PACKAGE_GST1_VAAPI_ENCODERS),y) -GST1_VAAPI_CONF_OPTS += --enable-encoders +GST1_VAAPI_CONF_OPTS += -Dwith_encoders=yes else -GST1_VAAPI_CONF_OPTS += --disable-encoders +GST1_VAAPI_CONF_OPTS += -Dwith_encoders=no endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/gstreamer1/gstreamer1-editing-services/Config.in b/package/gstreamer1/gstreamer1-editing-services/Config.in index fe46870491..9c41e8142b 100644 --- a/package/gstreamer1/gstreamer1-editing-services/Config.in +++ b/package/gstreamer1/gstreamer1-editing-services/Config.in @@ -15,4 +15,4 @@ config BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES GStreamer Editing Services is a high-level library for facilitating the creation of audio/video non-linear editors. - http://gstreamer.freedesktop.org + https://gstreamer.freedesktop.org diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 8724f39498..daaf729c70 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,6 +1,6 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.16.2.tar.xz.sha256sum -sha256 0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16 gstreamer-editing-services-1.16.2.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.5.tar.xz.sha256sum +sha256 8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 gst-editing-services-1.18.5.tar.xz # Hashes for license files: -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index e2bb747d0a..d3de79c5f6 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,9 +4,9 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.16.2 -GSTREAMER1_EDITING_SERVICES_SOURCE = gstreamer-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz -GSTREAMER1_EDITING_SERVICES_SITE = http://gstreamer.freedesktop.org/src/gstreamer-editing-services +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.5 +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+ GSTREAMER1_EDITING_SERVICES_LICENSE_FILES = COPYING COPYING.LIB GSTREAMER1_EDITING_SERVICES_INSTALL_STAGING = YES @@ -15,25 +15,23 @@ GSTREAMER1_EDITING_SERVICES_DEPENDENCIES = \ gstreamer1 \ gst1-plugins-base \ gst1-plugins-good \ - $(if $(BR2_PACKAGE_GST1_VALIDATE),gst1-validate) \ libxml2 -GSTREAMER1_EDITING_SERVICES_CONF_OPTS = --disable-benchmarks +GSTREAMER1_EDITING_SERVICES_CONF_OPTS = \ + -Ddoc=disabled \ + -Dexamples=disabled \ + -Dintrospection=disabled \ + -Dtests=disabled \ + -Dtools=enabled \ + -Dbash-completion=disabled \ + -Dxptv=disabled \ + -Dpython=disabled -# examples need GTK2/3 with X11 backend -ifneq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3_X11),) -GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --enable-examples - -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --with-gtk=2.0 -GSTREAMER1_EDITING_SERVICES_DEPENDENCIES += libgtk2 +ifeq ($(BR2_PACKAGE_GST1_DEVTOOLS),y) +GSTREAMER1_EDITING_SERVICES_DEPENDENCIES += gst1-devtools +GSTREAMER1_EDITING_SERVICES_CONF_OPTS += -Dvalidate=enabled else -GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --with-gtk=3.0 -GSTREAMER1_EDITING_SERVICES_DEPENDENCIES += libgtk3 +GSTREAMER1_EDITING_SERVICES_CONF_OPTS += -Dvalidate=disabled endif -else -GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --disable-examples -endif - -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/gstreamer1/gstreamer1/Config.in b/package/gstreamer1/gstreamer1/Config.in index 0626bcc96d..5609d8699d 100644 --- a/package/gstreamer1/gstreamer1/Config.in +++ b/package/gstreamer1/gstreamer1/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_GSTREAMER1 GStreamer is an open source multimedia framework. This 1.x version of Gstreamer is incompatible with Gstreamer 0.10.x. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ if BR2_PACKAGE_GSTREAMER1 diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index dd379e6027..c6282454ca 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.16.2.tar.xz.sha256sum -sha256 e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e gstreamer-1.16.2.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.5.tar.xz.sha256sum +sha256 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a gstreamer-1.18.5.tar.xz +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 47615aad1f..9bdd00caec 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,27 +4,32 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.16.2 +GSTREAMER1_VERSION = 1.18.5 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES GSTREAMER1_LICENSE_FILES = COPYING GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ +GSTREAMER1_CPE_ID_VENDOR = gstreamer_project +GSTREAMER1_CPE_ID_PRODUCT = gstreamer GSTREAMER1_CONF_OPTS = \ -Dexamples=disabled \ -Dtests=disabled \ -Dbenchmarks=disabled \ + -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) \ -Dgtk_doc=disabled \ + -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ - -Dgobject-cast-checks=disabled \ + -Dextra-checks=disabled \ -Dcheck=$(if $(BR2_PACKAGE_GSTREAMER1_CHECK),enabled,disabled) \ -Dtracer_hooks=$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),true,false) \ -Doption-parsing=$(if $(BR2_PACKAGE_GSTREAMER1_PARSE),true,false) \ -Dgst_debug=$(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),true,false) \ + -Dgst_parse=true \ -Dregistry=$(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),true,false) \ - -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) + -Ddoc=disabled GSTREAMER1_DEPENDENCIES = \ host-bison \ diff --git a/package/gtest/Config.in b/package/gtest/Config.in index 3f1f38556f..d8bcf6343f 100644 --- a/package/gtest/Config.in +++ b/package/gtest/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_GTEST depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_USE_MMU # fork() help Google's framework for writing C++ tests on a variety of @@ -48,7 +49,8 @@ config BR2_PACKAGE_GTEST_GMOCK endif # BR2_PACKAGE_GTEST -comment "gtest needs a toolchain w/ C++, wchar, threads" +comment "gtest needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index 082c597780..d21fea7142 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb gtest-1.10.0.tar.gz -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 googletest/LICENSE +sha256 b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5 gtest-1.11.0.tar.gz +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 LICENSE diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 7f967b8bfb..6447954e36 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -4,12 +4,14 @@ # ################################################################################ -GTEST_VERSION = 1.10.0 +GTEST_VERSION = 1.11.0 GTEST_SITE = $(call github,google,googletest,release-$(GTEST_VERSION)) GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO GTEST_LICENSE = BSD-3-Clause -GTEST_LICENSE_FILES = googletest/LICENSE +GTEST_LICENSE_FILES = LICENSE +GTEST_CPE_ID_VENDOR = google +GTEST_CPE_ID_PRODUCT = google_test ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) GTEST_DEPENDENCIES += host-gtest @@ -44,46 +46,8 @@ ifeq ($(BR2_STATIC_LIBS),) GTEST_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON endif -GTEST_CONF_OPTS += -DBUILD_GTEST=ON - -# Generate the gtest-config script manually, since the CMake build system is -# not doing it. -define GTEST_INSTALL_GTEST_CONFIG - sed 's%@PACKAGE_TARNAME@%gtest%;\ - s%@PACKAGE_VERSION@%$(GTEST_VERSION)%;\ - s%@prefix@%$(STAGING_DIR)/usr%;\ - s%@exec_prefix@%$(STAGING_DIR)/usr%;\ - s%@libdir@%$(STAGING_DIR)/usr/lib%;\ - s%@includedir@%$(STAGING_DIR)/usr/include%;\ - s%@bindir@%$(STAGING_DIR)/usr/bin%;\ - s%@PTHREAD_CFLAGS@%%;\ - s%@PTHREAD_LIBS@%-lpthread%;' \ - $(@D)/googletest/scripts/gtest-config.in \ - > $(STAGING_DIR)/usr/bin/gtest-config - chmod +x $(STAGING_DIR)/usr/bin/gtest-config -endef -GTEST_POST_INSTALL_STAGING_HOOKS = GTEST_INSTALL_GTEST_CONFIG - ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) GTEST_CONF_OPTS += -DBUILD_GMOCK=ON - -# Generate the gmock-config script manually, since the CMake build system is -# not doing it. -define GTEST_INSTALL_GMOCK_CONFIG - sed 's%@PACKAGE_TARNAME@%gmock%;\ - s%@PACKAGE_VERSION@%$(GTEST_VERSION)%;\ - s%@prefix@%$(STAGING_DIR)/usr%;\ - s%@exec_prefix@%$(STAGING_DIR)/usr%;\ - s%@libdir@%$(STAGING_DIR)/usr/lib%;\ - s%@includedir@%$(STAGING_DIR)/usr/include%;\ - s%@bindir@%$(STAGING_DIR)/usr/bin%;\ - s%@PTHREAD_CFLAGS@%%;\ - s%@PTHREAD_LIBS@%-lpthread%;' \ - $(@D)/googlemock/scripts/gmock-config.in \ - > $(STAGING_DIR)/usr/bin/gmock-config - chmod +x $(STAGING_DIR)/usr/bin/gmock-config -endef -GTEST_POST_INSTALL_STAGING_HOOKS += GTEST_INSTALL_GMOCK_CONFIG else GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF endif diff --git a/package/guile/guile.hash b/package/guile/guile.hash index 47ac009757..a163f59fce 100644 --- a/package/guile/guile.hash +++ b/package/guile/guile.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8619d82 guile-2.0.14.tar.xz +sha256 6b7947dc2e3d115983846a268b8f5753c12fd5547e42fbf2b97d75a3b79f0d31 guile-3.0.4.tar.xz # Locally computed sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 4992861071..44f4d1c85e 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -4,12 +4,12 @@ # ################################################################################ -GUILE_VERSION = 2.0.14 +GUILE_VERSION = 3.0.4 GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES # For 0002-calculate-csqrt_manually.patch and -# 0004-Makefile.am-fix-build-without-makeinfo.patch +# 0003-Makefile.am-fix-build-without-makeinfo.patch GUILE_AUTORECONF = YES GUILE_LICENSE = LGPL-3.0+ GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER @@ -29,6 +29,10 @@ GUILE_CFLAGS = \ -DHAVE_GC_GET_FREE_SPACE_DIVISOR \ -DHAVE_GC_SET_FINALIZE_ON_DEMAND +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +GUILE_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_STATIC_LIBS),y) GUILE_CFLAGS += -DGC_NO_DLOPEN endif @@ -38,6 +42,14 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM)$(BR2_OPTIMIZE_S),yy) GUILE_CFLAGS += -O2 endif +# jit triggers build failures with gcc < 5 +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),) +GUILE_CONF_OPTS += --disable-jit +endif +ifeq ($(BR2_HOST_GCC_AT_LEAST_5),) +HOST_GUILE_CONF_OPTS += --disable-jit +endif + # It can use readline, but on the condition that it was build against # ncurses. If both aren't present disable readline support since the # host readline/ncurses support can poison the build. diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index 5dc2ac1a9d..570f8ab3d0 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.12/gupnp-av-0.12.11.sha256sum: -sha256 689dcf1492ab8991daea291365a32548a77d1a2294d85b33622b55cca9ce6fdc gupnp-av-0.12.11.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.13/gupnp-av-0.13.0.sha256sum: +sha256 578b8f562b0f7e908416a41efbe2b7e6b892cd2ed7eac61ac63c48fdc8d7e6c8 gupnp-av-0.13.0.tar.xz # Hash for license file: -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index 55436d0e53..c2d3c3ba18 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -4,20 +4,20 @@ # ################################################################################ -GUPNP_AV_VERSION_MAJOR = 0.12 -GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).11 +GUPNP_AV_VERSION_MAJOR = 0.13 +GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).0 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) -GUPNP_AV_LICENSE = LGPL-2.0+ +GUPNP_AV_LICENSE = LGPL-2.1+ GUPNP_AV_LICENSE_FILES = COPYING GUPNP_AV_INSTALL_STAGING = YES GUPNP_AV_DEPENDENCIES = host-pkgconf libglib2 libxml2 gupnp ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -GUPNP_AV_CONF_OPTS += --enable-introspection -GUPNP_AV_DEPENDENCIES += gobject-introspection +GUPNP_AV_CONF_OPTS += -Dintrospection=true -Dvapi=true +GUPNP_AV_DEPENDENCIES += host-vala gobject-introspection else -GUPNP_AV_CONF_OPTS += --disable-introspection +GUPNP_AV_CONF_OPTS += -Dintrospection=false -Dvapi=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index 24a0d36631..9eb1eb467b 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.2/gupnp-1.2.2.sha256sum: -sha256 9a80bd953e5c8772ad26b72f8da01cbe7241a113edd6084903f413ce751c9989 gupnp-1.2.2.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.3/gupnp-1.3.1.sha256sum: +sha256 df70fe8321bfc53cadb6860edcff2e0dc456ec81899b463f41723684803d1408 gupnp-1.3.1.tar.xz # Hash for license file: -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index dfe25e16c5..bbba9ecf32 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -4,11 +4,11 @@ # ################################################################################ -GUPNP_VERSION_MAJOR = 1.2 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).2 +GUPNP_VERSION_MAJOR = 1.3 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).1 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) -GUPNP_LICENSE = LGPL-2.0+ +GUPNP_LICENSE = LGPL-2.1+ GUPNP_LICENSE_FILES = COPYING GUPNP_INSTALL_STAGING = YES GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk index 9cb80c3e95..b0fcd5a598 100644 --- a/package/gutenprint/gutenprint.mk +++ b/package/gutenprint/gutenprint.mk @@ -10,6 +10,7 @@ GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2 GUTENPRINT_LICENSE = GPL-2.0+ GUTENPRINT_LICENSE_FILES = COPYING +GUTENPRINT_CPE_ID_VENDOR = gutenprint_project # Needed, as we touch Makefile.am GUTENPRINT_AUTORECONF = YES diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in index 44a75210e5..68ad291436 100644 --- a/package/gvfs/Config.in +++ b/package/gvfs/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_GVFS depends on BR2_USE_WCHAR # glib2 depends on BR2_USE_MMU # dbus, glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_GSETTINGS_DESKTOP_SCHEMAS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_DBUS select BR2_PACKAGE_SHARED_MIME_INFO @@ -15,6 +17,7 @@ config BR2_PACKAGE_GVFS https://wiki.gnome.org/action/show/Projects/gvfs -comment "gvfs needs a toolchain w/ wchar, threads" +comment "gvfs needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index 6b7403ffa4..2ee945e710 100644 --- a/package/gvfs/gvfs.hash +++ b/package/gvfs/gvfs.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.31/gvfs-1.31.4.sha256sum -sha256 55244d447d040884dfb335fde638274cb6f2794285ada7fa84bcbbd34f06be04 gvfs-1.31.4.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.44/gvfs-1.44.1.sha256sum +sha256 50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46 gvfs-1.44.1.tar.xz # Hash for license file -sha256 45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4 COPYING +sha256 45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4 COPYING diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index b3b18a3482..fc77e8e1aa 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -4,60 +4,46 @@ # ################################################################################ -GVFS_VERSION_MAJOR = 1.31 -GVFS_VERSION = $(GVFS_VERSION_MAJOR).4 +GVFS_VERSION_MAJOR = 1.44 +GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES -GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info \ +GVFS_DEPENDENCIES = \ + host-pkgconf \ + host-libglib2 \ + dbus \ + gsettings-desktop-schemas \ + libglib2 \ + shared-mime-info \ $(TARGET_NLS_DEPENDENCIES) GVFS_LICENSE = LGPL-2.0+ GVFS_LICENSE_FILES = COPYING -GVFS_LIBS = $(TARGET_NLS_LIBS) +GVFS_CPE_ID_VENDOR = gnome -# 0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch -GVFS_IGNORE_CVES += CVE-2019-3827 - -# package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch -GVFS_IGNORE_CVES += CVE-2019-12448 - -# 0003-admin-Allow-changing-file-owner.patch -# 0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch -GVFS_IGNORE_CVES += CVE-2019-12447 - -# 0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch -GVFS_IGNORE_CVES += CVE-2019-12449 - -# 0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch -GVFS_IGNORE_CVES += CVE-2019-12795 - -# Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent -# build system from searching the host paths. -GVFS_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - LIBS="$(GVFS_LIBS)" +GVFS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) # Most of these are missing library support GVFS_CONF_OPTS = \ - --disable-afc \ - --disable-gdu \ - --disable-goa \ - --disable-google \ - --disable-libmtp \ - --disable-udisks2 + -Dafc=false \ + -Dgoa=false \ + -Dgoogle=false \ + -Dmtp=false \ + -Dsftp=false \ + -Dudisks2=false ifeq ($(BR2_PACKAGE_AVAHI),y) GVFS_DEPENDENCIES += avahi -GVFS_CONF_OPTS += --enable-avahi +GVFS_CONF_OPTS += -Ddnssd=true else -GVFS_CONF_OPTS += --disable-avahi +GVFS_CONF_OPTS += -Ddnssd=false endif ifeq ($(BR2_PACKAGE_GCR),y) GVFS_DEPENDENCIES += gcr -GVFS_CONF_OPTS += --enable-gcr +GVFS_CONF_OPTS += -Dgcr=true else -GVFS_CONF_OPTS += --disable-gcr +GVFS_CONF_OPTS += -Dgcr=false endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) @@ -66,121 +52,110 @@ endif ifeq ($(BR2_PACKAGE_LIBGUDEV),y) GVFS_DEPENDENCIES += libgudev -GVFS_CONF_OPTS += --enable-gudev +GVFS_CONF_OPTS += -Dgudev=true else -GVFS_CONF_OPTS += --disable-gudev +GVFS_CONF_OPTS += -Dgudev=false endif ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) GVFS_DEPENDENCIES += libarchive -GVFS_CONF_OPTS += \ - --enable-archive \ - --with-archive-includes=$(STAGING_DIR)/usr \ - --with-archive-libs=$(STAGING_DIR)/usr -GVFS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libarchive` +GVFS_CONF_OPTS += -Darchive=true else -GVFS_CONF_OPTS += --disable-archive +GVFS_CONF_OPTS += -Darchive=false endif ifeq ($(BR2_PACKAGE_LIBBLURAY),y) GVFS_DEPENDENCIES += libbluray -GVFS_CONF_OPTS += --enable-bluray +GVFS_CONF_OPTS += -Dbluray=true else -GVFS_CONF_OPTS += --disable-bluray +GVFS_CONF_OPTS += -Dbluray=false endif ifeq ($(BR2_PACKAGE_LIBCAP)$(BR2_PACKAGE_POLKIT),yy) GVFS_DEPENDENCIES += libcap polkit -GVFS_CONF_OPTS += --enable-admin +GVFS_CONF_OPTS += -Dadmin=true else -GVFS_CONF_OPTS += --disable-admin +GVFS_CONF_OPTS += -Dadmin=false endif ifeq ($(BR2_PACKAGE_LIBCDIO_PARANOIA)$(BR2_PACKAGE_LIBGUDEV),yy) GVFS_DEPENDENCIES += libcdio-paranoia libgudev -GVFS_CONF_OPTS += --enable-cdda +GVFS_CONF_OPTS += -Dcdda=true else -GVFS_CONF_OPTS += --disable-cdda +GVFS_CONF_OPTS += -Dcdda=false endif -ifeq ($(BR2_PACKAGE_LIBFUSE),y) -GVFS_DEPENDENCIES += libfuse -GVFS_CONF_OPTS += --enable-fuse +ifeq ($(BR2_PACKAGE_LIBFUSE3),y) +GVFS_DEPENDENCIES += libfuse3 +GVFS_CONF_OPTS += -Dfuse=true else -GVFS_CONF_OPTS += --disable-fuse +GVFS_CONF_OPTS += -Dfuse=false endif # AFP support is anon-only without libgcrypt which isn't very useful ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -GVFS_CONF_OPTS += --enable-afp +GVFS_CONF_OPTS += \ + -Dafp=true \ + -Dgcrypt=true GVFS_DEPENDENCIES += libgcrypt else -GVFS_CONF_OPTS += --disable-afp +GVFS_CONF_OPTS += \ + -Dafp=false \ + -Dgcrypt=false endif ifeq ($(BR2_PACKAGE_LIBGPHOTO2)$(BR2_PACKAGE_LIBGUDEV),yy) GVFS_DEPENDENCIES += libgphoto2 libgudev -GVFS_CONF_OPTS += --enable-gphoto2 +GVFS_CONF_OPTS += -Dgphoto2=true else -GVFS_CONF_OPTS += --disable-gphoto2 -endif - -ifeq ($(BR2_PACKAGE_LIBGTK3),y) -GVFS_CONF_OPTS += --enable-gtk -GVFS_DEPENDENCIES += libgtk3 -else -GVFS_CONF_OPTS += --disable-gtk +GVFS_CONF_OPTS += -Dgphoto2=false endif ifeq ($(BR2_PACKAGE_LIBNFS),y) -GVFS_CONF_OPTS += --enable-nfs +GVFS_CONF_OPTS += -Dnfs=true GVFS_DEPENDENCIES += libnfs else -GVFS_CONF_OPTS += --disable-nfs +GVFS_CONF_OPTS += -Dnfs=false endif ifeq ($(BR2_PACKAGE_LIBSECRET),y) GVFS_DEPENDENCIES += libsecret -GVFS_CONF_OPTS += --enable-keyring +GVFS_CONF_OPTS += -Dkeyring=true else -GVFS_CONF_OPTS += --disable-keyring +GVFS_CONF_OPTS += -Dkeyring=false endif ifeq ($(BR2_PACKAGE_LIBSOUP)$(BR2_PACKAGE_LIBXML2),yy) GVFS_DEPENDENCIES += libsoup libxml2 -GVFS_CONF_OPTS += --enable-http +GVFS_CONF_OPTS += -Dhttp=true else -GVFS_CONF_OPTS += --disable-http +GVFS_CONF_OPTS += -Dhttp=false endif ifeq ($(BR2_PACKAGE_LIBUSB),y) GVFS_DEPENDENCIES += libusb -GVFS_CONF_OPTS += --enable-libusb +GVFS_CONF_OPTS += -Dlibusb=true else -GVFS_CONF_OPTS += --disable-libusb +GVFS_CONF_OPTS += -Dlibusb=false endif ifeq ($(BR2_PACKAGE_SAMBA4),y) GVFS_DEPENDENCIES += samba4 -GVFS_CONF_OPTS += \ - --enable-samba \ - --with-samba-includes=$(STAGING_DIR)/usr/include/samba-4.0 \ - --with-samba-libs=$(STAGING_DIR)/usr/lib \ - ac_cv_lib_smbclient_smbc_option_get=yes +GVFS_CONF_OPTS += -Dsmb=true else -GVFS_CONF_OPTS += --disable-samba +GVFS_CONF_OPTS += -Dsmb=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) GVFS_DEPENDENCIES += systemd +GVFS_CONF_OPTS += -Dlogind=true else -GVFS_CONF_OPTS += --disable-libsystemd-login +GVFS_CONF_OPTS += \ + -Dlogind=false \ + -Dsystemduserunitdir=no \ + -Dtmpfilesdir=no endif -define GVFS_REMOVE_USELESS_BINARY - rm $(TARGET_DIR)/usr/bin/gvfs-less -endef - define GVFS_REMOVE_TARGET_SCHEMAS rm $(TARGET_DIR)/usr/share/glib-2.0/schemas/*.xml endef @@ -190,8 +165,7 @@ define GVFS_COMPILE_SCHEMAS endef GVFS_POST_INSTALL_TARGET_HOOKS += \ - GVFS_REMOVE_USELESS_BINARY \ GVFS_REMOVE_TARGET_SCHEMAS \ GVFS_COMPILE_SCHEMAS -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index 17b27b497c..c8fd3ddb7a 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -11,6 +11,7 @@ GZIP_SITE = $(BR2_GNU_MIRROR)/gzip GZIP_CONF_OPTS = --exec-prefix=/ GZIP_LICENSE = GPL-3.0+ GZIP_LICENSE_FILES = COPYING +GZIP_CPE_ID_VENDOR = gnu GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes HOST_GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes # configure substitutes $(SHELL) for the shell shebang in scripts like diff --git a/package/hackrf/Config.in b/package/hackrf/Config.in index b86790f2b0..05d01adc96 100644 --- a/package/hackrf/Config.in +++ b/package/hackrf/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_HACKRF bool "hackrf" depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_FFTW select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_LIBUSB @@ -10,5 +11,6 @@ config BR2_PACKAGE_HACKRF https://github.com/mossmann/hackrf/tree/master/host -comment "hackrf needs a toolchain w/ threads, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS +comment "hackrf needs a toolchain w/ threads, dynamic library, gcc >= 4.9" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index b89bda834b..2e39fb4aa5 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.1/src/haproxy-2.1.4.tar.gz.sha256 -sha256 51030ff696d7067162b4d24d354044293aecfbb36d7acc2f840c8d928bfe91cd haproxy-2.1.4.tar.gz +# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.7.tar.gz.sha256 +sha256 52af97f72f22ffd8a7a995fafc696291d37818feda50a23caef7dc0622421845 haproxy-2.4.7.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 6752367fac..0434c73348 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -4,22 +4,27 @@ # ################################################################################ -HAPROXY_VERSION_MAJOR = 2.1 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).4 +HAPROXY_VERSION_MAJOR = 2.4 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).7 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt +HAPROXY_CPE_ID_VENDOR = haproxy HAPROXY_MAKE_OPTS = \ LD=$(TARGET_CC) \ PREFIX=/usr \ TARGET=custom +ifeq ($(BR2_STATIC_LIBS),) +HAPROXY_MAKE_OPTS += USE_DL=1 +endif + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) HAPROXY_LIBS += -latomic endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) # threads uses atomics on gcc >= 4.7 and sync otherwise (see # include/common/hathreads.h) ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_ATOMIC),y:y) diff --git a/package/harfbuzz/Config.in b/package/harfbuzz/Config.in index e8f407bb8f..8bc88f4284 100644 --- a/package/harfbuzz/Config.in +++ b/package/harfbuzz/Config.in @@ -6,12 +6,12 @@ config BR2_PACKAGE_HARFBUZZ help HarfBuzz is an OpenType text shaping engine - http://www.freedesktop.org/wiki/Software/HarfBuzz/ + https://harfbuzz.github.io/ Harfbuzz can make optional use of cairo, freetype, glib2 and icu packages if they are selected. -comment "harfbuzz needs a toolchain w/ C++, gcc => 4.8" +comment "harfbuzz needs a toolchain w/ C++, gcc >= 4.8" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index ba54f477aa..774b3104a5 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,5 +1,3 @@ -# From https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz.sha256 -sha256 9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12 harfbuzz-2.6.4.tar.xz - # Locally computed -sha256 1b32b6e2fea50440c128c5ba482f7691367c46fd0cd573b80fc863bf07964cea COPYING +sha256 d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7 harfbuzz-2.8.2.tar.xz +sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 3006b5ab98..c7f5dfe9d2 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,66 +4,95 @@ # ################################################################################ -HARFBUZZ_VERSION = 2.6.4 -HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release +HARFBUZZ_VERSION = 2.8.2 +HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) HARFBUZZ_LICENSE_FILES = COPYING +HARFBUZZ_CPE_ID_VENDOR = harfbuzz_project HARFBUZZ_INSTALL_STAGING = YES -HARFBUZZ_CONF_OPTS = --with-coretext=no --with-uniscribe=no +HARFBUZZ_CONF_OPTS = \ + -Dgdi=disabled \ + -Ddirectwrite=disabled \ + -Dcoretext=disabled \ + -Dtests=disabled \ + -Ddocs=disabled \ + -Dbenchmark=disabled \ + -Dicu_builtin=false \ + -Dexperimental_api=false \ + -Dfuzzer_ldflags="" # freetype & glib2 support required by host-pango HOST_HARFBUZZ_DEPENDENCIES = \ host-freetype \ host-libglib2 HOST_HARFBUZZ_CONF_OPTS = \ - --with-coretext=no \ - --with-uniscribe=no \ - --with-graphite2=no \ - --with-cairo=no \ - --with-icu=no \ - --with-freetype=yes \ - --with-glib=yes - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -# forgets to link test programs with -pthread breaking static link -HARFBUZZ_CONF_ENV = LDFLAGS="$(TARGET_LDFLAGS) -pthread" -endif + -Dglib=enabled \ + -Dgobject=disabled \ + -Dcairo=disabled \ + -Dicu=disabled \ + -Dgraphite=disabled \ + -Dfreetype=enabled \ + -Dgdi=disabled \ + -Ddirectwrite=disabled \ + -Dcoretext=disabled \ + -Dtests=disabled \ + -Dintrospection=disabled \ + -Ddocs=disabled \ + -Dbenchmark=disabled \ + -Dicu_builtin=false \ + -Dexperimental_api=false \ + -Dfuzzer_ldflags="" ifeq ($(BR2_PACKAGE_CAIRO),y) HARFBUZZ_DEPENDENCIES += cairo -HARFBUZZ_CONF_OPTS += --with-cairo=yes +HARFBUZZ_CONF_OPTS += -Dcairo=enabled else -HARFBUZZ_CONF_OPTS += --with-cairo=no +HARFBUZZ_CONF_OPTS += -Dcairo=disabled endif ifeq ($(BR2_PACKAGE_FREETYPE),y) HARFBUZZ_DEPENDENCIES += freetype -HARFBUZZ_CONF_OPTS += --with-freetype=yes +HARFBUZZ_CONF_OPTS += -Dfreetype=enabled else -HARFBUZZ_CONF_OPTS += --with-freetype=no +HARFBUZZ_CONF_OPTS += -Dfreetype=disabled +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +HARFBUZZ_DEPENDENCIES += gobject-introspection +HARFBUZZ_CONF_OPTS += \ + -Dgobject=enabled \ + -Dintrospection=enabled +else +HARFBUZZ_CONF_OPTS += \ + -Dgobject=disabled \ + -Dintrospection=disabled endif ifeq ($(BR2_PACKAGE_GRAPHITE2),y) HARFBUZZ_DEPENDENCIES += graphite2 -HARFBUZZ_CONF_OPTS += --with-graphite2=yes +HARFBUZZ_CONF_OPTS += -Dgraphite=enabled else -HARFBUZZ_CONF_OPTS += --with-graphite2=no +HARFBUZZ_CONF_OPTS += -Dgraphite=disabled endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) HARFBUZZ_DEPENDENCIES += libglib2 -HARFBUZZ_CONF_OPTS += --with-glib=yes +HARFBUZZ_CONF_OPTS += -Dglib=enabled else -HARFBUZZ_CONF_OPTS += --with-glib=no +HARFBUZZ_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_ICU),y) HARFBUZZ_DEPENDENCIES += icu -HARFBUZZ_CONF_OPTS += --with-icu=yes +HARFBUZZ_CONF_OPTS += -Dicu=enabled else -HARFBUZZ_CONF_OPTS += --with-icu=no +HARFBUZZ_CONF_OPTS += -Dicu=disabled endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +HARFBUZZ_CXXFLAGS += $(TARGET_CXXFLAGS) -DHB_NO_MT +endif + +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/haserl/haserl.hash b/package/haserl/haserl.hash index 149bf0b0a5..c66b54a0ac 100644 --- a/package/haserl/haserl.hash +++ b/package/haserl/haserl.hash @@ -1,5 +1,5 @@ # From http://sourceforge.net/projects/haserl/files/haserl-devel/ -md5 918f0b4f6cec0b438c8b5c78f2989010 haserl-0.9.35.tar.gz -sha1 9a331d41e9d47a81e81e158f9a16bf5443347cd4 haserl-0.9.35.tar.gz +md5 b94cd201a82b410b7f93fe3a31416cff haserl-0.9.36.tar.gz +sha1 a6244b496f06e1fea70581cb02c04bc1f0ffcbc3 haserl-0.9.36.tar.gz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk index 4c24b9bcea..22950f4d6d 100644 --- a/package/haserl/haserl.mk +++ b/package/haserl/haserl.mk @@ -4,10 +4,11 @@ # ################################################################################ -HASERL_VERSION = 0.9.35 +HASERL_VERSION = 0.9.36 HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel HASERL_LICENSE = GPL-2.0 HASERL_LICENSE_FILES = COPYING +HASERL_CPE_ID_VENDOR = haserl_project HASERL_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y) diff --git a/package/haveged/haveged.hash b/package/haveged/haveged.hash index 2bb1fdd846..f55e004923 100644 --- a/package/haveged/haveged.hash +++ b/package/haveged/haveged.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 99aa1996c6e39ea2459cfc37addfb8b1eecc63f3a2b6da9db17b22e76b6851ae haveged-1.9.8.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 938cb494bcad7e4f24e61eb50fab4aa0acbc3240c80f3ad5c6cf7e6e922618c3 haveged-1.9.14.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk index cc834304df..5d76bdc3c9 100644 --- a/package/haveged/haveged.mk +++ b/package/haveged/haveged.mk @@ -4,13 +4,32 @@ # ################################################################################ -HAVEGED_VERSION = 1.9.8 +HAVEGED_VERSION = 1.9.14 HAVEGED_SITE = $(call github,jirka-h,haveged,v$(HAVEGED_VERSION)) HAVEGED_LICENSE = GPL-3.0+ HAVEGED_LICENSE_FILES = COPYING +HAVEGED_SELINUX_MODULES = entropyd +# patch touching configure.ac +HAVEGED_AUTORECONF = YES + +# '--disable-init' as buildroot ships its own sysv/systemd init files +HAVEGED_CONF_OPTS = \ + --enable-daemon \ + --disable-diagnostic \ + --disable-init \ + --disable-nistest \ + --disable-enttest \ + --disable-olt \ + --enable-tune ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) -HAVEGED_CONF_OPTS += --enable-clock_gettime=yes +HAVEGED_CONF_OPTS += --enable-clock_gettime +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +HAVEGED_CONF_OPTS += --enable-threads +else +HAVEGED_CONF_OPTS += --disable-threads endif define HAVEGED_INSTALL_INIT_SYSV diff --git a/package/haveged/haveged.service b/package/haveged/haveged.service index 91035c6711..5a2336b0a7 100644 --- a/package/haveged/haveged.service +++ b/package/haveged/haveged.service @@ -1,10 +1,22 @@ [Unit] -Description=Entropy Harvesting Daemon -Documentation=man:haveged(8) +# inspiration from upstream init.d/service.fedora +Description=Entropy Daemon based on the HAVEGE algorithm +Documentation=man:haveged(8) http://www.issihosts.com/haveged/ +DefaultDependencies=no +# This would wait for filesystems, but we only need /dev/random, which +# is certainly available after systemd initialised +# After=systemd-tmpfiles-setup-dev.service +Before=sysinit.target shutdown.target systemd-journald.service [Service] -ExecStart=/usr/sbin/haveged -F -w 1024 -v 1 -SuccessExitStatus=143 +ExecStart=/usr/sbin/haveged -w 1024 -v 1 --Foreground +Restart=always +SuccessExitStatus=137 143 + +# Only simple isolation methods that don't pull in dependencies +CapabilityBoundingSet=CAP_SYS_ADMIN +SecureBits=noroot-locked +ProtectSystem=full [Install] -WantedBy=multi-user.target +WantedBy=sysinit.target diff --git a/package/hdparm/Config.in b/package/hdparm/Config.in index 52385b18ce..17ecb65ce9 100644 --- a/package/hdparm/Config.in +++ b/package/hdparm/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_HDPARM bool "hdparm" depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS help - hdparm - get/set hard disk parameters for Linux IDE drives. + hdparm - get/set ATA/SATA drive parameters under Linux - http://www.ibiblio.org/pub/Linux/system/hardware/ + https://sourceforge.net/projects/hdparm/ diff --git a/package/hdparm/hdparm.hash b/package/hdparm/hdparm.hash index 4251b5a65c..b37826caf2 100644 --- a/package/hdparm/hdparm.hash +++ b/package/hdparm/hdparm.hash @@ -1,6 +1,5 @@ -# From http://sourceforge.net/projects/hdparm/files/hdparm/ -md5 4652c49cf096a64683c05f54b4fa4679 hdparm-9.58.tar.gz -sha1 b3425a141f1c0fe9f53b18631437129c2155ee45 hdparm-9.58.tar.gz +# From https://sourceforge.net/projects/hdparm/files/hdparm/ +sha1 100b9a5551b71d87b446b415d56c5d45ac41d131 hdparm-9.62.tar.gz # Locally computed -sha256 9ae78e883f3ce071d32ee0f1b9a2845a634fc4dd94a434e653fdbef551c5e10f hdparm-9.58.tar.gz -sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT +sha256 2c0f9d75cdbeda928a25a128cd3d0b7120445ec0910c0b29d4c1038ed1be777f hdparm-9.62.tar.gz +sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index 9826dde010..6a71c14fa7 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -4,8 +4,8 @@ # ################################################################################ -HDPARM_VERSION = 9.58 -HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm +HDPARM_VERSION = 9.62 +HDPARM_SITE = https://downloads.sourceforge.net/project/hdparm/hdparm HDPARM_LICENSE = BSD-Style HDPARM_LICENSE_FILES = LICENSE.TXT diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 5c0570fdd1..9a1a68f046 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -31,6 +31,7 @@ HOST_HEIMDAL_CONF_OPTS = \ HOST_HEIMDAL_CONF_ENV = MAKEINFO=true HEIMDAL_LICENSE = BSD-3-Clause HEIMDAL_LICENSE_FILES = LICENSE +HEIMDAL_CPE_ID_VENDOR = heimdal_project # We need asn1_compile in the PATH for samba4 define HOST_HEIMDAL_MAKE_SYMLINK diff --git a/package/heirloom-mailx/Config.in b/package/heirloom-mailx/Config.in index 87664b489e..c5b0bcbea7 100644 --- a/package/heirloom-mailx/Config.in +++ b/package/heirloom-mailx/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_HEIRLOOM_MAILX # uses fork() depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2 if BR2_PACKAGE_LIBOPENSSL help Heirloom mailx (previously known as nail) is a mail user agent for Unix systems. diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk index 2f7e635e0f..e851e1dfcc 100644 --- a/package/heirloom-mailx/heirloom-mailx.mk +++ b/package/heirloom-mailx/heirloom-mailx.mk @@ -9,6 +9,8 @@ HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/heirloom-mailx HEIRLOOM_MAILX_LICENSE = BSD-4-Clause, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPL-1.1 (nss) HEIRLOOM_MAILX_LICENSE_FILES = COPYING +HEIRLOOM_MAILX_CPE_ID_VENDOR = heirloom +HEIRLOOM_MAILX_CPE_ID_PRODUCT = mailx ifeq ($(BR2_PACKAGE_OPENSSL),y) HEIRLOOM_MAILX_DEPENDENCIES += openssl @@ -18,10 +20,18 @@ define HEIRLOOM_MAILX_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) $(SHELL) ./makeconfig) endef +HEIRLOOM_MAILX_CFLAGS = $(TARGET_CFLAGS) + # -fPIC is needed to build with NIOS2 toolchains. +HEIRLOOM_MAILX_CFLAGS += -fPIC + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101916),y) +HEIRLOOM_MAILX_CFLAGS += -O0 +endif + define HEIRLOOM_MAILX_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) \ - CFLAGS="$(TARGET_CFLAGS) -fPIC" \ + CFLAGS="$(HEIRLOOM_MAILX_CFLAGS)" \ -C $(@D) endef diff --git a/package/hiawatha/hiawatha.hash b/package/hiawatha/hiawatha.hash index 359a435420..2fba5600a2 100644 --- a/package/hiawatha/hiawatha.hash +++ b/package/hiawatha/hiawatha.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9 hiawatha-10.10.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE +sha256 79d85d165d68dd7043bbd337f5bc7dd10d8632d68ba61d0e557f84bd687c9727 hiawatha-10.11.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index eefd0f6f89..126cb71105 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -4,12 +4,20 @@ # ################################################################################ -HIAWATHA_VERSION = 10.10 +HIAWATHA_VERSION = 10.11 HIAWATHA_SITE = https://www.hiawatha-webserver.org/files HIAWATHA_DEPENDENCIES = zlib HIAWATHA_LICENSE = GPL-2.0 HIAWATHA_LICENSE_FILES = LICENSE +HIAWATHA_CONF_OPTS = \ + -DENABLE_TOOLKIT=OFF \ + -DCONFIG_DIR=/etc/hiawatha \ + -DLOG_DIR=/var/log \ + -DPID_DIR=/var/run \ + -DWEBROOT_DIR=/var/www/hiawatha \ + -DWORK_DIR=/var/lib/hiawatha + ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON HIAWATHA_DEPENDENCIES += mbedtls @@ -17,13 +25,11 @@ else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif -HIAWATHA_CONF_OPTS += \ - -DENABLE_TOOLKIT=OFF \ - -DENABLE_XSLT=OFF \ - -DCONFIG_DIR=/etc/hiawatha \ - -DLOG_DIR=/var/log \ - -DPID_DIR=/var/run \ - -DWEBROOT_DIR=/var/www/hiawatha \ - -DWORK_DIR=/var/lib/hiawatha +ifeq ($(BR2_PACKAGE_LIBXSLT),y) +HIAWATHA_CONF_OPTS += -DENABLE_XSLT=ON +HIAWATHA_DEPENDENCIES += libxslt +else +HIAWATHA_CONF_OPTS += -DENABLE_XSLT=OFF +endif $(eval $(cmake-package)) diff --git a/package/hicolor-icon-theme/hicolor-icon-theme.hash b/package/hicolor-icon-theme/hicolor-icon-theme.hash index b1dcaf4ae8..ec9635f05a 100644 --- a/package/hicolor-icon-theme/hicolor-icon-theme.hash +++ b/package/hicolor-icon-theme/hicolor-icon-theme.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9cc45ac3318c31212ea2d8cb99e64020732393ee7630fa6c1810af5f987033cc hicolor-icon-theme-0.15.tar.xz +sha256 317484352271d18cbbcfac3868eab798d67fff1b8402e740baa6ff41d588a9d8 hicolor-icon-theme-0.17.tar.xz sha256 b0a64377d4ee87b7dbcf418ce4fb33ec3b2d7081b6732890e4af06b8118c4526 COPYING diff --git a/package/hicolor-icon-theme/hicolor-icon-theme.mk b/package/hicolor-icon-theme/hicolor-icon-theme.mk index dec75c15c4..088aecf31c 100644 --- a/package/hicolor-icon-theme/hicolor-icon-theme.mk +++ b/package/hicolor-icon-theme/hicolor-icon-theme.mk @@ -4,7 +4,7 @@ # ################################################################################ -HICOLOR_ICON_THEME_VERSION = 0.15 +HICOLOR_ICON_THEME_VERSION = 0.17 HICOLOR_ICON_THEME_SITE = http://icon-theme.freedesktop.org/releases HICOLOR_ICON_THEME_SOURCE = hicolor-icon-theme-$(HICOLOR_ICON_THEME_VERSION).tar.xz HICOLOR_ICON_THEME_LICENSE = GPL-2.0 diff --git a/package/hidapi/Config.in b/package/hidapi/Config.in index d7d8cd53d7..061c7883f7 100644 --- a/package/hidapi/Config.in +++ b/package/hidapi/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_HIDAPI bool "hidapi" depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBGUDEV select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE @@ -14,5 +15,7 @@ config BR2_PACKAGE_HIDAPI http://github.com/libusb/hidapi/ -comment "hidapi needs udev /dev management and a toolchain w/ NPTL threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_PACKAGE_HAS_UDEV +comment "hidapi needs udev /dev management and a toolchain w/ NPTL, threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_PACKAGE_HAS_UDEV || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/hidapi/hidapi.hash b/package/hidapi/hidapi.hash index 232c1ec48d..b49b6d1f91 100644 --- a/package/hidapi/hidapi.hash +++ b/package/hidapi/hidapi.hash @@ -1,6 +1,6 @@ # Locally calculated -sha256 630ee1834bdd5c5761ab079fd04f463a89585df8fcae51a7bfe4229b1e02a652 hidapi-0.9.0.tar.gz -sha256 7d3b087c34f35d4d538e3bcddd1ff8f66e92f9ef336881999482800ddf840913 LICENSE.txt -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-gpl3.txt -sha256 30eb1bef29b46f8ba7ab8b416035dbd93cb034a45481dd97815b944284582cd2 LICENSE-bsd.txt -sha256 fb5436aa63d1b71a8dfbf74ecaf1a5b4e1ec4df7f80074d11fec99284f69ca5f LICENSE-orig.txt +sha256 f71dd8a1f46979c17ee521bc2117573872bbf040f8a4750e492271fc141f2644 hidapi-0.10.1.tar.gz +sha256 7d3b087c34f35d4d538e3bcddd1ff8f66e92f9ef336881999482800ddf840913 LICENSE.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-gpl3.txt +sha256 30eb1bef29b46f8ba7ab8b416035dbd93cb034a45481dd97815b944284582cd2 LICENSE-bsd.txt +sha256 fb5436aa63d1b71a8dfbf74ecaf1a5b4e1ec4df7f80074d11fec99284f69ca5f LICENSE-orig.txt diff --git a/package/hidapi/hidapi.mk b/package/hidapi/hidapi.mk index abbe5878e8..7598ef7fb9 100644 --- a/package/hidapi/hidapi.mk +++ b/package/hidapi/hidapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIDAPI_VERSION = 0.9.0 +HIDAPI_VERSION = 0.10.1 HIDAPI_SITE = $(call github,libusb,hidapi,hidapi-$(HIDAPI_VERSION)) HIDAPI_INSTALL_STAGING = YES # No configure provided, so we need to autoreconf. diff --git a/package/hiredis/hiredis.hash b/package/hiredis/hiredis.hash index 2d50ce0f54..a45cf68f99 100644 --- a/package/hiredis/hiredis.hash +++ b/package/hiredis/hiredis.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2663b2aed9fd430507e30fc5e63274ee40cdd1a296026e22eafd7d99b01c8913 hiredis-0.14.1.tar.gz +sha256 e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819 hiredis-1.0.2.tar.gz sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index 230fb2d187..a571951fa3 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -4,66 +4,20 @@ # ################################################################################ -HIREDIS_VERSION_MAJOR = 0.14 -HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).1 +HIREDIS_VERSION_MAJOR = 1.0 +HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).2 HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION)) HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING +HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES +HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON -HIREDIS_MAKE_OPTS = \ - $(TARGET_CONFIGURE_OPTS) \ - PREFIX=/usr - -HIREDIS_TARGETS = hiredis.pc -ifeq ($(BR2_STATIC_LIBS),y) -HIREDIS_TARGETS += static -else ifeq ($(BR2_SHARED_LIBS),y) -HIREDIS_TARGETS += dynamic -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -HIREDIS_TARGETS += dynamic static +ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy) +HIREDIS_CONF_OPTS += -DENABLE_SSL=ON +HIREDIS_DEPENDENCIES += openssl +else +HIREDIS_CONF_OPTS += -DENABLE_SSL=OFF endif -define HIREDIS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(HIREDIS_MAKE_OPTS) -C $(@D) \ - $(HIREDIS_TARGETS) -endef - -HIREDIS_INCLUDE_DIR = $(STAGING_DIR)/usr/include/hiredis - -ifeq ($(BR2_SHARED_LIBS),) -define HIREDIS_INSTALL_STAGING_STATIC_LIB - $(INSTALL) -D -m 0755 $(@D)/libhiredis.a \ - $(STAGING_DIR)/usr/lib/libhiredis.a -endef -endif - -ifeq ($(BR2_STATIC_LIBS),) -define HIREDIS_INSTALL_STAGING_SHARED_LIB - $(INSTALL) -D -m 0755 $(@D)/libhiredis.so \ - $(STAGING_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) - ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(STAGING_DIR)/usr/lib/libhiredis.so -endef -define HIREDIS_INSTALL_TARGET_SHARED_LIB - $(INSTALL) -D -m 0755 $(@D)/libhiredis.so \ - $(TARGET_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) - ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(TARGET_DIR)/usr/lib/libhiredis.so -endef -endif - -# Do not call make install as this target will build shared and static libraries -define HIREDIS_INSTALL_STAGING_CMDS - mkdir -p $(HIREDIS_INCLUDE_DIR) - cp -dpfr $(@D)/hiredis.h $(@D)/async.h $(@D)/read.h $(@D)/sds.h \ - $(@D)/alloc.h $(@D)/adapters $(HIREDIS_INCLUDE_DIR) - $(INSTALL) -D -m 0644 $(@D)/hiredis.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/hiredis.pc - $(HIREDIS_INSTALL_STAGING_STATIC_LIB) - $(HIREDIS_INSTALL_STAGING_SHARED_LIB) -endef - -define HIREDIS_INSTALL_TARGET_CMDS - $(HIREDIS_INSTALL_TARGET_SHARED_LIB) -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 54d2086c09..f4206ceea5 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_HOSTAPD bool "hostapd" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL help User space daemon for wireless access points. diff --git a/package/hostapd/hostapd.hash b/package/hostapd/hostapd.hash index bf5016acc3..9ac5f4b392 100644 --- a/package/hostapd/hostapd.hash +++ b/package/hostapd/hostapd.hash @@ -1,3 +1,7 @@ # Locally calculated sha256 881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7 hostapd-2.9.tar.gz +sha256 2d9a5b9d616f1b4aa4a22b967cee866e2f69b798b0b46803a7928c8559842bd7 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch +sha256 49feb35a5276279b465f6836d6fa2c6b34d94dc979e8b840d1918865c04260de 0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch +sha256 a8212a2d89a5bab2824d22b6047e7740553df163114fcec94832bfa9c5c5d78a 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch +sha256 7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index b94a0e4578..8820254f89 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -8,6 +8,11 @@ HOSTAPD_VERSION = 2.9 HOSTAPD_SITE = http://w1.fi/releases HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config +HOSTAPD_PATCH = \ + https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch \ + https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch \ + https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch \ + https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch HOSTAPD_DEPENDENCIES = host-pkgconf HOSTAPD_CFLAGS = $(TARGET_CFLAGS) HOSTAPD_LICENSE = BSD-3-Clause @@ -16,6 +21,16 @@ HOSTAPD_LICENSE_FILES = README # 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch HOSTAPD_IGNORE_CVES += CVE-2019-16275 +# 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch +HOSTAPD_IGNORE_CVES += CVE-2020-12695 + +# 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch +HOSTAPD_IGNORE_CVES += CVE-2021-30004 + +# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch +HOSTAPD_IGNORE_CVES += CVE-2021-27803 + +HOSTAPD_CPE_ID_VENDOR = w1.fi HOSTAPD_CONFIG_SET = HOSTAPD_CONFIG_ENABLE = \ diff --git a/package/hplip/Config.in b/package/hplip/Config.in index f4e0fe7530..bab29303e5 100644 --- a/package/hplip/Config.in +++ b/package/hplip/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_HPLIP depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on !BR2_STATIC_LIBS # libdl select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_JPEG @@ -17,7 +18,7 @@ config BR2_PACKAGE_HPLIP http://hplipopensource.com/ -comment "hplip needs a toolchain w/ C++, threads, dynamic library" +comment "hplip needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9" depends on BR2_PACKAGE_CUPS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/htop/Config.in b/package/htop/Config.in index c19ff27b77..214a9a1c99 100644 --- a/package/htop/Config.in +++ b/package/htop/Config.in @@ -1,9 +1,14 @@ config BR2_PACKAGE_HTOP bool "htop" depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # dlopen() select BR2_PACKAGE_NCURSES help htop is an interactive text-mode process viewer for Linux. It aims to be a better top. - http://hisham.hm/htop/ + https://htop.dev/ + +comment "htop needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/package/htop/htop.hash b/package/htop/htop.hash index e764644a0b..34d95eb7a1 100644 --- a/package/htop/htop.hash +++ b/package/htop/htop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57 htop-2.2.0.tar.gz -sha256 70466e76443cb5b68144d9fcedca9584e7bfdb6c50859daa5a0290ea27c58aad COPYING +sha256 123476d56a5e6a219654eebb6b2ec747dfa364f39c01a6475bf8030a25c81bff htop-ce6d60e7def146c13d0b8bca4642e7401a0a8995.tar.gz +sha256 c228cc14df980a23ea0c3c9ac957b904dd6a8514f6283db403de22e9179471be COPYING diff --git a/package/htop/htop.mk b/package/htop/htop.mk index dc84e32708..bb2bcb29ae 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -4,25 +4,31 @@ # ################################################################################ -HTOP_VERSION = 2.2.0 -HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION) +# This commit hash corresponds to version 3.0.5. +# htop sources were moved from bintray to github and the sources tar archive +# was also changed (the build process requires `HTOP_AUTORECONF = YES` now). We +# use commit hash instead of git tag here to avoid breaking existing source +# caches +HTOP_VERSION = ce6d60e7def146c13d0b8bca4642e7401a0a8995 +HTOP_SITE = $(call github,htop-dev,htop,$(HTOP_VERSION)) HTOP_DEPENDENCIES = ncurses +HTOP_AUTORECONF = YES # Prevent htop build system from searching the host paths HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) HTOP_LICENSE = GPL-2.0 HTOP_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LM_SENSORS),y) +HTOP_CONF_OPTS += --with-sensors +HTOP_DEPENDENCIES += lm-sensors +else +HTOP_CONF_OPTS += --without-sensors +endif + ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) HTOP_CONF_OPTS += --enable-unicode else HTOP_CONF_OPTS += --disable-unicode endif -# ARC uses an old uClibc that needs dladdr() for backtrace support, -# which doesn't work for static only scenario, so as a workaround, we -# pretend that execinfo.h is not available. -ifeq ($(BR2_arc)$(BR2_STATIC_LIBS),yy) -HTOP_CONF_ENV += ac_cv_header_execinfo_h=no -endif - $(eval $(autotools-package)) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 80e61e212d..be8576d8d2 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d90de6eb0937ad4c667e5f0edcc4ab3d6d91d2d2dbc08f70b5b99be3800ed836 hwdata-0.326.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE +sha256 fafcc97421ba766e08a2714ccc3eebb0daabc99e67d53c2d682721dd01ccf7a7 hwdata-0.345.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index f32a0ef939..0485603f16 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.326 +HWDATA_VERSION = 0.345 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index 9637ba1325..e207a6bb1a 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,6 +1,4 @@ -# From https://www.open-mpi.org/software/hwloc/v1.11/ -md5 3c792e23c209e9e1bafe9bdbc613d401 hwloc-1.11.13.tar.bz2 -sha1 c3ae96a845ff3800f28b28fdb48146f971589653 hwloc-1.11.13.tar.bz2 +# From https://www.open-mpi.org/software/hwloc/v2.4/ +sha256 392421e69f26120c8ab95d151fe989f2b4b69dab3c7735741c4e0a6d7de5de63 hwloc-2.4.1.tar.bz2 # Locally computed -sha256 a4494b7765f517c0990d1c7f09d98cb87755bb6b841e4e2cbfebca1b14bac9c8 hwloc-1.11.13.tar.bz2 -sha256 c1816ed2da6aea779c4f27352f807c8bbaf545c2843d7b2ae818e1d529028821 COPYING +sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 81cb89e35b..2a5a82cea4 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -4,14 +4,19 @@ # ################################################################################ -HWLOC_VERSION_MAJOR = 1.11 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).13 +HWLOC_VERSION_MAJOR = 2.4 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 -HWLOC_SITE = http://www.open-mpi.org/software/hwloc/v$(HWLOC_VERSION_MAJOR)/downloads +HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) HWLOC_LICENSE = BSD-3-Clause HWLOC_LICENSE_FILES = COPYING HWLOC_DEPENDENCIES = host-pkgconf HWLOC_INSTALL_STAGING = YES +HWLOC_SELINUX_MODULES = hwloc + +# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test +# provided by autoconf relies on wchar_t. +HWLOC_CONF_ENV = ac_cv_prog_cc_c99=-std=gnu99 HWLOC_CONF_OPTS = \ --disable-opencl \ @@ -19,9 +24,15 @@ HWLOC_CONF_OPTS = \ --disable-nvml \ --disable-gl \ --disable-cairo \ - --disable-libxml2 \ --disable-doxygen +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +HWLOC_CONF_OPTS += --enable-libudev +HWLOC_DEPENDENCIES += udev +else +HWLOC_CONF_OPTS += --disable-libudev +endif + ifeq ($(BR2_PACKAGE_LIBPCIACCESS),y) HWLOC_CONF_OPTS += --enable-pci HWLOC_DEPENDENCIES += libpciaccess @@ -29,11 +40,19 @@ else HWLOC_CONF_OPTS += --disable-pci endif -ifeq ($(BR2_PACKAGE_NUMACTL),y) -HWLOC_CONF_OPTS += --enable-libnuma -HWLOC_DEPENDENCIES += numactl +ifeq ($(BR2_PACKAGE_LIBXML2),y) +HWLOC_CONF_OPTS += --enable-libxml2 +HWLOC_DEPENDENCIES += libxml2 else -HWLOC_CONF_OPTS += --disable-libnuma +HWLOC_CONF_OPTS += --disable-libxml2 +endif + +ifeq ($(BR2_PACKAGE_NCURSES),y) +HWLOC_DEPENDENCIES += ncurses +endif + +ifeq ($(BR2_PACKAGE_NUMACTL),y) +HWLOC_DEPENDENCIES += numactl endif $(eval $(autotools-package)) diff --git a/package/i2c-tools/i2c-tools.hash b/package/i2c-tools/i2c-tools.hash index 280a139c00..9bfdacb3f1 100644 --- a/package/i2c-tools/i2c-tools.hash +++ b/package/i2c-tools/i2c-tools.hash @@ -1,7 +1,7 @@ -# Locally computed -sha256 57b219efd183795bd545dd5a60d9eabbe9dcb6f8fb92bc7ba2122b87f98527d5 i2c-tools-4.1.tar.xz +# From https://www.kernel.org/pub/software/utils/i2c-tools/sha256sums.asc +sha256 1f899e43603184fac32f34d72498fc737952dbc9c97a8dd9467fadfdf4600cf9 i2c-tools-4.3.tar.xz # License files -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 b75b04b46320dff5e2b50a9c69b8e526b7db5087083ea3ba65533f08fc11b9f0 README +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 2293b6e9076984d02184ff620baac557143e16cfa47d88f0a791d05a1271742c README diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index d4d9c012fa..7565349f5e 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -I2C_TOOLS_VERSION = 4.1 +I2C_TOOLS_VERSION = 4.3 I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.xz I2C_TOOLS_SITE = https://www.kernel.org/pub/software/utils/i2c-tools I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus), LGPL-2.1+ (libi2c) I2C_TOOLS_LICENSE_FILES = COPYING COPYING.LGPL README +I2C_TOOLS_CPE_ID_VENDOR = i2c-tools_project I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog I2C_TOOLS_INSTALL_STAGING = YES diff --git a/package/i2pd/i2pd.hash b/package/i2pd/i2pd.hash index 26d3be6914..da44d51e1b 100644 --- a/package/i2pd/i2pd.hash +++ b/package/i2pd/i2pd.hash @@ -1,3 +1,4 @@ +# From https://github.com/PurpleI2P/i2pd/releases/download/2.38.0/SHA512SUMS +sha512 01e160394dc07621b3d236fcc13d78b46e109290f59dbb77f282c05f4d80fdfa01c9b062de5ca91d6d6e739beb8a5b6f731508b48d9483f1a132a93a71d88e6f i2pd-2.38.0.tar.gz # Locally computed: -sha256 25915cbd33a9f53c89ddf7fbd68fccc5ffc89ab40d4445ccc813da74fae154f2 i2pd-2.30.0.tar.gz -sha256 d147a6acdaf8ec9f6513802ef6cad4a4afcdb5ab6b98d9f6bb26d2b7f4cf454c LICENSE +sha256 9c87aff490b272254d716475e3c4973f5f64af1d18f9f6962c1e61e252e1ad9a LICENSE diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk index 56af5cb44b..e6df5ca34c 100644 --- a/package/i2pd/i2pd.mk +++ b/package/i2pd/i2pd.mk @@ -4,7 +4,7 @@ # ################################################################################ -I2PD_VERSION = 2.30.0 +I2PD_VERSION = 2.38.0 I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION)) I2PD_LICENSE = BSD-3-Clause I2PD_LICENSE_FILES = LICENSE @@ -16,11 +16,6 @@ I2PD_DEPENDENCIES = \ I2PD_CONF_OPTS += -DWITH_GUI=OFF -# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to -# disable a try_run() call in the FindThreads tests, which caused a -# build failure when cross-compiling. -I2PD_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) I2PD_CONF_OPTS += \ -DHAVE_CXX_ATOMICS_WITHOUT_LIB=OFF \ diff --git a/package/ibrcommon/ibrcommon.mk b/package/ibrcommon/ibrcommon.mk index 4d2d351c88..d9e843ebc2 100644 --- a/package/ibrcommon/ibrcommon.mk +++ b/package/ibrcommon/ibrcommon.mk @@ -10,6 +10,7 @@ IBRCOMMON_INSTALL_STAGING = YES IBRCOMMON_LICENSE = Apache-2.0 IBRCOMMON_LICENSE_FILES = COPYING README IBRCOMMON_DEPENDENCIES = host-pkgconf +IBRCOMMON_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" ifeq ($(BR2_PACKAGE_OPENSSL),y) IBRCOMMON_DEPENDENCIES += openssl diff --git a/package/ibrdtn-tools/ibrdtn-tools.mk b/package/ibrdtn-tools/ibrdtn-tools.mk index 97ec3c9e17..77dbfc1032 100644 --- a/package/ibrdtn-tools/ibrdtn-tools.mk +++ b/package/ibrdtn-tools/ibrdtn-tools.mk @@ -9,6 +9,7 @@ IBRDTN_TOOLS_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases IBRDTN_TOOLS_LICENSE = Apache-2.0 IBRDTN_TOOLS_LICENSE_FILES = COPYING IBRDTN_TOOLS_DEPENDENCIES = ibrcommon ibrdtn host-pkgconf +IBRDTN_TOOLS_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" ifeq ($(BR2_STATIC_LIBS),y) IBRDTN_TOOLS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread" diff --git a/package/ibrdtn/ibrdtn.mk b/package/ibrdtn/ibrdtn.mk index 3f805c4024..99ff92d442 100644 --- a/package/ibrdtn/ibrdtn.mk +++ b/package/ibrdtn/ibrdtn.mk @@ -10,6 +10,7 @@ IBRDTN_INSTALL_STAGING = YES IBRDTN_LICENSE = Apache-2.0 IBRDTN_LICENSE_FILES = COPYING IBRDTN_DEPENDENCIES = ibrcommon host-pkgconf +IBRDTN_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" ifeq ($(BR2_PACKAGE_ZLIB),y) IBRDTN_CONF_OPTS += --with-compression diff --git a/package/ibrdtnd/ibrdtnd.mk b/package/ibrdtnd/ibrdtnd.mk index 0632ed36b7..20ac496fee 100644 --- a/package/ibrdtnd/ibrdtnd.mk +++ b/package/ibrdtnd/ibrdtnd.mk @@ -18,7 +18,9 @@ IBRDTND_CONF_OPTS = \ --without-vmime # don't build documentation -IBRDTND_CONF_ENV = PDFLATEX='no' +IBRDTND_CONF_ENV = \ + PDFLATEX='no' \ + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" ifeq ($(BR2_PACKAGE_LIBDAEMON),y) IBRDTND_CONF_OPTS += --enable-libdaemon diff --git a/package/icu/Config.in b/package/icu/Config.in index 32f35b9d96..b0c9eac83d 100644 --- a/package/icu/Config.in +++ b/package/icu/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_ICU bool "icu" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++11 PR56019 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 PR56019 depends on BR2_TOOLCHAIN_HAS_THREADS # icu does some funky things by generating by itself an ELF # file, and it cannot easily be changed to generate FLAT @@ -26,8 +27,9 @@ config BR2_PACKAGE_ICU_CUSTOM_DATA_PATH endif -comment "icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" +comment "icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.9, host gcc >= 4.9" depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/icu/icu.hash b/package/icu/icu.hash index 5eb508d2cb..5ed7cc4217 100644 --- a/package/icu/icu.hash +++ b/package/icu/icu.hash @@ -1,4 +1,3 @@ -# From https://github.com/unicode-org/icu/releases/download/release-65-1/SHASUM512.txt -sha512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139 icu4c-65_1-src.tgz # Locally computed -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d LICENSE +sha256 4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745 icu4c-69_1-src.tgz +sha256 7915b19db903070778581ae05d8bf4ea241b34a05deb51ca4f5cbb15ea1cbba3 LICENSE diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 0b8aeeaee1..0a17c61462 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -7,12 +7,15 @@ # Git tags (and therefore versions on release-monitoring.org) use the # XX-Y format, but the tarballs are named XX_Y and the containing # directories XX.Y. -ICU_VERSION = 65-1 +ICU_VERSION = 69-1 ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) ICU_LICENSE = ICU License ICU_LICENSE_FILES = LICENSE +ICU_CPE_ID_VENDOR = icu-project +ICU_CPE_ID_PRODUCT = international_components_for_unicode +ICU_CPE_ID_VERSION = $(subst -,.,$(ICU_VERSION)) ICU_DEPENDENCIES = host-icu ICU_INSTALL_STAGING = YES diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk index 06b0607414..6de7f17641 100644 --- a/package/ifplugd/ifplugd.mk +++ b/package/ifplugd/ifplugd.mk @@ -8,6 +8,7 @@ IFPLUGD_VERSION = 0.28 IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd IFPLUGD_LICENSE = GPL-2.0+ IFPLUGD_LICENSE_FILES = LICENSE +IFPLUGD_SELINUX_MODULES = ifplugd IFPLUGD_AUTORECONF = YES # install-strip unconditionally overwrites $(TARGET_DIR)/etc/ifplugd/ifplugd.* diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk index 84d24aedab..e62c2a79c5 100644 --- a/package/ifupdown/ifupdown.mk +++ b/package/ifupdown/ifupdown.mk @@ -9,6 +9,7 @@ IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown IFUPDOWN_LICENSE = GPL-2.0+ IFUPDOWN_LICENSE_FILES = COPYING +IFUPDOWN_CPE_ID_VENDOR = debian define IFUPDOWN_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/igd2-for-linux/Config.in b/package/igd2-for-linux/Config.in index 157cc6f30b..f1658d3aa6 100644 --- a/package/igd2-for-linux/Config.in +++ b/package/igd2-for-linux/Config.in @@ -18,7 +18,7 @@ config BR2_PACKAGE_IGD2_FOR_LINUX Please edit /etc/upnpd.conf before using upnpd! - https://github.com/ffontaine/igd2-for-linux + https://github.com/Orange-OpenSource/igd2-for-linux comment "igd2-for-linux needs a toolchain w/ threads, wchar" depends on BR2_USE_MMU diff --git a/package/igd2-for-linux/igd2-for-linux.hash b/package/igd2-for-linux/igd2-for-linux.hash index ecde4b51c2..fe1272338a 100644 --- a/package/igd2-for-linux/igd2-for-linux.hash +++ b/package/igd2-for-linux/igd2-for-linux.hash @@ -1,3 +1,4 @@ # Locally computed: -sha256 523545a26b0d662e9f6913bec2518df6e70f4d497935d88983d994336a1b0ea9 igd2-for-linux-1.2.tar.gz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 linuxigd2/doc/LICENSE +sha256 843f2b0a7597e6cc7af85da099a7cce3401a334cbb4a6ae9d38ce252311db9b9 igd2-for-linux-2.1.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 linuxigd2/doc/LICENSE +sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 linuxigd2/src/threadutil/COPYING diff --git a/package/igd2-for-linux/igd2-for-linux.mk b/package/igd2-for-linux/igd2-for-linux.mk index 478c353997..8cc3c6ae18 100644 --- a/package/igd2-for-linux/igd2-for-linux.mk +++ b/package/igd2-for-linux/igd2-for-linux.mk @@ -4,33 +4,17 @@ # ################################################################################ -IGD2_FOR_LINUX_VERSION = 1.2 -IGD2_FOR_LINUX_SITE = $(call github,ffontaine,igd2-for-linux,v$(IGD2_FOR_LINUX_VERSION)) +IGD2_FOR_LINUX_VERSION = 2.1 +IGD2_FOR_LINUX_SITE = \ + $(call github,Orange-OpenSource,igd2-for-linux,v$(IGD2_FOR_LINUX_VERSION)) -IGD2_FOR_LINUX_LICENSE = GPL-2.0 -IGD2_FOR_LINUX_LICENSE_FILES = linuxigd2/doc/LICENSE +IGD2_FOR_LINUX_LICENSE = GPL-2.0, BSD-3-Clause +IGD2_FOR_LINUX_LICENSE_FILES = linuxigd2/doc/LICENSE linuxigd2/src/threadutil/COPYING IGD2_FOR_LINUX_DEPENDENCIES = libupnp - -IGD2_FOR_LINUX_BUILD_DIR = $(@D)/linuxigd2 -IGD2_FOR_LINUX_CONF_DIR = $(IGD2_FOR_LINUX_BUILD_DIR)/configs - -define IGD2_FOR_LINUX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(IGD2_FOR_LINUX_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - LIBUPNP_PREFIX="$(STAGING_DIR)/usr" \ - all -endef - -define IGD2_FOR_LINUX_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(IGD2_FOR_LINUX_BUILD_DIR)/bin/upnpd \ - $(TARGET_DIR)/usr/sbin/upnpd - $(INSTALL) -D -m 0644 $(IGD2_FOR_LINUX_CONF_DIR)/upnpd.conf \ - $(TARGET_DIR)/etc/upnpd.conf - mkdir -p $(TARGET_DIR)/etc/linuxigd/ - cp -dpfr $(IGD2_FOR_LINUX_CONF_DIR)/*.{xml,png} \ - $(TARGET_DIR)/etc/linuxigd/ -endef +# From git +IGD2_FOR_LINUX_AUTORECONF = YES +IGD2_FOR_LINUX_SUBDIR = linuxigd2 define IGD2_FOR_LINUX_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/igd2-for-linux/S99upnpd \ @@ -42,4 +26,4 @@ define IGD2_FOR_LINUX_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/upnpd.service endef -$(eval $(generic-package)) +$(eval $(autotools-package)) diff --git a/package/igmpproxy/igmpproxy.hash b/package/igmpproxy/igmpproxy.hash index 2566987a7f..238de67e88 100644 --- a/package/igmpproxy/igmpproxy.hash +++ b/package/igmpproxy/igmpproxy.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 6faa1f42ba323f60a9eb4958550e25b2e7e9c645da32c52ba12db0c9bdfce1ba igmpproxy-0.2.1.tar.gz -sha256 be3d05af93dbbc4650f8d641d8e1bec220af4a729e07ba71e949c25b93a1b4f6 COPYING -sha256 c4f65d5d396ad518a37d30b83fe33897661858dc174ff64a15d0461630ce64e4 GPL.txt -sha256 4328a21f0822caa9976356623118bcdcc9970c7a0f9a3deeba23c779b7cfb5d1 Stanford.txt +sha256 d1fc244cb2fbbf99f720bda3e841fe59ece9b6919073790b4b892739b1b844eb igmpproxy-0.3.tar.gz +sha256 be3d05af93dbbc4650f8d641d8e1bec220af4a729e07ba71e949c25b93a1b4f6 COPYING +sha256 c4f65d5d396ad518a37d30b83fe33897661858dc174ff64a15d0461630ce64e4 GPL.txt +sha256 4328a21f0822caa9976356623118bcdcc9970c7a0f9a3deeba23c779b7cfb5d1 Stanford.txt diff --git a/package/igmpproxy/igmpproxy.mk b/package/igmpproxy/igmpproxy.mk index fe4614fd13..6a6b56afa0 100644 --- a/package/igmpproxy/igmpproxy.mk +++ b/package/igmpproxy/igmpproxy.mk @@ -4,8 +4,9 @@ # ################################################################################ -IGMPPROXY_VERSION = 0.2.1 -IGMPPROXY_SITE = $(call github,pali,igmpproxy,$(IGMPPROXY_VERSION)) +IGMPPROXY_VERSION = 0.3 +IGMPPROXY_SITE = \ + https://github.com/pali/igmpproxy/releases/download/$(IGMPPROXY_VERSION) IGMPPROXY_AUTORECONF = YES IGMPPROXY_LICENSE = GPL-2.0+, BSD-3-Clause (mrouted) IGMPPROXY_LICENSE_FILES = COPYING GPL.txt Stanford.txt diff --git a/package/ima-evm-utils/Config.in b/package/ima-evm-utils/Config.in index 851e2456bc..6c29c9de28 100644 --- a/package/ima-evm-utils/Config.in +++ b/package/ima-evm-utils/Config.in @@ -1,9 +1,10 @@ config BR2_PACKAGE_IMA_EVM_UTILS bool "ima-evm-utils" depends on BR2_USE_MMU # keyutils - depends on !BR2_STATIC_LIBS # keyutils + depends on !BR2_STATIC_LIBS # keyutils, tpm2-tss select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_KEYUTILS + select BR2_PACKAGE_TPM2_TSS help Linux Integrity Measurement Architecture (IMA) Extended Verification Module (EVM) tools. diff --git a/package/ima-evm-utils/ima-evm-utils.hash b/package/ima-evm-utils/ima-evm-utils.hash index 24be627d20..2cdba227ad 100644 --- a/package/ima-evm-utils/ima-evm-utils.hash +++ b/package/ima-evm-utils/ima-evm-utils.hash @@ -1,3 +1,4 @@ -# Locally computed -sha256 ad8471b58c4df29abd51c80d74b1501cfe3289b60d32d1b318618a8fd26c0c0a ima-evm-utils-1.2.1.tar.gz +# sha1 from sourceforge, sha256 locally computed +sha1 034d163533ae5f9c06001b375ec7e5a1b09a3853 ima-evm-utils-1.3.2.tar.gz +sha256 c2b206e7f9fbe62a938b7ae59e31906fefae4d5351fe01db739bd8346b75d4a7 ima-evm-utils-1.3.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ima-evm-utils/ima-evm-utils.mk b/package/ima-evm-utils/ima-evm-utils.mk index b944eda13c..cc53e02dd6 100644 --- a/package/ima-evm-utils/ima-evm-utils.mk +++ b/package/ima-evm-utils/ima-evm-utils.mk @@ -4,11 +4,11 @@ # ################################################################################ -IMA_EVM_UTILS_VERSION = 1.2.1 +IMA_EVM_UTILS_VERSION = 1.3.2 IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils IMA_EVM_UTILS_LICENSE = GPL-2.0 IMA_EVM_UTILS_LICENSE_FILES = COPYING -IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl +IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl tpm2-tss # Tarball doesn't contain configure IMA_EVM_UTILS_AUTORECONF = YES diff --git a/package/imagemagick/Config.in.host b/package/imagemagick/Config.in.host index bbe23baa6f..e12d82939a 100644 --- a/package/imagemagick/Config.in.host +++ b/package/imagemagick/Config.in.host @@ -1,5 +1,6 @@ config BR2_PACKAGE_HOST_IMAGEMAGICK bool "host imagemagick" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg help ImageMagick(R) is a software suite to create, edit, and compose bitmap images. It can read, convert and write images diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index f95fa275d1..b787643fde 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 238ee17196fcb80bb58485910aaefc12d48f99e4043c2a28f06ff9588161c4e3 7.0.8-59.tar.gz -sha256 5b47db932754743460eba7a226aea85b63e3408d3c7affb4d0117f70c9594ded LICENSE +sha256 fc454be622724c6224fa6c8230bb9c50191a05fbf05b9c9c25aa3e5497090b83 imagemagick-7.0.11-13.tar.gz +sha256 040badb77b659e751ea16113490a937e1e01f3f5d32181e966b8982413533fb2 LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 5ef04973a6..a6eaf99887 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,11 +4,11 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.8-59 -IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz -IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive +IMAGEMAGICK_VERSION = 7.0.11-13 +IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE +IMAGEMAGICK_CPE_ID_VENDOR = imagemagick IMAGEMAGICK_INSTALL_STAGING = YES IMAGEMAGICK_CONFIG_SCRIPTS = \ @@ -32,9 +32,12 @@ IMAGEMAGICK_CONF_OPTS = \ --without-fpx \ --without-gslib \ --without-gvc \ + --without-heic \ --without-jbig \ + --without-jxl \ --without-lqr \ --without-openexr \ + --without-openjp2 \ --without-perl \ --without-raqm \ --without-wmf \ @@ -88,6 +91,13 @@ else IMAGEMAGICK_CONF_OPTS += --without-png endif +ifeq ($(BR2_PACKAGE_LIBRAW),y) +IMAGEMAGICK_CONF_OPTS += --with-raw +IMAGEMAGICK_DEPENDENCIES += libraw +else +IMAGEMAGICK_CONF_OPTS += --without-raw +endif + ifeq ($(BR2_PACKAGE_LIBRSVG),y) IMAGEMAGICK_CONF_OPTS += --with-rsvg IMAGEMAGICK_DEPENDENCIES += librsvg @@ -103,6 +113,20 @@ else IMAGEMAGICK_CONF_OPTS += --without-xml endif +ifeq ($(BR2_PACKAGE_LIBZIP),y) +IMAGEMAGICK_CONF_OPTS += --with-zip +IMAGEMAGICK_DEPENDENCIES += libzip +else +IMAGEMAGICK_CONF_OPTS += --without-zip +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +IMAGEMAGICK_CONF_OPTS += --with-zstd +IMAGEMAGICK_DEPENDENCIES += zstd +else +IMAGEMAGICK_CONF_OPTS += --without-zstd +endif + ifeq ($(BR2_PACKAGE_PANGO),y) IMAGEMAGICK_CONF_OPTS += --with-pango IMAGEMAGICK_DEPENDENCIES += pango @@ -163,13 +187,19 @@ HOST_IMAGEMAGICK_CONF_OPTS = \ --without-fpx \ --without-gslib \ --without-gvc \ + --without-heic \ --without-jbig \ + --without-jxl \ --without-lqr \ --without-openexr \ + --without-openjp2 \ --without-perl \ --without-raqm \ + --without-raw \ --without-wmf \ --without-x \ + --without-zip \ + --without-zstd \ --without-bzlib \ --without-fftw \ --without-lcms \ diff --git a/package/imlib2/imlib2.hash b/package/imlib2/imlib2.hash index c52ce9d2f4..690d836c2e 100644 --- a/package/imlib2/imlib2.hash +++ b/package/imlib2/imlib2.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.5.1/ -md5 390aa207693e051bb692f2db650c694b imlib2-1.5.1.tar.bz2 -sha1 3e97e7157380f0cfbdf4f3c950a7a00bdfa6072c imlib2-1.5.1.tar.bz2 +# From https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.7.3/ +md5 1e79055a0b8fe27d208b6f8bb1bde60c imlib2-1.7.3.tar.bz2 +sha1 3d55965f946d0b2754a84c8e57c78ddc227252c6 imlib2-1.7.3.tar.bz2 # Locally computed -sha256 fa4e57452b8843f4a70f70fd435c746ae2ace813250f8c65f977db5d7914baae imlib2-1.5.1.tar.bz2 -sha256 fb70339dd33a77b6213c7ae067fccf93d04af44ff3f937c61f8863f7970e73f6 COPYING -sha256 8c9a2e92ed4937e2d30c2ea95439c36ed3002fc47e34efee43455a460fee8ef5 COPYING-PLAIN +sha256 158d0b8c20bc11221af9e77a64a116fca7051b03cdea2c4f31d31f469382f997 imlib2-1.7.3.tar.bz2 +sha256 fb70339dd33a77b6213c7ae067fccf93d04af44ff3f937c61f8863f7970e73f6 COPYING +sha256 8c9a2e92ed4937e2d30c2ea95439c36ed3002fc47e34efee43455a460fee8ef5 COPYING-PLAIN diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk index 1c2e924d50..89b4769f92 100644 --- a/package/imlib2/imlib2.mk +++ b/package/imlib2/imlib2.mk @@ -4,11 +4,12 @@ # ################################################################################ -IMLIB2_VERSION = 1.5.1 +IMLIB2_VERSION = 1.7.3 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2 IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION) IMLIB2_LICENSE = Imlib2 IMLIB2_LICENSE_FILES = COPYING COPYING-PLAIN +IMLIB2_CPE_ID_VENDOR = enlightenment IMLIB2_INSTALL_STAGING = YES IMLIB2_DEPENDENCIES = host-pkgconf freetype diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash index 6d5a329ed5..88fac9bb39 100644 --- a/package/imx-mkimage/imx-mkimage.hash +++ b/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a7e4c1c45b0d36e088bd7891335aa3c726682750984b7ca072e3c6329def92cf imx-mkimage-rel_imx_4.19.35_1.1.0.tar.gz -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 2746136aa5ed79ba24cfbe877d29022a2a33f6614b1bba728e95d1b2f0448196 imx-mkimage-rel_imx_5.4.70_2.3.0-br1.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index 270ef2ee01..17ba3596f7 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -4,14 +4,14 @@ # ################################################################################ -IMX_MKIMAGE_VERSION = rel_imx_4.19.35_1.1.0 +IMX_MKIMAGE_VERSION = rel_imx_5.4.70_2.3.0 IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage IMX_MKIMAGE_SITE_METHOD = git IMX_MKIMAGE_LICENSE = GPL-2.0+ IMX_MKIMAGE_LICENSE_FILES = COPYING HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM),y) +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP),y) # i.MX8M needs a different binary define HOST_IMX_MKIMAGE_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ diff --git a/package/imx-usb-loader/Config.in b/package/imx-usb-loader/Config.in index 1cc0dd8c25..9a152e0918 100644 --- a/package/imx-usb-loader/Config.in +++ b/package/imx-usb-loader/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_IMX_USB_LOADER bool "imx-usb-loader" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help This package contains tools to download and execute code @@ -9,5 +10,6 @@ config BR2_PACKAGE_IMX_USB_LOADER https://github.com/boundarydevices/imx_usb_loader -comment "imx-usb-loader needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "imx-usb-loader needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/imx-usb-loader/Config.in.host b/package/imx-usb-loader/Config.in.host index 04bd4cc018..78c5edea3f 100644 --- a/package/imx-usb-loader/Config.in.host +++ b/package/imx-usb-loader/Config.in.host @@ -1,9 +1,14 @@ config BR2_PACKAGE_HOST_IMX_USB_LOADER bool "host imx-usb-loader" depends on BR2_arm || BR2_aarch64 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help This package contains tools to download and execute code on Freescale i.MX5x/6x/7x/8x and Vybrid SoCs through the Serial Download Protocol. https://github.com/boundarydevices/imx_usb_loader + +comment "host imx-usb-loader needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm || BR2_aarch64 + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/imx-usb-loader/imx-usb-loader.hash b/package/imx-usb-loader/imx-usb-loader.hash index 182116a25f..7e1c097143 100644 --- a/package/imx-usb-loader/imx-usb-loader.hash +++ b/package/imx-usb-loader/imx-usb-loader.hash @@ -1,3 +1,3 @@ # locally computed -sha256 5a17886042c09f0f16093031183a287a2a7ae0fa9cd8bdfa31e7b31cb92510d9 imx-usb-loader-4aa9809099dcece9a9225776321f3b4b5b896d78.tar.gz +sha256 4357907c9669874d3ccbf00395bf0b1733c26e6daea85d721f1c0cd897f4162c imx-usb-loader-30b43d69770cd69e84c045dc9dcabb1f3e9d975a.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/imx-usb-loader/imx-usb-loader.mk b/package/imx-usb-loader/imx-usb-loader.mk index 594bbb9ca1..1a09486928 100644 --- a/package/imx-usb-loader/imx-usb-loader.mk +++ b/package/imx-usb-loader/imx-usb-loader.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_USB_LOADER_VERSION = 4aa9809099dcece9a9225776321f3b4b5b896d78 +IMX_USB_LOADER_VERSION = 30b43d69770cd69e84c045dc9dcabb1f3e9d975a IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION)) IMX_USB_LOADER_LICENSE = LGPL-2.1+ diff --git a/package/inadyn/inadyn.hash b/package/inadyn/inadyn.hash index 8480e449ca..638f92d119 100644 --- a/package/inadyn/inadyn.hash +++ b/package/inadyn/inadyn.hash @@ -1,6 +1,5 @@ -# From https://github.com/troglobit/inadyn/releases/download/v2.7/inadyn-2.7.tar.xz.md5 -md5 3ab125df504a9755264a9ebeedbfa4de inadyn-2.7.tar.xz +# From https://github.com/troglobit/inadyn/releases/download/v2.8.1/inadyn-2.8.1.tar.xz.sha256 +sha256 1185a9fb165bfc5f5b5f66f0dd8a695c9bd78d4b20cd162273eeea77f2d2e685 inadyn-2.8.1.tar.xz # Locally computed -sha256 eb03bc9d9c09dfbbc651b43a2eb5a967d0454a8293576df23784710dac50c6a4 inadyn-2.7.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk index 7888f5a360..c115e8926d 100644 --- a/package/inadyn/inadyn.mk +++ b/package/inadyn/inadyn.mk @@ -4,7 +4,7 @@ # ################################################################################ -INADYN_VERSION = 2.7 +INADYN_VERSION = 2.8.1 INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION) INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz INADYN_LICENSE = GPL-2.0+ diff --git a/package/inotify-tools/Config.in b/package/inotify-tools/Config.in index 1ca01b6e1e..6b113d9e42 100644 --- a/package/inotify-tools/Config.in +++ b/package/inotify-tools/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_INOTIFY_TOOLS filesystem events. Provides the 'inotifywait' and 'inotifywatch' binaries. - https://github.com/rvoicilas/inotify-tools + https://github.com/inotify-tools/inotify-tools diff --git a/package/inotify-tools/inotify-tools.hash b/package/inotify-tools/inotify-tools.hash index 83dc22b4a2..5984827f8b 100644 --- a/package/inotify-tools/inotify-tools.hash +++ b/package/inotify-tools/inotify-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242ac inotify-tools-3.20.1.tar.gz -sha256 e41fc126320a79ed53b5aa3386f059f7d10770856d6fd714ab80a96ce6bd09d6 COPYING +sha256 c5b018567814ea555d716f518b6e3ae243c733f7bd3e8585d81748a6da286f3c inotify-tools-3.20.2.2.tar.gz +sha256 e41fc126320a79ed53b5aa3386f059f7d10770856d6fd714ab80a96ce6bd09d6 COPYING diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk index 63626307c2..b410ade33d 100644 --- a/package/inotify-tools/inotify-tools.mk +++ b/package/inotify-tools/inotify-tools.mk @@ -4,11 +4,10 @@ # ################################################################################ -INOTIFY_TOOLS_VERSION = 3.20.1 -INOTIFY_TOOLS_SITE = $(call github,rvoicilas,inotify-tools,$(INOTIFY_TOOLS_VERSION)) +INOTIFY_TOOLS_VERSION = 3.20.2.2 +INOTIFY_TOOLS_SITE = https://github.com/inotify-tools/inotify-tools/releases/download/$(INOTIFY_TOOLS_VERSION) INOTIFY_TOOLS_LICENSE = GPL-2.0+ INOTIFY_TOOLS_LICENSE_FILES = COPYING INOTIFY_TOOLS_INSTALL_STAGING = YES -INOTIFY_TOOLS_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 1e8baba6c7..2f50646677 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bb874b41c499abb8f6253b1834e93a02ed9744de71f2503ee9cd4100af7c1860 intel-gmmlib-19.4.1.tar.gz -sha256 b61d639c5d84ec710ffcf5600ac92f8a4ace66670c1f9bd921f3bde671d36033 LICENSE.md +sha256 912cd86e4cb564b6fa549d69a28b72b9cdcb5a3eab9320955ed70ac37381fc2f intel-gmmlib-21.2.1.tar.gz +sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 517fc09131..451eec7287 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 19.4.1 +INTEL_GMMLIB_VERSION = 21.2.1 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md diff --git a/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch b/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch index bc29203317..376308ea42 100644 --- a/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch +++ b/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch @@ -17,27 +17,27 @@ diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt index 44ce4f08..b462fbea 100644 --- a/cmrtlib/linux/CMakeLists.txt +++ b/cmrtlib/linux/CMakeLists.txt -@@ -26,11 +26,11 @@ set(LIBRARY_OUTPUT_PATH ${MDF_OPTION__OUTPUT_DIR}) +@@ -32,11 +32,11 @@ + endif() # Set up compile options that will be used for the Linux build - if(CMAKE_COMPILER_IS_GNUCC) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -fstack-protector-all -Werror") -- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror") -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing ") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -fstack-protector-all -Werror") -- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror") +-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -Werror") ++set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror") +-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -Werror") ++set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") - set(GCC_SECURE_LINK_FLAGS "-z relro -z now") + set(GCC_SECURE_LINK_FLAGS "-z relro -z now") diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake index 9e85fdb2..c45ce11b 100755 --- a/media_driver/cmake/linux/media_compile_flags_linux.cmake +++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake -@@ -64,7 +64,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON +@@ -47,7 +47,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON # Other common flags -fmessage-length=0 -fvisibility=hidden @@ -45,11 +45,19 @@ index 9e85fdb2..c45ce11b 100755 -fdata-sections -ffunction-sections -Wl,--gc-sections +@@ -119,7 +118,6 @@ + set(MEDIA_COMPILER_FLAGS_RELEASE + ${MEDIA_COMPILER_FLAGS_RELEASE} + -O2 +- -D_FORTIFY_SOURCE=2 + -fno-omit-frame-pointer + ) + endif() diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake index 3491db1e..b30fa04a 100755 --- a/media_driver/media_top_cmake.cmake +++ b/media_driver/media_top_cmake.cmake -@@ -88,7 +88,7 @@ if(MEDIA_BUILD_FATAL_WARNINGS) +@@ -105,7 +105,7 @@ if(MEDIA_BUILD_FATAL_WARNINGS) set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror") endif() diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in index 35117f7712..2d5adbcf59 100644 --- a/package/intel-mediadriver/Config.in +++ b/package/intel-mediadriver/Config.in @@ -6,12 +6,10 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d depends on BR2_TOOLCHAIN_HAS_THREADS # libva depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d - depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_INTEL_GMMLIB select BR2_PACKAGE_LIBPCIACCESS select BR2_PACKAGE_LIBVA select BR2_PACKAGE_MESA3D - select BR2_PACKAGE_XLIB_LIBX11 help The Intel(R) Media Driver for VAAPI is a new VA-API (Video Acceleration API) user mode driver supporting hardware @@ -20,10 +18,6 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER https://github.com/intel/media-driver -comment "intel-mediadriver needs X.org" - depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 - depends on !BR2_PACKAGE_XORG7 - comment "intel-mediadriver needs a toolchain w/ dynamic library, C++, NPTL" depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 5d016695ae..74dc397041 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a03bd75eefe9cb0245e3aab2723b3fef555d9f180a180b2c29d7b12d483d9ec2 intel-media-19.4.0r.tar.gz -sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md +sha256 7b190a980447284508969da38971cfdaaf6e69d840d49e81f5969e124bf17e16 intel-media-21.2.3.tar.gz +sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index c3157867ed..31087776e9 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 19.4.0r +INTEL_MEDIADRIVER_VERSION = 21.2.3 INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause @@ -16,15 +16,17 @@ INTEL_MEDIADRIVER_DEPENDENCIES = \ intel-gmmlib \ libpciaccess \ libva \ - mesa3d \ - xlib_libX11 + mesa3d + +ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +INTEL_MEDIADRIVER_DEPENDENCIES += xlib_libX11 +endif INTEL_MEDIADRIVER_SUPPORTS_IN_SOURCE_BUILD = NO INTEL_MEDIADRIVER_CONF_OPTS = \ - -DBUILD_ALONG_WITH_CMRTLIB=1 \ - -DINSTALL_DRIVERS_SYSCONF=OFF \ - -DMEDIA_RUN_TEST_SUITE=OFF \ - -DRUN_TEST_SUITE=OFF + -DINSTALL_DRIVER_SYSCONF=OFF \ + -DMEDIA_BUILD_FATAL_WARNINGS=OFF \ + -DMEDIA_RUN_TEST_SUITE=OFF $(eval $(cmake-package)) diff --git a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch index a33c218c0a..a7e3b70294 100644 --- a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch +++ b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch @@ -7,6 +7,8 @@ This allows the environment to decide whether SSP should be used or not, for example to support toolchains that don't have SSP support. Signed-off-by: Thomas Petazzoni +[Bernd: rebased for 21.2.3] +Signed-off-by: Bernd Kuhls --- api/mfx_dispatch/linux/CMakeLists.txt | 2 +- builder/FindPackages.cmake | 4 ++-- @@ -16,7 +18,7 @@ diff --git a/api/mfx_dispatch/linux/CMakeLists.txt b/api/mfx_dispatch/linux/CMak index 15a4bd9a..4415f840 100644 --- a/api/mfx_dispatch/linux/CMakeLists.txt +++ b/api/mfx_dispatch/linux/CMakeLists.txt -@@ -100,7 +100,7 @@ target_link_libraries(mfx dl) +@@ -101,7 +101,7 @@ target_link_libraries(mfx dl) get_api_version(MFX_VERSION_MAJOR MFX_VERSION_MINOR) set_target_properties( mfx PROPERTIES LINK_FLAGS @@ -38,7 +40,7 @@ index 7e36ae2d..5b8b9b9d 100644 # message( STATUS "Libva located at: ${PKG_LIBVA_LIBRARY_DIRS}" ) if( ARGV1 MATCHES hw AND Linux ) -@@ -448,7 +448,7 @@ function(configure_dependencies target dependencies variant) +@@ -445,7 +445,7 @@ function(configure_dependencies target dependencies variant) endforeach() set(SCOPE_CFLAGS ${SCOPE_CFLAGS} PARENT_SCOPE) diff --git a/package/intel-mediasdk/Config.in b/package/intel-mediasdk/Config.in index 05293d7604..c1f609e3f8 100644 --- a/package/intel-mediasdk/Config.in +++ b/package/intel-mediasdk/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_INTEL_MEDIASDK depends on BR2_TOOLCHAIN_HAS_SYNC_1 # intel-mediadriver depends on BR2_TOOLCHAIN_HAS_THREADS # intel-mediadriver depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # intel-mediadriver - depends on BR2_PACKAGE_XORG7 # intel-mediadriver select BR2_PACKAGE_INTEL_MEDIADRIVER select BR2_PACKAGE_LIBDRM_INTEL help @@ -21,10 +20,6 @@ config BR2_PACKAGE_INTEL_MEDIASDK http://mediasdk.intel.com/ -comment "intel-mediasdk needs X.org" - depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 - depends on !BR2_PACKAGE_XORG7 - comment "intel-mediasdk needs a toolchain w/ dynamic library, C++, NPTL" depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index 103c8bb52d..7ae892b3bf 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 289a40ffe73dc291461d97edf452bdc622f76e52666483fd1eb4f131d2921cd1 intel-mediasdk-19.4.0.tar.gz -sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE +sha256 7791be83e5e9f6d55f31d6ad9037012fc78b846724644b9db2087d1b7dfec078 intel-mediasdk-21.2.3.tar.gz +sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index a2ffe081db..0aff54cafe 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 19.4.0 +INTEL_MEDIASDK_VERSION = 21.2.3 INTEL_MEDIASDK_SITE = http://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE @@ -12,6 +12,9 @@ INTEL_MEDIASDK_LICENSE_FILES = LICENSE INTEL_MEDIASDK_INSTALL_STAGING = YES INTEL_MEDIASDK_DEPENDENCIES = intel-mediadriver -INTEL_MEDIASDK_CONF_OPTS = -DMFX_INCLUDE="$(@D)/api/include" +INTEL_MEDIASDK_CONF_OPTS = \ + -DBUILD_SAMPLES=OFF \ + -DBUILD_TUTORIALS=OFF \ + -DMFX_INCLUDE="$(@D)/api/include" $(eval $(cmake-package)) diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index f9fce28b2d..6687d4c0eb 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0000f7cf96f2b07a1ba9d1fc0bcfcb49d0edb91f7d487a57a88c147e57c5873b intel-microcode-20191112.tar.gz -sha256 1f8bf63fc2b1b486c507b98ff7d283c7eb58c7945746b94188a310d6787cbee5 license +sha256 fd85b6b769efd029dec6a2c07106fd18fb4dcb548b7bc4cde09295a8344ef6d7 intel-microcode-20210608.tar.gz +sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 0492ace69e..af7f6fa804 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20191112 +INTEL_MICROCODE_VERSION = 20210608 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 @@ -27,4 +27,9 @@ else INTEL_MICROCODE_INSTALL_TARGET = NO endif +define INTEL_MICROCODE_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) + $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +endef + $(eval $(generic-package)) diff --git a/package/iodine/iodine.mk b/package/iodine/iodine.mk index 711d709c1d..521ca3d927 100644 --- a/package/iodine/iodine.mk +++ b/package/iodine/iodine.mk @@ -9,6 +9,8 @@ IODINE_SITE = http://code.kryo.se/iodine IODINE_DEPENDENCIES = zlib IODINE_LICENSE = MIT IODINE_LICENSE_FILES = README +IODINE_CPE_ID_VENDOR = kryo +IODINE_SELINUX_MODULES = iodine IODINE_CFLAGS = $(TARGET_CFLAGS) diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index f2f40473c3..61e8ff3abe 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6155850d1019f2450dc926bbdb5a24abf423ee3bb928ab1e68569cf60a908584 iozone3_489.tar +sha256 5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145ad4fed iozone3_490.tar diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index a491faf9d4..32d57ea76e 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,8 +4,8 @@ # ################################################################################ -IOZONE_VERSION = 3_489 -IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar +IOZONE_VERSION = 3.490 +IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) # IOzone license details can be found at: diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index 7088b0f152..5df94a1f63 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -8,6 +8,8 @@ IPERF_VERSION = 2.0.13 IPERF_SITE = http://downloads.sourceforge.net/project/iperf2 IPERF_LICENSE = MIT-like IPERF_LICENSE_FILES = COPYING +IPERF_CPE_ID_VENDOR = iperf2_project +IPERF_CPE_ID_PRODUCT = iperf2 IPERF_CONF_OPTS = \ --disable-web100 diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index 2e6cfd5ab9..c96d68cd99 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.7.tar.gz.sha256 -sha256 d846040224317caf2f75c843d309a950a7db23f9b44b94688ccbe557d6d1710c iperf-3.7.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.10.1.tar.gz.sha256 +sha256 03bc9760cc54a245191d46bfc8edaf8a4750f0e87abca6764486972044d6715a iperf-3.10.1.tar.gz # Locally computed -sha256 ee58f1e69139d39cfb055df15fe84453a379936dd45e44dbebf26c78afa3f5d4 LICENSE +sha256 0e1cb1921904626f0d3e86cacc0e28333140f0f9957267cff0b9d185645743ed LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 3537b23824..8c57c61fce 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,16 +4,15 @@ # ################################################################################ -IPERF3_VERSION = 3.7 +IPERF3_VERSION = 3.10.1 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT IPERF3_LICENSE_FILES = LICENSE +IPERF3_CPE_ID_VENDOR = es IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -IPERF3_CONF_OPTS += --disable-profiling - ifeq ($(BR2_PACKAGE_OPENSSL),y) # We intentionally don't pass --with-openssl, otherwise pkg-config is # not used, and indirect libraries are not picked up when static diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index 5254668877..facd97a0b8 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -9,6 +9,15 @@ IPMITOOL_SOURCE = ipmitool-$(IPMITOOL_VERSION).tar.bz2 IPMITOOL_SITE = http://downloads.sourceforge.net/project/ipmitool/ipmitool/$(IPMITOOL_VERSION) IPMITOOL_LICENSE = BSD-3-Clause IPMITOOL_LICENSE_FILES = COPYING +IPMITOOL_CPE_ID_VENDOR = ipmitool_project + +# 0008-fru-Fix-buffer-overflow-vulnerabilities.patch +# 0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch +# 0010-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch +# 0011-channel-Fix-buffer-overflow.patch +# 0012-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch +# 0013-fru-sdr-Fix-id_string-buffer-overflows.patch +IPMITOOL_IGNORE_CVES += CVE-2020-5208 ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y) IPMITOOL_DEPENDENCIES += openssl diff --git a/package/ipmiutil/ipmiutil.hash b/package/ipmiutil/ipmiutil.hash index 3f89b9049c..f87c2762de 100644 --- a/package/ipmiutil/ipmiutil.hash +++ b/package/ipmiutil/ipmiutil.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ipmiutil/files/ -md5 0d448d14726e2fda0eb9451fb2866a5c ipmiutil-3.1.3.tar.gz -sha1 d20cb3194f4c5cb8c9fd64b3693d5b53dc9510d4 ipmiutil-3.1.3.tar.gz +md5 fab260bc834a0f3f9324a6365fc26eca ipmiutil-3.1.7.tar.gz +sha1 a0cd29820b15166120eb4a51e6239bfa6f9c65dd ipmiutil-3.1.7.tar.gz # Locally computed -sha256 b80303b6f05cbe48e728dd925fef201e9604a90cd3fc9c8af113367e8d6dbe57 ipmiutil-3.1.3.tar.gz -sha256 7e0ec8238aa1431e95a4950032a4483fe33fec3fac348eaade5856cdc5ae3e39 COPYING +sha256 911fd6f8b33651b98863d57e678d2fc593bc43fcd2a21f5dc7d5db8f92128a9a ipmiutil-3.1.7.tar.gz +sha256 7e0ec8238aa1431e95a4950032a4483fe33fec3fac348eaade5856cdc5ae3e39 COPYING diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index 9633914e11..4c9de26583 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -4,15 +4,19 @@ # ################################################################################ -IPMIUTIL_VERSION = 3.1.3 +IPMIUTIL_VERSION = 3.1.7 IPMIUTIL_SITE = https://sourceforge.net/projects/ipmiutil/files IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING -# We're patching configure.ac -IPMIUTIL_AUTORECONF = YES IPMIUTIL_MAKE = $(MAKE1) +# aclocal.m4 is newer than config.h.in. Touch the latter to avoid autoreconf +define IPMIUTIL_TOUCH_CONFIG_H_IN + touch $(@D)/config.h.in +endef +IPMIUTIL_PRE_CONFIGURE_HOOKS += IPMIUTIL_TOUCH_CONFIG_H_IN + # forgets to link against libcrypto dependencies breaking static link ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) # tests against distro libcrypto so it might get a false positive when diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index c451cfa941..de4d09a3c1 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 bac543435cac208a11db44c9cc8e35aa902befef8750594654ee71941c388f7b iproute2-5.5.0.tar.xz -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 72a2e53774cac9e65f7b617deebb2059f87e8960d6e9713e4d788cea966f1b36 iproute2-5.13.0.tar.xz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index a2e2d25d81..46d3662767 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,18 +4,27 @@ # ################################################################################ -IPROUTE2_VERSION = 5.5.0 +IPROUTE2_VERSION = 5.13.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ $(if $(BR2_PACKAGE_LIBMNL),libmnl) IPROUTE2_LICENSE = GPL-2.0+ IPROUTE2_LICENSE_FILES = COPYING +IPROUTE2_CPE_ID_VENDOR = iproute2_project ifeq ($(BR2_PACKAGE_ELFUTILS),y) IPROUTE2_DEPENDENCIES += elfutils endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +IPROUTE2_DEPENDENCIES += libcap +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +IPROUTE2_DEPENDENCIES += libselinux +endif + ifeq ($(BR2_PACKAGE_IPTABLES)x$(BR2_STATIC_LIBS),yx) IPROUTE2_DEPENDENCIES += iptables else diff --git a/package/iprutils/iprutils.hash b/package/iprutils/iprutils.hash index 423943b22d..bcad6e6d01 100644 --- a/package/iprutils/iprutils.hash +++ b/package/iprutils/iprutils.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.15/ -md5 e4011051bba7470df3936cbba7dced98 iprutils-2.4.15.1.tar.gz -sha1 ed6c362ee3c6bd9023ee60d0d1a1ce5543c27c41 iprutils-2.4.15.1.tar.gz +# From https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.18/ +md5 df733f504dd4f96abf3272f679b25311 iprutils-2.4.18.1.tar.gz +sha1 701a1a9af6890d333904a92f0b01c26b92f821fa iprutils-2.4.18.1.tar.gz # Locally computed: -sha256 a733e65f8fb19565f2ef5191eaa2a14d816fabed0fc254ab4bbf1a4c7800ebe5 iprutils-2.4.15.1.tar.gz -sha256 59b4179e61248aff9cd2d6ee4cd1dbbd0ef48836fe2eeee19f4b16459785104a LICENSE +sha256 1c26aee3bf95517fcb844f35ff2711a39b46cbfb50619db1d792c93eeee6f43d iprutils-2.4.18.1.tar.gz +sha256 59b4179e61248aff9cd2d6ee4cd1dbbd0ef48836fe2eeee19f4b16459785104a LICENSE diff --git a/package/iprutils/iprutils.mk b/package/iprutils/iprutils.mk index 1165b3db0f..9595125ac9 100644 --- a/package/iprutils/iprutils.mk +++ b/package/iprutils/iprutils.mk @@ -4,11 +4,13 @@ # ################################################################################ -IPRUTILS_VERSION_MAJOR = 2.4.15 +IPRUTILS_VERSION_MAJOR = 2.4.18 IPRUTILS_VERSION = $(IPRUTILS_VERSION_MAJOR).1 IPRUTILS_SITE = https://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/$(IPRUTILS_VERSION_MAJOR) IPRUTILS_DEPENDENCIES = ncurses libsysfs pciutils zlib IPRUTILS_LICENSE = Common Public License Version 1.0 IPRUTILS_LICENSE_FILES = LICENSE +# We"re patching configure.ac +IPRUTILS_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/package/ipset/ipset.hash b/package/ipset/ipset.hash index fb200585d1..afe83f6dce 100644 --- a/package/ipset/ipset.hash +++ b/package/ipset/ipset.hash @@ -1,6 +1,4 @@ -# From http://ipset.netfilter.org/ipset-7.6.tar.bz2.md5sum.txt -md5 e107b679c3256af795261cece864d6d9 ipset-7.6.tar.bz2 -# Calculated based on the hash above -sha256 0e7d44caa9c153d96a9b5f12644fbe35a632537a5a7f653792b72e53d9d5c2db ipset-7.6.tar.bz2 +# From https://ipset.netfilter.org/ipset-7.11.tar.bz2.sha512sum.txt +sha512 20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922 ipset-7.11.tar.bz2 # Locally calculated -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index 869763d322..07f865d4ec 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -4,13 +4,15 @@ # ################################################################################ -IPSET_VERSION = 7.6 +IPSET_VERSION = 7.11 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf IPSET_CONF_OPTS = --with-kmod=no IPSET_LICENSE = GPL-2.0 IPSET_LICENSE_FILES = COPYING +IPSET_CPE_ID_VENDOR = netfilter IPSET_INSTALL_STAGING = YES +IPSET_SELINUX_MODULES = iptables $(eval $(autotools-package)) diff --git a/package/iptables/iptables.hash b/package/iptables/iptables.hash index 2e149aa11b..7f14413931 100644 --- a/package/iptables/iptables.hash +++ b/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80 iptables-1.8.3.tar.bz2 +sha256 c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0 iptables-1.8.7.tar.bz2 # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index ae5cf4ddd3..ca8178425e 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.3 +IPTABLES_VERSION = 1.8.7 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES @@ -12,6 +12,9 @@ IPTABLES_DEPENDENCIES = host-pkgconf \ $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) IPTABLES_LICENSE = GPL-2.0 IPTABLES_LICENSE_FILES = COPYING +IPTABLES_CPE_ID_VENDOR = netfilter +IPTABLES_SELINUX_MODULES = iptables + # Building static causes ugly warnings on some plugins IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr \ $(if $(BR2_STATIC_LIBS),,--disable-static) @@ -47,4 +50,11 @@ else IPTABLES_CONF_OPTS += --disable-bpf-compiler --disable-nfsynproxy endif +define IPTABLES_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES) +endef + $(eval $(autotools-package)) diff --git a/package/iptraf-ng/Config.in b/package/iptraf-ng/Config.in index 5c3b4848b9..5c61b7c0e2 100644 --- a/package/iptraf-ng/Config.in +++ b/package/iptraf-ng/Config.in @@ -1,13 +1,17 @@ config BR2_PACKAGE_IPTRAF_NG bool "iptraf-ng" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 select BR2_PACKAGE_NCURSES help - IPTraf-ng is a ncurses-based network monitoring utility. It - gathers data like TCP connection packet and byte counts, - interface statistics and activity indicators. + IPTraf-ng is a console-based network monitoring program for + Linux that gathers displays information about IP traffic. - https://fedorahosted.org/iptraf-ng/ + https://github.com/iptraf-ng/iptraf-ng IPTraf-ng is a fork of original IPTraf v3.0.0 (http://iptraf.seul.org). + +comment "iptraf-ng needs a toolchain w/ kernel headers >= 3.14" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 diff --git a/package/iptraf-ng/iptraf-ng.hash b/package/iptraf-ng/iptraf-ng.hash index 0a257ec2fd..314d5cee29 100644 --- a/package/iptraf-ng/iptraf-ng.hash +++ b/package/iptraf-ng/iptraf-ng.hash @@ -1,4 +1,3 @@ -# From https://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-1.1.4.tar.gz.sum -sha1 a2e51b0dd6b8c80583fc25d055850c96b3d2f544 iptraf-ng-1.1.4.tar.gz # Locally computed +sha256 9f5cef584065420dea1ba32c86126aede1fa9bd25b0f8362b0f9fd9754f00870 iptraf-ng-1.2.1.tar.gz sha256 4e49bef38f621aac4a870da4b30011c7b7abc7256b218daec1c425b08448ae1e LICENSE diff --git a/package/iptraf-ng/iptraf-ng.mk b/package/iptraf-ng/iptraf-ng.mk index ac572b9eef..044630be41 100644 --- a/package/iptraf-ng/iptraf-ng.mk +++ b/package/iptraf-ng/iptraf-ng.mk @@ -4,16 +4,21 @@ # ################################################################################ -IPTRAF_NG_VERSION = 1.1.4 -IPTRAF_NG_SITE = https://fedorahosted.org/releases/i/p/iptraf-ng +IPTRAF_NG_VERSION = 1.2.1 +IPTRAF_NG_SITE = $(call github,iptraf-ng,iptraf-ng,v$(IPTRAF_NG_VERSION)) IPTRAF_NG_LICENSE = GPL-2.0+ IPTRAF_NG_LICENSE_FILES = LICENSE IPTRAF_NG_DEPENDENCIES = ncurses -IPTRAF_NG_MAKE_ENV = \ - NCURSES_LDFLAGS="-lpanel -lncurses" +define IPTRAF_NG_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + NCURSES_LDFLAGS="-lpanel -lncurses" \ + -C $(@D) +endef -IPTRAF_NG_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" +define IPTRAF_NG_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + prefix=/usr DESTDIR=$(TARGET_DIR) install +endef -$(eval $(autotools-package)) +$(eval $(generic-package)) diff --git a/package/iputils/Config.in b/package/iputils/Config.in index b5d9141a7d..0d4a4ba3f8 100644 --- a/package/iputils/Config.in +++ b/package/iputils/Config.in @@ -7,3 +7,70 @@ config BR2_PACKAGE_IPUTILS etc. https://github.com/iputils/iputils + +if BR2_PACKAGE_IPUTILS + +config BR2_PACKAGE_IPUTILS_ARPING + bool "arping" + default y + help + Installs arping. + +config BR2_PACKAGE_IPUTILS_CLOCKDIFF + bool "clockdiff" + default y + help + Installs clockdiff. + +config BR2_PACKAGE_IPUTILS_PING + bool "ping" + default y + help + Installs ping. + +config BR2_PACKAGE_IPUTILS_RARPD + bool "rarpd" + help + Installs rarpd. + +config BR2_PACKAGE_IPUTILS_RDISC + bool "rdisc" + default y + help + Installs rdisc. + +config BR2_PACKAGE_IPUTILS_RDISC_SERVER + bool "rdisc (server code)" + default y + depends on BR2_PACKAGE_IPUTILS_RDISC + help + Builds rdisc with server code. + +config BR2_PACKAGE_IPUTILS_TFTPD + bool "tftpd" + help + Installs tftpd. + +config BR2_PACKAGE_IPUTILS_TRACEPATH + bool "tracepath" + default y + help + Installs tracepath. + +config BR2_PACKAGE_IPUTILS_TRACEROUTE6 + bool "traceroute6" + default y + help + Installs traceroute6. + +config BR2_PACKAGE_IPUTILS_NINFOD + bool "ninfod" + default y + depends on BR2_TOOLCHAIN_HAS_THREADS # ninfod requires + help + Installs ninfod. + +comment "ninfod needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +endif diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index 3630ae8678..3eafc7ab4e 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,5 +1,5 @@ -# https://github.com/iputils/iputils/releases/download/s20190709/sha256sum.asc -sha256 a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a iputils-20190709.tar.gz +# https://github.com/iputils/iputils/releases/download/20210722/sha256sum.asc +sha256 6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323 iputils-20210722.tar.gz # Locally computed sha256 b8ea785d12fa6a44916601104dd746216957e93f13a26d3eb858b3b5a4ad66ab LICENSE sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 0d260891e2..5721436221 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -11,12 +11,86 @@ # and IPv6 updates. # http://www.spinics.net/lists/netdev/msg279881.html -IPUTILS_VERSION = 20190709 -IPUTILS_SITE = $(call github,iputils,iputils,s$(IPUTILS_VERSION)) +IPUTILS_VERSION = 20210722 +IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 +IPUTILS_CPE_ID_VENDOR = iputils_project IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +# Selectively build binaries +IPUTILS_CONF_OPTS += \ + -DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \ + -DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \ + -DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \ + -DENABLE_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \ + -DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \ + -DBUILD_TRACEROUTE6=$(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),true,false) \ + -DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \ + -DSKIP_TESTS=true + +# Selectively select the appropriate SELinux refpolicy modules +IPUTILS_SELINUX_MODULES = \ + $(if $(BR2_PACKAGE_IPUTILS_ARPING),netutils) \ + $(if $(BR2_PACKAGE_IPUTILS_PING),netutils) \ + $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) \ + $(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),netutils) \ + $(if $(BR2_PACKAGE_IPUTILS_RDISC),rdisc) \ + $(if $(BR2_PACKAGE_IPUTILS_TFTPD),tftp) + +# +# arping +# +ifeq ($(BR2_PACKAGE_IPUTILS_ARPING),y) +IPUTILS_CONF_OPTS += -DBUILD_ARPING=true + +# move some binaries to the same location as where Busybox installs +# the corresponding applets, so that we have a single version of the +# tools (from iputils) +define IPUTILS_MOVE_ARPING_BINARY + mv $(TARGET_DIR)/usr/bin/arping $(TARGET_DIR)/usr/sbin/arping +endef +IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_ARPING_BINARY + +else +IPUTILS_CONF_OPTS += -DBUILD_ARPING=false +endif + +# +# ping +# +ifeq ($(BR2_PACKAGE_IPUTILS_PING),y) +IPUTILS_CONF_OPTS += -DBUILD_PING=true + +# same reason to move the ping binary as for arping +ifeq ($(BR2_ROOTFS_MERGED_USR),) +define IPUTILS_MOVE_PING_BINARY + mv $(TARGET_DIR)/usr/bin/ping $(TARGET_DIR)/bin/ping +endef +IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_PING_BINARY +endif + +# upstream requires distros to create symlink +define IPUTILS_CREATE_PING6_SYMLINK + ln -sf ping $(TARGET_DIR)/bin/ping6 +endef +IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_CREATE_PING6_SYMLINK + +else +IPUTILS_CONF_OPTS += -DBUILD_PING=false +endif + +# +# tftpd +# +ifeq ($(BR2_PACKAGE_IPUTILS_TFTPD),y) +IPUTILS_CONF_OPTS += -DBUILD_TFTPD=true + +else +IPUTILS_CONF_OPTS += -DBUILD_TFTPD=false +endif + +# Handle libraries ifeq ($(BR2_PACKAGE_LIBCAP),y) IPUTILS_CONF_OPTS += -DUSE_CAP=true IPUTILS_DEPENDENCIES += libcap @@ -31,85 +105,45 @@ else IPUTILS_CONF_OPTS += -DUSE_IDN=false endif -ifeq ($(BR2_PACKAGE_NETTLE),y) -IPUTILS_CONF_OPTS += -DUSE_CRYPTO=nettle -IPUTILS_DEPENDENCIES += nettle -else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -IPUTILS_CONF_OPTS += -DUSE_CRYPTO=gcrypt -IPUTILS_DEPENDENCIES += libgcrypt -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -IPUTILS_CONF_OPTS += -DUSE_CRYPTO=openssl -IPUTILS_DEPENDENCIES += openssl -else ifeq ($(BR2_PACKAGE_LINUX_HEADERS),y) -IPUTILS_CONF_OPTS += -DUSE_CRYPTO=kernel -IPUTILS_DEPENDENCIES += linux-headers -else -IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none -# BUILD_NINFOD=true and USE_CRYPTO=none cannot be combined -IPUTILS_NINFOD = n -endif - ifeq ($(BR2_PACKAGE_SYSTEMD),y) IPUTILS_DEPENDENCIES += systemd endif -# ninfod requires -ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -IPUTILS_NINFOD = n -endif - -ifeq ($(IPUTILS_NINFOD),n) -IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false -else -IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true -endif - ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) IPUTILS_CONF_OPTS += -DUSE_GETTEXT=true else IPUTILS_CONF_OPTS += -DUSE_GETTEXT=false endif -IPUTILS_CONF_OPTS += -DBUILD_TRACEROUTE6=true - # XSL Stylesheets for DocBook 5 not packaged for buildroot IPUTILS_CONF_OPTS += -DBUILD_MANS=false -DBUILD_HTML_MANS=false -# move iputils binaries to the same location as where Busybox installs -# the corresponding applets, so that we have a single version of the -# tools (from iputils) -define IPUTILS_MOVE_BINARIES - mv $(TARGET_DIR)/usr/bin/arping $(TARGET_DIR)/usr/sbin/arping - $(if $(BR2_ROOTFS_MERGED_USR),,\ - mv $(TARGET_DIR)/usr/bin/ping $(TARGET_DIR)/bin/ping) - mv $(TARGET_DIR)/usr/bin/tftpd $(TARGET_DIR)/usr/sbin/tftpd -endef -IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_BINARIES - -# upstream requires distros to create symlink -define IPUTILS_CREATE_PING6_SYMLINK - ln -sf ping $(TARGET_DIR)/bin/ping6 -endef -IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_CREATE_PING6_SYMLINK - # handle permissions ourselves IPUTILS_CONF_OPTS += -DNO_SETCAP_OR_SUID=true ifeq ($(BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES),y) define IPUTILS_PERMISSIONS - /usr/sbin/arping f 755 0 0 - - - - - - /usr/bin/clockdiff f 755 0 0 - - - - - - |xattr cap_net_raw+p - /bin/ping f 755 0 0 - - - - - - |xattr cap_net_raw+p - /usr/bin/traceroute6 f 755 0 0 - - - - - - |xattr cap_net_raw+p + $(if $(BR2_PACKAGE_IPUTILS_ARPING),\ + /usr/sbin/arping f 755 0 0 - - - - -,) + $(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),\ + /usr/bin/clockdiff f 755 0 0 - - - - - + |xattr cap_net_raw+p,) + $(if $(BR2_PACKAGE_IPUTILS_PING),\ + /bin/ping f 755 0 0 - - - - - + |xattr cap_net_raw+p,) + $(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),\ + /usr/bin/traceroute6 f 755 0 0 - - - - - + |xattr cap_net_raw+p,) endef else define IPUTILS_PERMISSIONS - /usr/sbin/arping f 755 0 0 - - - - - - /usr/bin/clockdiff f 4755 0 0 - - - - - - /bin/ping f 4755 0 0 - - - - - - /usr/bin/traceroute6 f 4755 0 0 - - - - - + $(if $(BR2_PACKAGE_IPUTILS_ARPING),\ + /usr/sbin/arping f 755 0 0 - - - - -,) + $(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),\ + /usr/bin/clockdiff f 4755 0 0 - - - - -,) + $(if $(BR2_PACKAGE_IPUTILS_PING),\ + /bin/ping f 4755 0 0 - - - - -,) + $(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),\ + /usr/bin/traceroute6 f 4755 0 0 - - - - -,) endef endif diff --git a/package/irqbalance/S13irqbalance b/package/irqbalance/S13irqbalance index b06a3372e9..f6ed9291be 100644 --- a/package/irqbalance/S13irqbalance +++ b/package/irqbalance/S13irqbalance @@ -10,6 +10,8 @@ PID="/var/run/irqbalance.pid" case "$1" in start) printf "Starting irqbalance: " + # for irqbalance socket /run/irqbalance/irqbalance.sock + mkdir -p /run/irqbalance start-stop-daemon -S -q -x $EXEC -- $ARGS if [ $? != 0 ]; then echo "FAILED" diff --git a/package/irqbalance/irqbalance.hash b/package/irqbalance/irqbalance.hash index 2e7cf49c25..49118f8c7d 100644 --- a/package/irqbalance/irqbalance.hash +++ b/package/irqbalance/irqbalance.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5ace9dd69d5190e24ee34210c3131333e9963e3ba649bf9237eabb4313c300d2 irqbalance-1.6.0.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 2e7ddb9687a6a5cc1f41626659eac2ad9d6b5875629156b92f693bd404d8ae63 irqbalance-1.8.0.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/irqbalance/irqbalance.mk b/package/irqbalance/irqbalance.mk index 36e9e42493..1efc0b7fa2 100644 --- a/package/irqbalance/irqbalance.mk +++ b/package/irqbalance/irqbalance.mk @@ -4,10 +4,11 @@ # ################################################################################ -IRQBALANCE_VERSION = 1.6.0 +IRQBALANCE_VERSION = 1.8.0 IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,v$(IRQBALANCE_VERSION)) IRQBALANCE_LICENSE = GPL-2.0 IRQBALANCE_LICENSE_FILES = COPYING +IRQBALANCE_SELINUX_MODULES = irqbalance IRQBALANCE_DEPENDENCIES = host-pkgconf libglib2 # Autoreconf needed because package is distributed without a configure script IRQBALANCE_AUTORECONF = YES diff --git a/package/irqbalance/irqbalance.service b/package/irqbalance/irqbalance.service index 9ba3be43bb..39574877fb 100644 --- a/package/irqbalance/irqbalance.service +++ b/package/irqbalance/irqbalance.service @@ -3,6 +3,7 @@ Description=irqbalance daemon After=syslog.target [Service] +RuntimeDirectory=irqbalance ExecStart=/usr/sbin/irqbalance --foreground [Install] diff --git a/package/irrlicht/irrlicht.mk b/package/irrlicht/irrlicht.mk index a1e190d98d..bd82815cde 100644 --- a/package/irrlicht/irrlicht.mk +++ b/package/irrlicht/irrlicht.mk @@ -38,6 +38,13 @@ ifeq ($(BR2_STATIC_LIBS),) IRRLICHT_CONF_OPTS += sharedlib endif +# Irrlicht fail to detect properly the NEON support on aarch64 or ARM with NEON FPU support. +# While linking an application with libIrrlicht.so, we get an undefined reference to +# png_init_filter_functions_neon. +# Some files are missing in the libpng bundled in Irrlicht, in particular arm/arm_init.c, +# so disable NEON support completely. +IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0" + define IRRLICHT_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(IRRLICHT_SUBDIR) $(IRRLICHT_CONF_OPTS) diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index 4d7268d291..c64690c59b 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -11,6 +11,7 @@ IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz IRSSI_SITE = https://github.com/irssi/irssi/releases/download/$(IRSSI_VERSION) IRSSI_LICENSE = GPL-2.0+ IRSSI_LICENSE_FILES = COPYING +IRSSI_CPE_ID_VENDOR = irssi IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses openssl IRSSI_CONF_OPTS = \ diff --git a/package/isl/isl.hash b/package/isl/isl.hash index 40d04dca80..3df331b143 100644 --- a/package/isl/isl.hash +++ b/package/isl/isl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6c8bc56c477affecba9c59e2c9f026967ac8bad01b51bdd07916db40a517b9fa isl-0.22.tar.xz -sha256 3a2c398103f6bca0f50a9a9465deca9230b370b0212af5fdf31ed88a36215c30 LICENSE +sha256 5efc53efaef151301f4e7dde3856b66812d8153dede24fab17673f801c8698f2 isl-0.23.tar.xz +sha256 3a2c398103f6bca0f50a9a9465deca9230b370b0212af5fdf31ed88a36215c30 LICENSE diff --git a/package/isl/isl.mk b/package/isl/isl.mk index a1a597d038..3abd6640cb 100644 --- a/package/isl/isl.mk +++ b/package/isl/isl.mk @@ -4,7 +4,7 @@ # ################################################################################ -ISL_VERSION = 0.22 +ISL_VERSION = 0.23 ISL_SOURCE = isl-$(ISL_VERSION).tar.xz ISL_SITE = http://isl.gforge.inria.fr ISL_LICENSE = MIT diff --git a/package/iucode-tool/iucode-tool.mk b/package/iucode-tool/iucode-tool.mk index bddc37295c..596ad268b7 100644 --- a/package/iucode-tool/iucode-tool.mk +++ b/package/iucode-tool/iucode-tool.mk @@ -7,11 +7,10 @@ IUCODE_TOOL_VERSION = 2.3.1 IUCODE_TOOL_SOURCE = iucode-tool_$(IUCODE_TOOL_VERSION).tar.xz IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/master -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -IUCODE_TOOL_DEPENDENCIES = argp-standalone -endif +IUCODE_TOOL_DEPENDENCIES = $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) IUCODE_TOOL_LICENSE = GPL-2.0+ IUCODE_TOOL_LICENSE_FILES = COPYING +IUCODE_TOOL_CPE_ID_VENDOR = iucode-tool_project define IUCODE_TOOL_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/iucode-tool/S00iucode-tool \ diff --git a/package/iw/iw.hash b/package/iw/iw.hash index 458262b712..126b1cb673 100644 --- a/package/iw/iw.hash +++ b/package/iw/iw.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 04afe857bc8dea67e461946de30ae1b012954b6965839c5c3fda7d0ed15505d5 iw-5.3.tar.xz +sha256 293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2 iw-5.9.tar.xz # Locally calculated -sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING +sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING diff --git a/package/iw/iw.mk b/package/iw/iw.mk index fae65f739d..32ecf93c19 100644 --- a/package/iw/iw.mk +++ b/package/iw/iw.mk @@ -4,11 +4,12 @@ # ################################################################################ -IW_VERSION = 5.3 +IW_VERSION = 5.9 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC IW_LICENSE_FILES = COPYING +IW_CPE_ID_VENDOR = kernel IW_DEPENDENCIES = host-pkgconf libnl IW_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ diff --git a/package/iwd/Config.in b/package/iwd/Config.in index c790f3dba1..59d4422305 100644 --- a/package/iwd/Config.in +++ b/package/iwd/Config.in @@ -1,14 +1,20 @@ config BR2_PACKAGE_IWD bool "iwd" + depends on BR2_USE_MMU # dbus + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell - depends on !BR2_STATIC_LIBS # ell + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell depends on BR2_USE_WCHAR # ell + select BR2_PACKAGE_DBUS # runtime select BR2_PACKAGE_ELL + select BR2_PACKAGE_OPENRESOLV if !BR2_PACKAGE_SYSTEMD_RESOLVED help iNet Wireless daemon (iwd) https://iwd.wiki.kernel.org/ -comment "iwd needs a toolchain w/ dynamic library, wchar" +comment "iwd needs a toolchain w/ threads, wchar, headers >= 4.12" + depends on BR2_USE_MMU # dbus depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 26ce712660..9decf459f9 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ -# Locally computed -sha256 10b53cee9c38c9c60f83d4e16a446b27551b6187a2bd09d724f2238c99877f3f iwd-1.6.tar.gz +# From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc +sha256 21be6ad59ba666ba1e50e01889d647472b9b2f96f4941123db036fd33c257f0b iwd-1.14.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index f3776fbfd4..171c96edcf 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,25 +4,20 @@ # ################################################################################ -IWD_VERSION = 1.6 -IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git -IWD_SITE_METHOD = git +IWD_VERSION = 1.14 +IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz +IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ IWD_LICENSE_FILES = COPYING -# sources from git, no configure script provided -IWD_AUTORECONF = YES +IWD_CPE_ID_VENDOR = intel +IWD_CPE_ID_PRODUCT = inet_wireless_daemon +IWD_SELINUX_MODULES = networkmanager IWD_CONF_OPTS = \ --disable-manual-pages \ --enable-external-ell IWD_DEPENDENCIES = ell -# autoreconf requires an existing build-aux directory -define IWD_MKDIR_BUILD_AUX - mkdir -p $(@D)/build-aux -endef -IWD_POST_PATCH_HOOKS += IWD_MKDIR_BUILD_AUX - ifeq ($(BR2_PACKAGE_DBUS),y) IWD_CONF_OPTS += --enable-dbus-policy --with-dbus-datadir=/usr/share IWD_DEPENDENCIES += dbus @@ -46,4 +41,24 @@ else IWD_CONF_OPTS += --disable-systemd-service endif +ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y) +IWD_RESOLV_SERVICE = systemd +else +IWD_RESOLV_SERVICE = resolvconf +endif + +define IWD_INSTALL_CONFIG_FILE + $(INSTALL) -D -m 644 package/iwd/main.conf $(TARGET_DIR)/etc/iwd/main.conf + $(SED) 's,__RESOLV_SERVICE__,$(IWD_RESOLV_SERVICE),' $(TARGET_DIR)/etc/iwd/main.conf +endef + +IWD_POST_INSTALL_TARGET_HOOKS += IWD_INSTALL_CONFIG_FILE + +define IWD_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/iwd/S40iwd \ + $(TARGET_DIR)/etc/init.d/S40iwd + mkdir -p $(TARGET_DIR)/var/lib/iwd + ln -sf /tmp/iwd/hotspot $(TARGET_DIR)/var/lib/iwd/hotspot +endef + $(eval $(autotools-package)) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index b9299e2fd8..1c67f10332 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -25,7 +25,7 @@ config BR2_PACKAGE_JACK1 Another implementation (BR2_PACKAGE_JACK2) is also available, please consult the documentation to choose the right one: - https://github.com/jackaudio/jackaudio.github.com/wiki/Q_difference_jack1_jack2 + https://github.com/jackaudio/jackaudio.github.com/wiki/Differences-between-jack1-and-jack2 comment "jack1 needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash index aec56e24a4..df708f7ca5 100644 --- a/package/jack2/jack2.hash +++ b/package/jack2/jack2.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 a20a32366780c0061fd58fbb5f09e514ea9b7ce6e53b080a44b11a558a83217c jack2-1.9.14.tar.gz +sha256 38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2 jack2-1.9.17.tar.gz +sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index db63b7f4b7..e6a036bac9 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -4,9 +4,11 @@ # ################################################################################ -JACK2_VERSION = 1.9.14 +JACK2_VERSION = 1.9.17 JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) +JACK2_LICENSE_FILES = COPYING +JACK2_CPE_ID_VENDOR = jackaudio JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib JACK2_INSTALL_STAGING = YES diff --git a/package/jailhouse/jailhouse.hash b/package/jailhouse/jailhouse.hash index 9fb4d599da..13a260e8d0 100644 --- a/package/jailhouse/jailhouse.hash +++ b/package/jailhouse/jailhouse.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8de2406f455db07794cc750238ce57bc897673ba2b68c56fc9ae2d8079142b33 jailhouse-0.11.tar.gz +sha256 3777a553c2acb2b693843fe4d16ab80333879daedd47d9c9f3717c9644e6cf93 jailhouse-0.12.tar.gz sha256 3aafb31a2436178323663e00511f16d58fc36ea654b1457532e79d017205efd8 COPYING diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index 1aa7851707..6356c5a7aa 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -JAILHOUSE_VERSION = 0.11 +JAILHOUSE_VERSION = 0.12 JAILHOUSE_SITE = $(call github,siemens,jailhouse,v$(JAILHOUSE_VERSION)) JAILHOUSE_LICENSE = GPL-2.0 JAILHOUSE_LICENSE_FILES = COPYING diff --git a/package/jansson/jansson.hash b/package/jansson/jansson.hash index 5baec1968d..5c19316981 100644 --- a/package/jansson/jansson.hash +++ b/package/jansson/jansson.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c7027d2c9 jansson-2.12.tar.gz -sha256 f0a0c95c64e9f49ec4cbfac8e7fee06823c85ee8ba4af5d57aaabb372347adc2 LICENSE +sha256 f4f377da17b10201a60c1108613e78ee15df6b12016b116b6de42209f47a474f jansson-2.13.1.tar.gz +sha256 1fff7d37d22157bcd81ab53b6c54da755d7c2f868f15807d9bde920f10730da0 LICENSE diff --git a/package/jansson/jansson.mk b/package/jansson/jansson.mk index b53381d465..2761ce9b16 100644 --- a/package/jansson/jansson.mk +++ b/package/jansson/jansson.mk @@ -4,10 +4,11 @@ # ################################################################################ -JANSSON_VERSION = 2.12 +JANSSON_VERSION = 2.13.1 JANSSON_SITE = http://www.digip.org/jansson/releases JANSSON_LICENSE = MIT JANSSON_LICENSE_FILES = LICENSE +JANSSON_CPE_ID_VENDOR = jansson_project JANSSON_INSTALL_STAGING = YES JANSSON_CONF_ENV = LIBS="-lm" diff --git a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch index ac6b045078..b54c8cbec6 100644 --- a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch @@ -26,12 +26,12 @@ Signed-off-by: Adam Duskett create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/Makefile.am b/Makefile.am -index c6e9ad2..42d256b 100644 +index f961fdb..3ddbe59 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -140,6 +140,7 @@ janus_CFLAGS = \ - -DTRANSPORTDIR=\"$(transportdir)\" \ +@@ -151,6 +151,7 @@ janus_CFLAGS = \ -DEVENTDIR=\"$(eventdir)\" \ + -DLOGGERDIR=\"$(loggerdir)\" \ -DCONFDIR=\"$(confdir)\" \ + @GCC_WARN_UNUSED_BUT_SET@ \ $(BORINGSSL_CFLAGS) \ @@ -60,7 +60,7 @@ index ca17a29..beef91a 100644 + -Wunsafe-loop-optimizations" esac - JANUS_VERSION=63 + JANUS_VERSION=103 diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000..51df0c0 diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in index fc32546717..5d711fe746 100644 --- a/package/janus-gateway/Config.in +++ b/package/janus-gateway/Config.in @@ -18,6 +18,12 @@ menuconfig BR2_PACKAGE_JANUS_GATEWAY if BR2_PACKAGE_JANUS_GATEWAY +config BR2_PACKAGE_JANUS_GATEWAY_DEMOS + bool "HTML demos" + help + Install the demonstration website, as featured on + https://janus.conf.meetecho.com/ + comment "plugins" config BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE @@ -59,12 +65,11 @@ comment "transports" config BR2_PACKAGE_JANUS_GATEWAY_MQTT bool "MQTT" - depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_PAHO_MQTT_C -comment "MQTT transport needs a toolchain w/ threads and dynamic library support" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS +comment "MQTT transport needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ bool "RabbitMQ" @@ -85,7 +90,6 @@ config BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS config BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS bool "WebSockets" - depends on BR2_USE_MMU select BR2_PACKAGE_LIBWEBSOCKETS endif diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index c61ffcd5b6..83afc72c98 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b6829edaf25862fbf613e2c3d2be7cad29943c0bb1ea5d1b935a07abfee37245 janus-gateway-0.9.2.tar.gz -sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING +sha256 21e2fc7dee4b20ed8d749a69577eccd961b0bfe5b863d42f39ddfcd2af903718 janus-gateway-0.10.10.tar.gz +sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index bbc7f95ee1..40652d802a 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,14 +4,17 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 0.9.2 +JANUS_GATEWAY_VERSION = 0.10.10 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING +JANUS_GATEWAY_CPE_ID_VENDOR = meetecho +JANUS_GATEWAY_CPE_ID_PRODUCT = janus # ding-libs provides the ini_config library JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \ - libsrtp host-gengetopt libglib2 openssl libconfig + libsrtp host-gengetopt libglib2 openssl libconfig \ + $(if $(BR2_PACKAGE_LIBOGG),libogg) # Straight out of the repository, no ./configure, and we also patch # configure.ac. @@ -21,6 +24,13 @@ JANUS_GATEWAY_CONF_OPTS = \ --disable-data-channels \ --disable-sample-event-handler +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_DEMOS),) +define JANUS_GATEWAY_REMOVE_DEMOS + $(RM) -fr $(TARGET_DIR)/usr/share/janus/demos/ +endef +JANUS_GATEWAY_POST_INSTALL_TARGET_HOOKS += JANUS_GATEWAY_REMOVE_DEMOS +endif + ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE),y) JANUS_GATEWAY_DEPENDENCIES += opus JANUS_GATEWAY_CONF_OPTS += --enable-plugin-audiobridge @@ -72,7 +82,6 @@ JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videoroom endif ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VOICE_MAIL),y) -JANUS_GATEWAY_DEPENDENCIES += libogg JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail @@ -112,4 +121,11 @@ else JANUS_GATEWAY_CONF_OPTS += --disable-websockets endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +JANUS_GATEWAY_DEPENDENCIES += systemd +JANUS_GATEWAY_CONF_OPTS += --enable-systemd-sockets +else +JANUS_GATEWAY_CONF_OPTS += --disable-systemd-sockets +endif + $(eval $(autotools-package)) diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash index 7e9ce0ea90..67653a8e88 100644 --- a/package/jasper/jasper.hash +++ b/package/jasper/jasper.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f1d8b90f231184d99968f361884e2054a1714fdbbd9944ba1ae4ebdcc9bbfdb1 jasper-2.0.16.tar.gz -sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE +sha256 6b4e5f682be0ab1a5acb0eeb6bf41d6ce17a658bb8e2dbda95de40100939cc88 jasper-2.0.28.tar.gz +sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 287c358884..6ef1afcac7 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -4,11 +4,12 @@ # ################################################################################ -JASPER_VERSION = 2.0.16 -JASPER_SITE = $(call github,mdadams,jasper,version-$(JASPER_VERSION)) +JASPER_VERSION = 2.0.28 +JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE +JASPER_CPE_ID_VENDOR = jasper_project JASPER_SUPPORTS_IN_SOURCE_BUILD = NO JASPER_CONF_OPTS = \ -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \ diff --git a/package/jbig2dec/jbig2dec.hash b/package/jbig2dec/jbig2dec.hash index eb2b674443..5a34af37f6 100644 --- a/package/jbig2dec/jbig2dec.hash +++ b/package/jbig2dec/jbig2dec.hash @@ -1,7 +1,7 @@ -# https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs927/MD5SUMS +# https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9530/MD5SUMS # and SHA512SUMS are missing the hashes for this file. # Locally computed: -sha256 a4f6bf15d217e7816aa61b92971597c801e81f0a63f9fe1daee60fb88e0f0602 jbig2dec-0.16.tar.gz +sha256 279476695b38f04939aa59d041be56f6bade3422003a406a85e9792c27118a37 jbig2dec-0.19.tar.gz # Hash for license files: -sha256 1bf5258afe453934484fd0cea97508b72301633a6a78b0ae8a9ee44ac78f26d9 LICENSE +sha256 1bf5258afe453934484fd0cea97508b72301633a6a78b0ae8a9ee44ac78f26d9 LICENSE diff --git a/package/jbig2dec/jbig2dec.mk b/package/jbig2dec/jbig2dec.mk index 5ac5b87a72..8d881136ad 100644 --- a/package/jbig2dec/jbig2dec.mk +++ b/package/jbig2dec/jbig2dec.mk @@ -4,10 +4,14 @@ # ################################################################################ -JBIG2DEC_VERSION = 0.16 -JBIG2DEC_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs927 +JBIG2DEC_VERSION = 0.19 +JBIG2DEC_SITE = \ + https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9530 JBIG2DEC_LICENSE = AGPL-3.0+ JBIG2DEC_LICENSE_FILES = LICENSE +JBIG2DEC_CPE_ID_VENDOR = artifex JBIG2DEC_INSTALL_STAGING = YES +# tarball is missing install-sh, install.sh, or shtool +JBIG2DEC_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/package/jemalloc/jemalloc.mk b/package/jemalloc/jemalloc.mk index aedc1f04bf..e43a4f7906 100644 --- a/package/jemalloc/jemalloc.mk +++ b/package/jemalloc/jemalloc.mk @@ -10,6 +10,7 @@ JEMALLOC_SITE = https://github.com/jemalloc/jemalloc/releases/download/$(JEMALLO JEMALLOC_LICENSE = BSD-2-Clause JEMALLOC_LICENSE_FILES = COPYING JEMALLOC_INSTALL_STAGING = YES +JEMALLOC_CONFIG_SCRIPTS = jemalloc-config # gcc bug internal compiler error: in merge_overlapping_regs, at # regrename.c:304. This bug is fixed since gcc 6. diff --git a/package/jhead/jhead.mk b/package/jhead/jhead.mk index d56ee0daff..49cb03da61 100644 --- a/package/jhead/jhead.mk +++ b/package/jhead/jhead.mk @@ -8,6 +8,7 @@ JHEAD_VERSION = 3.04 JHEAD_SITE = http://www.sentex.net/~mwandel/jhead JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt +JHEAD_CPE_ID_VENDOR = jhead_project define JHEAD_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) diff --git a/package/jimtcl/jimtcl.hash b/package/jimtcl/jimtcl.hash index 21d75c4f42..7960f4fddb 100644 --- a/package/jimtcl/jimtcl.hash +++ b/package/jimtcl/jimtcl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ab8204cd03b946f5149e1273af9c86d8e73b146084a0fbeb1d4f41a75b0b3411 jimtcl-0.79.tar.gz -sha256 419f1146334e57fb258d6c957d1f94d43455ec0d24b1b54c4447e5f61a353950 LICENSE +sha256 9e79a960de925552eeb4df51121f0ea017e34409568117b1ac461f4c3071289e jimtcl-0.80.tar.gz +sha256 419f1146334e57fb258d6c957d1f94d43455ec0d24b1b54c4447e5f61a353950 LICENSE diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index e712dff0be..5d6b379260 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -4,7 +4,7 @@ # ################################################################################ -JIMTCL_VERSION = 0.79 +JIMTCL_VERSION = 0.80 JIMTCL_SITE = $(call github,msteveb,jimtcl,$(JIMTCL_VERSION)) JIMTCL_INSTALL_STAGING = YES JIMTCL_LICENSE = BSD-2-Clause diff --git a/package/jitterentropy-library/jitterentropy-library.mk b/package/jitterentropy-library/jitterentropy-library.mk index 3db04b27d3..d9dc031c35 100644 --- a/package/jitterentropy-library/jitterentropy-library.mk +++ b/package/jitterentropy-library/jitterentropy-library.mk @@ -10,6 +10,7 @@ JITTERENTROPY_LIBRARY_LICENSE = GPL-2.0 or BSD-3-Clause JITTERENTROPY_LIBRARY_LICENSE_FILES = COPYING COPYING.bsd COPYING.gplv2 JITTERENTROPY_LIBRARY_INSTALL_STAGING = YES JITTERENTROPY_LIBRARY_INSTALL_TARGETS = install-includes +JITTERENTROPY_LIBRARY_SELINUX_MODULES = entropyd ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy-static diff --git a/package/jo/jo.hash b/package/jo/jo.hash index 8190a15e2f..8f1cc8fcd9 100644 --- a/package/jo/jo.hash +++ b/package/jo/jo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 de25c95671a3b392c6bcaba0b15d48eb8e2435508008c29477982d2d2f5ade64 jo-1.3.tar.gz -sha256 41d8b23dc6e76731f4920b9ce42d0d4a248d243a510319e2441d174a115f35cf COPYING +sha256 24c64d2eb863900947f58f32b502c95fec8f086105fd31151b91f54b7b5256a2 jo-1.4.tar.gz +sha256 41d8b23dc6e76731f4920b9ce42d0d4a248d243a510319e2441d174a115f35cf COPYING diff --git a/package/jo/jo.mk b/package/jo/jo.mk index 5eb013245e..24b499f345 100644 --- a/package/jo/jo.mk +++ b/package/jo/jo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JO_VERSION = 1.3 +JO_VERSION = 1.4 JO_SITE = https://github.com/jpmens/jo/releases/download/$(JO_VERSION) JO_LICENSE = MIT (json.[ch]), GPL-2.0+ (rest) JO_LICENSE_FILES = COPYING diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index 874f04fc82..1a22b1d6ff 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.4/ -sha1 163d8f96d0999526a117de0388624241b54dcd67 libjpeg-turbo-2.0.4.tar.gz -md5 d01d9e0c28c27bc0de9f4e2e8ff49855 libjpeg-turbo-2.0.4.tar.gz +# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.6/ +sha1 5406c7676d7df89fb4da791ad5af51202910fb25 libjpeg-turbo-2.0.6.tar.gz +md5 4cada3f0bdc93d826fa31bf9e4469ef6 libjpeg-turbo-2.0.6.tar.gz # Locally computed -sha256 33dd8547efd5543639e890efbf2ef52d5a21df81faf41bb940657af916a23406 libjpeg-turbo-2.0.4.tar.gz -sha256 69e570a251515ced17d4492256d57c89db77ed949652f88a44c80c1ca9607920 LICENSE.md -sha256 82fece2bff2669c476495f0fe70096b154e8bc5b40916a64e99836d9a01c3110 README.ijg +sha256 d74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb libjpeg-turbo-2.0.6.tar.gz +sha256 0b7a24c3906d26dfbe24e96e9415549b387c3227140dc6b7ab2fb924254e37a1 LICENSE.md +sha256 01ccef626ec864773c681d4a4056f72af9052d619e0609df0d369117f8b3efdf README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index 126b470630..5c977dc029 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,11 +4,13 @@ # ################################################################################ -JPEG_TURBO_VERSION = 2.0.4 +JPEG_TURBO_VERSION = 2.0.6 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) JPEG_TURBO_LICENSE_FILES = LICENSE.md README.ijg +JPEG_TURBO_CPE_ID_VENDOR = libjpeg-turbo +JPEG_TURBO_CPE_ID_PRODUCT = libjpeg-turbo JPEG_TURBO_INSTALL_STAGING = YES JPEG_TURBO_PROVIDES = jpeg JPEG_TURBO_DEPENDENCIES = host-pkgconf @@ -41,10 +43,11 @@ ifeq ($(BR2_STATIC_LIBS),) JPEG_TURBO_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON endif -define JPEG_TURBO_REMOVE_USELESS_TOOLS +ifeq ($(BR2_PACKAGE_JPEG_TURBO_TOOLS),) +define JPEG_TURBO_REMOVE_TOOLS rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) endef - -JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_USELESS_TOOLS +JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_TOOLS +endif $(eval $(cmake-package)) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index 3d0fea83b1..0a786060d7 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -1,8 +1,3 @@ -config BR2_PACKAGE_JPEG - bool "jpeg support" - help - Select the desired JPEG library provider. - # jpeg-turbo has simd support for some architectures config BR2_PACKAGE_JPEG_SIMD_SUPPORT bool @@ -11,6 +6,11 @@ config BR2_PACKAGE_JPEG_SIMD_SUPPORT default y if BR2_POWERPC_CPU_HAS_ALTIVEC default y if BR2_aarch64 || BR2_aarch64_be +config BR2_PACKAGE_JPEG + bool "jpeg support" + help + Select the desired JPEG library provider. + if BR2_PACKAGE_JPEG choice @@ -43,6 +43,8 @@ source "$BR2_BASE_DIR/.br2-external.in.jpeg" endchoice +source "package/jpeg-turbo/Config.in.options" + config BR2_PACKAGE_HAS_JPEG bool diff --git a/package/jq/Config.in b/package/jq/Config.in index 321cbe8b51..5edb5d0989 100644 --- a/package/jq/Config.in +++ b/package/jq/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_JQ bool "jq" + depends on BR2_TOOLCHAIN_HAS_THREADS help jq is like sed for JSON data - you can use it to slice and 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/ + +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 2cddda32c6..125781385c 100644 --- a/package/jq/jq.hash +++ b/package/jq/jq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3002cf80d871728562989b4a47d90a7301fe049a4e1d69836b99108f198dac06 jq-a97638713ad30653d424f136018098c4b0e5c71b.tar.gz -sha256 111136aebcbfa68b6b0084e582b30e981da76adcff84eab6f9be32a1f38c5bf1 COPYING +sha256 20249104d4df2247253df6df4a980b8be1f5232f03fef7cd41bacb7e6eab04fd jq-a17dd3248a666d01be75f6b16be37e80e20b0954.tar.gz +sha256 c8437d414ca5b394718784c3bf5bdff7f01fee417625fabf1fb722ca263037da COPYING diff --git a/package/jq/jq.mk b/package/jq/jq.mk index 3d22306537..7f890f8998 100644 --- a/package/jq/jq.mk +++ b/package/jq/jq.mk @@ -4,10 +4,11 @@ # ################################################################################ -JQ_VERSION = a97638713ad30653d424f136018098c4b0e5c71b +JQ_VERSION = a17dd3248a666d01be75f6b16be37e80e20b0954 JQ_SITE = $(call github,stedolan,jq,$(JQ_VERSION)) -JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation) +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 diff --git a/package/jquery-validation/jquery-validation.hash b/package/jquery-validation/jquery-validation.hash index af451a6c1a..4dbe07e218 100644 --- a/package/jquery-validation/jquery-validation.hash +++ b/package/jquery-validation/jquery-validation.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 14efe6f1784ef6e97116b15c77b04b7e8f47ec07b1479bcd6fa0b081faa19440 jquery-validation-1.14.0.zip -sha256 c2f9aa180de990ff16ca7e756c9af52ecc1b3536e3fb32649d7b2c510bccf9d0 README.md +sha256 01ad2ef0a7f9cd413aeb51081651293916da47d20e5c0a59ec62587e58b03564 jquery-validation-1.19.3.zip +sha256 3e5a99460077c16bf75f6821a30cdac9baa339119ebf63b2a6c49f4f50421ca4 README.md diff --git a/package/jquery-validation/jquery-validation.mk b/package/jquery-validation/jquery-validation.mk index a8c2897983..920ed1cece 100644 --- a/package/jquery-validation/jquery-validation.mk +++ b/package/jquery-validation/jquery-validation.mk @@ -4,11 +4,13 @@ # ################################################################################ -JQUERY_VALIDATION_VERSION = 1.14.0 -JQUERY_VALIDATION_SITE = http://jqueryvalidation.org/files +JQUERY_VALIDATION_VERSION = 1.19.3 +JQUERY_VALIDATION_SITE = https://github.com/jquery-validation/jquery-validation/releases/download/$(JQUERY_VALIDATION_VERSION) JQUERY_VALIDATION_SOURCE = jquery-validation-$(JQUERY_VALIDATION_VERSION).zip JQUERY_VALIDATION_LICENSE = MIT JQUERY_VALIDATION_LICENSE_FILES = README.md +JQUERY_VALIDATION_CPE_ID_VENDOR = jqueryvalidation +JQUERY_VALIDATION_CPE_ID_PRODUCT = jquery_validation define JQUERY_VALIDATION_EXTRACT_CMDS $(UNZIP) -d $(@D) $(JQUERY_VALIDATION_DL_DIR)/$(JQUERY_VALIDATION_SOURCE) diff --git a/package/jquery/jquery.hash b/package/jquery/jquery.hash index ec43e7cd7a..e9ef56a46d 100644 --- a/package/jquery/jquery.hash +++ b/package/jquery/jquery.hash @@ -1,2 +1,2 @@ # Locally computed hashes, not provided by upstream -sha256 2ecd295d295bec062cedebe177e54b9d6b19fc0a841dc5c178c654c9ccff09c0 jquery-1.11.2.min.js +sha256 f7f6a5894f1d19ddad6fa392b2ece2c5e578cbf7da4ea805b6885eb6985b6e3d jquery-3.5.1.min.js diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk index f75eded8b3..8febed36ca 100644 --- a/package/jquery/jquery.mk +++ b/package/jquery/jquery.mk @@ -4,10 +4,11 @@ # ################################################################################ -JQUERY_VERSION = 1.11.2 +JQUERY_VERSION = 3.5.1 JQUERY_SITE = http://code.jquery.com JQUERY_SOURCE = jquery-$(JQUERY_VERSION).min.js JQUERY_LICENSE = MIT +JQUERY_CPE_ID_VENDOR = jquery define JQUERY_EXTRACT_CMDS cp $(JQUERY_DL_DIR)/$(JQUERY_SOURCE) $(@D) diff --git a/package/json-c/json-c.hash b/package/json-c/json-c.hash index 0e03007476..a20d370eb0 100644 --- a/package/json-c/json-c.hash +++ b/package/json-c/json-c.hash @@ -1,4 +1,4 @@ # From https://github.com/json-c/json-c/wiki -sha256 b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873 json-c-0.13.1.tar.gz +sha256 b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6 json-c-0.15.tar.gz # Locally calculated -sha256 74c1e6ca5eba76b54d0ad00d4815c8315c1b3bc45ff99de61d103dc92486284c COPYING +sha256 74c1e6ca5eba76b54d0ad00d4815c8315c1b3bc45ff99de61d103dc92486284c COPYING diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 2788fe563b..3639bad25a 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -4,19 +4,12 @@ # ################################################################################ -JSON_C_VERSION = 0.13.1 +JSON_C_VERSION = 0.15 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 -# update config.h.in timestamp to avoid autoheader run -define JSON_C_UPDATE_CONFIG_TIMESTAMP - touch $(@D)/config.h.in -endef - -JSON_C_POST_EXTRACT_HOOKS += JSON_C_UPDATE_CONFIG_TIMESTAMP -HOST_JSON_C_POST_EXTRACT_HOOKS += JSON_C_UPDATE_CONFIG_TIMESTAMP - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(cmake-package)) +$(eval $(host-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 c67cd37558..eb9270b311 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 249548f4867417d66ae46b338dfe0a2805f3323e81c9e9b83c89f3adbfde6f31 json-3.7.3.tar.gz -sha256 7400586ce89c6a2cc65f6ca46997da5d356a230673d3a211e040b783f23578a1 LICENSE.MIT +sha256 9943db11eeaa5b23e58a88fbc26c453faccef7b546e55063ad00e7caaaf76d0b json-3.9.0.tar.gz +sha256 50be9457e5c9faaba5e60d9c73f8eabe9e0737a2d9c3e58357d856661862c18e 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 e6f1df96f6..b644f3354c 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,14 +4,16 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.7.3 +JSON_FOR_MODERN_CPP_VERSION = 3.9.0 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT JSON_FOR_MODERN_CPP_LICENSE_FILES = LICENSE.MIT +JSON_FOR_MODERN_CPP_CPE_ID_VENDOR = json-for-modern-cpp_project + JSON_FOR_MODERN_CPP_INSTALL_STAGING = YES # header only library JSON_FOR_MODERN_CPP_INSTALL_TARGET = NO -JSON_FOR_MODERN_CPP_CONF_OPTS = -DJSON_BuildTests=OFF +JSON_FOR_MODERN_CPP_CONF_OPTS = -DJSON_BuildTests=OFF -DJSON_MultipleHeaders=ON $(eval $(cmake-package)) diff --git a/package/jsoncpp/jsoncpp.hash b/package/jsoncpp/jsoncpp.hash index 1000167611..0070a1874e 100644 --- a/package/jsoncpp/jsoncpp.hash +++ b/package/jsoncpp/jsoncpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0 jsoncpp-1.9.2.tar.gz +sha256 e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999 jsoncpp-1.9.4.tar.gz sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a LICENSE diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index f9761d4a6e..829459df4d 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -4,10 +4,11 @@ # ################################################################################ -JSONCPP_VERSION = 1.9.2 +JSONCPP_VERSION = 1.9.4 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE +JSONCPP_CPE_ID_VENDOR = jsoncpp_project JSONCPP_INSTALL_STAGING = YES JSONCPP_CONF_OPTS = -Dtests=false diff --git a/package/kbd/Config.in b/package/kbd/Config.in index 6cf2fc0dc6..27cadf1af2 100644 --- a/package/kbd/Config.in +++ b/package/kbd/Config.in @@ -2,7 +2,12 @@ config BR2_PACKAGE_KBD bool "kbd" # Uses fork() depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Generic help Keytable files and keyboard utilities. http://kernel.org/pub/linux/utils/kbd/ + +comment "kbd needs a toolchain w/ gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/kbd/kbd.hash b/package/kbd/kbd.hash index cf29c59860..324ba065d0 100644 --- a/package/kbd/kbd.hash +++ b/package/kbd/kbd.hash @@ -1,3 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kbd/sha256sums.asc -sha256 5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88 kbd-2.0.4.tar.xz -sha256 8682bd7a7fe88bad31bf94ee9795c73fd4bc27bfcd50fb135f36dd8762c52035 COPYING +sha256 55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f kbd-2.4.0.tar.xz +sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING +sha256 5a16340fe773f422144b436df90319114a2884933c56e9be6fad642e59be5e1f CREDITS diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk index c32d82a3e9..ea2c00a373 100644 --- a/package/kbd/kbd.mk +++ b/package/kbd/kbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -KBD_VERSION = 2.0.4 +KBD_VERSION = 2.4.0 KBD_SOURCE = kbd-$(KBD_VERSION).tar.xz KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd KBD_CONF_OPTS = \ @@ -14,7 +14,7 @@ KBD_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ host-pkgconf KBD_LICENSE = GPL-2.0+ -KBD_LICENSE_FILES = COPYING +KBD_LICENSE_FILES = COPYING CREDITS KBD_INSTALL_TARGET_OPTS = MKINSTALLDIRS=$(@D)/config/mkinstalldirs DESTDIR=$(TARGET_DIR) install diff --git a/package/keepalived/Config.in b/package/keepalived/Config.in index c71821545c..2a0663fed0 100644 --- a/package/keepalived/Config.in +++ b/package/keepalived/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_KEEPALIVED bool "keepalived" depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS # uses libdl - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 select BR2_PACKAGE_OPENSSL help The main goal of the keepalived project is to add a strong & @@ -15,6 +14,6 @@ config BR2_PACKAGE_KEEPALIVED http://www.keepalived.org/ -comment "keepalived needs a toolchain w/ dynamic library, headers >= 3.4" +comment "keepalived needs a toolchain w/ dynamic library" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + depends on BR2_STATIC_LIBS diff --git a/package/keepalived/keepalived.hash b/package/keepalived/keepalived.hash index 091821467b..94af43c3e6 100644 --- a/package/keepalived/keepalived.hash +++ b/package/keepalived/keepalived.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 933ee01bc6346aa573453b998f87510d3cce4aba4537c9642b24e6dbfba5c6f4 keepalived-2.0.15.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 245bf399e4320064996ac5507236a8896f545d005f6c4c3b91701bcbc5728c60 keepalived-2.1.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 02c5a0cf39..5d42cab741 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -4,14 +4,13 @@ # ################################################################################ -KEEPALIVED_VERSION = 2.0.15 +KEEPALIVED_VERSION = 2.1.4 KEEPALIVED_SITE = http://www.keepalived.org/software KEEPALIVED_DEPENDENCIES = host-pkgconf openssl KEEPALIVED_LICENSE = GPL-2.0+ KEEPALIVED_LICENSE_FILES = COPYING +KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening -# We're patching configure.ac -KEEPALIVED_AUTORECONF = YES ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c @@ -34,18 +33,18 @@ else KEEPALIVED_CONF_OPTS += --disable-libnl endif +ifeq ($(BR2_PACKAGE_IPTABLES),y) +KEEPALIVED_DEPENDENCIES += iptables +KEEPALIVED_CONF_OPTS += --enable-iptables +# ipset support only makes sense when iptables support is enabled. ifeq ($(BR2_PACKAGE_IPSET),y) KEEPALIVED_DEPENDENCIES += ipset KEEPALIVED_CONF_OPTS += --enable-libipset else KEEPALIVED_CONF_OPTS += --disable-libipset endif - -ifeq ($(BR2_PACKAGE_IPTABLES),y) -KEEPALIVED_DEPENDENCIES += iptables -KEEPALIVED_CONF_OPTS += --enable-libiptc else -KEEPALIVED_CONF_OPTS += --disable-libiptc +KEEPALIVED_CONF_OPTS += --disable-iptables endif ifeq ($(BR2_PACKAGE_LIBNFTNL),y) diff --git a/package/kexec-lite/Config.in b/package/kexec-lite/Config.in index 3e84f90d57..abfa95ab36 100644 --- a/package/kexec-lite/Config.in +++ b/package/kexec-lite/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_KEXEC_LITE depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le depends on !BR2_STATIC_LIBS # dtc, elfutils depends on BR2_USE_WCHAR # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_DTC @@ -17,7 +18,8 @@ config BR2_PACKAGE_KEXEC_LITE https://github.com/antonblanchard/kexec-lite -comment "kexec-lite needs a uClibc or glibc toolchain w/ wchar, dynamic library" +comment "kexec-lite needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" depends on BR2_powerpc || BR2_powerpc64 depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/kexec-lite/kexec-lite.mk b/package/kexec-lite/kexec-lite.mk index 45c5d4d8b7..89d42659bd 100644 --- a/package/kexec-lite/kexec-lite.mk +++ b/package/kexec-lite/kexec-lite.mk @@ -10,5 +10,6 @@ KEXEC_LITE_LICENSE = GPL-2.0+ KEXEC_LITE_LICENSE_FILES = COPYING KEXEC_LITE_DEPENDENCIES = elfutils dtc KEXEC_LITE_AUTORECONF = YES +KEXEC_LITE_SELINUX_MODULES = kdump $(eval $(autotools-package)) diff --git a/package/kexec/Config.in b/package/kexec/Config.in index 410e503d9e..90a7bc2672 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_KEXEC depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh4 || BR2_sh4a || BR2_aarch64 + BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x help Kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index f87692b689..1cf860d85e 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 f020f07341977eb512663e301c2de60c6589e141467c16a8efd58243c0b2b238 kexec-tools-2.0.18.tar.xz +sha256 96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2 kexec-tools-2.0.22.tar.xz # locally calculated -sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING +sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index b011c0b4e5..81d35815d8 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,18 +4,19 @@ # ################################################################################ -KEXEC_VERSION = 2.0.18 +KEXEC_VERSION = 2.0.22 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 KEXEC_LICENSE_FILES = COPYING +KEXEC_SELINUX_MODULES = kdump # Makefile expects $STRIP -o to work, so needed for !BR2_STRIP_strip KEXEC_MAKE_OPTS = STRIP="$(TARGET_CROSS)strip" ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y) KEXEC_CONF_OPTS += --with-zlib -KEXEC_DEPENDENCIES = zlib +KEXEC_DEPENDENCIES += zlib else KEXEC_CONF_OPTS += --without-zlib endif diff --git a/package/keyutils/0001-fix-install-rule.patch b/package/keyutils/0001-fix-install-rule.patch index 26545716cb..b8bad533b2 100644 --- a/package/keyutils/0001-fix-install-rule.patch +++ b/package/keyutils/0001-fix-install-rule.patch @@ -11,7 +11,7 @@ Signed-off-by: Baruch Siach --- keyutils-1.5.9/Makefile.orig 2014-09-22 16:13:41.593562765 +0100 +++ keyutils-1.5.9/Makefile 2014-09-22 16:14:05.377963952 +0100 -@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0) +@@ -200,7 +200,7 @@ ifeq ($(NO_SOLIB),0) $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) mkdir -p $(DESTDIR)$(USRLIBDIR) diff --git a/package/keyutils/0002-cifs.patch b/package/keyutils/0002-cifs.patch index b2903f971f..23f8e33126 100644 --- a/package/keyutils/0002-cifs.patch +++ b/package/keyutils/0002-cifs.patch @@ -6,8 +6,8 @@ Description: Added 2 cifs helpers to request-key.conf (for CIFS DFS support) diff -Naurp keyutils.orig/request-key.conf keyutils/request-key.conf --- keyutils.orig/request-key.conf 2008-09-07 23:53:10.000000000 +0000 +++ keyutils/request-key.conf 2009-02-05 00:53:00.000000000 +0000 -@@ -34,4 +34,6 @@ - create user debug:* negate /bin/keyctl negate %k 30 %S +@@ -38,4 +38,6 @@ + create user debug:* revoked /bin/keyctl reject %k 30 %c %S create user debug:loop:* * |/bin/cat create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S +create cifs.spnego * * /usr/sbin/cifs.upcall -c %k diff --git a/package/keyutils/Config.in b/package/keyutils/Config.in index 7813de3799..e4a2e846a1 100644 --- a/package/keyutils/Config.in +++ b/package/keyutils/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_KEYUTILS These tools are used to control the key management system built into the Linux kernel. - http://people.redhat.com/~dhowells/keyutils/ + https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/ comment "keyutils needs a toolchain w/ dynamic library" depends on BR2_USE_MMU diff --git a/package/keyutils/keyutils.hash b/package/keyutils/keyutils.hash index d6781628cd..35de0c7829 100644 --- a/package/keyutils/keyutils.hash +++ b/package/keyutils/keyutils.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115 keyutils-1.6.tar.bz2 -sha256 f46409d4822b2457b39bbd0e7881eecb396130eb8320b7748fa7e9488970aa6d LICENCE.GPL -sha256 0d15593e3a8ad90917f8509b5ac1e4b5e5d196434a68029aa9dc0858a4a4c521 LICENCE.LGPL +sha256 a61d5706136ae4c05bd48f86186bcfdbd88dd8bd5107e3e195c924cfc1b39bb4 keyutils-1.6.3.tar.gz +sha256 f46409d4822b2457b39bbd0e7881eecb396130eb8320b7748fa7e9488970aa6d LICENCE.GPL +sha256 0d15593e3a8ad90917f8509b5ac1e4b5e5d196434a68029aa9dc0858a4a4c521 LICENCE.LGPL diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk index c8de3a0dfc..cba57cf199 100644 --- a/package/keyutils/keyutils.mk +++ b/package/keyutils/keyutils.mk @@ -4,9 +4,8 @@ # ################################################################################ -KEYUTILS_VERSION = 1.6 -KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2 -KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils +KEYUTILS_VERSION = 1.6.3 +KEYUTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot KEYUTILS_LICENSE = GPL-2.0+, LGPL-2.1+ KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL KEYUTILS_INSTALL_STAGING = YES @@ -23,6 +22,11 @@ ifeq ($(BR2_SHARED_LIBS),y) KEYUTILS_MAKE_PARAMS += NO_ARLIB=1 endif +# Touch cxx.stamp to avoid adding a C++ dependency +define KEYUTILS_CONFIGURE_CMDS + touch $(@D)/cxx.stamp +endef + define KEYUTILS_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) endef diff --git a/package/kf5/kf5-kcoreaddons/Config.in b/package/kf5/kf5-kcoreaddons/Config.in index 88fda03ee0..02bd38e395 100644 --- a/package/kf5/kf5-kcoreaddons/Config.in +++ b/package/kf5/kf5-kcoreaddons/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KF5_KCOREADDONS bool "kf5-kcoreaddons" + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_KF5_EXTRA_CMAKE_MODULES select BR2_PACKAGE_QT5TOOLS select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk index 2a782b35e1..81617492c0 100644 --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk @@ -15,7 +15,7 @@ KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -KF5_MODEMMANAGER_QT_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +KF5_MODEMMANAGER_QT_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif $(eval $(cmake-package)) diff --git a/package/kismet/Config.in b/package/kismet/Config.in index ab91c0e6fb..961d5f230e 100644 --- a/package/kismet/Config.in +++ b/package/kismet/Config.in @@ -1,42 +1,76 @@ -comment "kismet needs a toolchain w/ threads, C++, dynamic library" +comment "kismet needs a toolchain w/ threads, C++, gcc >= 5" depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" config BR2_PACKAGE_KISMET bool "kismet" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_NCURSES + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_LIBNL + select BR2_PACKAGE_PROTOBUF_C + select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_ZLIB help - Kismet - 802.11 layer2 wireless network detector, sniffer, - and intrusion detection system. + Kismet is a wireless network and device detector, sniffer, + wardriving tool, and WIDS (wireless intrusion detection) + framework. - Kismet will work with any wireless card which supports raw - monitoring (rfmon) mode, and can sniff 802.11b, 802.11a, and - 802.11g traffic. - - Kismet identifies networks by passively collecting packets - and detecting standard named networks, detecting (and given - time, decloaking) hidden networks, and infering the presence - of nonbeaconing networks via data traffic. + Kismet works with Wi-Fi interfaces, Bluetooth interfaces, some + SDR (software defined radio) hardware like the RTLSDR, and + other specialized capture hardware. http://www.kismetwireless.net if BR2_PACKAGE_KISMET -config BR2_PACKAGE_KISMET_CLIENT - bool "Install client" +config BR2_PACKAGE_KISMET_PYTHON_TOOLS + bool "Install python tools" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_PYTHON_NUMPY # runtime for RTLAMR and RTLADSB + select BR2_PACKAGE_PYTHON_PROTOBUF # runtime + select BR2_PACKAGE_PYTHON_SERIAL # runtime for Freaklabs Zigbee + select BR2_PACKAGE_PYTHON_SETUPTOOLS + help + Enable Python and Python-related tools (RTL_433, RTLAMR, + RTLADSB and Freaklabs Zigbee) -config BR2_PACKAGE_KISMET_DRONE - bool "Install drone" +comment "python tools needs python3" + depends on !BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + +comment "python tools needs a glibc or musl toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) config BR2_PACKAGE_KISMET_SERVER bool "Install server" default y + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_USE_WCHAR + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future + select BR2_PACKAGE_PROTOBUF + +comment "server needs a toolchain w/ dynamic library, wchar" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + +comment "server needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 endif diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash index 30780b1cc3..4c986a159b 100644 --- a/package/kismet/kismet.hash +++ b/package/kismet/kismet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 kismet-2016-07-R1.tar.xz -sha256 92b9eae679d8efbcd7514f7ff1346e4c1d42d272cd10bcb724d1511d35e28cd1 debian/copyright +sha256 f85939c9d32fa72d777db35c68af84c379171b94380acad0db7924f95a81bdaa kismet-2021-06-R1.tar.xz +sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index d3946d65f3..64f9501db8 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -4,16 +4,22 @@ # ################################################################################ -KISMET_VERSION = 2016-07-R1 +KISMET_VERSION = 2021-06-R1 KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz KISMET_SITE = http://www.kismetwireless.net/code -KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses libnl -KISMET_CONF_OPTS += --with-netlink-version=3 +KISMET_DEPENDENCIES = \ + host-pkgconf \ + libpcap \ + $(if $(BR2_PACKAGE_LIBNL),libnl) \ + $(if $(BR2_PACKAGE_PROTOBUF),protobuf) \ + protobuf-c \ + sqlite \ + zlib KISMET_LICENSE = GPL-2.0+ -KISMET_LICENSE_FILES = debian/copyright +KISMET_LICENSE_FILES = LICENSE +KISMET_SELINUX_MODULES = kismet -# We touch configure.in: -KISMET_AUTORECONF = YES +KISMET_CONF_OPTS = --disable-debuglibs KISMET_CXXFLAGS = $(TARGET_CXXFLAGS) @@ -23,43 +29,66 @@ endif KISMET_CONF_ENV += CXXFLAGS="$(KISMET_CXXFLAGS)" +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +KISMET_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) KISMET_DEPENDENCIES += libcap +KISMET_CONF_OPTS += --enable-libcap +else +KISMET_CONF_OPTS += --disable-libcap +endif + +ifeq ($(BR2_PACKAGE_LIBUSB),y) +KISMET_DEPENDENCIES += libusb +KISMET_CONF_OPTS += --enable-libusb +else +KISMET_CONF_OPTS += --disable-libusb +endif + +ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS),y) +KISMET_DEPENDENCIES += libwebsockets +KISMET_CONF_OPTS += --enable-libwebsockets +else +KISMET_CONF_OPTS += --disable-libwebsockets +endif + +ifeq ($(BR2_PACKAGE_LM_SENSORS),y) +KISMET_DEPENDENCIES += lm-sensors +KISMET_CONF_OPTS += --enable-lmsensors +else +KISMET_CONF_OPTS += --disable-lmsensors endif ifeq ($(BR2_PACKAGE_PCRE),y) KISMET_DEPENDENCIES += pcre +KISMET_CONF_OPTS += --enable-pcre +else +KISMET_CONF_OPTS += --disable-pcre endif -ifeq ($(BR2_PACKAGE_KISMET_CLIENT),y) -KISMET_TARGET_BINARIES += kismet_client +ifeq ($(BR2_PACKAGE_KISMET_PYTHON_TOOLS),y) +KISMET_DEPENDENCIES += python3 python-setuptools +KISMET_CONF_OPTS += \ + --enable-python-tools \ + --with-python-interpreter=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) +else +KISMET_CONF_OPTS += --disable-python-tools endif +KISMET_INSTALL_TARGET_OPTS += \ + DESTDIR=$(TARGET_DIR) \ + INSTUSR=$(shell id -u) \ + INSTGRP=$(shell id -g) \ + SUIDGROUP=$(shell id -g) + ifeq ($(BR2_PACKAGE_KISMET_SERVER),y) -KISMET_TARGET_BINARIES += kismet_server -KISMET_TARGET_CONFIGS += kismet.conf +KISMET_CONF_OPTS += --disable-capture-tools-only +KISMET_INSTALL_TARGET_OPTS += install +else +KISMET_CONF_OPTS += --enable-capture-tools-only +KISMET_INSTALL_TARGET_OPTS += binsuidinstall endif -ifeq ($(BR2_PACKAGE_KISMET_DRONE),y) -KISMET_TARGET_BINARIES += kismet_drone -KISMET_TARGET_CONFIGS += kismet_drone.conf -endif - -ifdef KISMET_TARGET_BINARIES -define KISMET_INSTALL_TARGET_BINARIES - $(INSTALL) -m 755 $(addprefix $(KISMET_DIR)/, $(KISMET_TARGET_BINARIES)) $(TARGET_DIR)/usr/bin -endef -endif - -ifdef KISMET_TARGET_CONFIGS -define KISMET_INSTALL_TARGET_CONFIGS - $(INSTALL) -m 644 $(addprefix $(KISMET_DIR)/conf/, $(KISMET_TARGET_CONFIGS)) $(TARGET_DIR)/etc -endef -endif - -define KISMET_INSTALL_TARGET_CMDS - $(KISMET_INSTALL_TARGET_BINARIES) - $(KISMET_INSTALL_TARGET_CONFIGS) -endef - $(eval $(autotools-package)) diff --git a/package/kmod/kmod.hash b/package/kmod/kmod.hash index 3cb60b2dd3..f0bd436dc8 100644 --- a/package/kmod/kmod.hash +++ b/package/kmod/kmod.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc -sha256 c1d3fbf16ca24b95f334c1de1b46f17bbe5a10b0e81e72668bdc922ebffbbc0c kmod-27.tar.xz +sha256 3969fc0f13daa98084256337081c442f8749310089e48aa695c9b4dfe1b3a26c kmod-28.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index e2dfea5c7b..7c5d200b0f 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -4,7 +4,7 @@ # ################################################################################ -KMOD_VERSION = 27 +KMOD_VERSION = 28 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod KMOD_INSTALL_STAGING = YES @@ -15,6 +15,8 @@ HOST_KMOD_DEPENDENCIES = host-pkgconf KMOD_LICENSE = LGPL-2.1+ (library) KMOD_LICENSE_FILES = libkmod/COPYING +KMOD_CPE_ID_VENDOR = kernel + # --gc-sections triggers binutils ld segfault # https://sourceware.org/bugzilla/show_bug.cgi?id=21180 ifeq ($(BR2_microblaze),y) @@ -35,11 +37,29 @@ endif ifeq ($(BR2_PACKAGE_ZLIB),y) KMOD_DEPENDENCIES += zlib KMOD_CONF_OPTS += --with-zlib +else +KMOD_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +KMOD_DEPENDENCIES += zstd +KMOD_CONF_OPTS += --with-zstd +else +KMOD_CONF_OPTS += --without-zstd endif ifeq ($(BR2_PACKAGE_XZ),y) KMOD_DEPENDENCIES += xz KMOD_CONF_OPTS += --with-xz +else +KMOD_CONF_OPTS += --without-xz +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +KMOD_DEPENDENCIES += openssl +KMOD_CONF_OPTS += --with-openssl +else +KMOD_CONF_OPTS += --without-openssl endif ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) @@ -71,6 +91,27 @@ else KMOD_CONF_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_HOST_KMOD_GZ),y) +HOST_KMOD_DEPENDENCIES += host-zlib +HOST_KMOD_CONF_OPTS += --with-zlib +else +HOST_KMOD_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_HOST_KMOD_ZSTD),y) +HOST_KMOD_DEPENDENCIES += host-zstd +HOST_KMOD_CONF_OPTS += --with-zstd +else +HOST_KMOD_CONF_OPTS += --without-zstd +endif + +ifeq ($(BR2_PACKAGE_HOST_KMOD_XZ),y) +HOST_KMOD_DEPENDENCIES += host-xz +HOST_KMOD_CONF_OPTS += --with-xz +else +HOST_KMOD_CONF_OPTS += --without-xz +endif + # We only install depmod, since that's the only tool used for the # host. define HOST_KMOD_INSTALL_TOOLS diff --git a/package/kmscube/kmscube.hash b/package/kmscube/kmscube.hash index 6a4140c541..cb7abd48ea 100644 --- a/package/kmscube/kmscube.hash +++ b/package/kmscube/kmscube.hash @@ -1,2 +1,3 @@ # Locally computed sha256 ec135069d8bee7f4fe38cb9dc96fbbd56e0057290fa25eff8b5b314ee473c502 kmscube-4660a7dca6512b6e658759d00cff7d4ad2a2059d.tar.gz +sha256 f622099ab0d274133f6e62d5fccfe970b61134d80ed036f45f8cf1e90c3d5a05 COPYING diff --git a/package/kmscube/kmscube.mk b/package/kmscube/kmscube.mk index dc8c691864..7b458376dc 100644 --- a/package/kmscube/kmscube.mk +++ b/package/kmscube/kmscube.mk @@ -7,6 +7,7 @@ KMSCUBE_VERSION = 4660a7dca6512b6e658759d00cff7d4ad2a2059d KMSCUBE_SITE = https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION) KMSCUBE_LICENSE = MIT +KMSCUBE_LICENSE_FILES = COPYING KMSCUBE_DEPENDENCIES = host-pkgconf mesa3d libdrm $(eval $(meson-package)) diff --git a/package/kmsxx/Config.in b/package/kmsxx/Config.in index 1d174c18b1..fa327ba18d 100644 --- a/package/kmsxx/Config.in +++ b/package/kmsxx/Config.in @@ -1,9 +1,11 @@ config BR2_PACKAGE_KMSXX bool "kms++" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 # linux/dma-buf.h depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + depends on BR2_USE_WCHAR # fmt + select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBDRM help libkms++ is a C++11 library for kernel mode setting. @@ -21,6 +23,7 @@ config BR2_PACKAGE_KMSXX_INSTALL_TESTS endif -comment "kms++ needs a toolchain w/ threads, C++, gcc >= 4.8, headers >= 3.8" +comment "kms++ needs a toolchain w/ threads, C++, gcc >= 4.8, headers >= 4.11, wchar" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 \ + || !BR2_USE_WCHAR diff --git a/package/kmsxx/kmsxx.hash b/package/kmsxx/kmsxx.hash index b8d06ac478..1eeb1e6a7e 100644 --- a/package/kmsxx/kmsxx.hash +++ b/package/kmsxx/kmsxx.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 28892e50c1d1c83fddff9ec683e3bdbd465f5032d0014ceeab43563b813807e1 kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9.tar.gz -sha256 022b4d51da34a380d74dc24eea8e2c4e1a4c8776a52171f8d9e941cf56daf888 LICENSE +sha256 4a682328b03c28ff1f6cfcafc48d30c3feb5ef98ed07e5dd3bbd9e6a1d4a47cc kmsxx-548905611c130ea9d31929a0caf7a198d8bac462.tar.gz +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/kmsxx/kmsxx.mk b/package/kmsxx/kmsxx.mk index 829beb1d68..fd40ff8e73 100644 --- a/package/kmsxx/kmsxx.mk +++ b/package/kmsxx/kmsxx.mk @@ -4,62 +4,46 @@ # ################################################################################ -KMSXX_VERSION = cb0786049f960f2bd383617151b01318e02e9ff9 +KMSXX_VERSION = 548905611c130ea9d31929a0caf7a198d8bac462 KMSXX_SITE = $(call github,tomba,kmsxx,$(KMSXX_VERSION)) KMSXX_LICENSE = MPL-2.0 KMSXX_LICENSE_FILES = LICENSE KMSXX_INSTALL_STAGING = YES -KMSXX_DEPENDENCIES = libdrm host-pkgconf -KMSXX_CONF_OPTS = -DKMSXX_ENABLE_PYTHON=OFF +KMSXX_DEPENDENCIES = fmt libdrm host-pkgconf +KMSXX_CONF_OPTS = \ + -Dkmscube=false \ + -Dpykms=disabled \ + -Domap=disabled \ + -Duse-system-fmt=true \ + -Duse-system-pybind11=true -KMSXX_CXXFLAGS = $(TARGET_CXXFLAGS) - -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) -KMSXX_CXXFLAGS += -O0 +ifeq ($(BR2_STATIC_LIBS),y) +KMSXX_CONF_OPTS += -Dstatic-libc=true +else +KMSXX_CONF_OPTS += -Dstatic-libc=false endif -KMSXX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(KMSXX_CXXFLAGS)" +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +KMSXX_CXXFLAGS += $(TARGET_CXXFLAGS) -O0 +endif ifeq ($(BR2_PACKAGE_KMSXX_INSTALL_TESTS),y) -KMSXX_TESTS = \ - fbtest kmsblank kmscapture \ - kmsprint kmstest kmsview wbcap \ - wbm2m - -define KMSXX_INSTALL_TARGET_TESTS - $(foreach t,$(KMSXX_TESTS),\ - $(INSTALL) -D -m 0755 $(@D)/bin/$(t) \ +KMSXX_CONF_OPTS += -Dutils=true +# extra handling for some utils not installed by default +KMSXX_EXTRA_UTILS = kmsview kmscapture omap-wbcap omap-wbm2m +ifeq ($(BR2_PACKAGE_LIBEVDEV),y) +KMSXX_DEPENDENCIES += libevdev +KMSXX_EXTRA_UTILS += kmstouch +endif +define KMSXX_INSTALL_EXTRA_UTILS + $(foreach t,$(KMSXX_EXTRA_UTILS),\ + $(INSTALL) -D -m 0755 $(@D)/build/utils/$(t) \ $(TARGET_DIR)/usr/bin/$(t) ) endef +KMSXX_POST_INSTALL_TARGET_HOOKS += KMSXX_INSTALL_EXTRA_UTILS +else +KMSXX_CONF_OPTS += -Dutils=false endif -KMSXX_LIBS = kms++ kms++util - -define KMSXX_INSTALL_TARGET_CMDS - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS), - $(foreach l,$(KMSXX_LIBS),\ - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \ - $(TARGET_DIR)/usr/lib/lib$(l).so - ) - ) - $(KMSXX_INSTALL_TARGET_TESTS) -endef - -# kmsxx only builds shared or static libraries, so when -# BR2_SHARED_STATIC_LIBS=y, we don't have any static library to -# install -define KMSXX_INSTALL_STAGING_CMDS - $(foreach l,$(KMSXX_LIBS),\ - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS), - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \ - $(STAGING_DIR)/usr/lib/lib$(l).so) - $(if $(BR2_STATIC_LIBS), - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).a \ - $(STAGING_DIR)/usr/lib/lib$(l).a) - mkdir -p $(STAGING_DIR)/usr/include/$(l) - cp -dpfr $(@D)/$(l)/inc/$(l)/* $(STAGING_DIR)/usr/include/$(l)/ - ) -endef - -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index 6bc7bc9acf..fcb5884807 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6827f1ebefa5f281ace52bdf83b5ab95789c77b88a344524ead1b346668d57e7 kodi-audiodecoder-modplug-2.0.3-Leia.tar.gz -sha256 317f732723eb58745a9b22c234861dbd2d98972039543f6b549c7cb26eb2cb08 debian/copyright +sha256 629a9f83a2663ab8f2ea1ae747782d1ce6df870f42d6d9b84c858bc9b607ae9c kodi-audiodecoder-modplug-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk index 8e1031053e..e4bee48f98 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = 2.0.3-Leia +KODI_AUDIODECODER_MODPLUG_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi libmodplug $(eval $(cmake-package)) diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index ae6931ae63..9f929d9f82 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 66305c9d654aed0b9efcf44b90acac0ab8db321dff57523d13faf67606cd78ce kodi-audiodecoder-nosefart-2.0.2-Leia.tar.gz -sha256 01a3f135925df23a5d8679ff633fe3d5021125224c9349acd2c35dd0cf3ea762 debian/copyright +sha256 a4be5f6efc46841c9b1689c91b06f69cd695220b583e62ed2948768fa93d09a2 kodi-audiodecoder-nosefart-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk index 8f437a7378..377f6b7ef1 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = 2.0.2-Leia +KODI_AUDIODECODER_NOSEFART_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash index 5c6a644ff3..cb66e0a00e 100644 --- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash +++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 271e513a3094b163f986eb5bb5cbc70c7a602f5764cef255cc161cc5094e5648 kodi-audiodecoder-sidplay-1.2.2-Leia.tar.gz -sha256 dc915100daec3589f59b47f3438e8ec5ccc11ec25ccb3d0e7e66639764f31584 debian/copyright +sha256 4919d71e76889df1c1e3c5abe60641cc266afdbbcf3976a5509ae3fda142d2c4 kodi-audiodecoder-sidplay-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk index 079ae0b202..d0ab98418f 100644 --- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk +++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_SIDPLAY_VERSION = 1.2.2-Leia +KODI_AUDIODECODER_SIDPLAY_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,xbmc,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION)) KODI_AUDIODECODER_SIDPLAY_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi libsidplay2 $(eval $(cmake-package)) diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index ad3bf9be90..b82c5b36a1 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e059f84b04b8e92e5ecc2989303f6a736f37d6e3bda939ac765499e616c91580 kodi-audiodecoder-snesapu-2.0.2-Leia.tar.gz -sha256 b7e8b234fc40687d647d929fc554b91cdaa4011e5e656e68c5c6ee8c4cdf81d2 debian/copyright +sha256 3537b735acfbbacaada2aa1d2035acbc698f37cc7626375f408e967ca612b2d0 kodi-audiodecoder-snesapu-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk index 57504a17bb..7cd2fe588c 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = 2.0.2-Leia +KODI_AUDIODECODER_SNESAPU_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash index ae1c82e2d0..ae6a5aa528 100644 --- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash +++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3e14a7da3822002a90bf7d31a9f98541ae9ec2137c764dc94ca5b4de4ac8de82 kodi-audiodecoder-stsound-2.0.2-Leia.tar.gz -sha256 417ded3464139990f7898ac17c9eacde85dc0fafd3b3ca0c497d945b1bd93af5 debian/copyright +sha256 65b452cd3bdf8b21929084ca0dc238147784defdfb25351c857fa459230e2f3f kodi-audiodecoder-stsound-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk index 679be5a7ff..6a5bb721bc 100644 --- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk +++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_STSOUND_VERSION = 2.0.2-Leia +KODI_AUDIODECODER_STSOUND_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_STSOUND_SITE = $(call github,xbmc,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION)) KODI_AUDIODECODER_STSOUND_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_STSOUND_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_STSOUND_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash index b4c9c36045..dcb835664d 100644 --- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash +++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b20a3a23056aaf76c216c755f36dff03e943d7c086d3e3fca4c920b93113e073 kodi-audiodecoder-timidity-2.0.5-Leia.tar.gz -sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md +sha256 0e049f25a12d8cfc9965d189de573d87aa3e7e6549e99a7ddcaf9d8cddc111db kodi-audiodecoder-timidity-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk index a4f0126c43..a79622cfd9 100644 --- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk +++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_TIMIDITY_VERSION = 2.0.5-Leia +KODI_AUDIODECODER_TIMIDITY_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,xbmc,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION)) KODI_AUDIODECODER_TIMIDITY_LICENSE = GPL-2.0+ KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash index 05d641b158..02df50cc7b 100644 --- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash +++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 28876be1e1317b3ec5c3a4fe415f20d92a4c5868912656c5e8ab9cdd7e3f32d8 kodi-audiodecoder-vgmstream-1.1.5-Leia.tar.gz -sha256 fc7c7ab8774d94fb2eccdf47e3b8052a3906e4b5ec8554191da321020c965d8e debian/copyright +sha256 81f4577c2ec53bfa7ab04d3da374b1cc639ef5f5fe9c2837f9e85916b50d9d5d kodi-audiodecoder-vgmstream-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk index 4e3cdab584..1c3e96bb1d 100644 --- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk +++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_VGMSTREAM_VERSION = 1.1.5-Leia +KODI_AUDIODECODER_VGMSTREAM_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,xbmc,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION)) KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash index 187a038eed..162d21e39c 100644 --- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash +++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 42e18fc2477ce5abc3efd89851a4bacc6b9436889a607a15f8232ef68b297f93 kodi-audioencoder-flac-2.0.6-Leia.tar.gz -sha256 21dc3eb9c75f1ed6367a4cf3f3999b299bc6c172da3730184edd2a5dd4d090aa debian/copyright +sha256 e9001f1789970178b551f01d9242a897523af4f2d34f70bfd7bbbe598bce2e6c kodi-audioencoder-flac-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk index 53c1f3debc..3987fa107d 100644 --- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk +++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_FLAC_VERSION = 2.0.6-Leia +KODI_AUDIOENCODER_FLAC_VERSION = 3.0.0-Matrix KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION)) KODI_AUDIOENCODER_FLAC_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_FLAC_LICENSE_FILES = debian/copyright +KODI_AUDIOENCODER_FLAC_LICENSE_FILES = LICENSE.md KODI_AUDIOENCODER_FLAC_DEPENDENCIES = flac kodi libogg host-pkgconf $(eval $(cmake-package)) diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index ef86f90eaa..9c12a58e55 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9df54cf5c5ae3882a2d89d745c1d1f8b749e71a7f9305a1b059ecfd356995a36 kodi-audioencoder-lame-2.0.4-Leia.tar.gz -sha256 68a06632cc80eea941b07e27777788dcd4f7c5ba9c006e24f467a9d4bf4d3582 debian/copyright +sha256 ad47d8c4dffe6690bd1ff32bb5fd44f11b691706ff9a1e5b6152efee92976a75 kodi-audioencoder-lame-3.0.2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk index 5d93e83ed6..2316473829 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = 2.0.4-Leia +KODI_AUDIOENCODER_LAME_VERSION = 3.0.2-Matrix KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION)) KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_LAME_LICENSE_FILES = debian/copyright +KODI_AUDIOENCODER_LAME_LICENSE_FILES = LICENSE.md KODI_AUDIOENCODER_LAME_DEPENDENCIES = kodi lame KODI_AUDIOENCODER_LAME_CONF_OPTS += \ -DLAME_INCLUDE_DIRS=$(STAGING_DIR)/usr/include diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash index 567b2d6f38..f415624db0 100644 --- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash +++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b4b2b1b7ae8bda35514f20ad0275b434f2b60fc93b1e17ca6e654ae145852b1f kodi-audioencoder-vorbis-2.0.4-Leia.tar.gz -sha256 706e890fc5c0496b72d3c36284abcc85f9c83b3f2b21db53a68439c538122a59 debian/copyright +sha256 ba4e6bf402e31096c1fd791db8db26d0eea575998ae414a74c797e868fd08000 kodi-audioencoder-vorbis-3.0.1-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk index b789d239bd..e79dd433db 100644 --- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk +++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_VORBIS_VERSION = 2.0.4-Leia +KODI_AUDIOENCODER_VORBIS_VERSION = 3.0.1-Matrix KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION)) KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = debian/copyright +KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = LICENSE.md KODI_AUDIOENCODER_VORBIS_DEPENDENCIES = kodi libogg libvorbis host-pkgconf $(eval $(cmake-package)) diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash index e779768812..345fd1aa03 100644 --- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash +++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 03cb2810b2aa335fd308a5e2b6580d21ac840334c55fc891acc310633c3c49b4 kodi-audioencoder-wav-2.0.3-Leia.tar.gz -sha256 341a6317428fbc7c9d5b971d1c6162ea34be64649caa650ee0a05c06ae53a872 debian/copyright +sha256 9c4c834717060c5ca643a8f9758c8d784b00382ee6ce20e55ab8f2fe0b5f44dd kodi-audioencoder-wav-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk index b597b1b13d..b47c2bce84 100644 --- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk +++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_WAV_VERSION = 2.0.3-Leia +KODI_AUDIOENCODER_WAV_VERSION = 3.0.0-Matrix KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION)) KODI_AUDIOENCODER_WAV_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_WAV_LICENSE_FILES = debian/copyright +KODI_AUDIOENCODER_WAV_LICENSE_FILES = LICENSE.md KODI_AUDIOENCODER_WAV_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-inputstream-adaptive/Config.in b/package/kodi-inputstream-adaptive/Config.in index f9ba20adcf..f0a24b7043 100644 --- a/package/kodi-inputstream-adaptive/Config.in +++ b/package/kodi-inputstream-adaptive/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE # wvdecrypter/cdm/build/build_config.h depends on BR2_aarch64 || BR2_arm || BR2_i386 || BR2_mipsel \ || BR2_mips64el || BR2_x86_64 + select BR2_PACKAGE_EXPAT help Kodi inputstream addon for several manifest types - https://github.com/peak3d/inputstream.adaptive + https://github.com/xbmc/inputstream.adaptive diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 4cdfe5aeac..1abf28d89e 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 83c3d1c45ed5f63d95ca8fa93fcf57fb249586987f9fe74ef4857ca660ed2f64 kodi-inputstream-adaptive-2.4.3-Leia.tar.gz -sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL +sha256 48eea3785dc820ee48cf652483ff91a1589d0fabe3f61c740e04595b5a020288 kodi-inputstream-adaptive-2.6.22-Matrix.tar.gz +sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index bf7f64ca72..1d95b8e97a 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.4.3-Leia -KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.6.22-Matrix +KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL -KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = kodi +KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = expat kodi $(eval $(cmake-package)) diff --git a/package/kodi-inputstream-rtmp/Config.in b/package/kodi-inputstream-rtmp/Config.in index fa83926301..c4bd2e1380 100644 --- a/package/kodi-inputstream-rtmp/Config.in +++ b/package/kodi-inputstream-rtmp/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_KODI_INPUTSTREAM_RTMP bool "kodi-inputstream-rtmp" + select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_RTMPDUMP + select BR2_PACKAGE_ZLIB help RTMP input stream add-on for Kodi diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash index ba6ae0d91d..e645fb14bb 100644 --- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash +++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 56dac63262fa736620863900d903616d4827d735992e6d8beda84e377a5599e5 kodi-inputstream-rtmp-2.0.9-Leia.tar.gz -sha256 ddba7d22c2586f13de40786c21f3b87c6913c9937f4862dc828d33cfff0395eb debian/copyright +sha256 efaaa9b07c18810582a3826df476fc36a2aac82be7512271545073c3f6cc0212 kodi-inputstream-rtmp-3.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk index e850be40ff..6029b7d35c 100644 --- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk +++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_INPUTSTREAM_RTMP_VERSION = 2.0.9-Leia +KODI_INPUTSTREAM_RTMP_VERSION = 3.4.0-Matrix KODI_INPUTSTREAM_RTMP_SITE = $(call github,xbmc,inputstream.rtmp,$(KODI_INPUTSTREAM_RTMP_VERSION)) KODI_INPUTSTREAM_RTMP_LICENSE = GPL-2.0+ -KODI_INPUTSTREAM_RTMP_LICENSE_FILES = debian/copyright -KODI_INPUTSTREAM_RTMP_DEPENDENCIES = kodi rtmpdump +KODI_INPUTSTREAM_RTMP_LICENSE_FILES = LICENSE.md +KODI_INPUTSTREAM_RTMP_DEPENDENCIES = kodi openssl rtmpdump zlib $(eval $(cmake-package)) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 934392e916..d57e9f2434 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 18.6-Leia +KODI_JSONSCHEMABUILDER_VERSION = 19.1-Matrix KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 15397c05cd..e85cd19a65 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0 kodi-peripheral-joystick-1.4.9-Leia.tar.gz -sha256 2bb807179053b1a7795f9952539a394664847f561a9ffa4ccc36d7bb3cddadf9 debian/copyright +sha256 405acfbcc510f96a48244168362213955357f95cd8b1b92fe1ce483213045bfb kodi-peripheral-joystick-1.7.2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 9cce174da1..b70f12ce12 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 1.4.9-Leia +KODI_PERIPHERAL_JOYSTICK_VERSION = 1.7.2-Matrix KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ -KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = debian/copyright +KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md KODI_PERIPHERAL_JOYSTICK_DEPENDENCIES = kodi tinyxml udev $(eval $(cmake-package)) diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash index 6ff1edf8b9..a971493c02 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c1d755230b0f2fe943cf7297a6d187371088f39391944d422d2bf5969c8863c1 kodi-peripheral-xarcade-51e1a4550a6c7d7feeb01760a731af17bea6c524.tar.gz -sha256 848ad4f3a480c953b556467fb9a315dd352ec1d267e012144c46adc571e39efb debian/copyright +sha256 6fa8e1d0e6ebb6c385a7aef6e6c7629d2f1f52601ade7839093c1c3abb844894 kodi-peripheral-xarcade-1.2.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk index 42d7af8a02..fe5a9e41a0 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PERIPHERAL_XARCADE_VERSION = 51e1a4550a6c7d7feeb01760a731af17bea6c524 +KODI_PERIPHERAL_XARCADE_VERSION = 1.2.0-Matrix KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION)) KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+ -KODI_PERIPHERAL_XARCADE_LICENSE_FILES = debian/copyright +KODI_PERIPHERAL_XARCADE_LICENSE_FILES = LICENSE.md KODI_PERIPHERAL_XARCADE_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-pvr-argustv/Config.in b/package/kodi-pvr-argustv/Config.in index 216000aefd..7cca2661c7 100644 --- a/package/kodi-pvr-argustv/Config.in +++ b/package/kodi-pvr-argustv/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_PVR_ARGUSTV bool "kodi-pvr-argustv" select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM help Kodi's ARGUS TV client addon diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index e9d3684b2f..f2927dd1b6 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d0fae3721715a17e1c1454dd7029eb8d18e7f761ed65e00f8c488c7c08433e8 kodi-pvr-argustv-3.5.4-Leia.tar.gz -sha256 17bc5450fff10fc46484886690adbf20c369f5baff021435feab1187b9943834 debian/copyright +sha256 4f6aaa28ff3437246a5cd77988076af55405a2689ddc0f8c48663423a9fc933b kodi-pvr-argustv-7.1.2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index b82a6f52d0..c5f85e221b 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 3.5.4-Leia +KODI_PVR_ARGUSTV_VERSION = 7.1.2-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ -KODI_PVR_ARGUSTV_LICENSE_FILES = debian/copyright -KODI_PVR_ARGUSTV_DEPENDENCIES = jsoncpp kodi-platform +KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md +KODI_PVR_ARGUSTV_DEPENDENCIES = jsoncpp kodi $(eval $(cmake-package)) diff --git a/package/kodi-pvr-dvblink/Config.in b/package/kodi-pvr-dvblink/Config.in index 57f11271ec..3358750376 100644 --- a/package/kodi-pvr-dvblink/Config.in +++ b/package/kodi-pvr-dvblink/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KODI_PVR_DVBLINK bool "kodi-pvr-dvblink" - select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_TINYXML2 help Kodi's DVBLink client addon diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash index c07f227809..158d1365c6 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ad7586abfe7b3f9dd67b3a2225c442fc8d2a442e48bd7df75b11652286392c2f kodi-pvr-dvblink-4.7.2-Leia.tar.gz -sha256 4200fb35edb052f04dc43d267a1ad59468cb899e7b4931756b5830039b82716d debian/copyright +sha256 e4491b7f4ee7f565f5b13ca4ea52640c2be076271d22de1fb4e35e69dc8c2bbf kodi-pvr-dvblink-9.1.2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk index 95bc7bbb4b..4e31f9c241 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_DVBLINK_VERSION = 4.7.2-Leia +KODI_PVR_DVBLINK_VERSION = 9.1.2-Matrix KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION)) KODI_PVR_DVBLINK_LICENSE = GPL-2.0+ -KODI_PVR_DVBLINK_LICENSE_FILES = debian/copyright -KODI_PVR_DVBLINK_DEPENDENCIES = kodi-platform tinyxml2 +KODI_PVR_DVBLINK_LICENSE_FILES = LICENSE.md +KODI_PVR_DVBLINK_DEPENDENCIES = kodi tinyxml2 $(eval $(cmake-package)) diff --git a/package/kodi-pvr-dvbviewer/Config.in b/package/kodi-pvr-dvbviewer/Config.in index e7dd7b3eb6..6a47d154fc 100644 --- a/package/kodi-pvr-dvbviewer/Config.in +++ b/package/kodi-pvr-dvbviewer/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_KODI_PVR_DVBVIEWER bool "kodi-pvr-dvbviewer" - select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_TINYXML help Kodi's DVBViewer client addon diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash index 642f93f71c..94db39898f 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8a3d167e652574caf30ba0ce9c22d278715e0237774b817e37826f1b2d647bff kodi-pvr-dvbviewer-3.7.11-Leia.tar.gz -sha256 5757dbd6a8731e9395508cd7ab9ca0ea0c2863a7aac7136299d40549c88c9c2c debian/copyright +sha256 d29108aca5bb22ede1613b9055cd5a8e684861b0086de96523c23e5d21de6143 kodi-pvr-dvbviewer-7.3.3-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk index b88d3d86cd..efc8862bda 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_DVBVIEWER_VERSION = 3.7.11-Leia +KODI_PVR_DVBVIEWER_VERSION = 7.3.3-Matrix KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION)) KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+ -KODI_PVR_DVBVIEWER_LICENSE_FILES = debian/copyright -KODI_PVR_DVBVIEWER_DEPENDENCIES = kodi-platform +KODI_PVR_DVBVIEWER_LICENSE_FILES = LICENSE.md +KODI_PVR_DVBVIEWER_DEPENDENCIES = kodi tinyxml $(eval $(cmake-package)) diff --git a/package/kodi-pvr-filmon/Config.in b/package/kodi-pvr-filmon/Config.in index 0b662df176..d10002912a 100644 --- a/package/kodi-pvr-filmon/Config.in +++ b/package/kodi-pvr-filmon/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_PVR_FILMON bool "kodi-pvr-filmon" select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM help Filmon PVR client addon for Kodi diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash index 947c81d2e6..b771212a3d 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 763500fb4a7210569f05dba8307d400e532dd0e72b24f1a1d2cd516695145190 kodi-pvr-filmon-2.4.4-Leia.tar.gz -sha256 081907693b03f27cb1b17e0a440ae05fd8c8b4631be6fe6fdba4e18a5d40fdc5 debian/copyright +sha256 3ede4930bce246f15cdc4a063086327c28c412b923d0c1030e2fd3ba8a63e138 kodi-pvr-filmon-6.1.2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk index 0ee910db9f..976db3fbe2 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_FILMON_VERSION = 2.4.4-Leia +KODI_PVR_FILMON_VERSION = 6.1.2-Matrix KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION)) KODI_PVR_FILMON_LICENSE = GPL-2.0+ -KODI_PVR_FILMON_LICENSE_FILES = debian/copyright -KODI_PVR_FILMON_DEPENDENCIES = jsoncpp kodi-platform +KODI_PVR_FILMON_LICENSE_FILES = LICENSE.md +KODI_PVR_FILMON_DEPENDENCIES = jsoncpp kodi $(eval $(cmake-package)) diff --git a/package/kodi-pvr-hdhomerun/Config.in b/package/kodi-pvr-hdhomerun/Config.in index ed5b914cb3..5a05a85c9c 100644 --- a/package/kodi-pvr-hdhomerun/Config.in +++ b/package/kodi-pvr-hdhomerun/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_PVR_HDHOMERUN bool "kodi-pvr-hdhomerun" select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_LIBHDHOMERUN help Kodi's HDHomeRun client addon diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index 3e76af00ed..cfd2f272f8 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 815ba3dfbe6e1318226d41879057f0b8a4f0ac960d12ebc5d69f0a1ac28cfa09 kodi-pvr-hdhomerun-3.5.0-Leia.tar.gz -sha256 9e76c8ce9e201f75c50c755982b9e2f15821280dedc5e953f685086912e1e39d debian/copyright +sha256 90a44fb73b471813c9ca99b802b5a119287c9d7fde705ae215d9f59bb8da9830 kodi-pvr-hdhomerun-7.1.1-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index ae42f5c33d..53197c49c2 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_HDHOMERUN_VERSION = 3.5.0-Leia +KODI_PVR_HDHOMERUN_VERSION = 7.1.1-Matrix KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+ -KODI_PVR_HDHOMERUN_LICENSE_FILES = debian/copyright -KODI_PVR_HDHOMERUN_DEPENDENCIES = jsoncpp kodi-platform libhdhomerun +KODI_PVR_HDHOMERUN_LICENSE_FILES = LICENSE.md +KODI_PVR_HDHOMERUN_DEPENDENCIES = jsoncpp kodi libhdhomerun $(eval $(cmake-package)) diff --git a/package/kodi-pvr-hts/Config.in b/package/kodi-pvr-hts/Config.in index c4c4497bd3..a352457f31 100644 --- a/package/kodi-pvr-hts/Config.in +++ b/package/kodi-pvr-hts/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_KODI_PVR_HTS bool "kodi-pvr-hts" - select BR2_PACKAGE_KODI_PLATFORM + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 help Tvheadend HTSP PVR client addon for Kodi https://github.com/kodi-pvr/pvr.hts + +comment "kodi-pvr-hts needs a toolchain w/ gcc >= 7" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index d5899f5119..b282eaf083 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6958b91ca616554e4c068bc303c66388e9a2c3a68b5979d8918b4e0d7b6bb95c kodi-pvr-hts-4.4.21-Leia.tar.gz -sha256 6d97c3d608a5d59565b567313bd3e53a1d0066ed59f4ae8e474c895d0c20e746 debian/copyright +sha256 98f4250d8d8700741798524ea8a3756c5d02403408c74de2d2d3b22b3f13aa23 kodi-pvr-hts-8.3.4-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index 6a25cda003..70240116a9 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 4.4.21-Leia +KODI_PVR_HTS_VERSION = 8.3.4-Matrix KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ -KODI_PVR_HTS_LICENSE_FILES = debian/copyright -KODI_PVR_HTS_DEPENDENCIES = kodi-platform +KODI_PVR_HTS_LICENSE_FILES = LICENSE.md +KODI_PVR_HTS_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-pvr-iptvsimple/Config.in b/package/kodi-pvr-iptvsimple/Config.in index 94fc1f0602..2f5a208bad 100644 --- a/package/kodi-pvr-iptvsimple/Config.in +++ b/package/kodi-pvr-iptvsimple/Config.in @@ -1,7 +1,14 @@ config BR2_PACKAGE_KODI_PVR_IPTVSIMPLE bool "kodi-pvr-iptvsimple" - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_RAPIDXML + # kodi-inputstream-adaptive + depends on BR2_aarch64 || BR2_arm || BR2_i386 || BR2_mipsel \ + || BR2_mips64el || BR2_x86_64 + select BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE # runtime + select BR2_PACKAGE_KODI_INPUTSTREAM_FFMPEGDIRECT # runtime + select BR2_PACKAGE_KODI_INPUTSTREAM_RTMP # runtime + select BR2_PACKAGE_PUGIXML + select BR2_PACKAGE_XZ + select BR2_PACKAGE_ZLIB help IPTV Live TV and Radio PVR client addon for Kodi diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index bd8caca76a..911837c0c6 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0812e359a943f4ffb763b47fc0440768a8aa09f12172ef8dff4440b0a48f9c96 kodi-pvr-iptvsimple-3.9.8-Leia.tar.gz -sha256 50e33ec3cddb75e6c5c5eb1b3d38cc0adee7dec71d7244925106d4a2c4d5e31d debian/copyright +sha256 b968b38d09299a9784b82d3fb82f461db1544901b450e374d270dd5c2be0c6d1 kodi-pvr-iptvsimple-7.6.9-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index f1a087100c..6785410562 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 3.9.8-Leia +KODI_PVR_IPTVSIMPLE_VERSION = 7.6.9-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ -KODI_PVR_IPTVSIMPLE_LICENSE_FILES = debian/copyright -KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi-platform rapidxml +KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md +KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi pugixml xz zlib $(eval $(cmake-package)) diff --git a/package/kodi-pvr-mediaportal-tvserver/Config.in b/package/kodi-pvr-mediaportal-tvserver/Config.in index 733ca8859e..e8f1e3d611 100644 --- a/package/kodi-pvr-mediaportal-tvserver/Config.in +++ b/package/kodi-pvr-mediaportal-tvserver/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_KODI_PVR_MEDIAPORTAL_TVSERVER bool "kodi-pvr-mediaportal-tvserver" - select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_TINYXML help MediaPortal TVServer PVR client addon for Kodi diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 84526b7461..1a5545feb6 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9c05578566f7448dc3a7677587c804596aa314afd493cb9c62cc65ea883645aa kodi-pvr-mediaportal-tvserver-3.5.18-Leia.tar.gz -sha256 f9df5b0c11a23b2d5ca84828c67412ecd8752df46527285aeff48f4d7988d367 debian/copyright +sha256 2051aea6d4c94c963699f4e7bd84e0083d8355dc465df0673f6b67d1f4d6198b kodi-pvr-mediaportal-tvserver-8.2.1-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index a00711c662..56bd4d1000 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 3.5.18-Leia +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 8.2.1-Matrix KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ -KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = debian/copyright -KODI_PVR_MEDIAPORTAL_TVSERVER_DEPENDENCIES = kodi-platform +KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md +KODI_PVR_MEDIAPORTAL_TVSERVER_DEPENDENCIES = kodi tinyxml $(eval $(cmake-package)) diff --git a/package/kodi-pvr-mythtv/Config.in b/package/kodi-pvr-mythtv/Config.in index 798ff3e911..ebdbc00487 100644 --- a/package/kodi-pvr-mythtv/Config.in +++ b/package/kodi-pvr-mythtv/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KODI_PVR_MYTHTV bool "kodi-pvr-mythtv" - select BR2_PACKAGE_KODI_PLATFORM help MythTV PVR for Kodi diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index c70e032289..307509cdd1 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 36d9142e0e19b904e1c4a6d8cd67063d291e63971f80a98a6f24b7f4554bb2e3 kodi-pvr-mythtv-5.10.15-Leia.tar.gz -sha256 0efb11009d447b39ec35d77dc265db3d1c3d261730bbc33b267587254d973ec8 debian/copyright +sha256 91cb98ea39fd41e9edcfd079e6ca39bfabeb4d6c247b1a540d86a7856e77c75e kodi-pvr-mythtv-7.3.1-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index b89db3a455..70b1c6efe0 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 5.10.15-Leia +KODI_PVR_MYTHTV_VERSION = 7.3.1-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ -KODI_PVR_MYTHTV_LICENSE_FILES = debian/copyright -KODI_PVR_MYTHTV_DEPENDENCIES = kodi-platform +KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md +KODI_PVR_MYTHTV_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-pvr-nextpvr/Config.in b/package/kodi-pvr-nextpvr/Config.in index e520426796..d260df833f 100644 --- a/package/kodi-pvr-nextpvr/Config.in +++ b/package/kodi-pvr-nextpvr/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_KODI_PVR_NEXTPVR bool "kodi-pvr-nextpvr" - select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_TINYXML2 help Kodi's NextPVR client addon diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 4d730deb85..898b7a3941 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5f1b7fa00d7248fa840a0e7574bb7714867bff4ad81ceb8ed33cb3aa6d5ccbe9 kodi-pvr-nextpvr-3.3.19-Leia.tar.gz -sha256 0bd576badce05c6b4315c415dabd77d80c871e72026c399f7a7bb8582e0911fe debian/copyright +sha256 0aa1239e5cbee28da8c2f29ed043ef644621c5478fc1db08c700fea971c80873 kodi-pvr-nextpvr-8.2.6-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index 94461f61d1..f00d5b3804 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 3.3.19-Leia +KODI_PVR_NEXTPVR_VERSION = 8.2.6-Matrix KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ -KODI_PVR_NEXTPVR_LICENSE_FILES = debian/copyright -KODI_PVR_NEXTPVR_DEPENDENCIES = kodi-platform +KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md +KODI_PVR_NEXTPVR_DEPENDENCIES = kodi tinyxml2 $(eval $(cmake-package)) diff --git a/package/kodi-pvr-njoy/Config.in b/package/kodi-pvr-njoy/Config.in index 33c493cb8b..bb84ea3a66 100644 --- a/package/kodi-pvr-njoy/Config.in +++ b/package/kodi-pvr-njoy/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_KODI_PVR_NJOY bool "kodi-pvr-njoy" - select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_TINYXML help Kodi's Njoy N7 client addon diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index cf23a3abaa..5b3f0a58d3 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8c42a3c3754d7a07de9682504c4883a584eb21a92b9af70f0129ffc2707c1554 kodi-pvr-njoy-3.4.2-Leia.tar.gz -sha256 9d42154eabd84ae131cc6384a3ea0fc622c3551595564bec7a6bec8df4a57fbd debian/copyright +sha256 6a7edf45bfe0e9bad0fe460accf9a9c0bbb93a907c2becf5e48dcc79a803cc8b kodi-pvr-njoy-7.1.1-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index ca86d46d85..6f4f54c955 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_NJOY_VERSION = 3.4.2-Leia +KODI_PVR_NJOY_VERSION = 7.1.1-Matrix KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) KODI_PVR_NJOY_LICENSE = GPL-2.0+ -KODI_PVR_NJOY_LICENSE_FILES = debian/copyright -KODI_PVR_NJOY_DEPENDENCIES = kodi-platform +KODI_PVR_NJOY_LICENSE_FILES = LICENSE.md +KODI_PVR_NJOY_DEPENDENCIES = kodi tinyxml $(eval $(cmake-package)) diff --git a/package/kodi-pvr-pctv/Config.in b/package/kodi-pvr-pctv/Config.in index 255cd4a5f0..11fe09b2f1 100644 --- a/package/kodi-pvr-pctv/Config.in +++ b/package/kodi-pvr-pctv/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_PVR_PCTV bool "kodi-pvr-pctv" select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM help PCTV PVR client addon for Kodi diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index f1bb8a4804..45c32ac0e9 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a9f1c5596786cf4cfa279d0b4477839ef7f5bb7267c65152dbcf7ae0bda56679 kodi-pvr-pctv-2.4.5-Leia.tar.gz -sha256 43376e70ae80133530c8ce71a3b0dcde8529a8162d3b3956009eb8fc0f5c559c debian/copyright +sha256 2692fc0387762f62e8fc9e57f21d613e4c2e52553d3eb30ee042f91cc61155ac kodi-pvr-pctv-6.1.1-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 45c916df49..3483bfed9e 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_PCTV_VERSION = 2.4.5-Leia +KODI_PVR_PCTV_VERSION = 6.1.1-Matrix KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ -KODI_PVR_PCTV_LICENSE_FILES = debian/copyright -KODI_PVR_PCTV_DEPENDENCIES = jsoncpp kodi-platform +KODI_PVR_PCTV_LICENSE_FILES = LICENSE.md +KODI_PVR_PCTV_DEPENDENCIES = jsoncpp kodi $(eval $(cmake-package)) diff --git a/package/kodi-pvr-stalker/Config.in b/package/kodi-pvr-stalker/Config.in index d334d0c2cb..f82d5a497f 100644 --- a/package/kodi-pvr-stalker/Config.in +++ b/package/kodi-pvr-stalker/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_PVR_STALKER bool "kodi-pvr-stalker" select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_LIBXML2 help A PVR Client that connects Kodi to Stalker Middleware diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 720689dc43..62d5e458c8 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 03eb428f21d6b8526b6671278b60ac6dc5a761a515af27172d8ac5c814cc3f65 kodi-pvr-stalker-3.4.10-Leia.tar.gz -sha256 f9fa34b2caa07376a7a976c1f0b1b9761b37449afd4ceb1e7afa283492054237 debian/copyright +sha256 4450dcdacfb471d8d10e3a487bace8c57f1cab4629f1be1c57adae2165fcc5b8 kodi-pvr-stalker-7.1.1-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index 0ae41171a9..0e6058bf48 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 3.4.10-Leia +KODI_PVR_STALKER_VERSION = 7.1.1-Matrix KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ -KODI_PVR_STALKER_LICENSE_FILES = debian/copyright -KODI_PVR_STALKER_DEPENDENCIES = jsoncpp kodi-platform libxml2 +KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md +KODI_PVR_STALKER_DEPENDENCIES = jsoncpp kodi libxml2 $(eval $(cmake-package)) diff --git a/package/kodi-pvr-vbox/Config.in b/package/kodi-pvr-vbox/Config.in index c1c22c10d1..202e3c66e8 100644 --- a/package/kodi-pvr-vbox/Config.in +++ b/package/kodi-pvr-vbox/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KODI_PVR_VBOX bool "kodi-pvr-vbox" - select BR2_PACKAGE_KODI_PLATFORM help Kodi PVR addon for interfacing with VBox Communications XTi TV Gateway diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash index a3c624526e..cf8c449b73 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98aadcf3d0109a7dc5f85b4e5473d595039b59c46b0686a2fbda88ff7631ee0c kodi-pvr-vbox-4.7.0-Leia.tar.gz -sha256 f535b79e33bdf4d270f8aed3fdcb92f807981f808d7f5e3c053c088e5ccf553b debian/copyright +sha256 b53943101401b97e6a3f63f7e4d3bffc78d892329b8fd9ef5cfb0833277456ea kodi-pvr-vbox-8.1.2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk index b10bfc5b85..56ed870a53 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_VBOX_VERSION = 4.7.0-Leia +KODI_PVR_VBOX_VERSION = 8.1.2-Matrix KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION)) KODI_PVR_VBOX_LICENSE = GPL-2.0+ -KODI_PVR_VBOX_LICENSE_FILES = debian/copyright -KODI_PVR_VBOX_DEPENDENCIES = kodi-platform +KODI_PVR_VBOX_LICENSE_FILES = LICENSE.md +KODI_PVR_VBOX_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-pvr-vdr-vnsi/Config.in b/package/kodi-pvr-vdr-vnsi/Config.in index 768dec88fd..6b57900b29 100644 --- a/package/kodi-pvr-vdr-vnsi/Config.in +++ b/package/kodi-pvr-vdr-vnsi/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_KODI_PVR_VDR_VNSI bool "kodi-pvr-vdr-vnsi" - select BR2_PACKAGE_KODI_PLATFORM + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 help Kodi PVR addon VNSI https://github.com/kodi-pvr/pvr.vdr.vnsi + +comment "kodi-pvr-vdr-vnsi needs a toolchain w/ gcc >= 7" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index d70a5c30b3..872afd891e 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f0ea8907e77ca014429bbe73d07c3410cc7be25a6db0df157863b87d2684affb kodi-pvr-vdr-vnsi-3.6.4-Leia.tar.gz -sha256 28266596fdf4162d4f15985e0108cd9ddb42531ddad2297011649c1af49f7fe2 debian/copyright +sha256 702410caf142c76434ed716900221f1292b3713501e3744330df6c2feb890614 kodi-pvr-vdr-vnsi-8.2.3-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index f467fa98f5..a3933752ac 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 3.6.4-Leia +KODI_PVR_VDR_VNSI_VERSION = 8.2.3-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ -KODI_PVR_VDR_VNSI_LICENSE_FILES = debian/copyright -KODI_PVR_VDR_VNSI_DEPENDENCIES = kodi-platform +KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md +KODI_PVR_VDR_VNSI_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-pvr-vuplus/Config.in b/package/kodi-pvr-vuplus/Config.in index 96320f6fcb..862f5f9267 100644 --- a/package/kodi-pvr-vuplus/Config.in +++ b/package/kodi-pvr-vuplus/Config.in @@ -1,9 +1,12 @@ config BR2_PACKAGE_KODI_PVR_VUPLUS bool "kodi-pvr-vuplus" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # json-for-modern-cpp select BR2_PACKAGE_JSON_FOR_MODERN_CPP - select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_TINYXML help VuPlus PVR client addon for Kodi https://github.com/kodi-pvr/pvr.vuplus + +comment "kodi-pvr-vuplus needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index bd7f865486..502d3d4106 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d7dd890e4491e211ff3781cdc043347ab7a4ef6e00619ac1b4641ed81b0c3626 kodi-pvr-vuplus-3.28.9-Leia.tar.gz -sha256 e98518889de8d38eaa6ddcb086b6e3b86efed98b501a5c666b9cf48f79e6df5d debian/copyright +sha256 c6032c7b79e45a83523c6fb32a7b097e8c8fa81de76996babdd160b2288061a4 kodi-pvr-vuplus-7.4.9-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index bf1de1178d..ff2598f9bc 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_VUPLUS_VERSION = 3.28.9-Leia +KODI_PVR_VUPLUS_VERSION = 7.4.9-Matrix KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) KODI_PVR_VUPLUS_LICENSE = GPL-2.0+ -KODI_PVR_VUPLUS_LICENSE_FILES = debian/copyright -KODI_PVR_VUPLUS_DEPENDENCIES = json-for-modern-cpp kodi-platform tinyxml +KODI_PVR_VUPLUS_LICENSE_FILES = LICENSE.md +KODI_PVR_VUPLUS_DEPENDENCIES = json-for-modern-cpp kodi tinyxml $(eval $(cmake-package)) diff --git a/package/kodi-pvr-wmc/Config.in b/package/kodi-pvr-wmc/Config.in index 2672c83434..3daf4c387b 100644 --- a/package/kodi-pvr-wmc/Config.in +++ b/package/kodi-pvr-wmc/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KODI_PVR_WMC bool "kodi-pvr-wmc" - select BR2_PACKAGE_KODI_PLATFORM help Kodi's Windows Media Center client addon diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index e72e8d20a9..48552005db 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4cb81f29cba23172d042e50bbab00cd64cd5670ad7350fd9d25301f63178e5f7 kodi-pvr-wmc-2.4.5-Leia.tar.gz -sha256 6d97c3d608a5d59565b567313bd3e53a1d0066ed59f4ae8e474c895d0c20e746 debian/copyright +sha256 4e534ca49390b0fcb62c23f1076235e1664358ee67bd3f8ed04660d16094053a kodi-pvr-wmc-6.1.2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index d669768e7e..0a1b684081 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 2.4.5-Leia +KODI_PVR_WMC_VERSION = 6.1.2-Matrix KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ -KODI_PVR_WMC_LICENSE_FILES = debian/copyright -KODI_PVR_WMC_DEPENDENCIES = kodi-platform +KODI_PVR_WMC_LICENSE_FILES = LICENSE.md +KODI_PVR_WMC_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-asteroids/Config.in b/package/kodi-screensaver-asteroids/Config.in index 3d66c3dcc3..833e065dfa 100644 --- a/package/kodi-screensaver-asteroids/Config.in +++ b/package/kodi-screensaver-asteroids/Config.in @@ -1,11 +1,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS bool "kodi-screensaver-asteroids" - depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_GLM help Asteroids screensaver for Kodi https://github.com/xbmc/screensaver.asteroids - -comment "kodi-screensaver-asteroids needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash index 00d40413b6..a8886d2733 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c359f8bb6a2e9b42dcfb063cdf965ce0b3fc95761816d98160000aea33894241 kodi-screensaver-asteroids-2.3.2-Leia.tar.gz -sha256 297a1d34e6000f1b1a924f5ab75c16c2270968bfa47357dd8fa3799c9dfc47d8 debian/copyright +sha256 b60d0123dd2ad2326a03b2a66a3cdba3ac17f0a109c4ecedc3216699ca28cae2 kodi-screensaver-asteroids-2.6.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk index 278efb4eea..add0ca5b9b 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_ASTEROIDS_VERSION = 2.3.2-Leia +KODI_SCREENSAVER_ASTEROIDS_VERSION = 2.6.0-Matrix KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,xbmc,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION)) KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = debian/copyright +KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = LICENSE.md KODI_SCREENSAVER_ASTEROIDS_DEPENDENCIES = glm kodi $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-asterwave/Config.in b/package/kodi-screensaver-asterwave/Config.in index b5e80cc535..ffb5caadd7 100644 --- a/package/kodi-screensaver-asterwave/Config.in +++ b/package/kodi-screensaver-asterwave/Config.in @@ -1,12 +1,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_ASTERWAVE bool "kodi-screensaver-asterwave" - depends on BR2_PACKAGE_HAS_LIBGL # libglu, libsoil - select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_LIBSOIL + select BR2_PACKAGE_GLM help AsterWave screensaver for Kodi https://github.com/xbmc/screensaver.asterwave - -comment "kodi-screensaver-asterwave needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash index c320215e54..8b47070194 100644 --- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash +++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 44fb4189afefec6ab5cff04d205425bed26b127c02625ae176b409cb67207e5f kodi-screensaver-asterwave-3.0.4-Leia.tar.gz -sha256 a0268e081014f3a555be39f7eb0fff759424963324915ad2ea56bf26668685e7 debian/copyright +sha256 4645ea5923df5a2cae84887b743c3963940344439c37ca2e18896d082ac76b1d kodi-screensaver-asterwave-3.3.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk index 794e772fb0..9e768fce85 100644 --- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk +++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk @@ -4,10 +4,14 @@ # ################################################################################ -KODI_SCREENSAVER_ASTERWAVE_VERSION = 3.0.4-Leia +KODI_SCREENSAVER_ASTERWAVE_VERSION = 3.3.0-Matrix KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,xbmc,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION)) KODI_SCREENSAVER_ASTERWAVE_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_ASTERWAVE_LICENSE_FILES = debian/copyright -KODI_SCREENSAVER_ASTERWAVE_DEPENDENCIES = kodi libglu libsoil +KODI_SCREENSAVER_ASTERWAVE_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_ASTERWAVE_DEPENDENCIES = glm kodi + +KODI_SCREENSAVER_ASTERWAVE_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-biogenesis/Config.in b/package/kodi-screensaver-biogenesis/Config.in index 9703e9091b..26f134d0bb 100644 --- a/package/kodi-screensaver-biogenesis/Config.in +++ b/package/kodi-screensaver-biogenesis/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_KODI_SCREENSAVER_BIOGENESIS bool "kodi-screensaver-biogenesis" - depends on BR2_PACKAGE_HAS_LIBGL help BioGenesis screensaver for Kodi https://github.com/xbmc/screensaver.biogenesis - -comment "kodi-screensaver-biogenesis needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash index df07f9fbc5..1f2c5e6305 100644 --- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash +++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b0f721d112282f633a769e7b077c5dd52e5045a8f1ae32c4e602b0e2e937acb0 kodi-screensaver-biogenesis-2.2.3-Leia.tar.gz -sha256 d38b9e2768b49acdedcb21a202d12753c8f1d7e85e5ee24ff1e4aee3c7601a65 debian/copyright +sha256 bf56384e6956674cd911c52b2807993d0a6e0ffa9623b5a1981a3153911e135a kodi-screensaver-biogenesis-2.5.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk index 562c279ec6..8b2d6b2ee5 100644 --- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk +++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_BIOGENESIS_VERSION = 2.2.3-Leia +KODI_SCREENSAVER_BIOGENESIS_VERSION = 2.5.0-Matrix KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,xbmc,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION)) KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = debian/copyright +KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = LICENSE.md KODI_SCREENSAVER_BIOGENESIS_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-cpblobs/Config.in b/package/kodi-screensaver-cpblobs/Config.in index 4e0003bddc..7f9a591418 100644 --- a/package/kodi-screensaver-cpblobs/Config.in +++ b/package/kodi-screensaver-cpblobs/Config.in @@ -1,11 +1,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_CPBLOBS bool "kodi-screensaver-cpblobs" - depends on BR2_PACKAGE_HAS_LIBGL # libsoil - select BR2_PACKAGE_LIBSOIL + select BR2_PACKAGE_GLM help CpBlobs screensaver for Kodi https://github.com/xbmc/screensaver.cpblobs - -comment "kodi-screensaver-cpblobs needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash index f73932d269..bc77c36248 100644 --- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash +++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8234240670c8cd0feb61536e08058a1ec2122dc638dcc4bf328fad8d70b3d4c6 kodi-screensaver-cpblobs-3.0.4-Leia.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 eda36572da291d870dacbf3ad596e4ff3daed96350d9585583c279b55cfdc34a kodi-screensaver-cpblobs-3.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk index f64fe3e55d..628f254a42 100644 --- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk +++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk @@ -4,10 +4,14 @@ # ################################################################################ -KODI_SCREENSAVER_CPBLOBS_VERSION = 3.0.4-Leia +KODI_SCREENSAVER_CPBLOBS_VERSION = 3.4.0-Matrix KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,xbmc,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION)) KODI_SCREENSAVER_CPBLOBS_LICENSE = GPL-2.0 -KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE -KODI_SCREENSAVER_CPBLOBS_DEPENDENCIES = kodi libsoil +KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_CPBLOBS_DEPENDENCIES = glm kodi + +KODI_SCREENSAVER_CPBLOBS_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-greynetic/Config.in b/package/kodi-screensaver-greynetic/Config.in index 685feb8872..92db2855e6 100644 --- a/package/kodi-screensaver-greynetic/Config.in +++ b/package/kodi-screensaver-greynetic/Config.in @@ -1,10 +1,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_GREYNETIC bool "kodi-screensaver-greynetic" - depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_GLM help Greynetic screensaver for Kodi https://github.com/xbmc/screensaver.greynetic - -comment "kodi-screensaver-greynetic needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash index 814d139689..d1f4992240 100644 --- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash +++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 02114c9c7467cba26ce93090ee66c015dd74fc1f0d74b46e609e53d1fd8fd218 kodi-screensaver-greynetic-2.2.2-Leia.tar.gz -sha256 2905fdee5c68dc4944c42711d45f47794e8fb881bd67d66d0875d10f9a2156a0 debian/copyright +sha256 093c77ad332dc5797f1866895218d6c6b4490ef1f9bd4cbdf15c000c3b881798 kodi-screensaver-greynetic-2.5.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk index 21cbe23a64..b7c4a15b87 100644 --- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk +++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_GREYNETIC_VERSION = 2.2.2-Leia +KODI_SCREENSAVER_GREYNETIC_VERSION = 2.5.0-Matrix KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,xbmc,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION)) KODI_SCREENSAVER_GREYNETIC_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = debian/copyright -KODI_SCREENSAVER_GREYNETIC_DEPENDENCIES = kodi +KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_GREYNETIC_DEPENDENCIES = glm kodi $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-matrixtrails/Config.in b/package/kodi-screensaver-matrixtrails/Config.in index 270a51c9f4..9f031ba10d 100644 --- a/package/kodi-screensaver-matrixtrails/Config.in +++ b/package/kodi-screensaver-matrixtrails/Config.in @@ -1,11 +1,6 @@ config BR2_PACKAGE_KODI_SCREENSAVER_MATRIXTRAILS bool "kodi-screensaver-matrixtrails" - depends on BR2_PACKAGE_HAS_LIBGL # libsoil - select BR2_PACKAGE_LIBSOIL help Matrix trails screensaver for Kodi https://github.com/xbmc/screensaver.matrixtrails - -comment "kodi-screensaver-matrixtrails needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash index 9a657a10dd..1f35f11b7d 100644 --- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash +++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d2c795853c5a72184bb6720247d79c48b1d9fbc97e9c2913003a707d612e3ac kodi-screensaver-matrixtrails-2.2.1-Leia.tar.gz -sha256 4cfbc2bc766d343a70ba0322bc7203332c232ba57b62fb57a0ee9189cca4ac27 debian/copyright +sha256 49986b82e7319e25ef2b3ec84b3892bbf1cb0b5253bd541da730c5cf5dd1940b kodi-screensaver-matrixtrails-2.6.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk index 937c43d8fc..a89ea72d5d 100644 --- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk +++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk @@ -4,10 +4,14 @@ # ################################################################################ -KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 2.2.1-Leia -KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,v$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION)) +KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 2.6.0-Matrix +KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION)) KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = debian/copyright -KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi libsoil +KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi + +KODI_SCREENSAVER_MATRIXTRAILS_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-pingpong/Config.in b/package/kodi-screensaver-pingpong/Config.in index bc76fffd6e..2983f7c2ea 100644 --- a/package/kodi-screensaver-pingpong/Config.in +++ b/package/kodi-screensaver-pingpong/Config.in @@ -1,10 +1,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_PINGPONG bool "kodi-screensaver-pingpong" - depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_GLM help Ping-pong screensaver for Kodi https://github.com/xbmc/screensaver.pingpong - -comment "kodi-screensaver-pingpong needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash index 6374f3aff1..245fdfdbe9 100644 --- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash +++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 618a7dfc85961c803b6292cea9004bdb71566e10a32aec2870cd29775681a808 kodi-screensaver-pingpong-2.1.2-Leia.tar.gz -sha256 96e9b817ea6384e3d2c5241c8a0504df11d6f8bd0a2f58f25df7152da64f263c debian/copyright +sha256 c38cda571b345d61882b43cea839536fa6fbfbb08e07231e8d8bc8adb8d28c08 kodi-screensaver-pingpong-2.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk index 12d9430651..cd794128f3 100644 --- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk +++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_PINGPONG_VERSION = 2.1.2-Leia +KODI_SCREENSAVER_PINGPONG_VERSION = 2.4.0-Matrix KODI_SCREENSAVER_PINGPONG_SITE = $(call github,xbmc,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION)) KODI_SCREENSAVER_PINGPONG_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = debian/copyright -KODI_SCREENSAVER_PINGPONG_DEPENDENCIES = kodi +KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_PINGPONG_DEPENDENCIES = glm kodi $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-pyro/Config.in b/package/kodi-screensaver-pyro/Config.in index e2d1988ec5..9ee99883b4 100644 --- a/package/kodi-screensaver-pyro/Config.in +++ b/package/kodi-screensaver-pyro/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_KODI_SCREENSAVER_PYRO bool "kodi-screensaver-pyro" - depends on BR2_PACKAGE_HAS_LIBGL help Pyro screensaver for Kodi https://github.com/xbmc/screensaver.pyro - -comment "kodi-screensaver-pyro needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash index f35a62a08d..db4244e8fa 100644 --- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash +++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cf9ed582b70460682175366641e6a00eaea085a1d3477a02710ba8398a1d17bd kodi-screensaver-pyro-3.0.1-Leia.tar.gz -sha256 24354cf1e6058ba0a95c7652eab9f1be2224c835ce36d14e82c0f401f65a53b7 debian/copyright +sha256 83a3375166d6aaed01939bc370981ad46909fe1f1365fe7af22d4614fa6d06e6 kodi-screensaver-pyro-3.3.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk index 8a6ea93e83..dac03c6347 100644 --- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk +++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_PYRO_VERSION = 3.0.1-Leia +KODI_SCREENSAVER_PYRO_VERSION = 3.3.0-Matrix KODI_SCREENSAVER_PYRO_SITE = $(call github,xbmc,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION)) KODI_SCREENSAVER_PYRO_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_PYRO_LICENSE_FILES = debian/copyright +KODI_SCREENSAVER_PYRO_LICENSE_FILES = LICENSE.md KODI_SCREENSAVER_PYRO_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-rsxs/Config.in b/package/kodi-screensaver-rsxs/Config.in index 076c7effa0..e88df1fe49 100644 --- a/package/kodi-screensaver-rsxs/Config.in +++ b/package/kodi-screensaver-rsxs/Config.in @@ -1,17 +1,13 @@ config BR2_PACKAGE_KODI_SCREENSAVER_RSXS bool "kodi-screensaver-rsxs" - depends on BR2_PACKAGE_HAS_LIBGL # libglu + depends on BR2_PACKAGE_KODI_RENDER_SYSTEM_GL select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_GLI select BR2_PACKAGE_GLM - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_LIBTOOL - select BR2_PACKAGE_TIFF help RSXS screensaver add-ons for Kodi https://github.com/xbmc/screensavers.rsxs -comment "kodi-screensaver-rsxs needs an OpenGL backend" - depends on !BR2_PACKAGE_HAS_LIBGL +comment "kodi-screensaver-rsxs needs OpenGL as Kodi render system" + depends on !BR2_PACKAGE_KODI_RENDER_SYSTEM_GL diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash index 8f34b349e7..ceb8d360f7 100644 --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 22ff3f0ca9679c59ce1a90b98d918dd10a8012b789729b2e44c04d4ce8c86ad8 kodi-screensaver-rsxs-7cb648507440d87948dec10d5bfdab3b722d37fe.tar.gz -sha256 fa0ff8b6a6267b9477be7d505aa384056633b4be17e0b9d308df9bd70d1c99f6 debian/copyright +sha256 343ecedbf6cfb75d43bb94e805aae807d61b0cd4f681a05c126f65839e3687a3 kodi-screensaver-rsxs-21c65de59546bde770225f023747a39b345baffd.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk index aa881d0d59..9b839b3112 100644 --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_RSXS_VERSION = 7cb648507440d87948dec10d5bfdab3b722d37fe +KODI_SCREENSAVER_RSXS_VERSION = 21c65de59546bde770225f023747a39b345baffd KODI_SCREENSAVER_RSXS_SITE = $(call github,xbmc,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION)) KODI_SCREENSAVER_RSXS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_RSXS_LICENSE_FILES = debian/copyright -KODI_SCREENSAVER_RSXS_DEPENDENCIES = bzip2 gli glm jpeg kodi libpng libtool tiff +KODI_SCREENSAVER_RSXS_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_RSXS_DEPENDENCIES = bzip2 gli glm kodi $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-stars/Config.in b/package/kodi-screensaver-stars/Config.in index a2e435c0f6..3a8713a56e 100644 --- a/package/kodi-screensaver-stars/Config.in +++ b/package/kodi-screensaver-stars/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_KODI_SCREENSAVER_STARS bool "kodi-screensaver-stars" - depends on BR2_PACKAGE_HAS_LIBGL help Starfield screensaver for Kodi https://github.com/xbmc/screensaver.stars - -comment "kodi-screensaver-stars needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash index 9ff902243f..b98c4baaef 100644 --- a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash +++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dca39e68d803cca3c1d9524df17feb3e12fc7eeae4166c6311a97dc68c29f523 kodi-screensaver-stars-2.1.3-Leia.tar.gz -sha256 004b08d7a7bbd574c6e3a4499c13b4f930de780e0cae5b35f85310642d5cdd1e debian/copyright +sha256 868105f6381bf5439f8c67d54dda00f2108a4363f4b25dfb12787ed65b602f0d kodi-screensaver-stars-2.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk index 678165b666..c062de9488 100644 --- a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk +++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_STARS_VERSION = 2.1.3-Leia +KODI_SCREENSAVER_STARS_VERSION = 2.4.0-Matrix KODI_SCREENSAVER_STARS_SITE = $(call github,xbmc,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION)) KODI_SCREENSAVER_STARS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_STARS_LICENSE_FILES = debian/copyright +KODI_SCREENSAVER_STARS_LICENSE_FILES = LICENSE.md KODI_SCREENSAVER_STARS_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.hash b/package/kodi-skin-confluence/kodi-skin-confluence.hash index 113548bf64..e3d1ff73f4 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.hash +++ b/package/kodi-skin-confluence/kodi-skin-confluence.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dc4a0abf05db50caf8e70e4904b8c2c445008ec3d6d23381c9c31dedaf6109de kodi-skin-confluence-cffcb8320003e6048abe4b26316e5d5f3d50eac9.tar.gz -sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.txt +sha256 49ba4dcf4b512ac0a97bd1a4ebf14685d294d89a7a07c26ddda0fe730c8aa047 kodi-skin-confluence-37a196cdb58c0da87b5b22b047a5d44dc447f1ae.tar.gz +sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.txt diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.mk b/package/kodi-skin-confluence/kodi-skin-confluence.mk index d9bd10bdfa..fcae506d1e 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.mk +++ b/package/kodi-skin-confluence/kodi-skin-confluence.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SKIN_CONFLUENCE_VERSION = cffcb8320003e6048abe4b26316e5d5f3d50eac9 +KODI_SKIN_CONFLUENCE_VERSION = 37a196cdb58c0da87b5b22b047a5d44dc447f1ae KODI_SKIN_CONFLUENCE_SITE = $(call github,xbmc,skin.confluence,$(KODI_SKIN_CONFLUENCE_VERSION)) KODI_SKIN_CONFLUENCE_LICENSE = GPL-2.0 KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index dc5984cedc..c50387e8d2 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 18.6-Leia +KODI_TEXTUREPACKER_VERSION = 19.1-Matrix KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi-vfs-rar/kodi-vfs-rar.hash b/package/kodi-vfs-rar/kodi-vfs-rar.hash index 80d04ebaca..e4d0f7fe63 100644 --- a/package/kodi-vfs-rar/kodi-vfs-rar.hash +++ b/package/kodi-vfs-rar/kodi-vfs-rar.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 17105acd5d2d83747a402b0782e4d7fe0f3e3f3a208ea9614af56c10186a757d kodi-vfs-rar-2.2.3-Leia.tar.gz +sha256 1111d1f90cc4addc2adb0884b779f4b47e30abb2766ba1708053e5f100b514bf kodi-vfs-rar-4.0.0-Matrix.tar.gz # License files -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a lib/UnrarXLib/license.txt -sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a lib/UnrarXLib/license.txt +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-rar/kodi-vfs-rar.mk b/package/kodi-vfs-rar/kodi-vfs-rar.mk index be766080ed..001bd7c61c 100644 --- a/package/kodi-vfs-rar/kodi-vfs-rar.mk +++ b/package/kodi-vfs-rar/kodi-vfs-rar.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_RAR_VERSION = 2.2.3-Leia +KODI_VFS_RAR_VERSION = 4.0.0-Matrix KODI_VFS_RAR_SITE = $(call github,xbmc,vfs.rar,$(KODI_VFS_RAR_VERSION)) KODI_VFS_RAR_LICENSE = unrar, GPL-2.0+ KODI_VFS_RAR_LICENSE_FILES = lib/UnrarXLib/license.txt LICENSE.md diff --git a/package/kodi-vfs-sftp/Config.in b/package/kodi-vfs-sftp/Config.in index a939bd927d..b742777ff0 100644 --- a/package/kodi-vfs-sftp/Config.in +++ b/package/kodi-vfs-sftp/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_KODI_VFS_SFTP bool "kodi-vfs-sftp" - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_LIBPLATFORM select BR2_PACKAGE_LIBSSH + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_ZLIB help SFTP VFS addon for Kodi diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash index 9cfe9e5c08..d12a85437b 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6a6d7fc777f574746bcc34b618700a4db3981aee470b68d60c3407eeeb0c16d9 kodi-vfs-sftp-1.0.5-Leia.tar.gz -sha256 65fd90626c2d3d9aa3f9908f524174fa46bb359f3edecb6d86044dbd31652465 debian/copyright +sha256 b15c5dde7b3aadb3e82e61cb9b0440812b6c2f65b38c6c25aef726f97e746f68 kodi-vfs-sftp-2.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk index c01a584f71..b1b0bef36d 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VFS_SFTP_VERSION = 1.0.5-Leia +KODI_VFS_SFTP_VERSION = 2.0.0-Matrix KODI_VFS_SFTP_SITE = $(call github,xbmc,vfs.sftp,$(KODI_VFS_SFTP_VERSION)) KODI_VFS_SFTP_LICENSE = GPL-2.0+ -KODI_VFS_SFTP_LICENSE_FILES = debian/copyright -KODI_VFS_SFTP_DEPENDENCIES = kodi-platform libplatform libssh +KODI_VFS_SFTP_LICENSE_FILES = LICENSE.md +KODI_VFS_SFTP_DEPENDENCIES = kodi libssh openssl zlib $(eval $(cmake-package)) diff --git a/package/kodi-visualisation-fishbmc/Config.in b/package/kodi-visualisation-fishbmc/Config.in index 66c1565bd7..4d86d8234b 100644 --- a/package/kodi-visualisation-fishbmc/Config.in +++ b/package/kodi-visualisation-fishbmc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_VISUALISATION_FISHBMC bool "kodi-visualisation-fishbmc" + select BR2_PACKAGE_GLM help Fische visualiser for Kodi diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash index e8b5c6cb59..f03602c003 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8142fe4a32c0c113945c5fc9745e54639ca73308371d292e3422730bfad1d064 kodi-visualisation-fishbmc-5.1.2-Leia.tar.gz -sha256 684792cea796ea39d086ffd6cf5cb7c70ab8188dcf493707ba90d081d28f787e visualization.fishbmc/LICENSE +sha256 fd6a4383e36ed67590d40eb945d11bc5eae0c83e0ea56bfcadbc0ff03de0b2a4 kodi-visualisation-fishbmc-6.3.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk index a89c559d26..31bb4900c2 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_FISHBMC_VERSION = 5.1.2-Leia +KODI_VISUALISATION_FISHBMC_VERSION = 6.3.0-Matrix KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+ -KODI_VISUALISATION_FISHBMC_LICENSE_FILES = visualization.fishbmc/LICENSE -KODI_VISUALISATION_FISHBMC_DEPENDENCIES = kodi +KODI_VISUALISATION_FISHBMC_LICENSE_FILES = LICENSE.md +KODI_VISUALISATION_FISHBMC_DEPENDENCIES = glm kodi $(eval $(cmake-package)) diff --git a/package/kodi-visualisation-goom/Config.in b/package/kodi-visualisation-goom/Config.in index 065bc1d773..18905bba3a 100644 --- a/package/kodi-visualisation-goom/Config.in +++ b/package/kodi-visualisation-goom/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_KODI_VISUALISATION_GOOM bool "kodi-visualisation-goom" - depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_KODI_RENDER_SYSTEM_GL select BR2_PACKAGE_GLM help GOOM visualiser for Kodi https://github.com/notspiff/visualization.goom -comment "kodi-visualization-goom needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL +comment "kodi-visualization-goom needs OpenGL as Kodi render system" + depends on !BR2_PACKAGE_KODI_RENDER_SYSTEM_GL diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash index a6f4e41796..ab5bda33c4 100644 --- a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a02dfd844cfd5ff24f735e614a2a4727771112ce15642957a2511061f724392a kodi-visualisation-goom-2.2.1-Leia.tar.gz -sha256 a6b36f495079206146ae0b11624a8db49a538f421ffe1341f8651c9e6b06f0b0 debian/copyright +sha256 8de34cd33977bb8fa5fd721993341f7d64bbf5b08e481438740287dd2a366079 kodi-visualisation-goom-3.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk index 29cd24df69..45f2f05ece 100644 --- a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_GOOM_VERSION = 2.2.1-Leia +KODI_VISUALISATION_GOOM_VERSION = 3.4.0-Matrix KODI_VISUALISATION_GOOM_SITE = $(call github,xbmc,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION)) KODI_VISUALISATION_GOOM_LICENSE = GPL-2.0+ -KODI_VISUALISATION_GOOM_LICENSE_FILES = debian/copyright +KODI_VISUALISATION_GOOM_LICENSE_FILES = LICENSE.md KODI_VISUALISATION_GOOM_DEPENDENCIES = glm kodi diff --git a/package/kodi-visualisation-shadertoy/Config.in b/package/kodi-visualisation-shadertoy/Config.in index 1fabba5ef5..aa671aae13 100644 --- a/package/kodi-visualisation-shadertoy/Config.in +++ b/package/kodi-visualisation-shadertoy/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_VISUALISATION_SHADERTOY bool "kodi-visualisation-shadertoy" select BR2_PACKAGE_GLM - select BR2_PACKAGE_LIBPLATFORM help Shadertoy visualiser for Kodi diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash index c0a04759f9..9102f68605 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b09de334ed3c96d2e2552e0594b8f76c11e36edfc10efd725851140132a4d4f kodi-visualisation-shadertoy-1.2.3-Leia.tar.gz -sha256 e33ac3ac6ca1bdd4a4a411481d43579d855622e7ecc207809b5f49ea617db480 debian/copyright +sha256 6c106c0d8e53f9b0794291a1c53e9a00370ff79be73919d556048dce0bb9785c kodi-visualisation-shadertoy-19.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk index f6e417bef3..89ec69f8ea 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_SHADERTOY_VERSION = 1.2.3-Leia +KODI_VISUALISATION_SHADERTOY_VERSION = 19.0.0-Matrix KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+ -KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = debian/copyright -KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = glm kodi libplatform +KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = LICENSE.md +KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = glm kodi $(eval $(cmake-package)) diff --git a/package/kodi-visualisation-spectrum/Config.in b/package/kodi-visualisation-spectrum/Config.in index 3b2b0a25e2..deb623087f 100644 --- a/package/kodi-visualisation-spectrum/Config.in +++ b/package/kodi-visualisation-spectrum/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_VISUALISATION_SPECTRUM bool "kodi-visualisation-spectrum" + select BR2_PACKAGE_GLM help Spectrum visualiser for Kodi diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash index 4064184a75..d770b40092 100644 --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ec88defbb90fdb03f075abdba39c436906a8fbad8f034da3e3b31f75842206cc kodi-visualisation-spectrum-3.0.2-Leia.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 32b130c26581c224e9b43672ccb5c947f2f4982e6d2ab12e389b41a9ceeb0e3f kodi-visualisation-spectrum-19.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk index c3d61c1ef4..ca01ea270c 100644 --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_SPECTRUM_VERSION = 3.0.2-Leia +KODI_VISUALISATION_SPECTRUM_VERSION = 19.0.0-Matrix KODI_VISUALISATION_SPECTRUM_SITE = $(call github,xbmc,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION)) KODI_VISUALISATION_SPECTRUM_LICENSE = GPL-2.0+ -KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = COPYING -KODI_VISUALISATION_SPECTRUM_DEPENDENCIES = kodi +KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = LICENSE.md +KODI_VISUALISATION_SPECTRUM_DEPENDENCIES = glm kodi $(eval $(cmake-package)) diff --git a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash index 354ff80cb0..25026ef61e 100644 --- a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash +++ b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8e2ee8b39fe1c0daa24b11a9c4a175a85fdbdf7dc1bc48a1ab4876edeb6f676f kodi-visualisation-starburst-2.0.2-Leia.tar.gz -sha256 2e668b3da2f061a6d6ecc3cb96bdfb0f8fc9cc98c9e9f95454bc45b88708690f debian/copyright +sha256 b610919fd181dac638cbcea3f88b01a0b3522941415fde8fab51a17a88f536e2 kodi-visualisation-starburst-19.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk index 9f1137d12c..421b27d7d1 100644 --- a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk +++ b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_STARBURST_VERSION = 2.0.2-Leia +KODI_VISUALISATION_STARBURST_VERSION = 19.0.0-Matrix KODI_VISUALISATION_STARBURST_SITE = $(call github,xbmc,visualization.starburst,$(KODI_VISUALISATION_STARBURST_VERSION)) KODI_VISUALISATION_STARBURST_LICENSE = GPL-2.0+ -KODI_VISUALISATION_STARBURST_LICENSE_FILES = debian/copyright +KODI_VISUALISATION_STARBURST_LICENSE_FILES = LICENSE.md KODI_VISUALISATION_STARBURST_DEPENDENCIES = glm kodi $(eval $(cmake-package)) diff --git a/package/kodi-visualisation-waveform/Config.in b/package/kodi-visualisation-waveform/Config.in index 56f25096f5..24a5f7f365 100644 --- a/package/kodi-visualisation-waveform/Config.in +++ b/package/kodi-visualisation-waveform/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_VISUALISATION_WAVEFORM bool "kodi-visualisation-waveform" + select BR2_PACKAGE_GLM help Waveform visualiser for Kodi diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash index 80808663c1..465ce9005e 100644 --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c5fbf48c2251b61d9abfcd679a750199f5efc78e63fded9a1482cfd9b41d0b5b kodi-visualisation-waveform-3.1.1-Leia.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 c0b20e5d5877c34be107df0db142d46def785acb7269e6525f39a511c5a8e030 kodi-visualisation-waveform-19.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk index 2d65df8538..c66b47d60c 100644 --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_WAVEFORM_VERSION = 3.1.1-Leia +KODI_VISUALISATION_WAVEFORM_VERSION = 19.0.0-Matrix KODI_VISUALISATION_WAVEFORM_SITE = $(call github,xbmc,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION)) KODI_VISUALISATION_WAVEFORM_LICENSE = GPL-2.0+ -KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = COPYING -KODI_VISUALISATION_WAVEFORM_DEPENDENCIES = kodi +KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = LICENSE.md +KODI_VISUALISATION_WAVEFORM_DEPENDENCIES = glm kodi $(eval $(cmake-package)) diff --git a/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch index 5abb77e777..057d2254bc 100644 --- a/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch +++ b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch @@ -8,18 +8,21 @@ When cross-compiling, the location at build time of the libraries is not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable is here to handle this difference, so use it in kodi-config.cmake. +Upstream status: Reverted (PR 17616) + Signed-off-by: Thomas Petazzoni (rebased and simplified for Kodi 17.0-Krypton) Signed-off-by: Bernd Kuhls +(rebased for Kodi 19.0-Matrix) --- - project/cmake/KodiConfig.cmake.in | 4 ++-- + cmake/KodiConfig.cmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in -index 76626ec..ffb8e1d 100644 +diff --git a/cmake/KodiConfig.cmake.in b/cmake/KodiConfig.cmake.in +index a06d889fca9d..ff299807ea44 100644 --- a/cmake/KodiConfig.cmake.in +++ b/cmake/KodiConfig.cmake.in -@@ -8,7 +8,7 @@ if(NOT @APP_NAME_UC@_PREFIX) +@@ -9,7 +9,7 @@ if(NOT @APP_NAME_UC@_PREFIX) set(@APP_NAME_UC@_PREFIX @APP_PREFIX@) endif() if(NOT @APP_NAME_UC@_INCLUDE_DIR) @@ -28,10 +31,10 @@ index 76626ec..ffb8e1d 100644 endif() if(NOT @APP_NAME_UC@_LIB_DIR) set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) -@@ -20,7 +20,7 @@ endif() - if(NOT WIN32) - set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") +@@ -18,7 +18,7 @@ if(NOT @APP_NAME_UC@_DATA_DIR) + set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@) endif() + set(APP_RENDER_SYSTEM @APP_RENDER_SYSTEM@) -list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index f5b37cf7d2..af7604428e 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -5,107 +5,103 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on !(BR2_i386 && !BR2_X86_CPU_HAS_SSE) depends on BR2_USE_MMU # libcdio, and others -comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.8" +comment "kodi needs python3 w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.9" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || BR2_TOOLCHAIN_USES_MUSL \ - || !BR2_PACKAGE_PYTHON \ - || BR2_PACKAGE_PYTHON_PYC_ONLY + || !BR2_PACKAGE_PYTHON3 \ + || BR2_PACKAGE_PYTHON3_PYC_ONLY config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS bool -config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM bool default y - # List of valid CPUs can be found here: - # https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake#L12 - depends on BR2_arm1176jzf_s || BR2_cortex_a7 || BR2_cortex_a53 - depends on BR2_PACKAGE_RPI_USERLAND + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_MESA3D_GBM depends on BR2_PACKAGE_HAS_UDEV # libinput select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS -config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GL +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND bool default y - depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp + depends on BR2_INSTALL_LIBSTDCPP # waylandpp depends on BR2_PACKAGE_WAYLAND # waylandpp select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS -config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GLES +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11 bool default y - depends on BR2_PACKAGE_HAS_LIBGLES - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp - depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp - depends on BR2_PACKAGE_WAYLAND # waylandpp - select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS - -config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL - bool - default y - depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS -comment "kodi needs an OpenGL EGL backend with OpenGL support" +comment "kodi needs an OpenGL EGL backend with OpenGL or GLES support" depends on !BR2_PACKAGE_KODI_PLATFORM_SUPPORTS menuconfig BR2_PACKAGE_KODI bool "kodi" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS # gnutls, python and others + depends on !BR2_STATIC_LIBS # gnutls, python3 and others + depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS - depends on BR2_PACKAGE_PYTHON - depends on !BR2_PACKAGE_PYTHON_PYC_ONLY + depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_PACKAGE_PYTHON3_PYC_ONLY select BR2_NEEDS_HOST_JAVA - select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_FFMPEG + select BR2_PACKAGE_FFMPEG_GPL + select BR2_PACKAGE_FFMPEG_POSTPROC + select BR2_PACKAGE_FFMPEG_SWSCALE select BR2_PACKAGE_FLATBUFFERS select BR2_PACKAGE_FMT - select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_FONTCONFIG # needed for libass select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FSTRCMP - select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO select BR2_PACKAGE_LIBCROSSGUID select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBFRIBIDI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST - select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LZO - select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP - select BR2_PACKAGE_PYTHON_2TO3 - select BR2_PACKAGE_PYTHON_BSDDB - select BR2_PACKAGE_PYTHON_CURSES - select BR2_PACKAGE_PYTHON_PYEXPAT - select BR2_PACKAGE_PYTHON_SQLITE - select BR2_PACKAGE_PYTHON_SSL - select BR2_PACKAGE_PYTHON_UNICODEDATA - select BR2_PACKAGE_PYTHON_ZLIB + select BR2_PACKAGE_PYTHON3_2TO3 + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_SQLITE + select BR2_PACKAGE_PYTHON3_SSL + select BR2_PACKAGE_PYTHON3_UNICODEDATA + select BR2_PACKAGE_PYTHON3_ZLIB select BR2_PACKAGE_RAPIDJSON + select BR2_PACKAGE_SPDLOG select BR2_PACKAGE_SQLITE select BR2_PACKAGE_TAGLIB select BR2_PACKAGE_TINYXML select BR2_PACKAGE_ZLIB select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support + select BR2_PACKAGE_LIBINPUT if BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND + select BR2_PACKAGE_WAYLANDPP if BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11 help Kodi is an award-winning free and open source (GPL) software media player and entertainment hub for digital media. @@ -114,8 +110,6 @@ menuconfig BR2_PACKAGE_KODI if BR2_PACKAGE_KODI -source "package/kodi-platform/Config.in" - config BR2_PACKAGE_KODI_ALSA_LIB bool "alsa" select BR2_PACKAGE_ALSA_LIB @@ -135,6 +129,8 @@ config BR2_PACKAGE_KODI_BLUEZ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID help Enable bluetooth support @@ -195,34 +191,17 @@ config BR2_PACKAGE_KODI_MYSQL Enable MySQL support choice - prompt "platform" - default BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL + prompt "render system" + default BR2_PACKAGE_KODI_RENDER_SYSTEM_GL -config BR2_PACKAGE_KODI_PLATFORM_RBPI - bool "Raspberry Pi" - depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI - select BR2_PACKAGE_LIBINPUT - select BR2_PACKAGE_LIBXKBCOMMON - -config BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL - bool "Wayland/OpenGL" - depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GL +config BR2_PACKAGE_KODI_RENDER_SYSTEM_GL + bool "OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_LIBXKBCOMMON - select BR2_PACKAGE_WAYLANDPP -config BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES - bool "Wayland/GLES" - depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GLES - select BR2_PACKAGE_LIBXKBCOMMON - select BR2_PACKAGE_WAYLANDPP - -config BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL - bool "X11/OpenGL" - depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_XLIB_LIBXRANDR +config BR2_PACKAGE_KODI_RENDER_SYSTEM_GLES + bool "GLES" + depends on BR2_PACKAGE_HAS_LIBGLES endchoice @@ -261,31 +240,17 @@ config BR2_PACKAGE_KODI_LIBUSB help Enable libusb support. -config BR2_PACKAGE_KODI_LIBVA - bool "va" - depends on \ - BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL || \ - BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES || \ - BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL - select BR2_PACKAGE_LIBVA - help - Enable libva support. - -comment "libva support needs platform 'Wayland' or 'X11/OpenGL'" - depends on \ - !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL && \ - !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES && \ - !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL - config BR2_PACKAGE_KODI_LIBVDPAU bool "vdpau" - depends on BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL + depends on BR2_PACKAGE_KODI_PLATFORM_X11 && \ + BR2_PACKAGE_KODI_RENDER_SYSTEM_GL select BR2_PACKAGE_LIBVDPAU help Enable libvdpau support. comment "libvdpau support needs platform 'X11/OpenGL'" - depends on !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL + depends on !BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11 || \ + !BR2_PACKAGE_KODI_RENDER_SYSTEM_GL config BR2_PACKAGE_KODI_UPNP bool "upnp" @@ -316,12 +281,12 @@ endmenu menu "Peripheral addons" source "package/kodi-peripheral-joystick/Config.in" - source "package/kodi-peripheral-steamcontroller/Config.in" source "package/kodi-peripheral-xarcade/Config.in" endmenu menu "Inputstream addons" source "package/kodi-inputstream-adaptive/Config.in" + source "package/kodi-inputstream-ffmpegdirect/Config.in" source "package/kodi-inputstream-rtmp/Config.in" endmenu @@ -337,12 +302,14 @@ menu "PVR addons" source "package/kodi-pvr-mythtv/Config.in" source "package/kodi-pvr-nextpvr/Config.in" source "package/kodi-pvr-njoy/Config.in" + source "package/kodi-pvr-octonet/Config.in" source "package/kodi-pvr-pctv/Config.in" source "package/kodi-pvr-stalker/Config.in" source "package/kodi-pvr-vbox/Config.in" source "package/kodi-pvr-vdr-vnsi/Config.in" source "package/kodi-pvr-vuplus/Config.in" source "package/kodi-pvr-wmc/Config.in" + source "package/kodi-pvr-zattoo/Config.in" endmenu menu "Screensavers" @@ -350,7 +317,6 @@ menu "Screensavers" source "package/kodi-screensaver-asterwave/Config.in" source "package/kodi-screensaver-biogenesis/Config.in" source "package/kodi-screensaver-cpblobs/Config.in" - source "package/kodi-screensaver-crystalmorph/Config.in" source "package/kodi-screensaver-greynetic/Config.in" source "package/kodi-screensaver-matrixtrails/Config.in" source "package/kodi-screensaver-pingpong/Config.in" @@ -364,6 +330,7 @@ menu "Skins" endmenu menu "Virtual file systems" + source "package/kodi-vfs-libarchive/Config.in" source "package/kodi-vfs-rar/Config.in" source "package/kodi-vfs-sftp/Config.in" endmenu @@ -371,6 +338,7 @@ endmenu menu "Visualisations" source "package/kodi-visualisation-fishbmc/Config.in" source "package/kodi-visualisation-goom/Config.in" + source "package/kodi-visualisation-matrix/Config.in" source "package/kodi-visualisation-shadertoy/Config.in" source "package/kodi-visualisation-spectrum/Config.in" source "package/kodi-visualisation-starburst/Config.in" diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 357cd55c7b..c8562ce9ed 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,7 +1,6 @@ # Locally computed -sha256 47e6d7d4e01dbda92ff83a3e141ac43003e918133e78b3a4b79faff65184711c kodi-18.6-Leia.tar.gz -sha256 e11e7594af35f36ab2711252c3d6bb106908f26605498aef4a9be2d7bc001db2 kodi-ffmpeg-4.0.4-Leia-18.4.tar.gz -sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz -sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz -sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz -sha256 9d2396ef3e091d3b82bc84143e070700412984e8589513570f54e0675d1e8851 LICENSE.md +sha256 195a916a32057e259e6f42b49ba8f07cc6253460018851a52deb058ae938c58c kodi-19.1-Matrix.tar.gz +sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz +sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz +sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz +sha256 9d2396ef3e091d3b82bc84143e070700412984e8589513570f54e0675d1e8851 LICENSE.md diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 0c4704ea84..6f020b58b8 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,22 +6,25 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION = 18.6-Leia +KODI_VERSION_MAJOR = 19.1 +KODI_VERSION_NAME = Matrix +KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPL-2.0 KODI_LICENSE_FILES = LICENSE.md +KODI_CPE_ID_VENDOR = kodi +KODI_CPE_ID_VERSION = $(KODI_VERSION_MAJOR) # needed for binary addons KODI_INSTALL_STAGING = YES # kodi recommends building out-of-source KODI_SUPPORTS_IN_SOURCE_BUILD = NO KODI_DEPENDENCIES = \ - expat \ + ffmpeg \ flatbuffers \ fmt \ fontconfig \ freetype \ fstrcmp \ - gnutls \ host-flatbuffers \ host-gawk \ host-gettext \ @@ -35,68 +38,86 @@ KODI_DEPENDENCIES = \ libcdio \ libcrossguid \ libcurl \ + libdrm \ + libegl \ libfribidi \ libplist \ - libsamplerate \ lzo \ - ncurses \ openssl \ pcre \ - python \ + python3 \ rapidjson \ + spdlog \ sqlite \ taglib \ tinyxml \ zlib # taken from tools/depends/target/*/*-VERSION -KODI_FFMPEG_VERSION = 4.0.4-Leia-18.4 KODI_LIBDVDCSS_VERSION = 1.4.2-Leia-Beta-5 KODI_LIBDVDNAV_VERSION = 6.0.0-Leia-Alpha-3 KODI_LIBDVDREAD_VERSION = 6.0.0-Leia-Alpha-3 KODI_EXTRA_DOWNLOADS += \ - $(call github,xbmc,FFmpeg,$(KODI_FFMPEG_VERSION))/kodi-ffmpeg-$(KODI_FFMPEG_VERSION).tar.gz \ $(call github,xbmc,libdvdcss,$(KODI_LIBDVDCSS_VERSION))/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ $(call github,xbmc,libdvdnav,$(KODI_LIBDVDNAV_VERSION))/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ $(call github,xbmc,libdvdread,$(KODI_LIBDVDREAD_VERSION))/kodi-libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz -define KODI_CPLUFF_AUTOCONF - cd $(KODI_SRCDIR)/lib/cpluff && ./autogen.sh -endef -KODI_PRE_CONFIGURE_HOOKS += KODI_CPLUFF_AUTOCONF -KODI_DEPENDENCIES += host-automake host-autoconf host-libtool - KODI_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(KODI_C_FLAGS)" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(KODI_CXX_FLAGS)" \ -DENABLE_APP_AUTONAME=OFF \ -DENABLE_CCACHE=OFF \ -DENABLE_DVDCSS=ON \ -DENABLE_INTERNAL_CROSSGUID=OFF \ - -DENABLE_INTERNAL_FFMPEG=ON \ + -DWITH_FFMPEG=$(STAGING_DIR)/usr \ -DENABLE_INTERNAL_FLATBUFFERS=OFF \ - -DFFMPEG_URL=$(KODI_DL_DIR)/kodi-ffmpeg-$(KODI_FFMPEG_VERSION).tar.gz \ + -DFLATBUFFERS_FLATC_EXECUTABLE=$(HOST_DIR)/bin/flatc \ -DKODI_DEPENDSBUILD=OFF \ -DENABLE_LDGOLD=OFF \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ + -DENABLE_TESTING=OFF \ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ -DLIBDVDNAV_URL=$(KODI_DL_DIR)/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ -DLIBDVDREAD_URL=$(KODI_DL_DIR)/kodi-libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz +ifeq ($(BR2_PACKAGE_KODI_RENDER_SYSTEM_GL),y) +KODI_CONF_OPTS += -DAPP_RENDER_SYSTEM=gl +KODI_DEPENDENCIES += libgl libglu +else ifeq ($(BR2_PACKAGE_KODI_RENDER_SYSTEM_GLES),y) +KODI_CONF_OPTS += -DAPP_RENDER_SYSTEM=gles +KODI_DEPENDENCIES += libgles +endif + +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM),y) +KODI_CORE_PLATFORM_NAME += gbm +KODI_DEPENDENCIES += libinput libxkbcommon mesa3d +endif + +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND),y) +KODI_CONF_OPTS += \ + -DPC_WAYLANDPP_SCANNER=$(HOST_DIR)/bin/wayland-scanner \ + -DPC_WAYLANDPP_SCANNER_FOUND=ON +KODI_CORE_PLATFORM_NAME += wayland +KODI_DEPENDENCIES += libxkbcommon waylandpp +endif + +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11),y) +KODI_CORE_PLATFORM_NAME += x11 +KODI_DEPENDENCIES += \ + xlib_libX11 \ + xlib_libXext \ + xlib_libXrandr +endif + +KODI_CONF_OPTS += -DCORE_PLATFORM_NAME="$(KODI_CORE_PLATFORM_NAME)" + ifeq ($(BR2_ENABLE_LOCALE),) KODI_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y) -# These CPU-specific options are only used on rbpi: -# https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake#L13 -ifeq ($(BR2_arm1176jzf_s)$(BR2_cortex_a7)$(BR2_cortex_a53),y) -KODI_CONF_OPTS += -DWITH_CPU="$(GCC_TARGET_CPU)" -endif -else ifeq ($(BR2_arceb)$(BR2_arcle),y) +ifeq ($(BR2_arceb)$(BR2_arcle),y) KODI_CONF_OPTS += -DWITH_ARCH=arc -DWITH_CPU=arc else ifeq ($(BR2_armeb),y) KODI_CONF_OPTS += -DWITH_ARCH=arm -DWITH_CPU=arm @@ -166,34 +187,11 @@ endif # mips: uses __atomic_load_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -KODI_CXX_FLAGS += -latomic +KODI_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y) -KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=rbpi -KODI_DEPENDENCIES += libinput libxkbcommon rpi-userland -endif - -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL),y) -KODI_CONF_OPTS += \ - -DCORE_PLATFORM_NAME=wayland \ - -DWAYLAND_RENDER_SYSTEM=gl -KODI_DEPENDENCIES += libegl libgl libglu libxkbcommon waylandpp -endif - -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES),y) -KODI_CONF_OPTS += \ - -DCORE_PLATFORM_NAME=wayland \ - -DWAYLAND_RENDER_SYSTEM=gles -KODI_C_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl` -KODI_CXX_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl` -KODI_DEPENDENCIES += libegl libgles libxkbcommon waylandpp -endif - -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL),y) -KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=x11 -KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \ - xlib_libXrandr libdrm +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),) +KODI_C_FLAGS += -std=gnu99 endif ifeq ($(BR2_PACKAGE_KODI_MYSQL),y) @@ -211,6 +209,8 @@ KODI_CONF_OPTS += -DENABLE_UDEV=OFF ifeq ($(BR2_PACKAGE_KODI_LIBUSB),y) KODI_CONF_OPTS += -DENABLE_LIBUSB=ON KODI_DEPENDENCIES += libusb-compat +else +KODI_CONF_OPTS += -DENABLE_LIBUSB=OFF endif endif @@ -315,9 +315,8 @@ ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) KODI_DEPENDENCIES += lirc-tools endif -# kodi needs libva & libva-glx -ifeq ($(BR2_PACKAGE_KODI_LIBVA)$(BR2_PACKAGE_MESA3D_DRI_DRIVER),yy) -KODI_DEPENDENCIES += mesa3d libva +ifeq ($(BR2_PACKAGE_LIBVA),y) +KODI_DEPENDENCIES += libva KODI_CONF_OPTS += -DENABLE_VAAPI=ON else KODI_CONF_OPTS += -DENABLE_VAAPI=OFF @@ -349,6 +348,12 @@ else KODI_CONF_OPTS += -DENABLE_PULSEAUDIO=OFF endif +ifeq ($(BR2_PACKAGE_LIBUDFREAD),y) +KODI_DEPENDENCIES += libudfread +else +KODI_CONF_OPTS += -DENABLE_INTERNAL_UDFREAD=OFF +endif + # Remove versioncheck addon, updating Kodi is done by building a new # buildroot image. KODI_ADDON_MANIFEST = $(TARGET_DIR)/usr/share/kodi/system/addon-manifest.xml diff --git a/package/ktap/ktap.mk b/package/ktap/ktap.mk index 3b9134da65..09daba5c53 100644 --- a/package/ktap/ktap.mk +++ b/package/ktap/ktap.mk @@ -25,5 +25,12 @@ endef KTAP_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) +define KTAP_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS) + $(call KCONFIG_ENABLE_OPT,CONFIG_FUNCTION_TRACER) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index 3458778937..ad500d04f2 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 346c543de9e953db283072e1c591cab9d0eb775f7fb1fff3d7560f38bdf6bdf2 kvm-unit-tests-kvm-unit-tests-20171020.tar.gz +sha256 e476443cd76c8f540734e075b419638b2f200ae002986d6fc14076d410f3751e kvm-unit-tests-kvm-unit-tests-20171020-br1.tar.gz sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index d83d31d2ee..a972602fb9 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -5,7 +5,7 @@ ################################################################################ KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 -KVM_UNIT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/scm/virt/kvm/kvm-unit-tests.git +KVM_UNIT_TESTS_SITE = https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git KVM_UNIT_TESTS_SITE_METHOD = git KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT diff --git a/package/kvmtool/kvmtool.hash b/package/kvmtool/kvmtool.hash index fd841c354c..8747ae1d21 100644 --- a/package/kvmtool/kvmtool.hash +++ b/package/kvmtool/kvmtool.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d55e4521ac040b870db015e1f075d69b89f940242d7ce5708f7d7060d62c0cc kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e.tar.gz +sha256 e2eb2cd8b31d24484e3095923cfe8c36d4b92741b76965cafaed6be3835369c6 kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e-br1.tar.gz sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk index 5894e4771d..2984817c7e 100644 --- a/package/kvmtool/kvmtool.mk +++ b/package/kvmtool/kvmtool.mk @@ -5,7 +5,7 @@ ################################################################################ KVMTOOL_VERSION = f77d646ba01d04be5aad9449ac00719c043fe36e -KVMTOOL_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/will/kvmtool.git +KVMTOOL_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git KVMTOOL_SITE_METHOD = git KVMTOOL_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BINUTILS),binutils) \ diff --git a/package/lame/lame.mk b/package/lame/lame.mk index 3d76ab93ac..3a57cffe3d 100644 --- a/package/lame/lame.mk +++ b/package/lame/lame.mk @@ -12,6 +12,7 @@ LAME_CONF_ENV = GTK_CONFIG=/bin/false LAME_CONF_OPTS = --enable-dynamic-frontends LAME_LICENSE = LGPL-2.0+ LAME_LICENSE_FILES = COPYING +LAME_CPE_ID_VENDOR = lame_project ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) LAME_DEPENDENCIES += libsndfile diff --git a/package/lapack/Config.in b/package/lapack/Config.in index 6cd0810cb1..4e92b49ab6 100644 --- a/package/lapack/Config.in +++ b/package/lapack/Config.in @@ -1,13 +1,22 @@ +config BR2_PACKAGE_LAPACK_ARCH_SUPPORTS + bool + default y + # _fpu_control is used on PowerPC, but not available with + # uClibc or musl + depends on !BR2_powerpc || BR2_TOOLCHAIN_USES_GLIBC + +comment "lapack/blas needs a glibc toolchain" + depends on BR2_powerpc + depends on !BR2_TOOLCHAIN_USES_GLIBC + comment "lapack/blas needs a toolchain w/ fortran" - depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_FORTRAN config BR2_PACKAGE_LAPACK bool "lapack/blas" + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_FORTRAN - depends on !BR2_PACKAGE_CLAPACK - # _fpu_control is used on PowerPC, but not available with uClibc - depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) help LAPACK and BLAS FORTRAN implementation. This package installs two libraries: libblas and liblapack. diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index 248a08cf87..8477610ff0 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.9 -sha1 60bea9875e017dd1c466e988c2ad98f8766e4e55 lcms2-2.9.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.12 +sha1 3d0c0276fcd3930b80c424512ec0b1ed54ec1497 lcms2-2.12.tar.gz # Locally computed: -sha256 48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20 lcms2-2.9.tar.gz -sha256 c725daac91a9259ce5e195683c0eeb797d345035c36ac5ba114c9fa80e11639a COPYING +sha256 18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 lcms2-2.12.tar.gz +sha256 46d4e05af3bce75332a12d01f19bcce7e32b6bac544be28a64043d0231291e31 COPYING diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index b6c292b762..49ddccd82b 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,11 +4,15 @@ # ################################################################################ -LCMS2_VERSION = 2.9 +LCMS2_VERSION = 2.12 LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING +LCMS2_CPE_ID_VENDOR = littlecms +LCMS2_CPE_ID_PRODUCT = little_cms LCMS2_INSTALL_STAGING = YES +# tiff is only used by tificc sample +LCMS2_CONF_OPTS = --without-tiff ifeq ($(BR2_PACKAGE_JPEG),y) LCMS2_CONF_OPTS += --with-jpeg @@ -17,13 +21,6 @@ else LCMS2_CONF_OPTS += --without-jpeg endif -ifeq ($(BR2_PACKAGE_TIFF),y) -LCMS2_CONF_OPTS += --with-tiff -LCMS2_DEPENDENCIES += tiff -else -LCMS2_CONF_OPTS += --without-tiff -endif - ifeq ($(BR2_PACKAGE_ZLIB),y) LCMS2_CONF_OPTS += --with-zlib LCMS2_DEPENDENCIES += zlib diff --git a/package/leptonica/leptonica.hash b/package/leptonica/leptonica.hash index 56f8643355..6ef1a09122 100644 --- a/package/leptonica/leptonica.hash +++ b/package/leptonica/leptonica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 e2ed2e81e7a22ddf45d2c05f0bc8b9ae7450545d995bfe28517ba408d14a5a88 leptonica-1.78.0.tar.gz -sha256 ca0ac11c7c0acad9599d54990942cc11c9f6d9b569f1a360d774a628819c3518 leptonica-license.txt +sha256 ec9c46c2aefbb960fb6a6b7f800fe39de48343437b6ce08e30a8d9688ed14ba4 leptonica-1.80.0.tar.gz +sha256 87829abb5bbb00b55a107365da89e9a33f86c4250169e5a1e5588505be7d5806 leptonica-license.txt diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 309c65052b..93d1e47c28 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -4,10 +4,11 @@ # ################################################################################ -LEPTONICA_VERSION = 1.78.0 +LEPTONICA_VERSION = 1.80.0 LEPTONICA_SITE = http://www.leptonica.org/source LEPTONICA_LICENSE = BSD-2-Clause LEPTONICA_LICENSE_FILES = leptonica-license.txt +LEPTONICA_CPE_ID_VENDOR = leptonica LEPTONICA_INSTALL_STAGING = YES LEPTONICA_DEPENDENCIES = host-pkgconf @@ -51,8 +52,15 @@ endif ifeq ($(BR2_PACKAGE_WEBP),y) LEPTONICA_DEPENDENCIES += webp LEPTONICA_CONF_OPTS += --with-libwebp +ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) +LEPTONICA_CONF_OPTS += --with-libwebpmux else -LEPTONICA_CONF_OPTS += --without-libwebp +LEPTONICA_CONF_OPTS += --without-libwebpmux +endif +else +LEPTONICA_CONF_OPTS += \ + --without-libwebp \ + --without-libwebpmux endif ifeq ($(BR2_PACKAGE_ZLIB),y) diff --git a/package/less/less.hash b/package/less/less.hash index 57a857efe4..eed8340ec1 100644 --- a/package/less/less.hash +++ b/package/less/less.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # using DSA key F153A7C833235259 -# http://www.greenwoodsoftware.com/less/less-551.sig -sha256 ff165275859381a63f19135a8f1f6c5a194d53ec3187f94121ecd8ef0795fe3d less-551.tar.gz +# http://www.greenwoodsoftware.com/less/less-590.sig +sha256 6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10 less-590.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/less/less.mk b/package/less/less.mk index 3e58d39ca5..7d7a6d5fe5 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -4,10 +4,11 @@ # ################################################################################ -LESS_VERSION = 551 +LESS_VERSION = 590 LESS_SITE = http://www.greenwoodsoftware.com/less LESS_LICENSE = GPL-3.0+ LESS_LICENSE_FILES = COPYING +LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses define LESS_INSTALL_TARGET_CMDS diff --git a/package/leveldb/Config.in b/package/leveldb/Config.in index c767b88645..c4279fcb64 100644 --- a/package/leveldb/Config.in +++ b/package/leveldb/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LEVELDB depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_SNAPPY help LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk index cf3c096f5d..684b618679 100644 --- a/package/leveldb/leveldb.mk +++ b/package/leveldb/leveldb.mk @@ -9,9 +9,12 @@ LEVELDB_SITE = $(call github,google,leveldb,$(LEVELDB_VERSION)) LEVELDB_LICENSE = BSD-3-Clause LEVELDB_LICENSE_FILES = LICENSE LEVELDB_INSTALL_STAGING = YES -LEVELDB_DEPENDENCIES = snappy LEVELDB_CONF_OPTS = \ -DLEVELDB_BUILD_BENCHMARKS=OFF \ -DLEVELDB_BUILD_TESTS=OFF +ifeq ($(BR2_PACKAGE_SNAPPY),y) +LEVELDB_DEPENDENCIES += snappy +endif + $(eval $(cmake-package)) diff --git a/package/lftp/lftp.hash b/package/lftp/lftp.hash index a2f60f95b0..e4c3305c03 100644 --- a/package/lftp/lftp.hash +++ b/package/lftp/lftp.hash @@ -1,7 +1,7 @@ -# From http://lftp.yar.ru/ftp/lftp-4.9.1.md5sum -md5 3da57b1960b1416e89a532c54a67a936 lftp-4.9.1.tar.xz +# From http://lftp.yar.ru/ftp/lftp-4.9.2.md5sum +md5 b3a272ecb7a2b60e3827776f90ffb2f3 lftp-4.9.2.tar.xz # Locally calculated after checking gpg signature -sha256 5969fcaefd102955dd882f3bcd8962198bc537224749ed92f206f415207a024b lftp-4.9.1.tar.xz +sha256 c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d lftp-4.9.2.tar.xz # Hash for license file: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk index 9c568da677..00b33b91fb 100644 --- a/package/lftp/lftp.mk +++ b/package/lftp/lftp.mk @@ -4,11 +4,12 @@ # ################################################################################ -LFTP_VERSION = 4.9.1 +LFTP_VERSION = 4.9.2 LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz LFTP_SITE = http://lftp.yar.ru/ftp LFTP_LICENSE = GPL-3.0+ LFTP_LICENSE_FILES = COPYING +LFTP_CPE_ID_VENDOR = lftp_project LFTP_DEPENDENCIES = readline zlib host-pkgconf # Help lftp finding readline and zlib diff --git a/package/libaacs/libaacs.hash b/package/libaacs/libaacs.hash index 22310295f8..62e389f2f9 100644 --- a/package/libaacs/libaacs.hash +++ b/package/libaacs/libaacs.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libaacs/0.9.0/libaacs-0.9.0.tar.bz2.sha512 -sha512 b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6 libaacs-0.9.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libaacs/0.11.0/libaacs-0.11.0.tar.bz2.sha512 +sha512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388 libaacs-0.11.0.tar.bz2 # Hash for license file: -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libaacs/libaacs.mk b/package/libaacs/libaacs.mk index 143b0ff3d7..3e0df18010 100644 --- a/package/libaacs/libaacs.mk +++ b/package/libaacs/libaacs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAACS_VERSION = 0.9.0 +LIBAACS_VERSION = 0.11.0 LIBAACS_SITE = http://download.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION) LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2 LIBAACS_LICENSE = LGPL-2.1+ diff --git a/package/libaio/libaio.hash b/package/libaio/libaio.hash index 17dd1ff706..ac815a73b5 100644 --- a/package/libaio/libaio.hash +++ b/package/libaio/libaio.hash @@ -1,5 +1,5 @@ # From https://releases.pagure.org/libaio/CHECKSUMS -sha256 62cf871ad8fd09eb3418f00aca7a7d449299b8e1de31c65f28bf6a2ef1fa502a libaio-0.3.111.tar.gz +sha256 ab0462f2c9d546683e5147b1ce9c195fe95d07fac5bf362f6c01637955c3b492 libaio-0.3.112.tar.gz # Hash for license file: -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index a215ca6533..34f08b75e7 100644 --- a/package/libaio/libaio.mk +++ b/package/libaio/libaio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAIO_VERSION = 0.3.111 +LIBAIO_VERSION = 0.3.112 LIBAIO_SITE = https://releases.pagure.org/libaio LIBAIO_INSTALL_STAGING = YES LIBAIO_LICENSE = LGPL-2.1+ diff --git a/package/libao/libao.mk b/package/libao/libao.mk index 501ea0c9f2..19a4c165c6 100644 --- a/package/libao/libao.mk +++ b/package/libao/libao.mk @@ -10,6 +10,7 @@ LIBAO_DEPENDENCIES = host-pkgconf LIBAO_INSTALL_STAGING = YES LIBAO_LICENSE = GPL-2.0+ LIBAO_LICENSE_FILES = COPYING +LIBAO_CPE_ID_VENDOR = xiph LIBAO_CONF_OPTS = \ --disable-esd \ --disable-wmm \ diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index 9da4eb3baa..d31e9f55f4 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176 libarchive-3.4.2.tar.gz +sha256 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz # Locally computed: -sha256 e1e3d4ba9d0b0ccba333b5f5539f7c6c9a3ef3d57a96cd165d2c45eaa1cd026d COPYING +sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 94f974e7d1..eec256ba75 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.4.2 +LIBARCHIVE_VERSION = 3.5.2 +LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING -LIBARCHIVE_CONF_OPTS = --without-mbedtls +LIBARCHIVE_CPE_ID_VENDOR = libarchive ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) @@ -79,12 +80,26 @@ else LIBARCHIVE_CONF_OPTS += --without-xml2 endif +ifeq ($(BR2_PACKAGE_LZ4),y) +LIBARCHIVE_CONF_OPTS += --with-lz4 +LIBARCHIVE_DEPENDENCIES += lz4 +else +LIBARCHIVE_CONF_OPTS += --without-lz4 +endif + ifeq ($(BR2_PACKAGE_LZO),y) LIBARCHIVE_DEPENDENCIES += lzo else LIBARCHIVE_CONF_OPTS += --without-lzo2 endif +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBARCHIVE_DEPENDENCIES += mbedtls +LIBARCHIVE_CONF_OPTS += --with-mbedtls +else +LIBARCHIVE_CONF_OPTS += --without-mbedtls +endif + ifeq ($(BR2_PACKAGE_NETTLE),y) LIBARCHIVE_DEPENDENCIES += nettle LIBARCHIVE_CONF_OPTS += --with-nettle @@ -131,11 +146,13 @@ HOST_LIBARCHIVE_CONF_OPTS = \ --without-expat \ --without-libiconv-prefix \ --without-xml2 \ + --without-lz4 \ --without-lzo2 \ --without-mbedtls \ --without-nettle \ --without-openssl \ - --without-lzma + --without-lzma \ + --without-zstd $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/libargon2/libargon2.hash b/package/libargon2/libargon2.hash index c524b42718..331eea99f4 100644 --- a/package/libargon2/libargon2.hash +++ b/package/libargon2/libargon2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eaea0172c1f4ee4550d1b6c9ce01aab8d1ab66b4207776aa67991eb5872fdcd8 libargon2-20171227.tar.gz -sha256 220f8736a89ff51c92ef3d497f413b48e6cf1df3d6278bc909c6308c78e1718e LICENSE +sha256 daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c libargon2-20190702.tar.gz +sha256 220f8736a89ff51c92ef3d497f413b48e6cf1df3d6278bc909c6308c78e1718e LICENSE diff --git a/package/libargon2/libargon2.mk b/package/libargon2/libargon2.mk index e10343a15e..b3f6e1b216 100644 --- a/package/libargon2/libargon2.mk +++ b/package/libargon2/libargon2.mk @@ -4,18 +4,19 @@ # ################################################################################ -# 20190702 is not recognized by php7.3 -LIBARGON2_VERSION = 20171227 +LIBARGON2_VERSION = 20190702 LIBARGON2_SITE = $(call github,P-H-C,phc-winner-argon2,$(LIBARGON2_VERSION)) LIBARGON2_LICENSE = CC0-1.0 or Apache-2.0 LIBARGON2_LICENSE_FILES = LICENSE LIBARGON2_INSTALL_STAGING = YES +LIBARGON2_OPTS = LIBRARY_REL=lib + # GCC_TARGET_ARCH is not defined for all architectures, but libargon2 # only uses it to detect if some x86 optimizations can be used, and # GCC_TARGET_ARCH is defined on x86. ifneq ($(GCC_TARGET_ARCH),) -LIBARGON2_OPTS = OPTTARGET=$(GCC_TARGET_ARCH) +LIBARGON2_OPTS += OPTTARGET=$(GCC_TARGET_ARCH) endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) @@ -29,12 +30,12 @@ endef define LIBARGON2_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR=$(STAGING_DIR) install + $(LIBARGON2_OPTS) DESTDIR=$(STAGING_DIR) install endef define LIBARGON2_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) install + $(LIBARGON2_OPTS) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk index 8215f552cd..d033e28f40 100644 --- a/package/libargtable2/libargtable2.mk +++ b/package/libargtable2/libargtable2.mk @@ -4,9 +4,11 @@ # ################################################################################ -LIBARGTABLE2_VERSION = 13 -LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz -LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-2.13 +LIBARGTABLE2_MAJOR_VERSION = 2 +LIBARGTABLE2_MINOR_VERSION = 13 +LIBARGTABLE2_VERSION = $(LIBARGTABLE2_MAJOR_VERSION).$(LIBARGTABLE2_MINOR_VERSION) +LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_MINOR_VERSION).tar.gz +LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-$(LIBARGTABLE2_VERSION) LIBARGTABLE2_INSTALL_STAGING = YES LIBARGTABLE2_CONF_OPTS = \ --disable-example \ diff --git a/package/libass/Config.in b/package/libass/Config.in index c654d8212a..803f6b4438 100644 --- a/package/libass/Config.in +++ b/package/libass/Config.in @@ -1,9 +1,18 @@ config BR2_PACKAGE_LIBASS bool "libass" + depends on BR2_INSTALL_LIBSTDCPP # harfbuzz + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # harfbuzz select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_LIBFRIBIDI help libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format https://github.com/libass/libass + +comment "libass needs a toolchain w/ C++, gcc >= 4.8" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/libass/libass.hash b/package/libass/libass.hash index 74ea5f921d..882bc456ae 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 881f2382af48aead75b7a0e02e65d88c5ebd369fe46bc77d9270a94aa8fd38a2 libass-0.14.0.tar.xz -sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING +sha256 1cdd39c9d007b06e737e7738004d7f38cf9b1e92843f37307b24e7ff63ab8e53 libass-0.15.1.tar.xz +sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 50600963ed..515f87c686 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.14.0 +LIBASS_VERSION = 0.15.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. @@ -12,9 +12,11 @@ LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSIO LIBASS_INSTALL_STAGING = YES LIBASS_LICENSE = ISC LIBASS_LICENSE_FILES = COPYING +LIBASS_CPE_ID_VENDOR = libass_project LIBASS_DEPENDENCIES = \ host-pkgconf \ freetype \ + harfbuzz \ libfribidi \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) @@ -31,11 +33,4 @@ else LIBASS_CONF_OPTS += --disable-fontconfig --disable-require-system-font-provider endif -ifeq ($(BR2_PACKAGE_HARFBUZZ),y) -LIBASS_DEPENDENCIES += harfbuzz -LIBASS_CONF_OPTS += --enable-harfbuzz -else -LIBASS_CONF_OPTS += --disable-harfbuzz -endif - $(eval $(autotools-package)) diff --git a/package/libassuan/libassuan.hash b/package/libassuan/libassuan.hash index bb008d6ed4..c817a3af63 100644 --- a/package/libassuan/libassuan.hash +++ b/package/libassuan/libassuan.hash @@ -1,8 +1,8 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 6d81bf42fa91ed2894df8b65764ce899e39776f8 libassuan-2.5.3.tar.bz2 +sha1 ec4f67c0117ccd17007c748a392ded96dc1b1ae9 libassuan-2.5.5.tar.bz2 # Locally calculated after checking signature -# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.3.tar.bz2.sig +# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702 libassuan-2.5.3.tar.bz2 -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB -sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING +sha256 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 libassuan-2.5.5.tar.bz2 +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk index 034a9bfdfe..f98c13b59f 100644 --- a/package/libassuan/libassuan.mk +++ b/package/libassuan/libassuan.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASSUAN_VERSION = 2.5.3 +LIBASSUAN_VERSION = 2.5.5 LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2 LIBASSUAN_LICENSE = LGPL-2.1+ (library), GPL-3.0 (tests, doc) diff --git a/package/libatomic_ops/Config.in b/package/libatomic_ops/Config.in index e9206f3395..8287c6522d 100644 --- a/package/libatomic_ops/Config.in +++ b/package/libatomic_ops/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS bool - default y if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_sparc || BR2_sparc64 || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64 || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_aarch64 || BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_riscv + default y if BR2_sparc || BR2_sparc64 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 1757192b00..4ab8c85866 100644 --- a/package/libbluray/libbluray.hash +++ b/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://get.videolan.org/libbluray/1.1.2/libbluray-1.1.2.tar.bz2.sha512 -sha512 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7 libbluray-1.1.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2.sha512 +sha512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc libbluray-1.3.0.tar.bz2 # Locally computed -sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING +sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index 49ee933d0a..233797f38d 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.1.2 -LIBBLURAY_SITE = http://get.videolan.org/libbluray/$(LIBBLURAY_VERSION) +LIBBLURAY_VERSION = 1.3.0 +LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES LIBBLURAY_LICENSE = LGPL-2.1+ LIBBLURAY_LICENSE_FILES = COPYING +LIBBLURAY_CPE_ID_VENDOR = videolan LIBBLURAY_DEPENDENCIES = host-pkgconf LIBBLURAY_CONF_OPTS = --disable-bdjava-jar @@ -18,6 +19,10 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) LIBBLURAY_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_LIBUDFREAD),y) +LIBBLURAY_DEPENDENCIES += libudfread +endif + ifeq ($(BR2_PACKAGE_FREETYPE),y) LIBBLURAY_DEPENDENCIES += freetype LIBBLURAY_CONF_OPTS += --with-freetype diff --git a/package/libbroadvoice/libbroadvoice.hash b/package/libbroadvoice/libbroadvoice.hash index 6d5afa8dbe..0a22817e25 100644 --- a/package/libbroadvoice/libbroadvoice.hash +++ b/package/libbroadvoice/libbroadvoice.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b68c91d5af6e493c3d4fc3be04825e109a7593fe4de8c18ec75546004eeb4749 libbroadvoice-f65b0f50c8c767229fbf1758370880abc0d78564.tar.gz -sha256 2550586c993ce4a8c23c8b11968ea36192116a896a2504799cc65307d769c094 COPYING +sha256 777e5dccc3d189514b7f8e85b6c941d3b9d16d2d68d72cad055cbdfb571d3681 libbroadvoice-f65b0f50c8c767229fbf1758370880abc0d78564-br1.tar.gz +sha256 2550586c993ce4a8c23c8b11968ea36192116a896a2504799cc65307d769c094 COPYING diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in index e54f5e6f23..845a22162b 100644 --- a/package/libbsd/Config.in +++ b/package/libbsd/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS config BR2_PACKAGE_LIBBSD bool "libbsd" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR help @@ -21,6 +22,7 @@ config BR2_PACKAGE_LIBBSD http://libbsd.freedesktop.org/ -comment "libbsd needs a toolchain w/ threads, wchar" +comment "libbsd needs a toolchain w/ dynamic library, threads, wchar" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk index 27bac6838a..256a75f15e 100644 --- a/package/libbsd/libbsd.mk +++ b/package/libbsd/libbsd.mk @@ -10,6 +10,7 @@ LIBBSD_SITE = https://libbsd.freedesktop.org/releases LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ MIT, ISC, Beerware LIBBSD_LICENSE_FILES = COPYING +LIBBSD_CPE_ID_VENDOR = freedesktop LIBBSD_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index 0b3540a657..92c17df849 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -1,10 +1,20 @@ -config BR2_PACKAGE_LIBCAMERA +config BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS + bool + default y + # Invalid packing size of ControlValue struct on m68k + depends on !BR2_m68k + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + +menuconfig BR2_PACKAGE_LIBCAMERA bool "libcamera" + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - # C++11 + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54316 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 - depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on !BR2_STATIC_LIBS # gnutls + depends on BR2_USE_WCHAR # gnutls + select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO if !BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE help libcamera provides a software stack to support complex devices that need heavy hardware image @@ -12,6 +22,56 @@ config BR2_PACKAGE_LIBCAMERA http://www.libcamera.org/ -comment "libcamera needs udev and a toolchain w/ C++, threads, gcc >= 5" +if BR2_PACKAGE_LIBCAMERA + +config BR2_PACKAGE_LIBCAMERA_V4L2 + bool "libcamera v4l2 compatibility layer" + help + libcamera v4l2 compatibility layer + +config BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + bool + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3 + bool "ipu3 pipeline" + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for Intel IPU3. + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI + bool "raspberrypi pipeline" + depends on BR2_USE_WCHAR # boost (already enforced for gnutls) + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for Raspberry Pi devices. + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1 + bool "rkisp1 pipeline" + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for Rockchip ISP1. + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE + bool "simple pipeline" + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for simple pipelines. + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO + bool "uvcvideo pipeline" + help + Pipeline for uvcvideo devices. + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC + bool "vimc pipeline" + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for the vimc device. + +endif # BR2_PACKAGE_LIBCAMERA + +comment "libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7" + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_PACKAGE_HAS_UDEV + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 6f721d87ee..78197b9aeb 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,3 +1,12 @@ -sha256 cbaa7e06059717f71b57f9c20135c86d5f121d9aab10bfc20513ba5d04478756 libcamera-448393f77ec9e37cb807e8e8d35c1a4877d253d4.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licenses/gnu-gpl-2.0.txt -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c licenses/gnu-lgpl-2.1.txt +sha256 fa9efe38397392a338c0ed9d0bf3ac1480d4d1c96b0597e422f8b9fb36f43398 libcamera-3a1f67a8031ac5ad96a11d5dc8b2e8976290497b-br1.tar.gz + +# license files +sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt +sha256 e11af671c491efac2f94c1d752bea92f4308ca2450c7d11e582e4b48c40e4de1 LICENSES/BSD-3-Clause.txt +sha256 6a573fb2f9082662978cf21fb153096df0a1981deaea7dbc10a11046fe005d9f LICENSES/CC0-1.0.txt +sha256 ec3732087acf8c52429a020d6bba362ff578705bdb53365a21744485ec15b0e6 LICENSES/CC-BY-SA-4.0.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 606aa26338f69ce178f1cbc648b7574aec4b5bbaeb20f4df36ff49010cb8fbbd LICENSES/GPL-2.0-or-later.txt +sha256 1ccf09bf2f598308df4bed9cd8e9657dc5cd0973d2800318f2e241486e2edf3f LICENSES/LGPL-2.1-or-later.txt +sha256 3f9e477523febab58de8b716ccfbcf02e6ef1c8e7728953905e8558637abe2a9 LICENSES/Linux-syscall-note.txt +sha256 8f25018489d6fe0dec34a352314c38dc146247b7de65735790f4398a92afa84b LICENSES/MIT.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index d209a38df3..11a6961da5 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,14 +5,91 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = 448393f77ec9e37cb807e8e8d35c1a4877d253d4 +LIBCAMERA_VERSION = 3a1f67a8031ac5ad96a11d5dc8b2e8976290497b LIBCAMERA_SITE_METHOD = git -LIBCAMERA_DEPENDENCIES = udev -LIBCAMERA_CONF_OPTS = -Dtest=false -Ddocumentation=false -LIBCAMERA_INSTALL_STAGING = yes -LIBCAMERA_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (utils) +LIBCAMERA_DEPENDENCIES = \ + host-openssl \ + host-pkgconf \ + host-python3-jinja2 \ + host-python3-ply \ + host-python3-pyyaml \ + gnutls +LIBCAMERA_CONF_OPTS = \ + -Dandroid=disabled \ + -Ddocumentation=disabled \ + -Dtest=false \ + -Dwerror=false +LIBCAMERA_INSTALL_STAGING = YES +LIBCAMERA_LICENSE = \ + LGPL-2.1+ (library), \ + GPL-2.0+ (utils), \ + MIT (qcam/assets/feathericons), \ + BSD-2-Clause (raspberrypi), \ + GPL-2.0 with Linux-syscall-note or BSD-3-Clause (linux kernel headers), \ + CC0-1.0 (meson build system), \ + CC-BY-SA-4.0 (doc) LIBCAMERA_LICENSE_FILES = \ - licenses/gnu-gpl-2.0.txt \ - licenses/gnu-lgpl-2.1.txt + LICENSES/LGPL-2.1-or-later.txt \ + LICENSES/GPL-2.0-or-later.txt \ + LICENSES/MIT.txt \ + LICENSES/BSD-2-Clause.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/Linux-syscall-note.txt \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/CC0-1.0.txt \ + LICENSES/CC-BY-SA-4.0.txt + +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),y) +LIBCAMERA_CXXFLAGS = -faligned-new +endif + +ifeq ($(BR2_PACKAGE_LIBCAMERA_V4L2),y) +LIBCAMERA_CONF_OPTS += -Dv4l2=true +else +LIBCAMERA_CONF_OPTS += -Dv4l2=false +endif + +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3) += ipu3 +ifeq ($(BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI),y) +LIBCAMERA_PIPELINES-y += raspberrypi +LIBCAMERA_DEPENDENCIES += boost +endif +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1) += rkisp1 +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE) += simple +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO) += uvcvideo +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC) += vimc + +LIBCAMERA_CONF_OPTS += -Dpipelines=$(subst $(space),$(comma),$(LIBCAMERA_PIPELINES-y)) + +# gstreamer-video-1.0, gstreamer-allocators-1.0 +ifeq ($(BR2_PACKAGE_GSTREAMER1)$(BR2_PACKAGE_GST1_PLUGINS_BASE),yy) +LIBCAMERA_CONF_OPTS += -Dgstreamer=enabled +LIBCAMERA_DEPENDENCIES += gstreamer1 gst1-plugins-base +endif + +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) +LIBCAMERA_CONF_OPTS += -Dqcam=enabled +LIBCAMERA_DEPENDENCIES += qt5base +ifeq ($(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS),y) +LIBCAMERA_DEPENDENCIES += qt5tools +endif +else +LIBCAMERA_CONF_OPTS += -Dqcam=disabled +endif + +ifeq ($(BR2_PACKAGE_TIFF),y) +LIBCAMERA_DEPENDENCIES += tiff +endif + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +LIBCAMERA_DEPENDENCIES += udev +endif + +ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) +LIBCAMERA_CONF_OPTS += -Dtracing=enabled +LIBCAMERA_DEPENDENCIES += lttng-libust +else +LIBCAMERA_CONF_OPTS += -Dtracing=disabled +endif $(eval $(meson-package)) diff --git a/package/libcap-ng/libcap-ng.hash b/package/libcap-ng/libcap-ng.hash index f8342ea928..f775ae6fc9 100644 --- a/package/libcap-ng/libcap-ng.hash +++ b/package/libcap-ng/libcap-ng.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 4a1532bcf3731aade40936f6d6a586ed5a66ca4c7455e1338d1f6c3e09221328 libcap-ng-0.7.9.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING -sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB +sha256 52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9 libcap-ng-0.8.2.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index 0f29ef0972..4fb0cf4777 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -4,15 +4,18 @@ # ################################################################################ -LIBCAP_NG_VERSION = 0.7.9 +LIBCAP_NG_VERSION = 0.8.2 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB +LIBCAP_NG_CPE_ID_VENDOR = libcap-ng_project LIBCAP_NG_INSTALL_STAGING = YES -# 0001-Fix-compilation-without-pthread.h.patch -LIBCAP_NG_AUTORECONF = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no LIBCAP_NG_CONF_OPTS = --without-python +HOST_LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no +HOST_LIBCAP_NG_CONF_OPTS = --without-python + $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/libcap/Config.in b/package/libcap/Config.in index 5b0c827191..e1971b7bb1 100644 --- a/package/libcap/Config.in +++ b/package/libcap/Config.in @@ -1,18 +1,18 @@ config BR2_PACKAGE_LIBCAP bool "libcap" + depends on BR2_USE_MMU # fork() help This library implements the user-space interfaces to the POSIX 1003.1e capabilities available in Linux kernels. These capabilities are a partitioning of the all powerful root privilege into a set of distinct privileges. - http://sites.google.com/site/fullycapable/ + https://sites.google.com/site/fullycapable/ if BR2_PACKAGE_LIBCAP config BR2_PACKAGE_LIBCAP_TOOLS bool "install tools" - depends on BR2_USE_MMU help Install setcap, getcap, getpcaps and capsh tools. diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index cbef0dc86d..ec87a38df7 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 dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a libcap-2.27.tar.xz +sha256 6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9 libcap-2.51.tar.xz # Hash for license file: -sha256 088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc License +sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 4919a4adca..3dc09bd551 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,70 +4,68 @@ # ################################################################################ -LIBCAP_VERSION = 2.27 +LIBCAP_VERSION = 2.51 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 LIBCAP_LICENSE_FILES = License +LIBCAP_CPE_ID_VENDOR = libcap_project LIBCAP_DEPENDENCIES = host-libcap host-gperf LIBCAP_INSTALL_STAGING = YES HOST_LIBCAP_DEPENDENCIES = host-gperf -ifeq ($(BR2_STATIC_LIBS),y) -LIBCAP_MAKE_TARGET = libcap.a libcap.pc -LIBCAP_MAKE_INSTALL_TARGET = install-static -else ifeq ($(BR2_SHARED_LIBS),y) -LIBCAP_MAKE_TARGET = all -LIBCAP_MAKE_INSTALL_TARGET = install-shared -else -LIBCAP_MAKE_TARGET = all -LIBCAP_MAKE_INSTALL_TARGET = install -endif - LIBCAP_MAKE_FLAGS = \ + CROSS_COMPILE="$(TARGET_CROSS)" \ BUILD_CC="$(HOSTCC)" \ - BUILD_CFLAGS="$(HOST_CFLAGS)" + BUILD_CFLAGS="$(HOST_CFLAGS)" \ + lib=lib \ + prefix=/usr \ + SHARED=$(if $(BR2_STATIC_LIBS),,yes) \ + PTHREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,) + +LIBCAP_MAKE_DIRS = libcap ifeq ($(BR2_PACKAGE_LIBCAP_TOOLS),y) -define LIBCAP_BUILD_TOOLS_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/progs \ - $(LIBCAP_MAKE_FLAGS) -endef - -define LIBCAP_INSTALL_TOOLS_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/progs \ - RAISE_SETFCAP=no prefix=/usr \ - DESTDIR=$(TARGET_DIR) $(LIBCAP_MAKE_FLAGS) install -endef +LIBCAP_MAKE_DIRS += progs endif define LIBCAP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/libcap \ - $(LIBCAP_MAKE_FLAGS) $(LIBCAP_MAKE_TARGET) - $(LIBCAP_BUILD_TOOLS_CMDS) + $(foreach d,$(LIBCAP_MAKE_DIRS), \ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(d) \ + $(LIBCAP_MAKE_FLAGS) all + ) endef define LIBCAP_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap $(LIBCAP_MAKE_FLAGS) \ - DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET) + $(foreach d,$(LIBCAP_MAKE_DIRS), \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) $(LIBCAP_MAKE_FLAGS) \ + DESTDIR=$(STAGING_DIR) install + ) endef define LIBCAP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap $(LIBCAP_MAKE_FLAGS) \ - DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET) - $(LIBCAP_INSTALL_TOOLS_CMDS) + $(foreach d,$(LIBCAP_MAKE_DIRS), \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) $(LIBCAP_MAKE_FLAGS) \ + DESTDIR=$(TARGET_DIR) install + ) endef +HOST_LIBCAP_MAKE_FLAGS = \ + DYNAMIC=yes \ + GOLANG=no \ + lib=lib \ + prefix=$(HOST_DIR) \ + RAISE_SETFCAP=no + define HOST_LIBCAP_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)\ - RAISE_SETFCAP=no + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(HOST_LIBCAP_MAKE_FLAGS) endef define HOST_LIBCAP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) prefix=$(HOST_DIR) \ - RAISE_SETFCAP=no lib=lib install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBCAP_MAKE_FLAGS) install endef $(eval $(generic-package)) diff --git a/package/libcdio/libcdio.mk b/package/libcdio/libcdio.mk index 4bf55d3344..df26d9a7ac 100644 --- a/package/libcdio/libcdio.mk +++ b/package/libcdio/libcdio.mk @@ -10,6 +10,7 @@ LIBCDIO_SITE = $(BR2_GNU_MIRROR)/libcdio LIBCDIO_INSTALL_STAGING = YES LIBCDIO_LICENSE = GPL-3.0+ LIBCDIO_LICENSE_FILES = COPYING +LIBCDIO_CPE_ID_VENDOR = gnu LIBCDIO_CONF_OPTS = --disable-example-progs --disable-cddb ifeq ($(BR2_ENABLE_LOCALE),) diff --git a/package/libcec/libcec.hash b/package/libcec/libcec.hash index c457ee7097..3e5a443057 100644 --- a/package/libcec/libcec.hash +++ b/package/libcec/libcec.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 035c617e48e14b1d70c503c5fefce42142198e36fefa0f8b01f0228df65edb52 libcec-91da1b6d5daecd3c85a1ac06d325ee4554f69b83.tar.gz -sha256 3618005b3db4eb8ede7292d233e6c41605cb8dcbd33e8790eff6e29c1e4f3789 COPYING +sha256 090696d7a4fb772d7acebbb06f91ab92e025531c7c91824046b9e4e71ecb3377 libcec-6.0.2.tar.gz +sha256 0137261d24ce001fc5237aacddd267533e0f150ac23cf21acffea599f7358f7a COPYING diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index e85fd6a4d3..6591bc009a 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCEC_VERSION = 91da1b6d5daecd3c85a1ac06d325ee4554f69b83 -LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION)) +LIBCEC_VERSION = 6.0.2 +LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION)) LIBCEC_LICENSE = GPL-2.0+ LIBCEC_LICENSE_FILES = COPYING diff --git a/package/libcgroup/libcgroup.hash b/package/libcgroup/libcgroup.hash index 11423e269f..70671212ef 100644 --- a/package/libcgroup/libcgroup.hash +++ b/package/libcgroup/libcgroup.hash @@ -1,3 +1,5 @@ -# Locally computed: -sha256 e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51 libcgroup-0.41.tar.bz2 +# From https://github.com/libcgroup/libcgroup/releases/download/v0.42.2/libcgroup-0.42.2.tar.bz2.sha256 +sha256 18939381324d418e11be4f5fdca37b01652c18917bfaf1f6b0c505f157e18d07 libcgroup-0.42.2.tar.bz2 + +# Hash for license file sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk index a26d5f2ddf..156b066162 100644 --- a/package/libcgroup/libcgroup.mk +++ b/package/libcgroup/libcgroup.mk @@ -4,17 +4,15 @@ # ################################################################################ -LIBCGROUP_VERSION = 0.41 +LIBCGROUP_VERSION = 0.42.2 LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2 -LIBCGROUP_SITE = http://downloads.sourceforge.net/project/libcg/libcgroup/v$(LIBCGROUP_VERSION) +LIBCGROUP_SITE = https://github.com/libcgroup/libcgroup/releases/download/v$(LIBCGROUP_VERSION) LIBCGROUP_LICENSE = LGPL-2.1 LIBCGROUP_LICENSE_FILES = COPYING +LIBCGROUP_CPE_ID_VENDOR = libcgroup_project LIBCGROUP_DEPENDENCIES = host-bison host-flex LIBCGROUP_INSTALL_STAGING = YES -# 0001-cgrulesengd-remove-umask-0.patch -LIBCGROUP_IGNORE_CVES += CVE-2018-14348 - # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # large file support. See https://bugzilla.redhat.com/show_bug.cgi?id=574992 # for more information. diff --git a/package/libclc/libclc.hash b/package/libclc/libclc.hash index 29728fbc76..2af64bc8e8 100644 --- a/package/libclc/libclc.hash +++ b/package/libclc/libclc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 5ea2cd2fa7fa1474d3e0580064e7a22014ef8d64dbbd7c546277fa4beb5acf86 libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060.tar.gz -sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT +sha256 54d7ae523aabf68d533011739d6c01546cae0c294442d0f44fd657c046cb707d libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060-br1.tar.gz +sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT diff --git a/package/libclc/libclc.mk b/package/libclc/libclc.mk index 630616905c..6fe8e10a77 100644 --- a/package/libclc/libclc.mk +++ b/package/libclc/libclc.mk @@ -6,7 +6,7 @@ # Use the latest commit from release_90 branch. LIBCLC_VERSION = d1cbc92e2ceee59963f5c3a576382e5bba31f060 -LIBCLC_SITE = https://git.llvm.org/git/libclc +LIBCLC_SITE = https://github.com/llvm-mirror/libclc LIBCLC_SITE_METHOD = git LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT LIBCLC_LICENSE_FILES = LICENSE.TXT diff --git a/package/libcli/Config.in b/package/libcli/Config.in index 3b625c3648..b2829cad3f 100644 --- a/package/libcli/Config.in +++ b/package/libcli/Config.in @@ -2,9 +2,9 @@ config BR2_PACKAGE_LIBCLI bool "libcli" help Libcli provides a shared library for including a Cisco-like - command- line interface into other software. It's a telnet + command-line interface into other software. It's a telnet interface which supports command-line editing, history, authentication and callbacks for a user-definable function tree. - http://sites.dparrish.com/libcli + https://github.com/dparrish/libcli diff --git a/package/libcli/libcli.hash b/package/libcli/libcli.hash index ce4373e92b..a17a176fe5 100644 --- a/package/libcli/libcli.hash +++ b/package/libcli/libcli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 190f0a315dbc291400e9d33f701f9a66894102a6c29e1aebb63f01239bb164d0 libcli-1.10.2.tar.gz -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING +sha256 43efade6f3deb621e1e226b7854274a869fca57e12e74e61c5496d5dea7c445d libcli-1.10.4.tar.gz +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/package/libcli/libcli.mk b/package/libcli/libcli.mk index bc46082546..2dedc9d5df 100644 --- a/package/libcli/libcli.mk +++ b/package/libcli/libcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCLI_VERSION = 1.10.2 +LIBCLI_VERSION = 1.10.4 LIBCLI_SITE = $(call github,dparrish,libcli,V$(LIBCLI_VERSION)) LIBCLI_LICENSE = LGPL-2.1 LIBCLI_LICENSE_FILES = COPYING diff --git a/package/libcoap/libcoap.hash b/package/libcoap/libcoap.hash index 579a052c8d..3472006224 100644 --- a/package/libcoap/libcoap.hash +++ b/package/libcoap/libcoap.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 9523e38da6ee8b2a8f5ce83ded64107dd1e514c7ad00cd74ccfe3454b679c271 libcoap-4.2.0.tar.gz -sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING -sha256 3821a9f881344ad53c543c84675ad4b6a29e913ca500cfa160ab52e4e6965b15 LICENSE +sha256 29a0394a265d3febee41e5e2dc03d34292a0aede37f5f80334e529ac0dab2321 libcoap-4.2.1.tar.gz +sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING +sha256 c51e85271aca3fbdd79bb4ee45dcfd854724538dad83b70afbbdfc62415e3e7f LICENSE diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index e2fbaa3dfb..9a5e04d4fd 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -4,13 +4,23 @@ # ################################################################################ -LIBCOAP_VERSION = 4.2.0 +LIBCOAP_VERSION = 4.2.1 LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = BSD-2-Clause LIBCOAP_LICENSE_FILES = COPYING LICENSE LIBCOAP_DEPENDENCIES = host-pkgconf -LIBCOAP_CONF_OPTS = --disable-examples +LIBCOAP_CONF_OPTS = --disable-examples --without-tinydtls LIBCOAP_AUTORECONF = YES +ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBCOAP_DEPENDENCIES += gnutls +LIBCOAP_CONF_OPTS += --enable-dtls --with-gnutls --without-openssl +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBCOAP_DEPENDENCIES += openssl +LIBCOAP_CONF_OPTS += --enable-dtls --without-gnutls --with-openssl +else +LIBCOAP_CONF_OPTS += --disable-dtls +endif + $(eval $(autotools-package)) diff --git a/package/libconfig/libconfig.hash b/package/libconfig/libconfig.hash index e056a17de3..d359301d6f 100644 --- a/package/libconfig/libconfig.hash +++ b/package/libconfig/libconfig.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f67ac44099916ae260a6c9e290a90809e7d782d96cdd462cac656ebc5b685726 libconfig-1.7.2.tar.gz +sha256 545166d6cac037744381d1e9cc5a5405094e7bfad16a411699bcff40bbb31ee7 libconfig-1.7.3.tar.gz sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING.LIB diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk index a127f9bcc8..6cdf603185 100644 --- a/package/libconfig/libconfig.mk +++ b/package/libconfig/libconfig.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBCONFIG_VERSION = 1.7.2 -LIBCONFIG_SITE = $(call github,hyperrealm,libconfig,v$(LIBCONFIG_VERSION)) +LIBCONFIG_VERSION = 1.7.3 +LIBCONFIG_SITE = https://github.com/hyperrealm/libconfig/releases/download/v$(LIBCONFIG_VERSION) LIBCONFIG_LICENSE = LGPL-2.1+ LIBCONFIG_LICENSE_FILES = COPYING.LIB LIBCONFIG_INSTALL_STAGING = YES -# From git -LIBCONFIG_AUTORECONF = YES -LIBCONFIG_CONF_OPTS = --disable-examples +LIBCONFIG_CONF_OPTS = --disable-examples --disable-tests ifneq ($(BR2_INSTALL_LIBSTDCPP),y) LIBCONFIG_CONF_OPTS += --disable-cxx diff --git a/package/libconfuse/libconfuse.hash b/package/libconfuse/libconfuse.hash index adc93f99a3..bb968f7a52 100644 --- a/package/libconfuse/libconfuse.hash +++ b/package/libconfuse/libconfuse.hash @@ -1,5 +1,5 @@ -# From https://github.com/martinh/libconfuse/releases/download/v3.2.2/confuse-3.2.2.tar.xz.md5 -md5 978996e421e5005e6a9f6f84948fac44 confuse-3.2.2.tar.xz +# From https://github.com/martinh/libconfuse/releases/download/v3.3/confuse-3.3.tar.xz.md5 +md5 a183cef2cecdd3783436ff8de500d274 confuse-3.3.tar.xz # Locally computed -sha256 a9240b653d02e8cfc52db48e8c4224426e528e1faa09b65e8ca08a197fad210b confuse-3.2.2.tar.xz +sha256 1dd50a0320e135a55025b23fcdbb3f0a81913b6d0b0a9df8cc2fdf3b3dc67010 confuse-3.3.tar.xz sha256 dc3ff4b62f851dd2e94a151061ffeb7d28ddfc880a442068dc5283dbaa927306 LICENSE diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk index b16bc9b7a7..2beb0e4fbf 100644 --- a/package/libconfuse/libconfuse.mk +++ b/package/libconfuse/libconfuse.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBCONFUSE_VERSION = 3.2.2 +LIBCONFUSE_VERSION = 3.3 LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.xz LIBCONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(LIBCONFUSE_VERSION) LIBCONFUSE_INSTALL_STAGING = YES LIBCONFUSE_CONF_OPTS = --disable-rpath LIBCONFUSE_LICENSE = ISC LIBCONFUSE_LICENSE_FILES = LICENSE +LIBCONFUSE_CPE_ID_VENDOR = libconfuse_project LIBCONFUSE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) $(eval $(autotools-package)) diff --git a/package/libcpprestsdk/Config.in b/package/libcpprestsdk/Config.in index 01ebc6aa7f..97f00e3383 100644 --- a/package/libcpprestsdk/Config.in +++ b/package/libcpprestsdk/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBCPPRESTSDK depends on BR2_ENABLE_LOCALE depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # boost + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_BOOST @@ -14,7 +15,6 @@ config BR2_PACKAGE_LIBCPPRESTSDK select BR2_PACKAGE_BOOST_REGEX select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB help The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern @@ -24,6 +24,7 @@ config BR2_PACKAGE_LIBCPPRESTSDK https://github.com/Microsoft/cpprestsdk comment "libcpprestsdk needs a toolchain w/ NPTL, C++, wchar, locale" + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_USE_WCHAR || !BR2_ENABLE_LOCALE diff --git a/package/libcpprestsdk/libcpprestsdk.hash b/package/libcpprestsdk/libcpprestsdk.hash index 1f79a4ad95..8e398d0c54 100644 --- a/package/libcpprestsdk/libcpprestsdk.hash +++ b/package/libcpprestsdk/libcpprestsdk.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1c027a53457e87b0b3a475e5c8045b94400c475898c8bd51b0fbd218b99a7f7b libcpprestsdk-2.10.15.tar.gz +sha256 6bd74a637ff182144b6a4271227ea8b6b3ea92389f88b25b215e6f94fd4d41cb libcpprestsdk-2.10.18.tar.gz sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt diff --git a/package/libcpprestsdk/libcpprestsdk.mk b/package/libcpprestsdk/libcpprestsdk.mk index 8404b5096c..68d4cf68c1 100644 --- a/package/libcpprestsdk/libcpprestsdk.mk +++ b/package/libcpprestsdk/libcpprestsdk.mk @@ -4,13 +4,13 @@ # ################################################################################ -LIBCPPRESTSDK_VERSION = 2.10.15 -LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,v$(LIBCPPRESTSDK_VERSION)) +LIBCPPRESTSDK_VERSION = 2.10.18 +LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,$(LIBCPPRESTSDK_VERSION)) LIBCPPRESTSDK_LICENSE = MIT LIBCPPRESTSDK_LICENSE_FILES = license.txt LIBCPPRESTSDK_SUBDIR = Release LIBCPPRESTSDK_INSTALL_STAGING = YES -LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib +LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DBUILD_SAMPLES=OFF ifeq ($(BR2_STATIC_LIBS),y) @@ -25,12 +25,19 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) LIBCPPRESTSDK_CXXFLAGS += -latomic endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBCPPRESTSDK_DEPENDENCIES += zlib +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_COMPRESSION=OFF +# brotli needs compression ifeq ($(BR2_PACKAGE_BROTLI),y) LIBCPPRESTSDK_DEPENDENCIES += brotli LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_BROTLI=OFF else LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_BROTLI=ON endif +else +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_COMPRESSION=ON +endif ifeq ($(BR2_PACKAGE_WEBSOCKETPP),y) LIBCPPRESTSDK_DEPENDENCIES += websocketpp diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index b89c46f5ef..d8072c0afc 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBCURL Telnet, and Dict servers, using any of the supported protocols. - http://curl.haxx.se/ + https://curl.se/ if BR2_PACKAGE_LIBCURL @@ -51,6 +51,7 @@ 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" @@ -71,6 +72,7 @@ config BR2_PACKAGE_LIBCURL_MBEDTLS config BR2_PACKAGE_LIBCURL_WOLFSSL bool "WolfSSL" depends on BR2_PACKAGE_WOLFSSL + select BR2_PACKAGE_WOLFSSL_ALL config BR2_PACKAGE_LIBCURL_TLS_NONE bool "None" diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 69cf7b5398..b13f01c874 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 03c7d5e6697f7b7e40ada1b2256e565a555657398e6c1fcfa4cb251ccd819d4f curl-7.69.1.tar.xz -sha256 db3c4a3b3695a0f317a0c5176acd2f656d18abc45b3ee78e50935a78eb1e132e COPYING +# Locally calculated after checking pgp signature +# https://curl.se/download/curl-7.79.1.tar.xz.asc +# signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 +sha256 0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689 curl-7.79.1.tar.xz +sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 7a29634c68..a70ebe4113 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,25 +4,27 @@ # ################################################################################ -LIBCURL_VERSION = 7.69.1 +LIBCURL_VERSION = 7.79.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz -LIBCURL_SITE = https://curl.haxx.se/download +LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ $(if $(BR2_PACKAGE_ZLIB),zlib) \ $(if $(BR2_PACKAGE_RTMPDUMP),rtmpdump) LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING +LIBCURL_CPE_ID_VENDOR = haxx +LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM support because it uses fork(), which doesn't work # on non-MMU platforms. Moreover, this authentication method is # probably almost never used. See -# http://curl.haxx.se/docs/manpage.html#--ntlm. +# http://curl.se/docs/manpage.html#--ntlm. # 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 \ --enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug \ - --disable-libcurl-option + --disable-libcurl-option --disable-ldap --disable-ldaps ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBCURL_CONF_OPTS += --enable-threaded-resolver @@ -124,6 +126,13 @@ else LIBCURL_CONF_OPTS += --without-nghttp2 endif +ifeq ($(BR2_PACKAGE_LIBGSASL),y) +LIBCURL_DEPENDENCIES += libgsasl +LIBCURL_CONF_OPTS += --with-gsasl +else +LIBCURL_CONF_OPTS += --without-gsasl +endif + ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) LIBCURL_CONF_OPTS += --enable-cookies else @@ -141,8 +150,6 @@ LIBCURL_CONF_OPTS += \ --enable-dict \ --enable-gopher \ --enable-imap \ - --enable-ldap \ - --enable-ldaps \ --enable-pop3 \ --enable-rtsp \ --enable-smb \ @@ -154,8 +161,6 @@ LIBCURL_CONF_OPTS += \ --disable-dict \ --disable-gopher \ --disable-imap \ - --disable-ldap \ - --disable-ldaps \ --disable-pop3 \ --disable-rtsp \ --disable-smb \ diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index a8f75108bc..cdf0819e68 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -8,6 +8,8 @@ LIBDAEMON_VERSION = 0.14 LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon LIBDAEMON_LICENSE = LGPL-2.1+ LIBDAEMON_LICENSE_FILES = LICENSE +LIBDAEMON_CPE_ID_VENDOR = libdaemon_project + LIBDAEMON_INSTALL_STAGING = YES LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no LIBDAEMON_CONF_OPTS = --disable-lynx diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index 4c9c4c4fed..d3f35b3de0 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,3 +1,6 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2020-April/261067.html -sha256 ddf31baa8e49473624860bd166ce654dc349873f7a6c7b3305964249315c78a7 libdrm-2.4.101.tar.xz -sha512 658cfc6f478b674b77b4613e1af9ce8f4fd2ace8a18e75729de254d14b7c1f5d67d4bfdb58744aea74abca0f6521326225f4156bd5cbeeed79ca3e025f657e8c libdrm-2.4.101.tar.xz +# From https://lists.freedesktop.org/archives/dri-devel/2021-July/313594.html +sha256 c554cef03b033636a975543eab363cc19081cb464595d3da1ec129f87370f888 libdrm-2.4.107.tar.xz +sha512 c7542ba15c4c934519a6a1f3cb1ec21effa820a805a030d0175313bb1cc796cd311f39596ead883f9f251679d701e262894c5a297d5cf45093c80a6cd818def0 libdrm-2.4.107.tar.xz + +# Hash for license file +sha256 7e952c6666ed17c99f91ee7af13c688b8769b0feaf6f4558bf6ad3e07512e1e6 xf86drm.c diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 4217fcc84c..c15be3e671 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.101 +LIBDRM_VERSION = 2.4.107 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT +LIBDRM_LICENSE_FILES = xf86drm.c LIBDRM_INSTALL_STAGING = YES LIBDRM_DEPENDENCIES = \ @@ -16,7 +17,7 @@ LIBDRM_DEPENDENCIES = \ LIBDRM_CONF_OPTS = \ -Dcairo-tests=false \ - -Dmanpages=false + -Dman-pages=false ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) LIBDRM_DEPENDENCIES += libatomic_ops diff --git a/package/libdvbsi/libdvbsi.hash b/package/libdvbsi/libdvbsi.hash index 184da52866..5f731a1908 100644 --- a/package/libdvbsi/libdvbsi.hash +++ b/package/libdvbsi/libdvbsi.hash @@ -1,8 +1,3 @@ -# From http://www.saftware.de/libdvbsi++/libdvbsi++-0.3.8.tar.bz2.md5 -md5 c8e6ef55ef4b96dacdee250779219d2a libdvbsi++-0.3.8.tar.bz2 - # Locally calculated -sha256 a5b3fa767aa45267178c169268df886b3e79431f335a24d779edf610e8372f89 libdvbsi++-0.3.8.tar.bz2 - -# Hash for license file: -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 a57949b842d94efedd895f2bd8e483c9f258e698092e35f1c3fdccb45b790953 libdvbsi++-0.3.9.tar.bz2 +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libdvbsi/libdvbsi.mk b/package/libdvbsi/libdvbsi.mk index d1646c0efd..65191b81ad 100644 --- a/package/libdvbsi/libdvbsi.mk +++ b/package/libdvbsi/libdvbsi.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBDVBSI_VERSION = 0.3.8 +LIBDVBSI_VERSION = 0.3.9 LIBDVBSI_SOURCE = libdvbsi++-$(LIBDVBSI_VERSION).tar.bz2 -LIBDVBSI_SITE = http://www.saftware.de/libdvbsi++ +LIBDVBSI_SITE = https://github.com/mtdcr/libdvbsi/releases/download/$(LIBDVBSI_VERSION) LIBDVBSI_INSTALL_STAGING = YES LIBDVBSI_LICENSE = LGPL-2.1 LIBDVBSI_LICENSE_FILES = COPYING diff --git a/package/libdvdcss/libdvdcss.hash b/package/libdvdcss/libdvdcss.hash index 1e1b03ed20..4d20f19efc 100644 --- a/package/libdvdcss/libdvdcss.hash +++ b/package/libdvdcss/libdvdcss.hash @@ -1,5 +1,7 @@ -# From http://download.videolan.org/pub/videolan/libdvdcss/1.4.2/libdvdcss-1.4.2.tar.bz2.sha256 -sha256 78c2ed77ec9c0d8fbed7bf7d3abc82068b8864be494cfad165821377ff3f2575 libdvdcss-1.4.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdcss/1.4.3/libdvdcss-1.4.3.tar.bz2.sha1 +sha1 fcea8b2749ead8183636e48300bea8791abc79ee libdvdcss-1.4.3.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdcss/1.4.3/libdvdcss-1.4.3.tar.bz2.sha256 +sha256 233cc92f5dc01c5d3a96f5b3582be7d5cee5a35a52d3a08158745d3d86070079 libdvdcss-1.4.3.tar.bz2 # Hash for license file: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libdvdcss/libdvdcss.mk b/package/libdvdcss/libdvdcss.mk index 0593d556e1..f4d721771f 100644 --- a/package/libdvdcss/libdvdcss.mk +++ b/package/libdvdcss/libdvdcss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDVDCSS_VERSION = 1.4.2 +LIBDVDCSS_VERSION = 1.4.3 LIBDVDCSS_SOURCE = libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2 LIBDVDCSS_SITE = http://www.videolan.org/pub/videolan/libdvdcss/$(LIBDVDCSS_VERSION) LIBDVDCSS_INSTALL_STAGING = YES diff --git a/package/libdvdnav/libdvdnav.hash b/package/libdvdnav/libdvdnav.hash index 8de6debfeb..61d64b8ee3 100644 --- a/package/libdvdnav/libdvdnav.hash +++ b/package/libdvdnav/libdvdnav.hash @@ -1,9 +1,7 @@ -# From http://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2.md5 -md5 3a28d2cc7e25c1cbcb06443f3114f0b1 libdvdnav-6.0.1.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2.sha1 -sha1 258b82156e13803f2b0dbaec74e15475b4341d2f libdvdnav-6.0.1.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2.sha256 -sha256 e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733 libdvdnav-6.0.1.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdnav/6.1.1/libdvdnav-6.1.1.tar.bz2.sha1 +sha1 7ac76aa95d046db715763da23b7053b65cbc7540 libdvdnav-6.1.1.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdnav/6.1.1/libdvdnav-6.1.1.tar.bz2.sha256 +sha256 c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48 libdvdnav-6.1.1.tar.bz2 # Hash for license file: -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk index 450f8f687d..e34c0710bc 100644 --- a/package/libdvdnav/libdvdnav.mk +++ b/package/libdvdnav/libdvdnav.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBDVDNAV_VERSION = 6.0.1 +LIBDVDNAV_VERSION = 6.1.1 LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 LIBDVDNAV_SITE = http://www.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION) LIBDVDNAV_INSTALL_STAGING = YES +LIBDVDNAV_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf LIBDVDNAV_LICENSE = GPL-2.0+ LIBDVDNAV_LICENSE_FILES = COPYING diff --git a/package/libdvdread/libdvdread.hash b/package/libdvdread/libdvdread.hash index c6b5807af9..de9afcfa30 100644 --- a/package/libdvdread/libdvdread.hash +++ b/package/libdvdread/libdvdread.hash @@ -1,9 +1,7 @@ -# From http://download.videolan.org/pub/videolan/libdvdread/6.0.2/libdvdread-6.0.2.tar.bz2.md5 -md5 49990935174bf6b2fa501e789c578135 libdvdread-6.0.2.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdread/6.0.2/libdvdread-6.0.2.tar.bz2.sha1 -sha1 a3d4b85cbe52b11cff7587ed010fa38ce512fd95 libdvdread-6.0.2.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdread/6.0.2/libdvdread-6.0.2.tar.bz2.sha256 -sha256 f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0 libdvdread-6.0.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdread/6.1.2/libdvdread-6.1.2.tar.bz2.sha1 +sha1 789d0780fbdcd7d6dadf0fda3d4a4b6198c16393 libdvdread-6.1.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdread/6.1.2/libdvdread-6.1.2.tar.bz2.sha256 +sha256 cc190f553758ced7571859e301f802cb4821f164d02bfacfd320c14a4e0da763 libdvdread-6.1.2.tar.bz2 # Hash for license file: -sha256 d6cb0e9e560f51085556949a84af12b79a00f10ab8b66c752537faf7cd665572 COPYING +sha256 d6cb0e9e560f51085556949a84af12b79a00f10ab8b66c752537faf7cd665572 COPYING diff --git a/package/libdvdread/libdvdread.mk b/package/libdvdread/libdvdread.mk index 7744fc42ac..9ddb6721c7 100644 --- a/package/libdvdread/libdvdread.mk +++ b/package/libdvdread/libdvdread.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBDVDREAD_VERSION = 6.0.2 +LIBDVDREAD_VERSION = 6.1.2 LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 LIBDVDREAD_SITE = http://www.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION) LIBDVDREAD_INSTALL_STAGING = YES LIBDVDREAD_LICENSE = GPL-2.0+ LIBDVDREAD_LICENSE_FILES = COPYING +LIBDVDREAD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu99" LIBDVDREAD_CONF_OPTS = --with-libdvdcss LIBDVDREAD_DEPENDENCIES = libdvdcss host-pkgconf diff --git a/package/libeXosip2/Config.in b/package/libeXosip2/Config.in index 4cb8218f20..9fbe9789f8 100644 --- a/package/libeXosip2/Config.in +++ b/package/libeXosip2/Config.in @@ -4,10 +4,10 @@ config BR2_PACKAGE_LIBEXOSIP2 select BR2_PACKAGE_LIBOSIP2 help eXosip is a library that hides the complexity of using the - SIP protocol for mutlimedia session establishement. + SIP protocol for multimedia session establishment. This protocol is mainly to be used by VoIP telephony applications (endpoints or conference server) but might be - also usefull for any application that wish to establish + also useful for any application that wish to establish sessions like multiplayer games. eXosip is based in libosip. diff --git a/package/libeXosip2/libeXosip2.hash b/package/libeXosip2/libeXosip2.hash index a7d3c56d00..53e27e929c 100644 --- a/package/libeXosip2/libeXosip2.hash +++ b/package/libeXosip2/libeXosip2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 21420c00bf8e0895ff36161766beec12b7e6f1d371030c389dba845e271272e2 libexosip2-5.1.1.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 e3ae88df8573c9e08dbc24fe6195a118845e845109a8e291c91ecd6a2a3b7225 libexosip2-5.2.0.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk index 4bd8922b41..3ed637a3d4 100644 --- a/package/libeXosip2/libeXosip2.mk +++ b/package/libeXosip2/libeXosip2.mk @@ -4,13 +4,15 @@ # ################################################################################ -LIBEXOSIP2_VERSION = 5.1.1 +LIBEXOSIP2_VERSION = 5.2.0 # Since version 5.0, letter 'X' in library's name is in lower case LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip LIBEXOSIP2_INSTALL_STAGING = YES LIBEXOSIP2_LICENSE = GPL-2.0+ LIBEXOSIP2_LICENSE_FILES = COPYING +LIBEXOSIP2_CPE_ID_VENDOR = gnu +LIBEXOSIP2_CPE_ID_PRODUCT = exosip LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2 diff --git a/package/libebml/libebml.hash b/package/libebml/libebml.hash index 88511f7b93..32ca1e3dd3 100644 --- a/package/libebml/libebml.hash +++ b/package/libebml/libebml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c6a792f4127b8059bc446fb32391e6633811f45748d7d7ba873d7028362f5e3e libebml-1.3.10.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL +sha256 41c7237ce05828fb220f62086018b080af4db4bb142f31bec0022c925889b9f2 libebml-1.4.2.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL diff --git a/package/libebml/libebml.mk b/package/libebml/libebml.mk index 549d2f8e6f..056cf888e1 100644 --- a/package/libebml/libebml.mk +++ b/package/libebml/libebml.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBEBML_VERSION = 1.3.10 +LIBEBML_VERSION = 1.4.2 LIBEBML_SOURCE = libebml-$(LIBEBML_VERSION).tar.xz LIBEBML_SITE = http://dl.matroska.org/downloads/libebml LIBEBML_INSTALL_STAGING = YES LIBEBML_LICENSE = LGPL-2.1+ LIBEBML_LICENSE_FILES = LICENSE.LGPL +LIBEBML_CPE_ID_VENDOR = matroska $(eval $(cmake-package)) diff --git a/package/libebur128/libebur128.hash b/package/libebur128/libebur128.hash index e2285bc7cf..9c8c9e0c31 100644 --- a/package/libebur128/libebur128.hash +++ b/package/libebur128/libebur128.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2ee41a3a5ae3891601ae975d5ec2642b997d276ef647cf5c5b363b6127f7add8 libebur128-1.2.4.tar.gz -sha256 d6b4754bb67bdd08b97d5d11b2d7434997a371585a78fe77007149df3af8d09c COPYING +sha256 baa7fc293a3d4651e244d8022ad03ab797ca3c2ad8442c43199afe8059faa613 libebur128-1.2.6.tar.gz +sha256 d6b4754bb67bdd08b97d5d11b2d7434997a371585a78fe77007149df3af8d09c COPYING diff --git a/package/libebur128/libebur128.mk b/package/libebur128/libebur128.mk index 97c1bdbbd9..b7272fa7e1 100644 --- a/package/libebur128/libebur128.mk +++ b/package/libebur128/libebur128.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEBUR128_VERSION = 1.2.4 +LIBEBUR128_VERSION = 1.2.6 LIBEBUR128_SITE = $(call github,jiixyj,libebur128,v$(LIBEBUR128_VERSION)) LIBEBUR128_LICENSE = MIT LIBEBUR128_LICENSE_FILES = COPYING diff --git a/package/libedit/libedit.hash b/package/libedit/libedit.hash index 7b84909d8b..d405e47b42 100644 --- a/package/libedit/libedit.hash +++ b/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ac8f0f51c1cf65492e4d1e3ed2be360bda41e54633444666422fbf393bba1bae libedit-20190324-3.1.tar.gz -sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING +sha256 dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071 libedit-20191231-3.1.tar.gz +sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index 0a9b28afa7..cb18b97f6d 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEDIT_VERSION = 20190324-3.1 +LIBEDIT_VERSION = 20191231-3.1 LIBEDIT_SITE = http://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses diff --git a/package/libepoxy/libepoxy.hash b/package/libepoxy/libepoxy.hash index a37e3949a6..376920c3cc 100644 --- a/package/libepoxy/libepoxy.hash +++ b/package/libepoxy/libepoxy.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.4.sha256sum -sha256 0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2 libepoxy-1.5.4.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.9.sha256sum +sha256 d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4 libepoxy-1.5.9.tar.xz # Hashes for license files: -sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING +sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING diff --git a/package/libepoxy/libepoxy.mk b/package/libepoxy/libepoxy.mk index efc23a7636..5a71fe5998 100644 --- a/package/libepoxy/libepoxy.mk +++ b/package/libepoxy/libepoxy.mk @@ -5,7 +5,7 @@ ################################################################################ LIBEPOXY_VERSION_MAJOR = 1.5 -LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).4 +LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).9 LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_INSTALL_STAGING = YES diff --git a/package/liberation/liberation.hash b/package/liberation/liberation.hash index a15dc23511..6606142d86 100644 --- a/package/liberation/liberation.hash +++ b/package/liberation/liberation.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f14ff0a0be87b5aeb672e669363b5a699db76feb1144b06798261c0fdcd2b24d liberation-fonts-ttf-2.00.5.tar.gz -sha256 93fed46019c38bbe566b479d22148e2e8a1e85ada614accb0211c37b2c61c19b LICENSE +sha256 14694930f28391675008c67b18889d1a7dfea74b16adf50394f8057b57eaf8e0 liberation-fonts-ttf-2.1.2.tar.gz +sha256 93fed46019c38bbe566b479d22148e2e8a1e85ada614accb0211c37b2c61c19b LICENSE diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk index 495a1ffa63..522a038ddd 100644 --- a/package/liberation/liberation.mk +++ b/package/liberation/liberation.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBERATION_VERSION = 2.00.5 -LIBERATION_SITE = https://github.com/liberationfonts/liberation-fonts/files/2926169 +LIBERATION_VERSION = 2.1.2 +LIBERATION_SITE = https://github.com/liberationfonts/liberation-fonts/files/5722233 LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation LIBERATION_LICENSE = OFL-1.1 diff --git a/package/libesmtp/Config.in b/package/libesmtp/Config.in index f3ed521d22..c631d127e0 100644 --- a/package/libesmtp/Config.in +++ b/package/libesmtp/Config.in @@ -1,10 +1,12 @@ config BR2_PACKAGE_LIBESMTP bool "libesmtp" depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL help Library for sending emails through SMTP. - http://brianstafford.info/libesmtp + https://libesmtp.github.io comment "libesmtp needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/libesmtp/libesmtp.hash b/package/libesmtp/libesmtp.hash index 9e1ca22b5b..596ed4eaca 100644 --- a/package/libesmtp/libesmtp.hash +++ b/package/libesmtp/libesmtp.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b libesmtp-1.0.6.tar.bz2 -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING -sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB +sha256 32bc3614ca12d21c7d933f32d43410e8744b6f91fdca7732da9877a385e4e6c3 libesmtp-1.1.0.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING.GPL +sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 LICENSE diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk index 9c336793a4..10fe7bf324 100644 --- a/package/libesmtp/libesmtp.mk +++ b/package/libesmtp/libesmtp.mk @@ -4,13 +4,24 @@ # ################################################################################ -LIBESMTP_VERSION = 1.0.6 -LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2 -LIBESMTP_SITE = http://brianstafford.info/libesmtp +LIBESMTP_VERSION = 1.1.0 +LIBESMTP_SITE = $(call github,libesmtp,libESMTP,v$(LIBESMTP_VERSION)) LIBESMTP_INSTALL_STAGING = YES -LIBESMTP_CONFIG_SCRIPTS = libesmtp-config -LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl) LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) -LIBESMTP_LICENSE_FILES = COPYING COPYING.LIB +LIBESMTP_LICENSE_FILES = COPYING.GPL LICENSE +LIBESMTP_CPE_ID_VENDOR = libesmtp_project -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBESMTP_CONF_OPTS += -Dtls=enabled +LIBESMTP_DEPENDENCIES += openssl +else +LIBESMTP_CONF_OPTS += -Dtls=disabled +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBESMTP_CONF_OPTS += -Dpthreads=enabled +else +LIBESMTP_CONF_OPTS += -Dpthreads=disabled +endif + +$(eval $(meson-package)) diff --git a/package/libestr/libestr.mk b/package/libestr/libestr.mk index 30960f7257..6ce22efae2 100644 --- a/package/libestr/libestr.mk +++ b/package/libestr/libestr.mk @@ -8,6 +8,7 @@ LIBESTR_VERSION = 0.1.11 LIBESTR_SITE = http://libestr.adiscon.com/files/download LIBESTR_LICENSE = LGPL-2.1+ LIBESTR_LICENSE_FILES = COPYING +LIBESTR_CPE_ID_VENDOR = adiscon LIBESTR_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash index 5a28275319..584a9941c5 100644 --- a/package/libevdev/libevdev.hash +++ b/package/libevdev/libevdev.hash @@ -1,8 +1,6 @@ -# From https://lists.freedesktop.org/archives/input-tools/2020-March/001530.html -md5 13c3f0911f9326d4b9fa103365f84421 libevdev-1.9.0.tar.xz -sha1 ab5040ee88dd4cb49a75da72e8fded91b282c108 libevdev-1.9.0.tar.xz -sha256 e7e18a64264f2dea19b6c50a481f8c062529d42919ccda0bc861495bce28eb9e libevdev-1.9.0.tar.xz -sha512 6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a libevdev-1.9.0.tar.xz +# From https://lists.freedesktop.org/archives/input-tools/2021-February/001557.html +sha256 63f4ea1489858a109080e0b40bd43e4e0903a1e12ea888d581db8c495747c2d0 libevdev-1.11.0.tar.xz +sha512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d libevdev-1.11.0.tar.xz # Hash for license files: -sha256 f063d1279b31e73007e1c54493391818b4cb5f9162d590120397e0347b932137 COPYING +sha256 6f13de7ce28e4948ba95170e0723ee1254c1978ce1f127af82aeca597b567cb9 COPYING diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index 78e3146b9a..f6172809fd 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.9.0 +LIBEVDEV_VERSION = 1.11.0 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz -LIBEVDEV_LICENSE = X11 +LIBEVDEV_LICENSE = MIT LIBEVDEV_LICENSE_FILES = COPYING LIBEVDEV_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY) diff --git a/package/libevent/libevent.hash b/package/libevent/libevent.hash index 7bcb381dd3..77574e784b 100644 --- a/package/libevent/libevent.hash +++ b/package/libevent/libevent.hash @@ -1,4 +1,4 @@ # locally computed -md5 7f35cfe69b82d879111ec0d7b7b1c531 libevent-2.1.11-stable.tar.gz -sha1 a76bba0a281da9384d4be5b40f3907c07e21428c libevent-2.1.11-stable.tar.gz -sha256 ff02effc9b331edcdac387d198691bfa3e575e7d244ad10cb826aa51ef085670 LICENSE +sha1 cd55656a9b5bed630b08f05495230affb7996b21 libevent-2.1.12-stable.tar.gz +sha256 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb libevent-2.1.12-stable.tar.gz +sha256 ff02effc9b331edcdac387d198691bfa3e575e7d244ad10cb826aa51ef085670 LICENSE diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index d604559313..93ba88ca88 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBEVENT_VERSION = 2.1.11 +LIBEVENT_VERSION = 2.1.12 LIBEVENT_SITE = https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION)-stable LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz LIBEVENT_INSTALL_STAGING = YES LIBEVENT_LICENSE = BSD-3-Clause, OpenBSD LIBEVENT_LICENSE_FILES = LICENSE +LIBEVENT_CPE_ID_VENDOR = libevent_project LIBEVENT_CONF_OPTS = \ --disable-libevent-regress \ --disable-samples diff --git a/package/libexif/Config.in b/package/libexif/Config.in index 8a38b477b8..8064c2e9f9 100644 --- a/package/libexif/Config.in +++ b/package/libexif/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LIBEXIF image. The EXIF library allows you to parse an EXIF file and read the data from those tags. - http://libexif.sf.net + https://libexif.github.io diff --git a/package/libexif/libexif.hash b/package/libexif/libexif.hash index aa9fcc8d89..e087daf58a 100644 --- a/package/libexif/libexif.hash +++ b/package/libexif/libexif.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a libexif-0.6.21.tar.bz2 +sha256 a740a99920eb81ae0aa802bb46e683ce6e0cde061c210f5d5bde5b8572380431 libexif-0.6.23.tar.xz sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk index 643d9ed893..49637f1519 100644 --- a/package/libexif/libexif.mk +++ b/package/libexif/libexif.mk @@ -4,21 +4,14 @@ # ################################################################################ -LIBEXIF_VERSION = 0.6.21 -LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2 -LIBEXIF_SITE = http://downloads.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION) +LIBEXIF_VERSION = 0.6.23 +LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.xz +LIBEXIF_SITE = \ + https://github.com/libexif/libexif/releases/download/v$(LIBEXIF_VERSION) LIBEXIF_INSTALL_STAGING = YES LIBEXIF_DEPENDENCIES = host-pkgconf LIBEXIF_LICENSE = LGPL-2.1+ LIBEXIF_LICENSE_FILES = COPYING - -# 0001-fixes-some-not-all-buffer-overreads-during-decoding-.patch -LIBEXIF_IGNORE_CVES += CVE-2016-6328 -# 0002-On-saving-makernotes-make-sure-the-makernote-contain.patch -LIBEXIF_IGNORE_CVES += CVE-2017-7544 -# 0004-Improve-deep-recursion-detection-in-exif_data_load_d.patch -LIBEXIF_IGNORE_CVES += CVE-2018-20030 -# 0005-fix-CVE-2019-9278.patch -LIBEXIF_IGNORE_CVES += CVE-2019-9278 +LIBEXIF_CPE_ID_VENDOR = libexif_project $(eval $(autotools-package)) diff --git a/package/libfastjson/libfastjson.hash b/package/libfastjson/libfastjson.hash index 07ea88f11e..218a738b37 100644 --- a/package/libfastjson/libfastjson.hash +++ b/package/libfastjson/libfastjson.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7e49057b26a5a9e3c6623e024f95f9fd9a14b571b9150aeb89d6d475fc3633e3 libfastjson-0.99.8.tar.gz +sha256 881f954633aa76931e4c756ece0bda6fd8a673c6e66955a3db3b2bb9d6bbff72 libfastjson-0.99.9.tar.gz sha256 b29370bbfa98816e1fca0901f18149d920736771bfd68b4ee0eb00c78b38d245 COPYING diff --git a/package/libfastjson/libfastjson.mk b/package/libfastjson/libfastjson.mk index ecca72f56c..7ab978dc67 100644 --- a/package/libfastjson/libfastjson.mk +++ b/package/libfastjson/libfastjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFASTJSON_VERSION = 0.99.8 +LIBFASTJSON_VERSION = 0.99.9 LIBFASTJSON_SITE = $(call github,rsyslog,libfastjson,v$(LIBFASTJSON_VERSION)) LIBFASTJSON_INSTALL_STAGING = YES LIBFASTJSON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' @@ -12,5 +12,6 @@ LIBFASTJSON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBFASTJSON_AUTORECONF = YES LIBFASTJSON_LICENSE = MIT LIBFASTJSON_LICENSE_FILES = COPYING +LIBFASTJSON_CPE_ID_VENDOR = rsyslog $(eval $(autotools-package)) diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk index c158df2395..ee61c22c45 100644 --- a/package/libfcgi/libfcgi.mk +++ b/package/libfcgi/libfcgi.mk @@ -8,6 +8,8 @@ LIBFCGI_VERSION = 2.4.2 LIBFCGI_SITE = $(call github,FastCGI-Archives,fcgi2,$(LIBFCGI_VERSION)) LIBFCGI_LICENSE = OML LIBFCGI_LICENSE_FILES = LICENSE.TERMS +LIBFCGI_CPE_ID_VENDOR = fastcgi +LIBFCGI_CPE_ID_PRODUCT = fcgi LIBFCGI_INSTALL_STAGING = YES LIBFCGI_AUTORECONF = YES diff --git a/package/libffi/libffi.hash b/package/libffi/libffi.hash index 496ae0d904..cf1977c40d 100644 --- a/package/libffi/libffi.hash +++ b/package/libffi/libffi.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 3f2f86094f5cf4c36cfe850d2fe029d01f5c2c2296619407c8ba0d8207da9a6b libffi-3.3.tar.gz +sha256 540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620 libffi-3.4.2.tar.gz # License files, locally calculated -sha256 deaf3a42effb551a5b140fa9afefed183a27f1341c6d1bf430d106a5e6931fc0 LICENSE +sha256 a61d06e8f7be57928e71e800eb9273b05cb8868c484108afe41e4305bb320dde LICENSE diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 722a03dca0..85b4ab5b84 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -4,12 +4,18 @@ # ################################################################################ -LIBFFI_VERSION = 3.3 -LIBFFI_SITE = $(call github,libffi,libffi,v$(LIBFFI_VERSION)) +LIBFFI_VERSION = 3.4.2 +LIBFFI_SITE = \ + https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION) LIBFFI_LICENSE = MIT LIBFFI_LICENSE_FILES = LICENSE LIBFFI_INSTALL_STAGING = YES +# We're patching Makefile.am LIBFFI_AUTORECONF = YES +# The static exec trampolines is enabled by default since +# libffi 3.4.2. However it doesn't work with gobject-introspection. +LIBFFI_CONF_OPTS = --disable-exec-static-tramp + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/libfm-extra/Config.in b/package/libfm-extra/Config.in index eefc022c4e..60e6fda30f 100644 --- a/package/libfm-extra/Config.in +++ b/package/libfm-extra/Config.in @@ -10,6 +10,6 @@ config BR2_PACKAGE_LIBFM_EXTRA http://wiki.lxde.org/en/Libfm -comment "libfm-extra needs a toolchain w/ wchar, threads, C++" +comment "libfm-extra needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libfm-extra/libfm-extra.hash b/package/libfm-extra/libfm-extra.hash index e78fbab0de..116cefb053 100644 --- a/package/libfm-extra/libfm-extra.hash +++ b/package/libfm-extra/libfm-extra.hash @@ -1,7 +1,8 @@ # From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ -md5 c15ecd2c9317e2c385cd3f046d0b61ba libfm-1.3.1.tar.xz -sha1 29539f50acd5c00a00362adffd532053b0688e66 libfm-1.3.1.tar.xz +md5 c87a0ff41ae77825079b2f785ec0741e libfm-1.3.2.tar.xz +sha1 7c5c14dd0615b457687966ce4e55c2d054bf93e1 libfm-1.3.2.tar.xz -# Hash for license files: -sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING -sha256 c3a3d93e111462f2b0292b56a6a7b87d342fd7156741d8b81b8b08723be4597e src/extra/fm-xml-file.c +# Locally computed: +sha256 a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5 libfm-1.3.2.tar.gz +sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING +sha256 c3a3d93e111462f2b0292b56a6a7b87d342fd7156741d8b81b8b08723be4597e src/extra/fm-xml-file.c diff --git a/package/libfm-extra/libfm-extra.mk b/package/libfm-extra/libfm-extra.mk index b41e8654b0..2a5df9cab6 100644 --- a/package/libfm-extra/libfm-extra.mk +++ b/package/libfm-extra/libfm-extra.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFM_EXTRA_VERSION = 1.3.1 +LIBFM_EXTRA_VERSION = 1.3.2 LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz LIBFM_EXTRA_SITE = http://sourceforge.net/projects/pcmanfm/files LIBFM_EXTRA_DEPENDENCIES = libglib2 host-intltool diff --git a/package/libfm/libfm.hash b/package/libfm/libfm.hash index d63a436119..74781b2a0b 100644 --- a/package/libfm/libfm.hash +++ b/package/libfm/libfm.hash @@ -1,7 +1,8 @@ # From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ -md5 c15ecd2c9317e2c385cd3f046d0b61ba libfm-1.3.1.tar.xz -sha1 29539f50acd5c00a00362adffd532053b0688e66 libfm-1.3.1.tar.xz +md5 c87a0ff41ae77825079b2f785ec0741e libfm-1.3.2.tar.xz +sha1 7c5c14dd0615b457687966ce4e55c2d054bf93e1 libfm-1.3.2.tar.xz -# Hash for license files: -sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING -sha256 c3a3d93e111462f2b0292b56a6a7b87d342fd7156741d8b81b8b08723be4597e src/extra/fm-xml-file.c +# Locally computed: +sha256 a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5 libfm-1.3.2.tar.xz +sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING +sha256 c3a3d93e111462f2b0292b56a6a7b87d342fd7156741d8b81b8b08723be4597e src/extra/fm-xml-file.c diff --git a/package/libfm/libfm.mk b/package/libfm/libfm.mk index 47f01b17cb..29f6d7d56a 100644 --- a/package/libfm/libfm.mk +++ b/package/libfm/libfm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFM_VERSION = 1.3.1 +LIBFM_VERSION = 1.3.2 LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files LIBFM_DEPENDENCIES = menu-cache libglib2 cairo diff --git a/package/libfreefare/Config.in b/package/libfreefare/Config.in index 2bb0c93ddf..574787e83b 100644 --- a/package/libfreefare/Config.in +++ b/package/libfreefare/Config.in @@ -1,12 +1,9 @@ config BR2_PACKAGE_LIBFREEFARE bool "libfreefare" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBNFC help Library for high level manipulation of MIFARE cards. http://nfc-tools.org/index.php?title=Libfreefare - -comment "libfreefare needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libfreeimage/libfreeimage.mk b/package/libfreeimage/libfreeimage.mk index b254fa8846..4775f92109 100644 --- a/package/libfreeimage/libfreeimage.mk +++ b/package/libfreeimage/libfreeimage.mk @@ -9,6 +9,8 @@ LIBFREEIMAGE_SITE = http://downloads.sourceforge.net/freeimage LIBFREEIMAGE_SOURCE = FreeImage$(subst .,,$(LIBFREEIMAGE_VERSION)).zip LIBFREEIMAGE_LICENSE = GPL-2.0 or GPL-3.0 or FreeImage Public License LIBFREEIMAGE_LICENSE_FILES = license-gplv2.txt license-gplv3.txt license-fi.txt +LIBFREEIMAGE_CPE_ID_VENDOR = freeimage_project +LIBFREEIMAGE_CPE_ID_PRODUCT = freeimage LIBFREEIMAGE_INSTALL_STAGING = YES define LIBFREEIMAGE_EXTRACT_CMDS @@ -18,7 +20,8 @@ define LIBFREEIMAGE_EXTRACT_CMDS endef define LIBFREEIMAGE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" $(MAKE) -C $(@D) endef define LIBFREEIMAGE_INSTALL_STAGING_CMDS diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index eba767668d..8e7eb49bcd 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5ab5f21e9f2fc57b4b40f8ea8f14dba78a5cc46d9cf94bc5e00a58e6886a935d fribidi-1.0.7.tar.bz2 -sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING +sha256 7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01 fribidi-1.0.10.tar.xz +sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index 0e17be6db0..97e875b4a2 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,11 +4,13 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.7 -LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.bz2 +LIBFRIBIDI_VERSION = 1.0.10 +LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ LIBFRIBIDI_LICENSE_FILES = COPYING +LIBFRIBIDI_CPE_ID_VENDOR = gnu +LIBFRIBIDI_CPE_ID_PRODUCT = fribidi LIBFRIBIDI_INSTALL_STAGING = YES LIBFRIBIDI_DEPENDENCIES = host-pkgconf diff --git a/package/libftdi/Config.in b/package/libftdi/Config.in index 23dae1be1f..fdeac28a64 100644 --- a/package/libftdi/Config.in +++ b/package/libftdi/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBFTDI bool "libftdi" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -23,5 +24,6 @@ comment "libftdi C++ bindings need a toolchain w/ wchar, C++" endif # BR2_PACKAGE_LIBFTDI -comment "libftdi needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libftdi needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch b/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch index 487fc28215..8c45b8811c 100644 --- a/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch +++ b/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch @@ -1,67 +1,64 @@ From 7e57ff280b55b45e74329b9988279e8831d32eab Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 25 Jan 2015 09:45:04 +0100 -Subject: [PATCH 1/2] cmake: use the standard CMake flag to drive the shared +Subject: [PATCH] cmake: use the standard CMake flag to drive the shared object build Remove the STATICLIBS CMake option (and the code handling it) and let the standard CMake flags drive the shared object build. Signed-off-by: Samuel Martin +[Fabrice: update for 1.5] +Signed-off-by: Fabrice Fontaine --- - CMakeLists.txt | 2 -- - ftdipp/CMakeLists.txt | 15 +-------------- + CMakeOptions.txt | 1 - + ftdipp/CMakeLists.txt | 14 +------------- src/CMakeLists.txt | 13 +------------ - 3 files changed, 2 insertions(+), 28 deletions(-) + 3 files changed, 2 insertions(+), 26 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 74f80f4..0ba0b08 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,8 +46,6 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development") - set(CPACK_COMPONENT_STATICLIBS_GROUP "Development") - set(CPACK_COMPONENT_HEADERS_GROUP "Development") - +diff --git a/CMakeOptions.txt b/CMakeOptions.txt +index 07b5887..b780ffd 100644 +--- a/CMakeOptions.txt ++++ b/CMakeOptions.txt +@@ -1,4 +1,3 @@ -option ( STATICLIBS "Build static libraries" ON ) -- - # guess LIB_SUFFIX, don't take debian multiarch into account - if ( NOT DEFINED LIB_SUFFIX ) - if( CMAKE_SYSTEM_NAME MATCHES "Linux" + option ( BUILD_TESTS "Build unit tests with Boost Unit Test framework" OFF ) + option ( DOCUMENTATION "Generate API documentation with Doxygen" OFF ) + option ( EXAMPLES "Build example programs" ON ) diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt -index 7500211..27e7884 100644 +index fac5bcc..a06edf1 100644 --- a/ftdipp/CMakeLists.txt +++ b/ftdipp/CMakeLists.txt -@@ -23,8 +23,7 @@ if (FTDIPP) - set(FTDI_BUILD_CPP True PARENT_SCOPE) - message(STATUS "Building libftdi1++") +@@ -12,7 +12,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} + include_directories(${Boost_INCLUDE_DIRS}) -- # Shared library -- add_library(ftdipp1 SHARED ${cpp_sources}) -+ add_library(ftdipp1 ${cpp_sources}) + # Shared library +-add_library(ftdipp1 SHARED ${cpp_sources}) ++add_library(ftdipp1 ${cpp_sources}) - math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatiblity with previous releases - set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) -@@ -41,18 +40,6 @@ if (FTDIPP) - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - ) -- -- # Static library -- if ( STATICLIBS ) -- add_library(ftdipp1-static STATIC ${cpp_sources}) -- set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1") -- set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) + math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatibility with previous releases + set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 3) +@@ -29,18 +29,6 @@ install ( TARGETS ftdipp1 + ARCHIVE DESTINATION lib${LIB_SUFFIX} + ) + +-# Static library +-if ( STATICLIBS ) +- add_library(ftdipp1-static STATIC ${cpp_sources}) +- set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1") +- set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) - -- install ( TARGETS ftdipp1-static -- ARCHIVE DESTINATION lib${LIB_SUFFIX} -- COMPONENT staticlibs -- ) -- endif () - - install ( FILES ${cpp_headers} - DESTINATION include/${PROJECT_NAME} +- install ( TARGETS ftdipp1-static +- ARCHIVE DESTINATION lib${LIB_SUFFIX} +- COMPONENT staticlibs +- ) +-endif () +- + install ( FILES ${cpp_headers} + DESTINATION include/${PROJECT_NAME} + COMPONENT headers diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9fd86a6..501d4a8 100644 +index 17b3617..ae4fc61 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,7 +21,7 @@ configure_file(ftdi_version_i.h.in "${CMAKE_CURRENT_BINARY_DIR}/ftdi_version_i.h @@ -71,7 +68,7 @@ index 9fd86a6..501d4a8 100644 -add_library(ftdi1 SHARED ${c_sources}) +add_library(ftdi1 ${c_sources}) - math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatiblity with previous releases + math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatibility with previous releases set_target_properties(ftdi1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) @@ -38,17 +38,6 @@ install ( TARGETS ftdi1 ARCHIVE DESTINATION lib${LIB_SUFFIX} @@ -92,5 +89,5 @@ index 9fd86a6..501d4a8 100644 DESTINATION include/${PROJECT_NAME} COMPONENT headers -- -2.2.2 +2.27.0 diff --git a/package/libftdi1/Config.in b/package/libftdi1/Config.in index d47321345b..2d32573563 100644 --- a/package/libftdi1/Config.in +++ b/package/libftdi1/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBFTDI1 bool "libftdi1" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Userspace access to FTDI USB interface chips (version 1.x) @@ -33,5 +34,6 @@ config BR2_PACKAGE_LIBFTDI1_FDTI_EEPROM endif # BR2_PACKAGE_LIBFTDI1 -comment "libftdi1 needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libftdi1 needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libftdi1/libftdi1.hash b/package/libftdi1/libftdi1.hash index f17543fa03..6b825e8d88 100644 --- a/package/libftdi1/libftdi1.hash +++ b/package/libftdi1/libftdi1.hash @@ -1,6 +1,6 @@ # Locally computed after checking the signature -# https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.4.tar.bz2.sig -sha256 ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74 libftdi1-1.4.tar.bz2 +# https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.5.tar.bz2.sig +sha256 7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049 libftdi1-1.5.tar.bz2 # Hash for license files: sha256 524f46428bf72bb8c6acfeca4909551fd2e0bdbb5305406d38382f4056095c56 LICENSE diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk index 9c3bafdbc0..6688694b47 100644 --- a/package/libftdi1/libftdi1.mk +++ b/package/libftdi1/libftdi1.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFTDI1_VERSION = 1.4 +LIBFTDI1_VERSION = 1.5 LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2 LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download LIBFTDI1_INSTALL_STAGING = YES diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk index 074dc59886..2677e46853 100644 --- a/package/libfuse/libfuse.mk +++ b/package/libfuse/libfuse.mk @@ -9,6 +9,7 @@ LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION) LIBFUSE_LICENSE = GPL-2.0, LGPL-2.1 LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB +LIBFUSE_CPE_ID_VENDOR = libfuse_project LIBFUSE_INSTALL_STAGING = YES LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) LIBFUSE_CONF_OPTS = \ diff --git a/package/libg7221/libg7221.hash b/package/libg7221/libg7221.hash index 09023f9543..b2174e8b46 100644 --- a/package/libg7221/libg7221.hash +++ b/package/libg7221/libg7221.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 330dafa58d37a585a866167bc33f8fbe06dbcfc9a69cad43fab0b6702ebf2393 libg7221-dbfc29d4806ecdace50379a2f4d68a992a6fec34.tar.gz -sha256 26cc5f718279b45dbe34e25a2d29b2c8ca487bd9ab11b2d68c9318ff59d5c645 COPYING +sha256 7f00d6a4f435a91ab3bc96e6c95aa1334bd416f80d98843b4f178067239ee832 libg7221-dbfc29d4806ecdace50379a2f4d68a992a6fec34-br1.tar.gz +sha256 26cc5f718279b45dbe34e25a2d29b2c8ca487bd9ab11b2d68c9318ff59d5c645 COPYING diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 580bdf331f..23562d0ed3 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2019q3/000440.html -sha1 2d8781e92f88706707a1e76fb628b499ad538a30 libgcrypt-1.8.5.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 1bccc8393482fa1953323ff429c6b5ba5676eb1a libgcrypt-1.9.4.tar.bz2 # Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.5.tar.bz2.sig -# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3 libgcrypt-1.8.5.tar.bz2 +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA +sha256 ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 libgcrypt-1.9.4.tar.bz2 sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index d21513bd39..e5fdfcfc8e 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.8.5 +LIBGCRYPT_VERSION = 1.9.4 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB @@ -12,9 +12,9 @@ LIBGCRYPT_SITE = https://gnupg.org/ftp/gcrypt/libgcrypt LIBGCRYPT_INSTALL_STAGING = YES LIBGCRYPT_DEPENDENCIES = libgpg-error LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config +LIBGCRYPT_CPE_ID_VENDOR = gnupg -# Patching acinclude.m4 in 0001 -# Patching configure.ac and Makefile.am in 0002 +# Patching configure.ac and Makefile.am in 0001 LIBGCRYPT_AUTORECONF = YES LIBGCRYPT_CONF_OPTS = \ --disable-tests \ @@ -30,11 +30,4 @@ ifeq ($(BR2_arm),y) LIBGCRYPT_CONF_ENV += CFLAGS="$(patsubst -mthumb,,$(TARGET_CFLAGS))" endif -# Tests use fork() -define LIBGCRYPT_DISABLE_TESTS - $(SED) 's/ tests//' $(@D)/Makefile.in -endef - -LIBGCRYPT_POST_PATCH_HOOKS += LIBGCRYPT_DISABLE_TESTS - $(eval $(autotools-package)) diff --git a/package/libgdiplus/libgdiplus.hash b/package/libgdiplus/libgdiplus.hash index d89b352d26..3a2e5ff25c 100644 --- a/package/libgdiplus/libgdiplus.hash +++ b/package/libgdiplus/libgdiplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6a75e4a476695cd6a1475fd6b989423ecf73978fd757673669771d8a6e13f756 libgdiplus-5.6.tar.gz +sha256 1fd034f4b636214cc24e94c563cd10b3f3444d9f0660927b60e63fd4131d97fa libgdiplus-6.0.5.tar.gz sha256 81317bf837e02a116dc20b032fa1d0cbf9ec357621f141ff2c2daf26c17cbb5d LICENSE diff --git a/package/libgdiplus/libgdiplus.mk b/package/libgdiplus/libgdiplus.mk index d120f6a314..be4a9168f9 100644 --- a/package/libgdiplus/libgdiplus.mk +++ b/package/libgdiplus/libgdiplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGDIPLUS_VERSION = 5.6 +LIBGDIPLUS_VERSION = 6.0.5 LIBGDIPLUS_SITE = $(call github,mono,libgdiplus,$(LIBGDIPLUS_VERSION)) LIBGDIPLUS_LICENSE = MIT diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash index c82651c68a..72d2c21ced 100644 --- a/package/libgee/libgee.hash +++ b/package/libgee/libgee.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.3.sha256sum -sha256 d0b5edefc88cbca5f1709d19fa62aef490922c6577a14ac4e7b085507911a5de libgee-0.20.3.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.4.sha256sum +sha256 524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e libgee-0.20.4.tar.xz # Hash for license file: sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 4b2581e171..48bc9c9e41 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGEE_VERSION_MAJOR = 0.20 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).3 +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).4 LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 diff --git a/package/libgeotiff/libgeotiff.hash b/package/libgeotiff/libgeotiff.hash index 12d3b2a166..51adcc2843 100644 --- a/package/libgeotiff/libgeotiff.hash +++ b/package/libgeotiff/libgeotiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c libgeotiff-1.5.1.tar.gz -sha256 6a22340b8293c50a34ce8e95589489bd3ec65bcb8b93e61cbda3daaafe498375 LICENSE +sha256 9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca libgeotiff-1.6.0.tar.gz +sha256 6a22340b8293c50a34ce8e95589489bd3ec65bcb8b93e61cbda3daaafe498375 LICENSE diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk index c196b804a2..c6fb61b4a2 100644 --- a/package/libgeotiff/libgeotiff.mk +++ b/package/libgeotiff/libgeotiff.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBGEOTIFF_VERSION = 1.5.1 +LIBGEOTIFF_VERSION = 1.6.0 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff LIBGEOTIFF_LICENSE = X11-style, public domain LIBGEOTIFF_LICENSE_FILES = LICENSE LIBGEOTIFF_DEPENDENCIES = proj tiff host-pkgconf LIBGEOTIFF_INSTALL_STAGING = YES -# We're patching configure.ac -LIBGEOTIFF_AUTORECONF = YES ifeq ($(BR2_PACKAGE_ZLIB),y) LIBGEOTIFF_DEPENDENCIES += zlib diff --git a/package/libgit2/Config.in b/package/libgit2/Config.in index 53ba4d4245..a6a9728ff0 100644 --- a/package/libgit2/Config.in +++ b/package/libgit2/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_LIBGIT2 bool "libgit2" + depends on !BR2_STATIC_LIBS # libhttpparser + select BR2_PACKAGE_LIBHTTPPARSER select BR2_PACKAGE_ZLIB help libgit2 is a portable, pure C implementation of the Git core @@ -7,3 +9,6 @@ config BR2_PACKAGE_LIBGIT2 allowing to build Git functionality into your application. https://github.com/libgit2/libgit2 + +comment "libgit2 needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index d4912c0327..367ade3afe 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 30f3877469d09f2e4a21be933b4e2800560d16646028dd800744dc5f7fb0c749 libgit2-0.28.4.tar.gz -sha256 d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813 COPYING +sha256 ad73f845965cfd528e70f654e428073121a3fa0dc23caac81a1b1300277d4dba libgit2-1.1.0.tar.gz +sha256 afc8bde99ba630012107c25d3c42dde628ec5f0cd3f428131f7e3a0f7d58ff42 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 909fcb83f0..668fa758f8 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,19 +4,23 @@ # ################################################################################ -LIBGIT2_VERSION = 0.28.4 -LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception +LIBGIT2_VERSION = 1.1.0 +LIBGIT2_SITE = https://github.com/libgit2/libgit2/releases/download/v$(LIBGIT2_VERSION) +LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) LIBGIT2_LICENSE_FILES = COPYING +LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ -DUSE_GSSAPI=OFF \ -DBUILD_CLAR=OFF \ -DUSE_ICONV=ON \ + -DREGEX_BACKEND=regcomp \ + -DUSE_HTTP_PARSER=system \ + -DUSE_NTLMCLIENT=OFF \ -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) -LIBGIT2_DEPENDENCIES = zlib +LIBGIT2_DEPENDENCIES = zlib libhttpparser # If libiconv is available (for !locale toolchains), then we can use # it for iconv support. Note that USE_ICONV=ON is still correct even diff --git a/package/libglew/Config.in b/package/libglew/Config.in index 099c9461a4..1d28c018b6 100644 --- a/package/libglew/Config.in +++ b/package/libglew/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_LIBGLEW and extension functionality is exposed in a single header file. - http://glew.sourceforge.net + https://github.com/nigels-com/glew comment "libglew depends on X.org and needs an OpenGL backend" depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL diff --git a/package/libglew/libglew.hash b/package/libglew/libglew.hash index 2e1b1f3c3c..29e63fa308 100644 --- a/package/libglew/libglew.hash +++ b/package/libglew/libglew.hash @@ -1,6 +1,3 @@ -# From https://sourceforge.net/projects/glew/files/glew/2.1.0/ -sha1 18eca05460d0b61709fc115e632b6fe320718b44 glew-2.1.0.tgz -md5 b2ab12331033ddfaa50dc39345343980 glew-2.1.0.tgz # Locally computed: -sha256 04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95 glew-2.1.0.tgz -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff LICENSE.txt +sha256 d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1 glew-2.2.0.tgz +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff LICENSE.txt diff --git a/package/libglew/libglew.mk b/package/libglew/libglew.mk index 8a07170e99..c9c49e6987 100644 --- a/package/libglew/libglew.mk +++ b/package/libglew/libglew.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBGLEW_VERSION = 2.1.0 +LIBGLEW_VERSION = 2.2.0 LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz -LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION) +LIBGLEW_SITE = https://github.com/nigels-com/glew/releases/download/glew-$(LIBGLEW_VERSION) LIBGLEW_LICENSE = BSD-3-Clause, MIT LIBGLEW_LICENSE_FILES = LICENSE.txt LIBGLEW_INSTALL_STAGING = YES @@ -15,6 +15,7 @@ LIBGLEW_DEPENDENCIES = libgl xlib_libX11 xlib_libXext xlib_libXi xlib_libXmu # using $TARGET_CONFIGURE_OPTS breaks compilation define LIBGLEW_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + GLEW_NO_GLU="-DGLEW_NO_GLU" \ GLEW_DEST="/usr" LIBDIR="/usr/lib" \ AR="$(TARGET_AR)" CC="$(TARGET_CC)" \ LD="$(TARGET_CC)" STRIP="$(TARGET_STRIP)" \ @@ -23,12 +24,14 @@ endef define LIBGLEW_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + GLEW_NO_GLU="-DGLEW_NO_GLU" \ GLEW_DEST="$(STAGING_DIR)/usr" LIBDIR="$(STAGING_DIR)/usr/lib" \ $(TARGET_CONFIGURE_OPTS) install endef define LIBGLEW_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + GLEW_NO_GLU="-DGLEW_NO_GLU" \ GLEW_DEST="$(TARGET_DIR)/usr" LIBDIR="$(TARGET_DIR)/usr/lib" \ $(TARGET_CONFIGURE_OPTS) install endef diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in index 045bd269e4..06f4376453 100644 --- a/package/libglfw/Config.in +++ b/package/libglfw/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBGLFW depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXINERAMA select BR2_PACKAGE_XLIB_LIBXRANDR help diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash index 6796b81368..c21a595bbc 100644 --- a/package/libglfw/libglfw.hash +++ b/package/libglfw/libglfw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 81bf5fde487676a8af55cb317830703086bb534c53968d71936e7b48ee5a0f3e libglfw-3.3.tar.gz -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 LICENSE.md +sha256 98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537 libglfw-3.3.2.tar.gz +sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index aac5b1799d..63d2a88bf8 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBGLFW_VERSION = 3.3 +LIBGLFW_VERSION = 3.3.2 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) LIBGLFW_INSTALL_STAGING = YES LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \ - xlib_libXinerama xlib_libXrandr + xlib_libXi xlib_libXinerama xlib_libXrandr LIBGLFW_LICENSE = Zlib LIBGLFW_LICENSE_FILES = LICENSE.md @@ -17,10 +17,6 @@ LIBGLFW_CONF_OPTS += \ -DGLFW_BUILD_TESTS=OFF \ -DGLFW_BUILD_DOCS=OFF -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -LIBGLFW_DEPENDENCIES += xlib_libXi -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) LIBGLFW_DEPENDENCIES += xlib_libXxf86vm endif diff --git a/package/libglib2/0001-fix-compile-time-atomic-detection.patch b/package/libglib2/0001-fix-compile-time-atomic-detection.patch index 9d2381bb35..aae505f8e5 100644 --- a/package/libglib2/0001-fix-compile-time-atomic-detection.patch +++ b/package/libglib2/0001-fix-compile-time-atomic-detection.patch @@ -5,24 +5,26 @@ Subject: [PATCH] Fix compile time atomic detection Improved compile-time detection of atomic support in the compiler. -Upstream-Status: Merged +Upstream-Status: 'Needs information' See : https://gitlab.gnome.org/GNOME/glib/issues/1063 Signed-off-by: Brendan Heading Signed-off-by: Adam Duskett +Refresh for 2.68.1 --- - glib/gthread-posix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + glib/gthread-posix.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c index 71a6b7b..d09d029 100644 --- a/glib/gthread-posix.c +++ b/glib/gthread-posix.c -@@ -73,7 +73,7 @@ +@@ -72,8 +72,7 @@ + #include #endif - /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */ --#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && !defined(__clang__) +-#if defined(HAVE_FUTEX) && \ +- (defined(HAVE_STDATOMIC_H) || defined(__ATOMIC_SEQ_CST)) +#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && !defined(__clang__) #define USE_NATIVE_MUTEX #endif diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 345a01ba37..d421e025ff 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.64/glib-2.64.1.sha256sum -sha256 17967603bcb44b6dbaac47988d80c29a3d28519210b28157c2bd10997595bbc7 glib-2.64.1.tar.xz +# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum +sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz # License files, locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 1b9eef7147..af73aeb3bf 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,12 +4,14 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.64 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 +LIBGLIB2_VERSION_MAJOR = 2.68 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ LIBGLIB2_LICENSE_FILES = COPYING +LIBGLIB2_CPE_ID_VENDOR = gnome +LIBGLIB2_CPE_ID_PRODUCT = glib LIBGLIB2_INSTALL_STAGING = YES LIBGLIB2_CFLAGS = $(TARGET_CFLAGS) @@ -23,11 +25,13 @@ endif HOST_LIBGLIB2_CONF_OPTS = \ -Ddtrace=false \ -Dfam=false \ + -Dglib_debug=disabled \ + -Dlibelf=disabled \ -Dselinux=disabled \ -Dsystemtap=false \ -Dxattr=false \ -Dinternal_pcre=false \ - -Dinstalled_tests=false \ + -Dtests=false \ -Doss_fuzz=disabled LIBGLIB2_DEPENDENCIES = \ @@ -47,11 +51,18 @@ HOST_LIBGLIB2_DEPENDENCIES = \ # ${libdir} would be prefixed by the sysroot by pkg-config, causing a # bogus installation path once combined with $(DESTDIR). LIBGLIB2_CONF_OPTS = \ + -Dglib_debug=disabled \ -Dinternal_pcre=false \ + -Dlibelf=disabled \ -Dgio_module_dir=/usr/lib/gio/modules \ - -Dinstalled_tests=false \ + -Dtests=false \ -Doss_fuzz=disabled +LIBGLIB2_MESON_EXTRA_PROPERTIES = \ + have_c99_vsnprintf=true \ + have_c99_snprintf=true \ + have_unix98_printf=true + ifneq ($(BR2_ENABLE_LOCALE),y) LIBGLIB2_DEPENDENCIES += libiconv endif @@ -66,10 +77,10 @@ LIBGLIB2_DEPENDENCIES += libiconv endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -LIBGLIB2_CONF_OPTS += -Dselinux=enabled +LIBGLIB2_CONF_OPTS += -Dselinux=enabled -Dxattr=true LIBGLIB2_DEPENDENCIES += libselinux else -LIBGLIB2_CONF_OPTS += -Dselinux=disabled +LIBGLIB2_CONF_OPTS += -Dselinux=disabled -Dxattr=false endif # Purge gdb-related files @@ -81,7 +92,11 @@ endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) LIBGLIB2_CONF_OPTS += -Dlibmount=enabled +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBS),y) +LIBGLIB2_DEPENDENCIES += util-linux-libs +else LIBGLIB2_DEPENDENCIES += util-linux +endif else LIBGLIB2_CONF_OPTS += -Dlibmount=disabled endif diff --git a/package/libglu/libglu.hash b/package/libglu/libglu.hash index b0202a1334..234b58dd63 100644 --- a/package/libglu/libglu.hash +++ b/package/libglu/libglu.hash @@ -1,7 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2019-July/000530.html -md5 151aef599b8259efe9acd599c96ea2a3 glu-9.0.1.tar.xz -sha1 b6ffef562ba55d3f80146d4238589cb9b1de66f5 glu-9.0.1.tar.xz -sha256 fb5a4c2dd6ba6d1c21ab7c05129b0769544e1d68e1e3b0ffecb18e73c93055bc glu-9.0.1.tar.xz -sha512 8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018 glu-9.0.1.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2021-June/000634.html +sha256 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 glu-9.0.2.tar.xz +sha512 2517d7406bb643d12c017a95dcb5d8716f307344332638bcbdf274a90752a7c22165d34745f1b082ed916bb07d40e62d1d1d67d96426225be63166f3480d6f64 glu-9.0.2.tar.xz # locally computed -sha256 84187ce0fd0153769675cb7f3301583eb27393f66b57c5604999a1d805a9184c include/GL/glu.h +sha256 3a9992ccc9d672cfdd07ea862431d943a992d04836570c638a733bf15ec62c54 include/GL/glu.h diff --git a/package/libglu/libglu.mk b/package/libglu/libglu.mk index e18c7f1494..8820e75d8b 100644 --- a/package/libglu/libglu.mk +++ b/package/libglu/libglu.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGLU_VERSION = 9.0.1 +LIBGLU_VERSION = 9.0.2 LIBGLU_SITE = https://mesa.freedesktop.org/archive/glu LIBGLU_SOURCE = glu-$(LIBGLU_VERSION).tar.xz LIBGLU_LICENSE = SGI-B-2.0 diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in index 415cd015cf..44e9d67aaf 100644 --- a/package/libgpg-error/Config.in +++ b/package/libgpg-error/Config.in @@ -7,9 +7,9 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS BR2_mipsel || BR2_mips64 || BR2_mips64el || \ BR2_m68k || BR2_nios2 || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_RISCV_64 || \ - BR2_RISCV_32 || BR2_sh4 || BR2_sh4eb || \ - BR2_sh4a || BR2_sh4aeb || BR2_sparc || \ - BR2_sparc64 || BR2_x86_64 + BR2_RISCV_32 || BR2_s390x || BR2_sh4 || \ + BR2_sh4eb || BR2_sh4a || BR2_sh4aeb || \ + BR2_sparc || BR2_sparc64 || BR2_x86_64 config BR2_PACKAGE_LIBGPG_ERROR bool "libgpg-error" @@ -44,6 +44,8 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG if BR2_RISCV_32 default "riscv64-unknown-linux-gnu" \ if BR2_RISCV_64 + default "s390x-unknown-linux-gnu" \ + if BR2_s390x default "sh4-unknown-linux-gnu" \ if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb default "sparc-unknown-linux-gnu" \ diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index 05c46d6d43..4e124941cd 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,7 +1,10 @@ +# From https://www.gnupg.org/download/integrity_check.html +sha1 5e620d71fc24d287a7ac2460b1d819074bb8b9bb libgpg-error-1.42.tar.bz2 + # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.37.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763 libgpg-error-1.37.tar.bz2 +sha256 fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23 libgpg-error-1.42.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 6281faa662..babcbdaded 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,15 +4,22 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.37 +LIBGPG_ERROR_VERSION = 1.42 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB +LIBGPG_ERROR_CPE_ID_VENDOR = gnupg LIBGPG_ERROR_INSTALL_STAGING = YES LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LIBGPG_ERROR_CONF_OPTS = --disable-tests \ --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBGPG_ERROR_CONF_OPTS += --enable-threads +else +LIBGPG_ERROR_CONF_OPTS += --disable-threads +endif + $(eval $(autotools-package)) diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash index 6ed6a3625d..35767a27fe 100644 --- a/package/libgpgme/libgpgme.hash +++ b/package/libgpgme/libgpgme.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.13.1.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.15.1.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46 gpgme-1.13.1.tar.bz2 +sha256 eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad gpgme-1.15.1.tar.bz2 # Locally calculated -sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER +sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 1951cc6675..95a419258b 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -4,11 +4,13 @@ # ################################################################################ -LIBGPGME_VERSION = 1.13.1 +LIBGPGME_VERSION = 1.15.1 LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPL-2.1+ LIBGPGME_LICENSE_FILES = COPYING.LESSER +LIBGPGME_CPE_ID_VENDOR = gnupg +LIBGPGME_CPE_ID_PRODUCT = gpgpme LIBGPGME_INSTALL_STAGING = YES LIBGPGME_DEPENDENCIES = libassuan libgpg-error LIBGPGME_CONFIG_SCRIPTS = gpgme-config diff --git a/package/libgphoto2/Config.in b/package/libgphoto2/Config.in index fc60dd68a8..184ca206f1 100644 --- a/package/libgphoto2/Config.in +++ b/package/libgphoto2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBGPHOTO2 bool "libgphoto2" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBTOOL select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBXML2 @@ -10,5 +11,6 @@ config BR2_PACKAGE_LIBGPHOTO2 http://gphoto.org/proj/libgphoto2/ -comment "libgphoto needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libgphoto needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libgphoto2/libgphoto2.hash b/package/libgphoto2/libgphoto2.hash index 0d965da0f1..e405735c8b 100644 --- a/package/libgphoto2/libgphoto2.hash +++ b/package/libgphoto2/libgphoto2.hash @@ -1,7 +1,6 @@ -# https://sourceforge.net/projects/gphoto/files/libgphoto/2.5.23/ -md5 bf052ce815e607dc781c5b0f3c5ca5c0 libgphoto2-2.5.23.tar.bz2 -sha1 01f91d2b5d2aef7e80ab846fea4d5eb5cc67ed79 libgphoto2-2.5.23.tar.bz2 +# https://sourceforge.net/projects/gphoto/files/libgphoto/2.5.26/ +sha1 38373ef7f76e90492ffca309094487fb1474f3fe libgphoto2-2.5.26.tar.bz2 # Locally calculated hash -sha256 d8af23364aa40fd8607f7e073df74e7ace05582f4ba13f1724d12d3c97e8852d libgphoto2-2.5.23.tar.bz2 -sha256 ebc385a0b1d477be5177ed6d9129557aa59a3ad0f26ebe7dd97ee942a0fb68ee COPYING +sha256 7740fea3cbb78489071cdfec06c07fab528e69e27ac82734eae6a73eaeeabcd4 libgphoto2-2.5.26.tar.bz2 +sha256 ebc385a0b1d477be5177ed6d9129557aa59a3ad0f26ebe7dd97ee942a0fb68ee COPYING diff --git a/package/libgphoto2/libgphoto2.mk b/package/libgphoto2/libgphoto2.mk index 63e6a8775f..1d42ba862f 100644 --- a/package/libgphoto2/libgphoto2.mk +++ b/package/libgphoto2/libgphoto2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPHOTO2_VERSION = 2.5.23 +LIBGPHOTO2_VERSION = 2.5.26 LIBGPHOTO2_SOURCE = libgphoto2-$(LIBGPHOTO2_VERSION).tar.bz2 # Project is maintained on github but github tarball doesn't have # configure, so use tarballs from SourceForge @@ -27,6 +27,13 @@ ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) LIBGPHOTO2_DEPENDENCIES += libusb-compat endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +LIBGPHOTO2_DEPENDENCIES += libcurl +LIBGPHOTO2_CONF_OPTS += --with-libcurl=auto +else +LIBGPHOTO2_CONF_OPTS += --with-libcurl=no +endif + ifeq ($(BR2_PACKAGE_LIBEXIF),y) LIBGPHOTO2_DEPENDENCIES += libexif LIBGPHOTO2_CONF_OPTS += --with-libexif=auto diff --git a/package/libgpiod/Config.in b/package/libgpiod/Config.in index 63a7cb6e78..293eef6c89 100644 --- a/package/libgpiod/Config.in +++ b/package/libgpiod/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBGPIOD This is a C library that abstracts the GPIO character device operations on linux. - https://github.com/brgl/libgpiod + https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/ if BR2_PACKAGE_LIBGPIOD diff --git a/package/libgpiod/libgpiod.hash b/package/libgpiod/libgpiod.hash index f0009a7510..f0803cab36 100644 --- a/package/libgpiod/libgpiod.hash +++ b/package/libgpiod/libgpiod.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 21ae8fd1f8dafc2eb2ba50e652390cf533d21351419a7426255895cb52e21b1c libgpiod-1.4.1.tar.xz +sha256 841be9d788f00bab08ef22c4be5c39866f0e46cb100a3ae49ed816ac9c5dddc7 libgpiod-1.6.3.tar.xz # Hash for license file -sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING +sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING diff --git a/package/libgpiod/libgpiod.mk b/package/libgpiod/libgpiod.mk index 2474ab90a2..35d003fa33 100644 --- a/package/libgpiod/libgpiod.mk +++ b/package/libgpiod/libgpiod.mk @@ -4,13 +4,19 @@ # ################################################################################ -LIBGPIOD_VERSION = 1.4.1 +# Be careful when bumping versions. +# Dependency on kernel header versions may change. +LIBGPIOD_VERSION = 1.6.3 LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD_LICENSE = LGPL-2.1+ LIBGPIOD_LICENSE_FILES = COPYING LIBGPIOD_INSTALL_STAGING = YES -LIBGPIOD_DEPENDENCIES = host-pkgconf +LIBGPIOD_DEPENDENCIES = host-pkgconf host-autoconf-archive +# We're patching configure.ac +LIBGPIOD_AUTORECONF = YES +LIBGPIOD_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive +LIBGPIOD_CONF_OPTS = --disable-tests --disable-examples ifeq ($(BR2_PACKAGE_LIBGPIOD_TOOLS),y) LIBGPIOD_CONF_OPTS += --enable-tools diff --git a/package/libgsasl/libgsasl.hash b/package/libgsasl/libgsasl.hash index 82bfe339c6..75e5a317fa 100644 --- a/package/libgsasl/libgsasl.hash +++ b/package/libgsasl/libgsasl.hash @@ -1,7 +1,11 @@ +# From https://lists.gnu.org/archive/html/help-gsasl/2021-01/msg00007.html +sha1 a16ff428bbf28fcfa681c7edd2cd2bb087bcc4e7 libgsasl-1.10.0.tar.gz +sha224 20b37757fccb6a0f8b4c6fcb28f51a3b4b8a4b1fdb4736da07707a0b libgsasl-1.10.0.tar.gz + # Locally calculated after checking pgp signature -sha256 3adfb49f9c92a719dea855fd1840d698cde55d4648d332a69032ba8bea207720 libgsasl-1.8.0.tar.gz +sha256 f1b553384dedbd87478449775546a358d6f5140c15cccc8fb574136fdc77329f libgsasl-1.10.0.tar.gz # Hash for license files: -sha256 4eb54155afd4684d7e9423f6037e5cc887ae4d8818e83d3af93350ebd4a8e6eb README -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 26e99818ca6ce79d8b2c461fabc72dc6e03483e6b0fd9692dcb07ab1b09bbac7 README +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libgsasl/libgsasl.mk b/package/libgsasl/libgsasl.mk index 9a625433ee..e813a354a1 100644 --- a/package/libgsasl/libgsasl.mk +++ b/package/libgsasl/libgsasl.mk @@ -4,13 +4,18 @@ # ################################################################################ -LIBGSASL_VERSION = 1.8.0 +LIBGSASL_VERSION = 1.10.0 LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl LIBGSASL_LICENSE = LGPL-2.1+ (library), GPL-3.0+ (programs) LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING LIBGSASL_INSTALL_STAGING = YES -# It doesn't seem to build with our libgcrypt so better be safe + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +LIBGSASL_CONF_OPTS = --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBGSASL_DEPENDENCIES += libgcrypt +else LIBGSASL_CONF_OPTS = --without-libgcrypt +endif ifeq ($(BR2_PACKAGE_LIBIDN),y) LIBGSASL_CONF_OPTS += --with-libidn-prefix=$(STAGING_DIR)/usr diff --git a/package/libgsm/libgsm.hash b/package/libgsm/libgsm.hash index 32e20c8f48..88d2573f56 100644 --- a/package/libgsm/libgsm.hash +++ b/package/libgsm/libgsm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 04f68087c3348bf156b78d59f4d8aff545da7f6e14f33be8f47d33f4efae2a10 gsm-1.0.18.tar.gz +sha256 4903652f68a8c04d0041f0d19b1eb713ddcd2aa011c5e595b3b8bca2755270f6 gsm-1.0.19.tar.gz sha256 81c68a3374937ed9b5e4929c709e81a2c4b35b5d1f450ecf8c473e2daea46ff6 COPYRIGHT diff --git a/package/libgsm/libgsm.mk b/package/libgsm/libgsm.mk index b9ae7d3eeb..e3ebee4b11 100644 --- a/package/libgsm/libgsm.mk +++ b/package/libgsm/libgsm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGSM_VERSION = 1.0.18 +LIBGSM_VERSION = 1.0.19 LIBGSM_SOURCE = gsm-$(LIBGSM_VERSION).tar.gz LIBGSM_SITE = http://www.quut.com/gsm LIBGSM_LICENSE = gsm diff --git a/package/libgtk2/libgtk2.hash b/package/libgtk2/libgtk2.hash index 49bec78da1..9b10a1f0ce 100644 --- a/package/libgtk2/libgtk2.hash +++ b/package/libgtk2/libgtk2.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.32.sha256sum -sha256 b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e gtk+-2.24.32.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.33.sha256sum +sha256 ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da gtk+-2.24.33.tar.xz # Hash for license file: -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 9b7d39a532..d30e1d9d43 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -5,12 +5,14 @@ ################################################################################ LIBGTK2_VERSION_MAJOR = 2.24 -LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).32 +LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).33 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR) LIBGTK2_INSTALL_STAGING = YES LIBGTK2_LICENSE = LGPL-2.0+ LIBGTK2_LICENSE_FILES = COPYING +LIBGTK2_CPE_ID_VENDOR = gnome +LIBGTK2_CPE_ID_PRODUCT = gtk # For 0001-reduce-dependencies.patch LIBGTK2_AUTORECONF = YES diff --git a/package/libgtk3/0001-no-gtk-doc.patch b/package/libgtk3/0001-no-gtk-doc.patch index 6dede7348a..e1d3208022 100644 --- a/package/libgtk3/0001-no-gtk-doc.patch +++ b/package/libgtk3/0001-no-gtk-doc.patch @@ -14,7 +14,7 @@ Signed-off-by: Hadrien Boutteville --- a/gtk-doc.make +++ b/gtk-doc.make -@@ -267,7 +267,7 @@ +@@ -300,7 +300,7 @@ # # Require gtk-doc when making dist # diff --git a/package/libgtk3/0002-fix-introspection-check.patch b/package/libgtk3/0002-fix-introspection-check.patch index 4c2806d819..450505c914 100644 --- a/package/libgtk3/0002-fix-introspection-check.patch +++ b/package/libgtk3/0002-fix-introspection-check.patch @@ -14,7 +14,7 @@ Signed-off-by: Hadrien Boutteville --- a/configure.ac +++ b/configure.ac -@@ -1621,7 +1621,10 @@ +@@ -1650,7 +1650,10 @@ # GObject introspection ################################################## diff --git a/package/libgtk3/0003-disable-atk-bridge.patch b/package/libgtk3/0003-disable-atk-bridge.patch index c92174f400..42de83b5bb 100644 --- a/package/libgtk3/0003-disable-atk-bridge.patch +++ b/package/libgtk3/0003-disable-atk-bridge.patch @@ -7,7 +7,7 @@ Signed-off-by: Hadrien Boutteville --- a/configure.ac +++ b/configure.ac -@@ -1349,11 +1349,7 @@ +@@ -1364,11 +1364,7 @@ # Check for Accessibility Toolkit flags ######################################## @@ -23,7 +23,7 @@ Signed-off-by: Hadrien Boutteville --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c @@ -37,10 +37,6 @@ - #include + #include #include -#ifdef GDK_WINDOWING_X11 @@ -33,7 +33,7 @@ Signed-off-by: Hadrien Boutteville static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, -@@ -987,9 +983,5 @@ +@@ -988,9 +984,5 @@ _gtk_accessibility_override_atk_util (); do_window_event_initialization (); diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 6b8f5abff6..093aacac51 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -1,4 +1,5 @@ comment "libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ @@ -13,6 +14,7 @@ comment "libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend" config BR2_PACKAGE_LIBGTK3 bool "libgtk3" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-libgtk3 -> host-librsvg depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 @@ -36,7 +38,7 @@ config BR2_PACKAGE_LIBGTK3 help The GTK+ version 3 graphical user interface library - http://www.gtk.org/ + https://www.gtk.org/ if BR2_PACKAGE_LIBGTK3 diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index dd902624cf..1493998686 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.24/gtk+-3.24.12.sha256sum -sha256 1384eba5614fed160044ae0d32369e3df7b4f517b03f4b1f24d383e528f4be83 gtk+-3.24.12.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.30.sha256sum +sha256 ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9 gtk+-3.24.30.tar.xz # Hash for license file: -sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index dbb975dbfd..80a2affd87 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,11 +5,13 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).12 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).30 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ LIBGTK3_LICENSE_FILES = COPYING +LIBGTK3_CPE_ID_VENDOR = gnome +LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES LIBGTK3_AUTORECONF = YES diff --git a/package/libgudev/libgudev.hash b/package/libgudev/libgudev.hash index bee394601e..1040ffb0c0 100644 --- a/package/libgudev/libgudev.hash +++ b/package/libgudev/libgudev.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libgudev/233/libgudev-233.sha256sum -sha256 587c4970eb23f4e2deee2cb1fb7838c94a78c578f41ce12cac0a3f4a80dabb03 libgudev-233.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/libgudev/236/libgudev-236.sha256sum +sha256 e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524 libgudev-236.tar.xz # Hash for license file: -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgudev/libgudev.mk b/package/libgudev/libgudev.mk index 63d592f9ac..eabd446d7b 100644 --- a/package/libgudev/libgudev.mk +++ b/package/libgudev/libgudev.mk @@ -4,13 +4,20 @@ # ################################################################################ -LIBGUDEV_VERSION = 233 +LIBGUDEV_VERSION = 236 LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION) LIBGUDEV_INSTALL_STAGING = YES LIBGUDEV_DEPENDENCIES = host-pkgconf udev libglib2 LIBGUDEV_LICENSE = LGPL-2.1+ LIBGUDEV_LICENSE_FILES = COPYING -LIBGUDEV_CONF_OPTS = --disable-umockdev +LIBGUDEV_CONF_OPTS = -Dtests=disabled -Dvapi=disabled -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBGUDEV_CONF_OPTS += -Dintrospection=enabled +LIBGUDEV_DEPENDENCIES += gobject-introspection +else +LIBGUDEV_CONF_OPTS += -Dintrospection=disabled +endif + +$(eval $(meson-package)) diff --git a/package/libhdhomerun/libhdhomerun.hash b/package/libhdhomerun/libhdhomerun.hash index 8b45486a12..8abce42eb9 100644 --- a/package/libhdhomerun/libhdhomerun.hash +++ b/package/libhdhomerun/libhdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9a60f663b00de5f820bdb85806662e25f22da248b14942e33a8b43a0331f855a libhdhomerun_20190621.tgz -sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE +sha256 b996389aa6f124a6d9dc1e75ec749e86d06102e2b3e7359d57163d4cc6e633f8 libhdhomerun_20210224.tgz +sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/libhdhomerun/libhdhomerun.mk b/package/libhdhomerun/libhdhomerun.mk index 8281b2462b..eaa60a062a 100644 --- a/package/libhdhomerun/libhdhomerun.mk +++ b/package/libhdhomerun/libhdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHDHOMERUN_VERSION = 20190621 +LIBHDHOMERUN_VERSION = 20210224 LIBHDHOMERUN_SOURCE = libhdhomerun_$(LIBHDHOMERUN_VERSION).tgz LIBHDHOMERUN_SITE = http://download.silicondust.com/hdhomerun LIBHDHOMERUN_LICENSE = LGPL-2.1+ diff --git a/package/libhid/Config.in b/package/libhid/Config.in index ec66308061..abf338fdc7 100644 --- a/package/libhid/Config.in +++ b/package/libhid/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBHID bool "libhid" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -8,5 +9,6 @@ config BR2_PACKAGE_LIBHID https://directory.fsf.org/wiki/Libhid -comment "libhid needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libhid needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libhtp/libhtp.hash b/package/libhtp/libhtp.hash index b3775c3ad3..91c20697df 100644 --- a/package/libhtp/libhtp.hash +++ b/package/libhtp/libhtp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a6a6f3b3f1fb6e8b8a1dae02db8a0090c438f0d057102dd8e52208224868c4e4 libhtp-0.5.32.tar.gz -sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE +sha256 8365f338fdf5ef0f3b37f3cb4e2670d218c843eccc42aa87119819c0f018ef39 libhtp-0.5.38.tar.gz +sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE diff --git a/package/libhtp/libhtp.mk b/package/libhtp/libhtp.mk index 577b700953..982ffe81cb 100644 --- a/package/libhtp/libhtp.mk +++ b/package/libhtp/libhtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTP_VERSION = 0.5.32 +LIBHTP_VERSION = 0.5.38 LIBHTP_SITE = $(call github,OISF,libhtp,$(LIBHTP_VERSION)) LIBHTP_LICENSE = BSD-3-Clause LIBHTP_LICENSE_FILES = LICENSE diff --git a/package/libhttpparser/libhttpparser.hash b/package/libhttpparser/libhttpparser.hash index 4634b06620..6ab63e8209 100644 --- a/package/libhttpparser/libhttpparser.hash +++ b/package/libhttpparser/libhttpparser.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8fa0ab8770fd8425a9b431fdbf91623c4d7a9cdb842b9339289bd2b0b01b0d3d libhttpparser-2.9.3.tar.gz -sha256 79e6ba8b687cb54786207342b9b6fcee0ac10218453ed9009b84d949b2233cc0 LICENSE-MIT +sha256 467b9e30fd0979ee301065e70f637d525c28193449e1b13fbcb1b1fab3ad224f libhttpparser-2.9.4.tar.gz +sha256 79e6ba8b687cb54786207342b9b6fcee0ac10218453ed9009b84d949b2233cc0 LICENSE-MIT diff --git a/package/libhttpparser/libhttpparser.mk b/package/libhttpparser/libhttpparser.mk index d7b6907493..5cf7f77391 100644 --- a/package/libhttpparser/libhttpparser.mk +++ b/package/libhttpparser/libhttpparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTTPPARSER_VERSION = 2.9.3 +LIBHTTPPARSER_VERSION = 2.9.4 LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,v$(LIBHTTPPARSER_VERSION)) LIBHTTPPARSER_INSTALL_STAGING = YES LIBHTTPPARSER_LICENSE = MIT diff --git a/package/libhttpserver/Config.in b/package/libhttpserver/Config.in index 03715d0569..dcdf30566d 100644 --- a/package/libhttpserver/Config.in +++ b/package/libhttpserver/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBHTTPSERVER bool "libhttpserver" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 PR59526 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBMICROHTTPD @@ -11,5 +12,6 @@ config BR2_PACKAGE_LIBHTTPSERVER https://github.com/etr/libhttpserver -comment "libhttpserver needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "libhttpserver needs a toolchain w/ C++, threads, gcc >= 5" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libhttpserver/libhttpserver.hash b/package/libhttpserver/libhttpserver.hash index 0333aabbae..19ad63bde2 100644 --- a/package/libhttpserver/libhttpserver.hash +++ b/package/libhttpserver/libhttpserver.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 778fa0aec199bf8737b2d540c2563a694c18957329f9885e372f7aaafb838351 libhttpserver-0.17.5.tar.gz -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LESSER +sha256 1dfe548ac2add77fcb6c05bd00222c55650ffd02b209f4e3f133a6e3eb29c89d libhttpserver-0.18.2.tar.gz +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LESSER diff --git a/package/libhttpserver/libhttpserver.mk b/package/libhttpserver/libhttpserver.mk index 1fd76519f4..bd3ecbd416 100644 --- a/package/libhttpserver/libhttpserver.mk +++ b/package/libhttpserver/libhttpserver.mk @@ -4,12 +4,14 @@ # ################################################################################ -LIBHTTPSERVER_VERSION = 0.17.5 +LIBHTTPSERVER_VERSION = 0.18.2 LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION)) LIBHTTPSERVER_LICENSE = LGPL-2.1+ LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER LIBHTTPSERVER_INSTALL_STAGING = YES -LIBHTTPSERVER_CONF_OPTS = --enable-same-directory-build +LIBHTTPSERVER_CONF_OPTS = \ + --disable-examples \ + --enable-same-directory-build LIBHTTPSERVER_AUTORECONF = YES LIBHTTPSERVER_DEPENDENCIES = libmicrohttpd diff --git a/package/libical/libical.mk b/package/libical/libical.mk index f9a266026e..afbbfd98c8 100644 --- a/package/libical/libical.mk +++ b/package/libical/libical.mk @@ -9,6 +9,7 @@ LIBICAL_SITE = https://github.com/libical/libical/releases/download/v$(LIBICAL_V LIBICAL_INSTALL_STAGING = YES LIBICAL_LICENSE = MPL-1.0 or LGPL-2.1 LIBICAL_LICENSE_FILES = LICENSE +LIBICAL_CPE_ID_VENDOR = libical_project # 0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch LIBICAL_IGNORE_CVES += CVE-2016-9584 diff --git a/package/libid3tag/libid3tag.hash b/package/libid3tag/libid3tag.hash index 82ad59d9ac..9aa1d00270 100644 --- a/package/libid3tag/libid3tag.hash +++ b/package/libid3tag/libid3tag.hash @@ -1,4 +1,7 @@ -# Locally computed: -sha256 63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151 libid3tag-0.15.1b.tar.gz +# From http://snapshot.debian.org/archive/debian/20190310T213528Z/pool/main/libi/libid3tag/libid3tag_0.15.1b-14.dsc +sha256 63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151 libid3tag_0.15.1b.orig.tar.gz +sha256 f174cafe02bef25a9ad8cb7f9ce80119147297a7036f50878e85ac0d7ae09c62 libid3tag_0.15.1b-14.debian.tar.xz + +# Hash for license files: sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 7f12ad28dc075763e91b91bfa60fad04062380011ddad8f6bac21dd7b1f44367 COPYRIGHT diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk index 3ec145725f..5d7b219bb1 100644 --- a/package/libid3tag/libid3tag.mk +++ b/package/libid3tag/libid3tag.mk @@ -5,11 +5,20 @@ ################################################################################ LIBID3TAG_VERSION = 0.15.1b -LIBID3TAG_SITE = http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VERSION) +LIBID3TAG_PATCH = libid3tag_$(LIBID3TAG_VERSION)-14.debian.tar.xz +LIBID3TAG_SOURCE = libid3tag_$(LIBID3TAG_VERSION).orig.tar.gz +LIBID3TAG_SITE = \ + http://snapshot.debian.org/archive/debian/20190310T213528Z/pool/main/libi/libid3tag LIBID3TAG_LICENSE = GPL-2.0+ LIBID3TAG_LICENSE_FILES = COPYING COPYRIGHT LIBID3TAG_INSTALL_STAGING = YES -LIBID3TAG_DEPENDENCIES = zlib +LIBID3TAG_DEPENDENCIES = host-gperf zlib + +# debian/patches/10_utf16.dpatch +LIBID3TAG_IGNORE_CVES += CVE-2004-2779 CVE-2017-11551 + +# debian/patches/11_unknown_encoding.dpatch +LIBID3TAG_IGNORE_CVES += CVE-2017-11550 # Force autoreconf to be able to use a more recent libtool script, that # is able to properly behave in the face of a missing C++ compiler. diff --git a/package/libidn/libidn.hash b/package/libidn/libidn.hash index f5ba311e90..c6cd668bbc 100644 --- a/package/libidn/libidn.hash +++ b/package/libidn/libidn.hash @@ -1,7 +1,7 @@ # Locally computed: -sha256 f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e libidn-1.35.tar.gz +sha256 de00b840f757cd3bb14dd9a20d5936473235ddcba06d4bc2da804654b8bbf0f6 libidn-1.38.tar.gz # Hash for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYINGv3 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSERv3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYINGv3 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSERv3 diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk index 601edcb57d..4a400d195d 100644 --- a/package/libidn/libidn.mk +++ b/package/libidn/libidn.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIDN_VERSION = 1.35 +LIBIDN_VERSION = 1.38 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN_INSTALL_STAGING = YES LIBIDN_CONF_ENV = EMACS="no" MAKEINFO=true @@ -12,6 +12,7 @@ LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no LIBIDN_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) $(if $(BR2_PACKAGE_LIBICONV),libiconv) LIBIDN_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+ LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3 +LIBIDN_CPE_ID_VENDOR = gnu define LIBIDN_REMOVE_BINARY rm -f $(TARGET_DIR)/usr/bin/idn diff --git a/package/libidn2/libidn2.hash b/package/libidn2/libidn2.hash index 2d2fcdfd15..bc96d7e15a 100644 --- a/package/libidn2/libidn2.hash +++ b/package/libidn2/libidn2.hash @@ -1,8 +1,8 @@ # Calculated locally after checking signature -sha256 e1cb1db3d2e249a6a3eb6f0946777c2e892d5c5dc7bd91c74394fc3a01cab8b5 libidn2-2.3.0.tar.gz +sha256 76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91 libidn2-2.3.2.tar.gz # Hash for license files: -sha256 73483f797a83373fca1b968c11785b98c4fc4803cdc7d3210811ca8b075d6d76 COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSERv3 -sha256 01d621eef165cf4d3d3dbb737aa0699178d94c6f18cf87e9dde6db3ca7790f46 COPYING.unicode +sha256 73483f797a83373fca1b968c11785b98c4fc4803cdc7d3210811ca8b075d6d76 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSERv3 +sha256 01d621eef165cf4d3d3dbb737aa0699178d94c6f18cf87e9dde6db3ca7790f46 COPYING.unicode diff --git a/package/libidn2/libidn2.mk b/package/libidn2/libidn2.mk index 3f87b9bb8c..19fbe4aafd 100644 --- a/package/libidn2/libidn2.mk +++ b/package/libidn2/libidn2.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBIDN2_VERSION = 2.3.0 +LIBIDN2_VERSION = 2.3.2 LIBIDN2_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN2_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) LIBIDN2_LICENSE_FILES = COPYING COPYINGv2 COPYING.LESSERv3 COPYING.unicode +LIBIDN2_CPE_ID_VENDOR = gnu LIBIDN2_DEPENDENCIES = \ host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) \ diff --git a/package/libiio/Config.in b/package/libiio/Config.in index dcc7c79d1a..0d89331c89 100644 --- a/package/libiio/Config.in +++ b/package/libiio/Config.in @@ -33,13 +33,15 @@ config BR2_PACKAGE_LIBIIO_USB_BACKEND bool "USB backend" default y depends on BR2_TOOLCHAIN_HAS_THREADS # from libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBIIO_XML_BACKEND select BR2_PACKAGE_LIBUSB help Enable the USB backend of the library. -comment "The USB backend needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "The USB backend needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_LIBIIO_SERIAL_BACKEND bool "Serial backend" diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index efd582a5ea..af5b27ba5f 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -72,7 +72,6 @@ endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP),y) define LIBIIO_INSTALL_CSHARP_BINDINGS_TO_TARGET - rm $(TARGET_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll.mdb $(HOST_DIR)/bin/gacutil -root $(TARGET_DIR)/usr/lib -i \ $(TARGET_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll endef diff --git a/package/libilbc/libilbc.hash b/package/libilbc/libilbc.hash index 81a0c4e037..5f41a99ced 100644 --- a/package/libilbc/libilbc.hash +++ b/package/libilbc/libilbc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 70cd6a4f6bbe6dcebfc4293eea7b6200f883d1bf0affa1efba819d44d274e35f libilbc-829b08c7902ceb87a261279fabb36b6d523c6e07.tar.gz -sha256 b7f4cbb4a12cd11a3d1aeda9bd17c99f59b054de4b3ee53045531cd2fa74dd2a gips_iLBClicense.pdf +sha256 f97d8284776c95b31ed5d5441f13b519b8c7966b77a26aa06c29bb77e02cfe16 libilbc-829b08c7902ceb87a261279fabb36b6d523c6e07-br1.tar.gz +sha256 b7f4cbb4a12cd11a3d1aeda9bd17c99f59b054de4b3ee53045531cd2fa74dd2a gips_iLBClicense.pdf diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index ee6416e3b8..7958cbac88 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,8 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-March/041332.html -md5 76c5cb1a55f5098ed353ae7d4e054c50 libinput-1.15.4.tar.xz -sha1 43740a5fec3f6d474906173cc01ff3d73d935d2f libinput-1.15.4.tar.xz -sha256 9c8b6846d94e374ee4bdb32634e4ac4aa318afc31f9a58fcb545cd3095c745c1 libinput-1.15.4.tar.xz -sha512 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80 libinput-1.15.4.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2021-June/041849.html +sha256 18c6a286583268d39841348e561fbb4713bde0c643b360f5d8a3f27800afdb9a libinput-1.18.0.tar.xz +sha512 9a834f075d7a1f892416bb6b241eb052f749d3aa883c4b39c0f1c9616c115d6b9a541b587508646fddaf0d3fe57af92fe4629b522d1d51196499e7b523e0aa90 libinput-1.18.0.tar.xz # License files -sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING +sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 5e2ee696bf..32b822edb7 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.15.4 +LIBINPUT_VERSION = 1.18.0 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev diff --git a/package/libiqrf/Config.in b/package/libiqrf/Config.in index 03555e063a..d86a7fd0ec 100644 --- a/package/libiqrf/Config.in +++ b/package/libiqrf/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBIQRF bool "libiqrf" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help This library implement specific protocol @@ -10,5 +11,6 @@ config BR2_PACKAGE_LIBIQRF https://github.com/nandra/libiqrf -comment "libiqrf needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libiqrf needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libiqrf/libiqrf.hash b/package/libiqrf/libiqrf.hash index b7f3b9bf2c..df749def17 100644 --- a/package/libiqrf/libiqrf.hash +++ b/package/libiqrf/libiqrf.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 8111031dd9dd6093a1927eb32dd7476fe22cfee9190043aa8e4c88003c104b16 libiqrf-0.1.2.tar.gz +sha256 8111031dd9dd6093a1927eb32dd7476fe22cfee9190043aa8e4c88003c104b16 libiqrf-0.1.2.tar.gz +sha256 11e0700d7c23604d86fa1e7c54c7caa778d79eeb0035be8f80b5a552224ef015 src/iqrf.c diff --git a/package/libiqrf/libiqrf.mk b/package/libiqrf/libiqrf.mk index cd03373dec..3f4e3e8498 100644 --- a/package/libiqrf/libiqrf.mk +++ b/package/libiqrf/libiqrf.mk @@ -9,5 +9,6 @@ LIBIQRF_SITE = $(call github,nandra,libiqrf,v$(LIBIQRF_VERSION)) LIBIQRF_INSTALL_STAGING = YES LIBIQRF_DEPENDENCIES = libusb LIBIQRF_LICENSE = LGPL-2.1+ +LIBIQRF_LICENSE_FILES = src/iqrf.c $(eval $(cmake-package)) diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index b855344f3c..6b55aba7e5 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -5,11 +5,16 @@ ################################################################################ LIBJPEG_VERSION = 9d -LIBJPEG_SITE = http://www.ijg.org/files +# 9d was released 2020-01-12, but the tarball was replaced upstream circa +# 2021-03, causing hash mismatch. Until there is a new version released, +# use our cached copy from s.b.o. +#LIBJPEG_SITE = http://www.ijg.org/files +LIBJPEG_SITE = http://sources.buildroot.org/libjpeg LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README LIBJPEG_INSTALL_STAGING = YES +LIBJPEG_CPE_ID_VENDOR = ijg LIBJPEG_PROVIDES = jpeg define LIBJPEG_REMOVE_USELESS_TOOLS diff --git a/package/libjson/libjson.mk b/package/libjson/libjson.mk index d04ddc40f3..73268c9ccf 100644 --- a/package/libjson/libjson.mk +++ b/package/libjson/libjson.mk @@ -11,7 +11,7 @@ LIBJSON_INSTALL_STAGING = YES LIBJSON_LICENSE = BSD-2-Clause LIBJSON_LICENSE_FILES = License.txt -LIBJSON_CXXFLAGS = $(TARGET_CFLAGS) -DNDEBUG +LIBJSON_CXXFLAGS = $(TARGET_CFLAGS) -DNDEBUG -std=c++11 ifeq ($(BR2_STATIC_LIBS),y) LIBJSON_MAKE_OPTS += SHARED=0 diff --git a/package/libkrb5/Config.in b/package/libkrb5/Config.in index 2e24c87229..3357d4ad04 100644 --- a/package/libkrb5/Config.in +++ b/package/libkrb5/Config.in @@ -3,6 +3,9 @@ config BR2_PACKAGE_LIBKRB5 # needs fork() depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL help Kerberos is a system for authenticating users and services on a network. Kerberos is a trusted third-party service. diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash index aa7c3a3778..860f828793 100644 --- a/package/libkrb5/libkrb5.hash +++ b/package/libkrb5/libkrb5.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5a6e2284a53de5702d3dc2be3b9339c963f9b5397d3fbbc53beb249380a781f5 krb5-1.17.tar.gz +sha256 66085e2f594751e77e82e0dbf7bbc344320fb48a9df2a633cfdd8f7d6da99fc8 krb5-1.18.4.tar.gz # Hash for license file: -sha256 5149ea464bde245388d313309539e142156d371788ae57bbd4feb223757f6da1 NOTICE +sha256 7fba8b076bdc2cfef1d0813c5d4067d76d5be60c32d84de22d5d1cf451744feb NOTICE diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index 44a20b3707..d41e7559a5 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -4,16 +4,21 @@ # ################################################################################ -LIBKRB5_VERSION_MAJOR = 1.17 -LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR) +LIBKRB5_VERSION_MAJOR = 1.18 +LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).4 LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR) LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src LIBKRB5_LICENSE = MIT LIBKRB5_LICENSE_FILES = NOTICE +LIBKRB5_CPE_ID_VENDOR = mit +LIBKRB5_CPE_ID_PRODUCT = kerberos_5 LIBKRB5_DEPENDENCIES = host-bison $(TARGET_NLS_DEPENDENCIES) LIBKRB5_INSTALL_STAGING = YES +# 0001-Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch +LIBKRB5_IGNORE_CVES += CVE-2021-37750 + # The configure script uses AC_TRY_RUN tests to check for those values, # which doesn't work in a cross-compilation scenario. Therefore, # we feed the configure script with the correct answer for those tests @@ -39,6 +44,21 @@ else LIBKRB5_CONF_OPTS += --without-ldap endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBKRB5_CONF_OPTS += \ + --enable-pkinit \ + --with-crypto-impl=openssl \ + --with-spake-openssl \ + --with-tls-impl=openssl +LIBKRB5_DEPENDENCIES += openssl +else +LIBKRB5_CONF_OPTS += \ + --disable-pkinit \ + --with-crypto-impl=builtin \ + --without-spake-openssl \ + --without-tls-impl +endif + ifeq ($(BR2_PACKAGE_LIBEDIT),y) LIBKRB5_CONF_OPTS += --with-libedit LIBKRB5_DEPENDENCIES += host-pkgconf libedit diff --git a/package/libksba/libksba.hash b/package/libksba/libksba.hash index 8ab7e6efe8..422048be5f 100644 --- a/package/libksba/libksba.hash +++ b/package/libksba/libksba.hash @@ -1,9 +1,9 @@ # Locally calculated after checking pgp signature -sha256 41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340 libksba-1.3.5.tar.bz2 +sha256 dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b libksba-1.6.0.tar.bz2 # Hash for license files: -sha256 240908e1356ffeb5d0730227b6198dcc8e878375d28632fd813e0ed75b35ccc2 AUTHORS -sha256 6197b98c6bf69838c624809c509d84333de1bc847155168c0e84527446a27076 COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 -sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING.GPLv3 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LGPLv3 +sha256 8f1b87e551d97b2b23b6d3403a5d598c63ea89824cb8ee351f631f6cab2beaa5 AUTHORS +sha256 6197b98c6bf69838c624809c509d84333de1bc847155168c0e84527446a27076 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 +sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING.GPLv3 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LGPLv3 diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 25b17a47da..ca5fc1d749 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBKSBA_VERSION = 1.3.5 +LIBKSBA_VERSION = 1.6.0 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 +LIBKSBA_CPE_ID_VENDOR = libksba_project LIBKSBA_INSTALL_STAGING = YES LIBKSBA_DEPENDENCIES = libgpg-error LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(STAGING_DIR)/usr diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 75159389de..9c248bbc19 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -9,6 +9,8 @@ LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns LIBLDNS_LICENSE = BSD-3-Clause LIBLDNS_LICENSE_FILES = LICENSE +LIBLDNS_CPE_ID_VENDOR = nlnetlabs +LIBLDNS_CPE_ID_PRODUCT = ldns LIBLDNS_INSTALL_STAGING = YES LIBLDNS_DEPENDENCIES = openssl # --disable-dane-verify can be removed after openssl bump to 1.1.x diff --git a/package/libllcp/Config.in b/package/libllcp/Config.in index 1660e92a87..5dc5c36a67 100644 --- a/package/libllcp/Config.in +++ b/package/libllcp/Config.in @@ -1,9 +1,12 @@ config BR2_PACKAGE_LIBLLCP bool "libllcp" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBNFC help Library extending libnfc with support for Logical Link Control Protocol. https://github.com/nfc-tools/libllcp + +comment "libllcp needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/liblo/liblo.hash b/package/liblo/liblo.hash index 049ab80747..a3d34d796c 100644 --- a/package/liblo/liblo.hash +++ b/package/liblo/liblo.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/liblo/files/liblo/0.30/ -sha1 152a3260d186f111a71508dc0ed709984960f130 liblo-0.30.tar.gz -md5 fa1a9d45f86fc18fb54019f670ff2262 liblo-0.30.tar.gz +# From http://sourceforge.net/projects/liblo/files/liblo/0.31/ +sha1 d188a62df51e29fa98861daec1db0fdae400410d liblo-0.31.tar.gz +md5 14378c1e74c58e777fbb4fcf33ac5315 liblo-0.31.tar.gz # Locally computed -sha256 30a7c9de49a25ed7f2425a7a7415f5b14739def62431423d3419ea26fb978d1b liblo-0.30.tar.gz -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING +sha256 2b4f446e1220dcd624ecd8405248b08b7601e9a0d87a0b94730c2907dbccc750 liblo-0.31.tar.gz +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk index 69918186db..27dba1f99f 100644 --- a/package/liblo/liblo.mk +++ b/package/liblo/liblo.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLO_VERSION = 0.30 +LIBLO_VERSION = 0.31 LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION) LIBLO_LICENSE = LGPL-2.1+ diff --git a/package/liblogging/liblogging.mk b/package/liblogging/liblogging.mk index c756891a86..24375b56b4 100644 --- a/package/liblogging/liblogging.mk +++ b/package/liblogging/liblogging.mk @@ -8,6 +8,7 @@ LIBLOGGING_VERSION = 1.0.6 LIBLOGGING_SITE = http://download.rsyslog.com/liblogging LIBLOGGING_LICENSE = BSD-2-Clause LIBLOGGING_LICENSE_FILES = COPYING +LIBLOGGING_CPE_ID_VENDOR = adiscon LIBLOGGING_INSTALL_STAGING = YES LIBLOGGING_CONF_OPTS = --enable-cached-man-pages diff --git a/package/libloki/libloki.mk b/package/libloki/libloki.mk index 7564239f6a..07a9372df9 100644 --- a/package/libloki/libloki.mk +++ b/package/libloki/libloki.mk @@ -23,6 +23,7 @@ endif define LIBLOKI_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ -C $(@D) $(LIBLOKI_BUILD_TARGETS) endef diff --git a/package/libmad/libmad.hash b/package/libmad/libmad.hash index 8b7859395f..2be1a8a3a8 100644 --- a/package/libmad/libmad.hash +++ b/package/libmad/libmad.hash @@ -1,4 +1,6 @@ -# Locally computed: -sha256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 libmad-0.15.1b.tar.gz -sha256 0e21f2c6b19337d0b237dacc04f7b90a56be7f359f4c9a2ee0b202d9af0cfa69 frame_length.diff +# From http://snapshot.debian.org/archive/debian/20190310T213528Z/pool/main/libm/libmad/libmad_0.15.1b-10.dsc +sha256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 libmad_0.15.1b.orig.tar.gz +sha256 dfeabd5d2398bf902660edc31f87ad40600f0aa732b946f864d8ee6bbf56a99c libmad_0.15.1b-10.diff.gz + +# Hash for license file: sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index b1c9cee5ac..33134e26d4 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -5,12 +5,27 @@ ################################################################################ LIBMAD_VERSION = 0.15.1b -LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION) +LIBMAD_PATCH = libmad_$(LIBMAD_VERSION)-10.diff.gz +LIBMAD_SOURCE = libmad_$(LIBMAD_VERSION).orig.tar.gz +LIBMAD_SITE = \ + http://snapshot.debian.org/archive/debian/20190310T213528Z/pool/main/libm/libmad LIBMAD_INSTALL_STAGING = YES LIBMAD_LICENSE = GPL-2.0+ LIBMAD_LICENSE_FILES = COPYING -LIBMAD_PATCH = \ - https://sources.debian.net/data/main/libm/libmad/0.15.1b-8/debian/patches/frame_length.diff + +define LIBMAD_APPLY_DEBIAN_PATCHES + if [ -d $(@D)/debian/patches ]; then \ + $(APPLY_PATCHES) $(@D) $(@D)/debian/patches *.patch; \ + fi +endef + +LIBMAD_POST_PATCH_HOOKS += LIBMAD_APPLY_DEBIAN_PATCHES + +# debian/patches/md_size.diff +LIBMAD_IGNORE_CVES += CVE-2017-8372 CVE-2017-8373 + +# debian/patches/length-check.patch +LIBMAD_IGNORE_CVES += CVE-2017-8374 # Force autoreconf to be able to use a more recent libtool script, that # is able to properly behave in the face of a missing C++ compiler. diff --git a/package/libmatroska/libmatroska.hash b/package/libmatroska/libmatroska.hash index 827f08921c..81b418d030 100644 --- a/package/libmatroska/libmatroska.hash +++ b/package/libmatroska/libmatroska.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0ac6debfbf781d47f001b830aaf9be9dfbcefd13bcfb80ca5efc1c04b4a3c962 libmatroska-1.5.2.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL +sha256 daf91a63f58dd157ca340c457871e66260cb9c3333fefb008b318befbb0e081a libmatroska-1.6.3.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL diff --git a/package/libmatroska/libmatroska.mk b/package/libmatroska/libmatroska.mk index 7b7c5f03ef..7d326c0076 100644 --- a/package/libmatroska/libmatroska.mk +++ b/package/libmatroska/libmatroska.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBMATROSKA_VERSION = 1.5.2 +LIBMATROSKA_VERSION = 1.6.3 LIBMATROSKA_SOURCE = libmatroska-$(LIBMATROSKA_VERSION).tar.xz LIBMATROSKA_SITE = http://dl.matroska.org/downloads/libmatroska LIBMATROSKA_INSTALL_STAGING = YES LIBMATROSKA_LICENSE = LGPL-2.1+ LIBMATROSKA_LICENSE_FILES = LICENSE.LGPL +LIBMATROSKA_CPE_ID_VENDOR = matroska LIBMATROSKA_DEPENDENCIES = libebml host-pkgconf $(eval $(cmake-package)) diff --git a/package/libmaxminddb/libmaxminddb.hash b/package/libmaxminddb/libmaxminddb.hash index a3ca682c2a..4bdc05f34e 100644 --- a/package/libmaxminddb/libmaxminddb.hash +++ b/package/libmaxminddb/libmaxminddb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dd582aa971be23dee960ec33c67fb5fd38affba508e6f00ea75959dbd5aad156 libmaxminddb-1.4.2.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 5237076d250a5f7c297e331c35a433eeaaf0dc205e070e4db353c9ba10f340a2 libmaxminddb-1.5.2.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/libmaxminddb/libmaxminddb.mk b/package/libmaxminddb/libmaxminddb.mk index 18e2eaee7d..c022acf797 100644 --- a/package/libmaxminddb/libmaxminddb.mk +++ b/package/libmaxminddb/libmaxminddb.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBMAXMINDDB_VERSION = 1.4.2 +LIBMAXMINDDB_VERSION = 1.5.2 LIBMAXMINDDB_SITE = \ https://github.com/maxmind/libmaxminddb/releases/download/$(LIBMAXMINDDB_VERSION) LIBMAXMINDDB_INSTALL_STAGING = YES LIBMAXMINDDB_LICENSE = Apache-2.0 LIBMAXMINDDB_LICENSE_FILES = LICENSE +LIBMAXMINDDB_CPE_ID_VENDOR = maxmind LIBMAXMINDDB_CONF_OPTS = --disable-tests # mmdblookup binary depends on pthreads diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index 828bea0f92..07cfd69163 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ -# Locally computed: -sha256 5c0778eb1cd12c3604523134e55183f5147b0cae71150e875b583768f7aa1f38 libmbim-1.22.0.tar.xz +# Locally computed +sha256 63b53db0196dadea673f04524b0683ce40282f25bfd513d398e2a10b992cac01 libmbim-1.26.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 67cfd2bc0b..cdc3fabedb 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -4,24 +4,27 @@ # ################################################################################ -LIBMBIM_VERSION = 1.22.0 -LIBMBIM_SITE = https://www.freedesktop.org/software/libmbim -LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz +LIBMBIM_VERSION = 1.26.0 +LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB +LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES LIBMBIM_DEPENDENCIES = libglib2 -# we don't want -Werror -LIBMBIM_CONF_OPTS = --enable-more-warnings=no - -# if libgudev available, request udev support -ifeq ($(BR2_PACKAGE_LIBGUDEV),y) -LIBMBIM_DEPENDENCIES += libgudev -LIBMBIM_CONF_OPTS += --with-udev +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBMBIM_DEPENDENCIES += gobject-introspection +LIBMBIM_CONF_OPTS += -Dintrospection=true else -LIBMBIM_CONF_OPTS += --without-udev +LIBMBIM_CONF_OPTS += -Dintrospection=false endif -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +LIBMBIM_DEPENDENCIES += bash-completion +LIBMBIM_CONF_OPTS += -Dbash_completion=true +else +LIBMBIM_CONF_OPTS += -Dbash_completion=false +endif + +$(eval $(meson-package)) diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index 0fc451fcde..c9d4d25c78 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307 libmicrohttpd-0.9.70.tar.gz -sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING +sha256 a37b2f1b88fd1bfe74109586be463a434d34e773530fc2a74364cfcf734c032e libmicrohttpd-0.9.73.tar.gz +sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index ea2de55804..ef9f114494 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,9 +4,10 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.70 +LIBMICROHTTPD_VERSION = 0.9.73 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING +LIBMICROHTTPD_CPE_ID_VENDOR = gnu LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 diff --git a/package/libminiupnpc/libminiupnpc.hash b/package/libminiupnpc/libminiupnpc.hash index 556d8cc45a..758ea29f59 100644 --- a/package/libminiupnpc/libminiupnpc.hash +++ b/package/libminiupnpc/libminiupnpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e19fb5e01ea5a707e2a8cb96f537fbd9f3a913d53d804a3265e3aeab3d2064c6 miniupnpc-2.1.tar.gz -sha256 e2df21b3d4b1a84a0ac31d808a3ff330fdf3602e0839a526d3df2fcfba287ac4 LICENSE +sha256 69f72fe355f911b807915f78dcfc0af772c0f22bc7ab1157e70f334e37db7d39 miniupnpc-2.1.20201016.tar.gz +sha256 0b476c395af6dd21eeb54c40a21d22e1c11a751fbd2dd17a41ce26e370be88d5 LICENSE diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 5a4c8fc693..551a6767cf 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -4,11 +4,17 @@ # ################################################################################ -LIBMINIUPNPC_VERSION = 2.1 +LIBMINIUPNPC_VERSION_MAJOR = 2.1 +LIBMINIUPNPC_VERSION_MINOR = 20201016 +LIBMINIUPNPC_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR).$(LIBMINIUPNPC_VERSION_MINOR) LIBMINIUPNPC_SOURCE = miniupnpc-$(LIBMINIUPNPC_VERSION).tar.gz LIBMINIUPNPC_SITE = http://miniupnp.free.fr/files LIBMINIUPNPC_INSTALL_STAGING = YES LIBMINIUPNPC_LICENSE = BSD-3-Clause LIBMINIUPNPC_LICENSE_FILES = LICENSE +LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project +LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc +LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) +LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) $(eval $(cmake-package)) diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk index 236fe1376e..a4c40ad60a 100644 --- a/package/libmms/libmms.mk +++ b/package/libmms/libmms.mk @@ -10,5 +10,6 @@ LIBMMS_INSTALL_STAGING = YES LIBMMS_DEPENDENCIES = host-pkgconf libglib2 LIBMMS_LICENSE = LGPL-2.1+ LIBMMS_LICENSE_FILES = COPYING.LIB +LIBMMS_CPE_ID_VENDOR = libmms_project $(eval $(autotools-package)) diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk index 7fcce4c21f..d3b33db2e0 100644 --- a/package/libmnl/libmnl.mk +++ b/package/libmnl/libmnl.mk @@ -10,5 +10,6 @@ LIBMNL_SITE = http://netfilter.org/projects/libmnl/files LIBMNL_INSTALL_STAGING = YES LIBMNL_LICENSE = LGPL-2.1+ LIBMNL_LICENSE_FILES = COPYING +LIBMNL_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk index 584ac75055..52eb318a99 100644 --- a/package/libmodbus/libmodbus.mk +++ b/package/libmodbus/libmodbus.mk @@ -8,6 +8,7 @@ LIBMODBUS_VERSION = 3.1.6 LIBMODBUS_SITE = http://libmodbus.org/releases LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER +LIBMODBUS_CPE_ID_VENDOR = libmodbus LIBMODBUS_INSTALL_STAGING = YES LIBMODBUS_CONF_OPTS = --without-documentation --disable-tests diff --git a/package/libmodplug/libmodplug.mk b/package/libmodplug/libmodplug.mk index 05786ce812..98c38a3b00 100644 --- a/package/libmodplug/libmodplug.mk +++ b/package/libmodplug/libmodplug.mk @@ -9,5 +9,6 @@ LIBMODPLUG_SITE = http://downloads.sourceforge.net/project/modplug-xmms/libmodpl LIBMODPLUG_INSTALL_STAGING = YES LIBMODPLUG_LICENSE = Public Domain LIBMODPLUG_LICENSE_FILES = COPYING +LIBMODPLUG_CPE_ID_VENDOR = konstanty_bialkowski $(eval $(autotools-package)) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index ea58c6d0e2..87f7a9c103 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBMODSECURITY bool "libmodsecurity" depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_PCRE help @@ -16,6 +15,5 @@ config BR2_PACKAGE_LIBMODSECURITY https://github.com/SpiderLabs/ModSecurity -comment "libmodsecurity needs a toolchain w/ C++, dynamic library, threads" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS +comment "libmodsecurity needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index ddce3ef9c6..dff39569c1 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.4/modsecurity-v3.0.4.tar.gz.sha256 -sha256 b4231177dd80b4e076b228e57d498670113b69d445bab86db25f65346c24db22 modsecurity-v3.0.4.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.5/modsecurity-v3.0.5.tar.gz.sha256 +sha256 751bf95a7a8d39c440d0c26ec1f73961550ca2eb2ac9e2e7a56dce2dd7b959e9 modsecurity-v3.0.5.tar.gz # Localy calculated -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 063f969fc6..be46eb6e02 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,17 +4,16 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.4 +LIBMODSECURITY_VERSION = 3.0.5 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE -# 0002-test-for-uClinux-in-configure-script.patch +LIBMODSECURITY_CPE_ID_VENDOR = trustwave +LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity +# We're patching build/libmaxmind.m4 LIBMODSECURITY_AUTORECONF = YES -# libinjection uses AC_CHECK_FILE, not available in cross-compile -LIBMODSECURITY_CONF_ENV = \ - ac_cv_file_others_libinjection_src_libinjection_html5_c=yes LIBMODSECURITY_DEPENDENCIES = pcre LIBMODSECURITY_CONF_OPTS = \ @@ -53,4 +52,14 @@ else LIBMODSECURITY_CONF_OPTS += --without-maxmind endif +LIBMODSECURITY_CXXFLAGS = $(TARGET_CXXFLAGS) + +# m68k_cf can't use -fPIC that libmodsecurity forces to use, so we need +# to disable it to avoid a build failure. +ifeq ($(BR2_m68k_cf),y) +LIBMODSECURITY_CXXFLAGS += -fno-PIC +endif + +LIBMODSECURITY_CONF_OPTS += CXXFLAGS="$(LIBMODSECURITY_CXXFLAGS)" + $(eval $(autotools-package)) diff --git a/package/libmpdclient/libmpdclient.hash b/package/libmpdclient/libmpdclient.hash index e4456f125c..882a588a88 100644 --- a/package/libmpdclient/libmpdclient.hash +++ b/package/libmpdclient/libmpdclient.hash @@ -1,3 +1,3 @@ -# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.18.tar.xz.sig, sha256 locally computed -sha256 4cb01e1f567e0169aca94875fb6e1200e7f5ce35b63a4df768ec1591fb1081fa libmpdclient-2.18.tar.xz +# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.19.tar.xz.sig, sha256 locally computed +sha256 158aad4c2278ab08e76a3f2b0166c99b39fae00ee17231bd225c5a36e977a189 libmpdclient-2.19.tar.xz sha256 9574c3b0a9c31723cc3d5f32af4655a015fff5ec6ec8115b7906cd7d9623cf32 COPYING diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk index 6e7c5a45a9..a880980a3c 100644 --- a/package/libmpdclient/libmpdclient.mk +++ b/package/libmpdclient/libmpdclient.mk @@ -5,7 +5,7 @@ ################################################################################ LIBMPDCLIENT_VERSION_MAJOR = 2 -LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).18 +LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).19 LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR) LIBMPDCLIENT_INSTALL_STAGING = YES diff --git a/package/libmspack/libmspack.mk b/package/libmspack/libmspack.mk index e9fdc3ca8d..f806192eec 100644 --- a/package/libmspack/libmspack.mk +++ b/package/libmspack/libmspack.mk @@ -4,10 +4,15 @@ # ################################################################################ -LIBMSPACK_VERSION = 0.10.1alpha +LIBMSPACK_VERSION_MAJOR = 0.10.1 +LIBMSPACK_VERSION_MINOR = alpha +LIBMSPACK_VERSION = $(LIBMSPACK_VERSION_MAJOR)$(LIBMSPACK_VERSION_MINOR) LIBMSPACK_SITE = https://www.cabextract.org.uk/libmspack LIBMSPACK_LICENSE = LGPL-2.1 LIBMSPACK_LICENSE_FILES = COPYING.LIB +LIBMSPACK_CPE_ID_VENDOR = kyzer +LIBMSPACK_CPE_ID_VERSION = $(LIBMSPACK_VERSION_MAJOR) +LIBMSPACK_CPE_ID_UPDATE = $(LIBMSPACK_VERSION_MINOR) LIBMSPACK_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/package/libndp/libndp.hash b/package/libndp/libndp.hash index 8d4b6ef524..389e0ba5fc 100644 --- a/package/libndp/libndp.hash +++ b/package/libndp/libndp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 44be73630ee785ed9f571f9aaaeba0e1d375fa337fd841270034c813b5b0e6fd libndp-1.7.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 c3ea76e253def89869651686a827da75b56896fe94fabd87d8c14b1d4588fd05 libndp-1.8.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libndp/libndp.mk b/package/libndp/libndp.mk index 3783eb135a..db1de7b81c 100644 --- a/package/libndp/libndp.mk +++ b/package/libndp/libndp.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBNDP_VERSION = 1.7 +LIBNDP_VERSION = 1.8 LIBNDP_SITE = $(call github,jpirko,libndp,v$(LIBNDP_VERSION)) LIBNDP_LICENSE = LGPL-2.1+ LIBNDP_LICENSE_FILES = COPYING +LIBNDP_CPE_ID_VENDOR = libndp LIBNDP_AUTORECONF = YES LIBNDP_INSTALL_STAGING = YES diff --git a/package/libnet/Config.in b/package/libnet/Config.in index 7186972b7e..135f97e948 100644 --- a/package/libnet/Config.in +++ b/package/libnet/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LIBNET libnet provides a portable framework for low-level network packet construction. - http://sourceforge.net/projects/libnet-dev + https://github.com/libnet/libnet diff --git a/package/libnet/libnet.hash b/package/libnet/libnet.hash index 9f62aeda60..1f03d8f983 100644 --- a/package/libnet/libnet.hash +++ b/package/libnet/libnet.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/libnet-dev/files/ -sha1 dffff71c325584fdcf99b80567b60f8ad985e34c libnet-1.1.6.tar.gz -md5 710296fe424a49344e5fcc0d09e53317 libnet-1.1.6.tar.gz +# From https://github.com/libnet/libnet/releases/download/v1.2/libnet-1.2.tar.gz.md5 +md5 a36c669e0cdfda6a2aa3adfb1f6fe60a libnet-1.2.tar.gz # Locally computed -sha256 961355c8bac6de11ecb8f634111986712e80a88272c0bb0954fd1810e6f47cab doc/COPYING +sha256 caa4868157d9e5f32e9c7eac9461efeff30cb28357f7f6bf07e73933fb4edaa7 libnet-1.2.tar.gz +sha256 a06f600f67f239898d85f083aeed82ce6015b1c57599ab1def00fb68787ef388 LICENSE diff --git a/package/libnet/libnet.mk b/package/libnet/libnet.mk index 966106837a..a5a814f4d2 100644 --- a/package/libnet/libnet.mk +++ b/package/libnet/libnet.mk @@ -4,12 +4,15 @@ # ################################################################################ -LIBNET_VERSION = 1.1.6 -LIBNET_SITE = http://sourceforge.net/projects/libnet-dev/files +LIBNET_VERSION = 1.2 +LIBNET_SITE = \ + https://github.com/libnet/libnet/releases/download/v$(LIBNET_VERSION) LIBNET_INSTALL_STAGING = YES # PF_PACKET is always available on Linux LIBNET_CONF_OPTS = libnet_cv_have_packet_socket=yes LIBNET_LICENSE = BSD-2-Clause, BSD-3-Clause -LIBNET_LICENSE_FILES = doc/COPYING +LIBNET_LICENSE_FILES = LICENSE +LIBNET_CPE_ID_VENDOR = libnet_project +LIBNET_CONFIG_SCRIPTS = libnet-config $(eval $(autotools-package)) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 5cd9b99062..24cc3a5557 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,2 +1,3 @@ -sha256 38e780cdd0135e9c7fe44b5190a1acc8c33cb28aa395c329893b019a57b1f783 libnetconf2-1.1.3.tar.gz -sha256 085122ea91161812dda9cd2f42d8c50ecc3a48cc1a4f15044d86cfc5aa887577 LICENSE +# Locally calculated +sha256 66139fc9e68aa89c82235f4135dba9e44f5db663541279c14c74131e22b7f571 libnetconf2-1.1.43.tar.gz +sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index bd25c69e0e..40fa935bb1 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 1.1.3 +LIBNETCONF2_VERSION = 1.1.43 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk index 8beefefb51..0a5a94be8f 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk @@ -11,5 +11,6 @@ LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl LIBNETFILTER_CONNTRACK_LICENSE = GPL-2.0+ LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING +LIBNETFILTER_CONNTRACK_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/package/libnetfilter_cthelper/libnetfilter_cthelper.mk b/package/libnetfilter_cthelper/libnetfilter_cthelper.mk index 61d6acd07c..d74ea4d0fd 100644 --- a/package/libnetfilter_cthelper/libnetfilter_cthelper.mk +++ b/package/libnetfilter_cthelper/libnetfilter_cthelper.mk @@ -12,5 +12,6 @@ LIBNETFILTER_CTHELPER_DEPENDENCIES = host-pkgconf libmnl LIBNETFILTER_CTHELPER_AUTORECONF = YES LIBNETFILTER_CTHELPER_LICENSE = GPL-2.0+ LIBNETFILTER_CTHELPER_LICENSE_FILES = COPYING +LIBNETFILTER_CTHELPER_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk index 9c4c951687..f5c5067b64 100644 --- a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk +++ b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk @@ -12,5 +12,6 @@ LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl LIBNETFILTER_CTTIMEOUT_AUTORECONF = YES LIBNETFILTER_CTTIMEOUT_LICENSE = GPL-2.0+ LIBNETFILTER_CTTIMEOUT_LICENSE_FILES = COPYING +LIBNETFILTER_CTTIMEOUT_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/package/libnetfilter_queue/libnetfilter_queue.hash b/package/libnetfilter_queue/libnetfilter_queue.hash index 1425d41b31..098205c9de 100644 --- a/package/libnetfilter_queue/libnetfilter_queue.hash +++ b/package/libnetfilter_queue/libnetfilter_queue.hash @@ -1,6 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_queue/libnetfilter_queue-1.0.3.tar.bz2.{md5sum,sha1sum} -md5 700ce0ae4784257ab5abe6fd1802f366 libnetfilter_queue-1.0.3.tar.bz2 -sha1 3d182e3211b633d0a0f8a2b12ef80dc2621f53cb libnetfilter_queue-1.0.2.tar.bz2 +# From http://netfilter.org/pub/libnetfilter_queue/libnetfilter_queue-1.0.5.tar.bz2.sha256sum +sha256 f9ff3c11305d6e03d81405957bdc11aea18e0d315c3e3f48da53a24ba251b9f5 libnetfilter_queue-1.0.5.tar.bz2 # Hash for license file: -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_queue/libnetfilter_queue.mk b/package/libnetfilter_queue/libnetfilter_queue.mk index 302f9a2575..6cd35baea1 100644 --- a/package/libnetfilter_queue/libnetfilter_queue.mk +++ b/package/libnetfilter_queue/libnetfilter_queue.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_QUEUE_VERSION = 1.0.3 +LIBNETFILTER_QUEUE_VERSION = 1.0.5 LIBNETFILTER_QUEUE_SOURCE = libnetfilter_queue-$(LIBNETFILTER_QUEUE_VERSION).tar.bz2 LIBNETFILTER_QUEUE_SITE = http://www.netfilter.org/projects/libnetfilter_queue/files LIBNETFILTER_QUEUE_INSTALL_STAGING = YES @@ -12,5 +12,6 @@ LIBNETFILTER_QUEUE_DEPENDENCIES = host-pkgconf libnfnetlink libmnl LIBNETFILTER_QUEUE_AUTORECONF = YES LIBNETFILTER_QUEUE_LICENSE = GPL-2.0+ LIBNETFILTER_QUEUE_LICENSE_FILES = COPYING +LIBNETFILTER_QUEUE_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/package/libnfc/Config.in b/package/libnfc/Config.in index 14084dc889..ead61e4529 100644 --- a/package/libnfc/Config.in +++ b/package/libnfc/Config.in @@ -24,13 +24,15 @@ comment "acr122_pcsc driver needs a toolchain w/ threads, dynamic library" config BR2_PACKAGE_LIBNFC_ACR122_USB bool "acr122_usb driver" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help support for acr122_usb driver -comment "acr122_usb driver needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "acr122_usb driver needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_LIBNFC_ACR122S bool "acr122s driver" @@ -62,13 +64,15 @@ config BR2_PACKAGE_LIBNFC_PN53X_USB bool "pn53x_usb driver" default y depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help support for pn53x_usb driver -comment "pn53x_usb driver needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "pn53x_usb driver needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_LIBNFC_EXAMPLES bool "build libnfc examples" diff --git a/package/libnfc/libnfc.hash b/package/libnfc/libnfc.hash index 32decf2d03..8a346cbfc7 100644 --- a/package/libnfc/libnfc.hash +++ b/package/libnfc/libnfc.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072 libnfc-1.7.1.tar.bz2 -sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING +sha256 6d9ad31c86408711f0a60f05b1933101c7497683c2e0d8917d1611a3feba3dd5 libnfc-1.8.0.tar.bz2 +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk index ca8700484b..1971563334 100644 --- a/package/libnfc/libnfc.mk +++ b/package/libnfc/libnfc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFC_VERSION = 1.7.1 +LIBNFC_VERSION = 1.8.0 LIBNFC_SOURCE = libnfc-$(LIBNFC_VERSION).tar.bz2 LIBNFC_SITE = https://github.com/nfc-tools/libnfc/releases/download/libnfc-$(LIBNFC_VERSION) LIBNFC_LICENSE = LGPL-3.0+ diff --git a/package/libnfnetlink/libnfnetlink.mk b/package/libnfnetlink/libnfnetlink.mk index 13f5d72c87..a5ad47b85e 100644 --- a/package/libnfnetlink/libnfnetlink.mk +++ b/package/libnfnetlink/libnfnetlink.mk @@ -11,5 +11,6 @@ LIBNFNETLINK_AUTORECONF = YES LIBNFNETLINK_INSTALL_STAGING = YES LIBNFNETLINK_LICENSE = GPL-2.0 LIBNFNETLINK_LICENSE_FILES = COPYING +LIBNFNETLINK_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 4d2eb0ef08..f22b02af09 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 66de4d05227c0a1a731c369b193010d18a05b1185c2735211e0ecf658eeb14f3 libnftnl-1.1.5.tar.bz2 -sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING +sha256 20dbc13f11004aea2c9e479cfb90359cb11fe3446c3140811c18e4ec1648ed8f libnftnl-1.1.7.tar.bz2 +sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index ac780bd8d3..f4487bdebe 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.1.5 +LIBNFTNL_VERSION = 1.1.7 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 LIBNFTNL_LICENSE = GPL-2.0+ diff --git a/package/libnice/libnice.hash b/package/libnice/libnice.hash index 61be9517e3..55785cd5ff 100644 --- a/package/libnice/libnice.hash +++ b/package/libnice/libnice.hash @@ -1,7 +1,7 @@ # Locally computed after checking pgp signature -sha256 06b678066f94dde595a4291588ed27acd085ee73775b8c4e8399e28c01eeefdf libnice-0.1.16.tar.gz +sha256 5eabd25ba2b54e817699832826269241abaa1cf78f9b240d1435f936569273f4 libnice-0.1.18.tar.gz # Hash for license files: -sha256 9246b2ee8b1db30cf03d5d9719ad8bb5edce1cadc85f8cfef319c23d24d950b5 COPYING -sha256 3b3c75ae6c663c4f93987647eb5463d33dc1602a1aded3ac479773f2c3928e3a COPYING.MPL -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LGPL +sha256 9246b2ee8b1db30cf03d5d9719ad8bb5edce1cadc85f8cfef319c23d24d950b5 COPYING +sha256 3b3c75ae6c663c4f93987647eb5463d33dc1602a1aded3ac479773f2c3928e3a COPYING.MPL +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LGPL diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk index 8cbf003529..5889b24ba2 100644 --- a/package/libnice/libnice.mk +++ b/package/libnice/libnice.mk @@ -4,29 +4,36 @@ # ################################################################################ -LIBNICE_VERSION = 0.1.16 +LIBNICE_VERSION = 0.1.18 LIBNICE_SITE = http://nice.freedesktop.org/releases LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL LIBNICE_DEPENDENCIES = libglib2 host-pkgconf LIBNICE_INSTALL_STAGING = YES -LIBNICE_CONF_OPTS = --without-gstreamer-0.10 +LIBNICE_CONF_OPTS = \ + -Dexamples=disabled \ + -Dtests=disabled ifeq ($(BR2_PACKAGE_GNUTLS),y) -LIBNICE_CONF_OPTS += --with-crypto-library=gnutls +LIBNICE_CONF_OPTS += -Dcrypto-library=gnutls LIBNICE_DEPENDENCIES += gnutls else -LIBNICE_CONF_OPTS += \ - --with-crypto-library=openssl \ - --with-openssl=$(STAGING_DIR)/usr +LIBNICE_CONF_OPTS += -Dcrypto-library=openssl LIBNICE_DEPENDENCIES += openssl endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) -LIBNICE_CONF_OPTS += --with-gstreamer -LIBNICE_DEPENDENCIES += gst1-plugins-base +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBNICE_CONF_OPTS += -Dintrospection=enabled +LIBNICE_DEPENDENCIES += gobject-introspection else -LIBNICE_CONF_OPTS += --without-gstreamer +LIBNICE_CONF_OPTS += -Dintrospection=disabled endif -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) +LIBNICE_CONF_OPTS += -Dgstreamer=enabled +LIBNICE_DEPENDENCIES += gst1-plugins-base +else +LIBNICE_CONF_OPTS += -Dgstreamer=disabled +endif + +$(eval $(meson-package)) diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index 795dfc2316..fc9398b29a 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -8,6 +8,8 @@ LIBNL_VERSION = 3.5.0 LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION)) LIBNL_LICENSE = LGPL-2.1+ LIBNL_LICENSE_FILES = COPYING +LIBNL_CPE_ID_VENDOR = libnl_project + LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison host-flex host-pkgconf diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash index cdbf6ce69d..13d3958735 100644 --- a/package/libnspr/libnspr.hash +++ b/package/libnspr/libnspr.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/nspr/releases/v4.25/src/SHA256SUMS -sha256 0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256 nspr-4.25.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.32/src/SHA256SUMS +sha256 bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c nspr-4.32.tar.gz # Locally calculated -sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index 857052d8c7..58a3338c60 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.25 +LIBNSPR_VERSION = 4.32 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src LIBNSPR_SUBDIR = nspr diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 7f496311f4..b8c58e3425 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_51_RTM/src/SHA256SUMS -sha256 75348b3b3229362486c57a880db917da1f96ef4eb639dc9cc2ff17d72268459c nss-3.51.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_68_RTM/src/SHA256SUMS +sha256 c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b nss-3.68.tar.gz # Locally calculated -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 3b12e8c41d..0db543e34b 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.51 +LIBNSS_VERSION = 3.68 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist @@ -105,6 +105,8 @@ define LIBNSS_INSTALL_TARGET_CMDS $(@D)/$(LIBNSS_DISTDIR)/lib/*.a $(INSTALL) -D -m 0644 $(TOPDIR)/package/libnss/nss.pc.in \ $(TARGET_DIR)/usr/lib/pkgconfig/nss.pc + $(INSTALL) -D -m 755 $(@D)/$(LIBNSS_DISTDIR)/bin/certutil \ + $(TARGET_DIR)/usr/bin/certutil $(SED) 's/@VERSION@/$(LIBNSS_VERSION)/g;' \ $(TARGET_DIR)/usr/lib/pkgconfig/nss.pc endef diff --git a/package/libogg/Config.in b/package/libogg/Config.in index bf719ff4d7..48c62063c2 100644 --- a/package/libogg/Config.in +++ b/package/libogg/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LIBOGG with all Xiph.org technology is it an open format free for anyone to use. - http://xiph.org/ogg/ + https://xiph.org/ogg/ diff --git a/package/libogg/libogg.hash b/package/libogg/libogg.hash index 5d95c85d3a..9727c1cfaa 100644 --- a/package/libogg/libogg.hash +++ b/package/libogg/libogg.hash @@ -1,7 +1,5 @@ -# From: http://www.xiph.org/downloads/ -md5 eadef24aad6e3e8379ba0d14971fd64a libogg-1.3.4.tar.xz -sha1 f07499a35566aa62affb5ca989f62eed5b8092c3 libogg-1.3.4.tar.xz -sha256 c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe libogg-1.3.4.tar.xz +# From https://www.xiph.org/downloads/ +sha256 c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705 libogg-1.3.5.tar.xz # Hash for license file: -sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING +sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk index 08e5f87b72..49f9c7b6ac 100644 --- a/package/libogg/libogg.mk +++ b/package/libogg/libogg.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOGG_VERSION = 1.3.4 +LIBOGG_VERSION = 1.3.5 LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.xz LIBOGG_SITE = http://downloads.xiph.org/releases/ogg LIBOGG_LICENSE = BSD-3-Clause diff --git a/package/libolm/libolm.hash b/package/libolm/libolm.hash index 613dda3544..c080c7eaf3 100644 --- a/package/libolm/libolm.hash +++ b/package/libolm/libolm.hash @@ -1,3 +1,3 @@ # locally computed -sha256 1ca9926ce71d778fb7352d1ee77513194db8c7f49c0d69d38ac49ec3bafcea38 olm-3.1.4.tar.gz -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE +sha256 d947d9570345e68696668cb855f1a6a7141b7b89cbcc15a08b1fae18535c4c45 olm-3.2.1.tar.gz +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk index 78ee05b3c2..034b3449d9 100644 --- a/package/libolm/libolm.mk +++ b/package/libolm/libolm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOLM_VERSION = 3.1.4 +LIBOLM_VERSION = 3.2.1 LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index fdb03d2f77..0689ab961f 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 73c35f80cc487560d11ecabb6d31ad828bd2f59d412f9cd726cc26bfaf4561fd libopenh264-2.0.0.tar.gz -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE +sha256 af173e90fce65f80722fa894e1af0d6b07572292e76de7b65273df4c0a8be678 libopenh264-2.1.1.tar.gz +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index 307dbc589f..0c17579979 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,10 +4,12 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.0.0 +LIBOPENH264_VERSION = 2.1.1 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE +LIBOPENH264_CPE_ID_VENDOR = cisco +LIBOPENH264_CPE_ID_PRODUCT = openh264 LIBOPENH264_INSTALL_STAGING = YES ifeq ($(BR2_aarch64),y) diff --git a/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch b/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch index f20b6f0834..6527bc23a1 100644 --- a/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +++ b/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch @@ -9,6 +9,8 @@ Signed-off-by: Ryan Barnett [rebased on openssl-1.1.0h] Signed-off-by: Peter Seiderer +[rebased on openssl-1.1.1i] +Signed-off-by: Bernd Kuhls --- Configurations/unix-Makefile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -17,7 +19,7 @@ diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tm index 40cf2c3..777d9ca 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl -@@ -268,7 +268,7 @@ list-tests: +@@ -491,7 +491,7 @@ list-tests: @echo "Tests are not supported with your chosen Configure options" @ : {- output_on() if !$disabled{tests}; "" -} diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index 881518d1cb..fcead4c11a 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -14,10 +14,6 @@ config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH_LINUX_PPC config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH string - # Use "gcc" minimalistic target to disable DSO - # no-asm is needed with generic architectures such as gcc, see - # https://github.com/openssl/openssl/issues/9839 - default "gcc no-asm" if BR2_STATIC_LIBS # Doesn't work for thumb-only (Cortex-M?) default "linux-armv4" if BR2_ARM_CPU_HAS_ARM default "linux-aarch64" if BR2_aarch64 @@ -29,7 +25,7 @@ config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH # no-asm is needed with generic architectures such as # linux-generic{32,64}, see # https://github.com/openssl/openssl/issues/9839 - default "linux-generic64 no-asm" if BR2_ARCH_IS_64 + default "linux-generic64 no-asm" if BR2_ARCH_IS_64 && !BR2_MIPS_NABI32 default "linux-generic32 no-asm" config BR2_PACKAGE_LIBOPENSSL_BIN @@ -44,4 +40,99 @@ config BR2_PACKAGE_LIBOPENSSL_ENGINES help Install additional encryption engine libraries. +config BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA + bool "enable CHACHA" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 + bool "enable RC5" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2 + bool "enable RC2" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 + bool "enable RC4" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_MD2 + bool "enable MD2" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 + bool "enable MD4" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2 + bool "enable MDC2" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 + bool "enable BLAKE2" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_IDEA + bool "enable IDEA" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_SEED + bool "enable SEED" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_DES + bool "enable DES" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 + bool "enable RMD160" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_WHIRLPOOL + bool "enable WHIRLPOOL" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH + bool "enable BLOWFISH" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL + bool "enable SSL" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL2 + bool "enable SSL2" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL3 + bool "enable SSL3" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_WEAK_SSL + bool "enable WEAK_SSL" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK + bool "enable mode PSK" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST + bool "enable mode CAST" + default y + +config BR2_PACKAGE_LIBOPENSSL_UNSECURE + bool "enable unit test, debug, backtrace" + default y + help + Enable unit-test crypto-mdebug-backtrace + crypto-mdebug autoerrinit mode. + +config BR2_PACKAGE_LIBOPENSSL_DYNAMIC_ENGINE + bool "enable dynamic engine" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_COMP + bool "enable compression" + default y + endif # BR2_PACKAGE_LIBOPENSSL diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 3becd790ac..93c688d9dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1d.tar.gz.sha256 -sha256 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 openssl-1.1.1f.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1l.tar.gz.sha256 +sha256 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz # License files -sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE +sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 4639c63fac..f139213315 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1f +LIBOPENSSL_VERSION = 1.1.1l LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay @@ -15,6 +15,8 @@ HOST_LIBOPENSSL_DEPENDENCIES = host-zlib LIBOPENSSL_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH)) LIBOPENSSL_CFLAGS = $(TARGET_CFLAGS) LIBOPENSSL_PROVIDES = openssl +LIBOPENSSL_CPE_ID_VENDOR = $(LIBOPENSSL_PROVIDES) +LIBOPENSSL_CPE_ID_PRODUCT = $(LIBOPENSSL_PROVIDES) ifeq ($(BR2_m68k_cf),y) # relocation truncated to fit: R_68K_GOT16O @@ -23,10 +25,6 @@ LIBOPENSSL_CFLAGS += -mxgot LIBOPENSSL_CFLAGS += -DOPENSSL_SMALL_FOOTPRINT endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBOPENSSL_CFLAGS += -DOPENSSL_THREADS -endif - ifeq ($(BR2_USE_MMU),) LIBOPENSSL_CFLAGS += -DHAVE_FORK=0 -DOPENSSL_NO_MADVISE endif @@ -65,7 +63,7 @@ define HOST_LIBOPENSSL_CONFIGURE_CMDS shared \ zlib-dynamic \ ) - $(SED) "s#-O[0-9s]#$(HOST_CFLAGS)#" $(@D)/Makefile + $(SED) "s#-O[0-9sg]#$(HOST_CFLAGS)#" $(@D)/Makefile endef define LIBOPENSSL_CONFIGURE_CMDS @@ -77,7 +75,7 @@ define LIBOPENSSL_CONFIGURE_CMDS --prefix=/usr \ --openssldir=/etc/ssl \ $(if $(BR2_TOOLCHAIN_HAS_LIBATOMIC),-latomic) \ - $(if $(BR2_TOOLCHAIN_HAS_THREADS),-lpthread threads, no-threads) \ + $(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \ $(if $(BR2_STATIC_LIBS),no-shared,shared) \ $(if $(BR2_PACKAGE_HAS_CRYPTODEV),enable-devcryptoeng) \ no-rc5 \ @@ -86,13 +84,45 @@ define LIBOPENSSL_CONFIGURE_CMDS no-tests \ no-fuzz-libfuzzer \ no-fuzz-afl \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5),,no-rc5) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD2),,no-md2) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4),,no-md4) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2),,no-mdc2) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2),,no-blake2) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_IDEA),,no-idea) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_SEED),,no-seed) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_DES),,no-des) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160),,no-rmd160) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_WHIRLPOOL),,no-whirlpool) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH),,no-bf) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL),,no-ssl) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL2),,no-ssl2) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL3),,no-ssl3) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_WEAK_SSL),,no-weak-ssl-ciphers) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK),,no-psk) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST),,no-cast) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_UNSECURE),,no-unit-test no-crypto-mdebug-backtrace no-crypto-mdebug no-autoerrinit) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_DYNAMIC_ENGINE),,no-dynamic-engine ) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_COMP),,no-comp) \ $(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \ + $(if $(BR2_STATIC_LIBS),no-dso) \ ) $(SED) "s#-march=[-a-z0-9] ##" -e "s#-mcpu=[-a-z0-9] ##g" $(@D)/Makefile - $(SED) "s#-O[0-9s]#$(LIBOPENSSL_CFLAGS)#" $(@D)/Makefile + $(SED) "s#-O[0-9sg]#$(LIBOPENSSL_CFLAGS)#" $(@D)/Makefile $(SED) "s# build_tests##" $(@D)/Makefile endef +# libdl is not available in a static build, and this is not implied by no-dso +ifeq ($(BR2_STATIC_LIBS),y) +define LIBOPENSSL_FIXUP_STATIC_MAKEFILE + $(SED) 's#-ldl##g' $(@D)/Makefile +endef +LIBOPENSSL_POST_CONFIGURE_HOOKS += LIBOPENSSL_FIXUP_STATIC_MAKEFILE +endif + define HOST_LIBOPENSSL_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) endef @@ -115,6 +145,16 @@ define LIBOPENSSL_INSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/usr/bin/c_rehash endef +# libdl has no business in a static build +ifeq ($(BR2_STATIC_LIBS),y) +define LIBOPENSSL_FIXUP_STATIC_PKGCONFIG + $(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libcrypto.pc + $(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libssl.pc + $(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/openssl.pc +endef +LIBOPENSSL_POST_INSTALL_STAGING_HOOKS += LIBOPENSSL_FIXUP_STATIC_PKGCONFIG +endif + ifeq ($(BR2_PACKAGE_PERL),) define LIBOPENSSL_REMOVE_PERL_SCRIPTS $(RM) -f $(TARGET_DIR)/etc/ssl/misc/{CA.pl,tsget} diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk index 4aa3e30ee8..a4541cb3bf 100644 --- a/package/liboping/liboping.mk +++ b/package/liboping/liboping.mk @@ -11,6 +11,7 @@ LIBOPING_INSTALL_STAGING = YES LIBOPING_CONF_OPTS = --without-perl-bindings LIBOPING_LICENSE = LGPL-2.1+, GPL-2.0 LIBOPING_LICENSE_FILES = COPYING +LIBOPING_CPE_ID_VENDOR = noping ifeq ($(BR2_PACKAGE_NCURSES),y) LIBOPING_DEPENDENCIES += ncurses diff --git a/package/libosip2/libosip2.hash b/package/libosip2/libosip2.hash index 76bc29d5fe..400158cd7f 100644 --- a/package/libosip2/libosip2.hash +++ b/package/libosip2/libosip2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 61bb28317221a630e47f65389d5ff3e4693996d3128e9e0d5d1399e4feebf64d libosip2-5.1.1.tar.gz +sha256 4fb48b2ea568bb41c6244b0df2bb7175849ca93e84be53ceb268fdf9351bb375 libosip2-5.2.0.tar.gz # Hash for license file: -sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING +sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk index e608f671c8..b86a72479e 100644 --- a/package/libosip2/libosip2.mk +++ b/package/libosip2/libosip2.mk @@ -4,11 +4,13 @@ # ################################################################################ -LIBOSIP2_VERSION = 5.1.1 +LIBOSIP2_VERSION = 5.2.0 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip LIBOSIP2_INSTALL_STAGING = YES LIBOSIP2_LICENSE = LGPL-2.1+ LIBOSIP2_LICENSE_FILES = COPYING +LIBOSIP2_CPE_ID_VENDOR = gnu +LIBOSIP2_CPE_ID_PRODUCT = osip ifeq ($(BR2_arc),y) # toolchain __arc__ define conflicts with libosip2 source diff --git a/package/libostree/Config.in b/package/libostree/Config.in index 4a6ab5464f..14ae4da4c8 100644 --- a/package/libostree/Config.in +++ b/package/libostree/Config.in @@ -1,14 +1,12 @@ config BR2_PACKAGE_LIBOSTREE bool "libostree" depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme, libgpg-error - depends on !BR2_STATIC_LIBS # libfuse depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 - depends on BR2_USE_MMU # e2fsprogs, libfuse, libglib2, libgpgme + depends on BR2_USE_MMU # e2fsprogs, libglib2, libgpgme # doesn't build with musl due to lack of TEMP_FAILURE_RETRY() depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_E2FSPROGS - select BR2_PACKAGE_LIBFUSE select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBGPGME diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 2ebc560d83..928e4fbe1b 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5877396ea092f5b6701c17bd20280746cad20f55a94c760dbeba0fa115818c05 libostree-2020.3.tar.xz +sha256 0fa5a39f0c3e58c2040133e4229cb28660c61b978cd4a2a3d2f6e97ef4c8d0b3 libostree-2021.3.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 57d9e98d72..94ea08664a 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,13 +4,13 @@ # ################################################################################ -LIBOSTREE_VERSION = 2020.3 +LIBOSTREE_VERSION = 2021.3 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) LIBOSTREE_LICENSE = LGPL-2.0+ LIBOSTREE_LICENSE_FILES = COPYING -LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpg-error libgpgme xz +LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libglib2 libgpg-error libgpgme xz LIBOSTREE_INSTALL_STAGING = YES LIBOSTREE_CONF_ENV = \ @@ -69,6 +69,13 @@ else LIBOSTREE_CONF_OPTS += --without-libarchive endif +ifeq ($(BR2_PACKAGE_LIBFUSE),y) +LIBOSTREE_CONF_OPTS += --enable-rofiles-fuse +LIBOSTREE_DEPENDENCIES += libfuse +else +LIBOSTREE_CONF_OPTS += --disable-rofiles-fuse +endif + ifeq ($(BR2_PACKAGE_LIBSELINUX),y) LIBOSTREE_CONF_OPTS += --with-selinux LIBOSTREE_DEPENDENCIES += libselinux diff --git a/package/libp11/libp11.hash b/package/libp11/libp11.hash index bba5c770a2..52d73d4206 100644 --- a/package/libp11/libp11.hash +++ b/package/libp11/libp11.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 639ea43c3341e267214b712e1e5e12397fd2d350899e673dd1220f3c6b8e3db4 libp11-0.4.10.tar.gz -sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING +sha256 57d47a12a76fd92664ae30032cf969284ebac1dfc25bf824999d74b016d51366 libp11-0.4.11.tar.gz +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING diff --git a/package/libp11/libp11.mk b/package/libp11/libp11.mk index 90c582571e..45a718ee99 100644 --- a/package/libp11/libp11.mk +++ b/package/libp11/libp11.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBP11_VERSION = 0.4.10 +LIBP11_VERSION = 0.4.11 LIBP11_SITE = https://github.com/OpenSC/libp11/releases/download/libp11-$(LIBP11_VERSION) LIBP11_DEPENDENCIES = openssl host-pkgconf LIBP11_INSTALL_STAGING = YES diff --git a/package/libpam-tacplus/libpam-tacplus.hash b/package/libpam-tacplus/libpam-tacplus.hash index b1cd053f12..084a3e54a4 100644 --- a/package/libpam-tacplus/libpam-tacplus.hash +++ b/package/libpam-tacplus/libpam-tacplus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 82f204b949b2a55d0711b314c6e3b213bd1c0c1ee0d9ba15680570db22bff2d8 libpam-tacplus-1.5.1.tar.gz -sha256 b2b961f07e97c4fb78074276da304ea36b85dc299aae5efb79080cedaea3d5ac COPYING +sha256 73961800dc0d5e422751ad4c9f09b1863ab33e381e0bdb2a1d0343dcfc30e44e libpam-tacplus-1.6.1.tar.gz +sha256 b2b961f07e97c4fb78074276da304ea36b85dc299aae5efb79080cedaea3d5ac COPYING diff --git a/package/libpam-tacplus/libpam-tacplus.mk b/package/libpam-tacplus/libpam-tacplus.mk index fd2b4f9a30..ff0dce9c0b 100644 --- a/package/libpam-tacplus/libpam-tacplus.mk +++ b/package/libpam-tacplus/libpam-tacplus.mk @@ -4,17 +4,21 @@ # ################################################################################ -LIBPAM_TACPLUS_VERSION = 1.5.1 +LIBPAM_TACPLUS_VERSION = 1.6.1 LIBPAM_TACPLUS_SITE = $(call github,jeroennijhof,pam_tacplus,v$(LIBPAM_TACPLUS_VERSION)) LIBPAM_TACPLUS_LICENSE = GPL-2.0+ LIBPAM_TACPLUS_LICENSE_FILES = COPYING +LIBPAM_TACPLUS_CPE_ID_VENDOR = pam_tacplus_project +LIBPAM_TACPLUS_CPE_ID_PRODUCT = pam_tacplus LIBPAM_TACPLUS_DEPENDENCIES = \ linux-pam \ $(if $(BR2_PACKAGE_OPENSSL),openssl) # Fetching from github, we need to generate the configure script +# 0001-Add-an-option-to-disable-Werror.patch LIBPAM_TACPLUS_AUTORECONF = YES LIBPAM_TACPLUS_INSTALL_STAGING = YES LIBPAM_TACPLUS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) +LIBPAM_TACPLUS_CONF_OPTS = --disable-werror $(eval $(autotools-package)) diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash index a24fba24de..84c8e405df 100644 --- a/package/libpcap/libpcap.hash +++ b/package/libpcap/libpcap.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature -sha256 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094 libpcap-1.9.1.tar.gz +# https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz.sig +sha256 ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4 libpcap-1.10.1.tar.gz # Hash for license file: -sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE +sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 881a109a0a..1e02ec56e0 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,18 +4,23 @@ # ################################################################################ -LIBPCAP_VERSION = 1.9.1 -LIBPCAP_SITE = http://www.tcpdump.org/release +LIBPCAP_VERSION = 1.10.1 +LIBPCAP_SITE = https://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE +LIBPCAP_CPE_ID_VENDOR = tcpdump LIBPCAP_INSTALL_STAGING = YES -LIBPCAP_DEPENDENCIES = host-flex host-bison +LIBPCAP_DEPENDENCIES = host-flex host-bison host-pkgconf +# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test +# provided by autoconf relies on wchar_t. LIBPCAP_CONF_ENV = \ ac_cv_header_linux_wireless_h=yes \ + ac_cv_prog_cc_c99=-std=gnu99 \ CFLAGS="$(LIBPCAP_CFLAGS)" LIBPCAP_CFLAGS = $(TARGET_CFLAGS) -LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag +LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag \ + --without-dpdk # Disable dbus to break recursive dependencies LIBPCAP_CONF_OPTS += --disable-dbus LIBPCAP_CONFIG_SCRIPTS = pcap-config @@ -34,8 +39,7 @@ endif ifeq ($(BR2_PACKAGE_LIBNL),y) LIBPCAP_DEPENDENCIES += libnl -LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3" -LIBPCAP_CONF_OPTS += --with-libnl=$(STAGING_DIR)/usr +LIBPCAP_CONF_OPTS += --with-libnl else LIBPCAP_CONF_OPTS += --without-libnl endif diff --git a/package/libpfm4/libpfm4.hash b/package/libpfm4/libpfm4.hash index 2c1442dd11..bdc7806a7c 100644 --- a/package/libpfm4/libpfm4.hash +++ b/package/libpfm4/libpfm4.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/perfmon2/files/libpfm4/: -sha1 78599e1668142f48c24afb1f79ca00a89df51b65 libpfm-4.10.1.tar.gz -md5 d8f66cb9bfa7e1434434e0de6409db5b libpfm-4.10.1.tar.gz +sha1 112bced9a67d565ff0ce6c2bb90452516d1183e5 libpfm-4.11.0.tar.gz +md5 4811c1d99b95752b4ba53b89a9389ec3 libpfm-4.11.0.tar.gz # Locally calculated -sha256 c61c575378b5c17ccfc5806761e4038828610de76e2e34fac9f7fa73ba844b49 libpfm-4.10.1.tar.gz +sha256 5da5f8872bde14b3634c9688d980f68bda28b510268723cc12973eedbab9fecc libpfm-4.11.0.tar.gz sha256 beef323d68fc5db9c67b20e8e9de7ccde371d20cdbcdd686804055b18b926d90 COPYING diff --git a/package/libpfm4/libpfm4.mk b/package/libpfm4/libpfm4.mk index cc89d4422b..2144766d96 100644 --- a/package/libpfm4/libpfm4.mk +++ b/package/libpfm4/libpfm4.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPFM4_VERSION = 4.10.1 +LIBPFM4_VERSION = 4.11.0 LIBPFM4_SOURCE = libpfm-$(LIBPFM4_VERSION).tar.gz LIBPFM4_SITE = http://downloads.sourceforge.net/project/perfmon2/libpfm4 LIBPFM4_LICENSE = libpfm4 license @@ -14,7 +14,8 @@ LIBPFM4_INSTALL_STAGING = YES LIBPFM4_FLAGS = SYS=Linux ARCH=$(BR2_ARCH) \ CC="$(TARGET_CC)" LDCONFIG=true \ CONFIG_PFMLIB_SHARED=$(if $(BR2_STATIC_LIBS),n,y) \ - DBG= + DBG= \ + EXAMPLE_DIRS= define LIBPFM4_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) diff --git a/package/libphidget/Config.in b/package/libphidget/Config.in index 61e915481d..ab1e3e31b1 100644 --- a/package/libphidget/Config.in +++ b/package/libphidget/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBPHIDGET bool "libphidget" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBUSB help @@ -23,6 +24,6 @@ config BR2_PACKAGE_LIBPHIDGET http://phidgets.com/ -comment "libphidget needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_STATIC_LIBS +comment "libphidget needs a toolchain w/ threads, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index f0956d11ae..8feec9bcb2 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -12,6 +12,8 @@ LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING +LIBPJSIP_CPE_ID_VENDOR = pjsip +LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) diff --git a/package/libplatform/libplatform.hash b/package/libplatform/libplatform.hash index 09f9dadb19..283b435b7c 100644 --- a/package/libplatform/libplatform.hash +++ b/package/libplatform/libplatform.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 94dba139066a332d048486f817736e4cf4962393c9f892d2c7dd40d9d69ca788 libplatform-1eb12b1b1efa6747c1e190964854e9e267e3a1e2.tar.gz -sha256 80fc66febbb2393c9d518e3eefa4ad9aae15a9b6a84174c0e443ea79eeea5131 src/os.h +sha256 ebee46c76b86b40b703fa913465f5004fa3166eeb6a4794c58fc8a5c25702931 libplatform-a7cd0d5780ed80a4e70480d1650749f29e8a1fb2.tar.gz +sha256 80fc66febbb2393c9d518e3eefa4ad9aae15a9b6a84174c0e443ea79eeea5131 src/os.h diff --git a/package/libplatform/libplatform.mk b/package/libplatform/libplatform.mk index 0a4c492969..90192369fe 100644 --- a/package/libplatform/libplatform.mk +++ b/package/libplatform/libplatform.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPLATFORM_VERSION = 1eb12b1b1efa6747c1e190964854e9e267e3a1e2 +LIBPLATFORM_VERSION = a7cd0d5780ed80a4e70480d1650749f29e8a1fb2 LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION)) LIBPLATFORM_LICENSE = GPL-2.0+ LIBPLATFORM_LICENSE_FILES = src/os.h diff --git a/package/libplist/libplist.hash b/package/libplist/libplist.hash index 9934ad05eb..4dab755e5d 100644 --- a/package/libplist/libplist.hash +++ b/package/libplist/libplist.hash @@ -1,4 +1,3 @@ # Locally calculated -sha256 4b33f9af3f9208d54a3c3e1a8c149932513f451c98d1dd696fe42c06e30b7f03 libplist-2.1.0.tar.gz +sha256 4a5517e5377ec421df84c586ba85bb4e1d26f11ad203d7d450a907c0156fbd9a libplist-2.2.0.tar.bz2 sha256 7619c753cac95d4740220223bde48a032606fcaccde5e546f9bc444c81ab356d COPYING -sha256 7619c753cac95d4740220223bde48a032606fcaccde5e546f9bc444c81ab356d COPYING diff --git a/package/libplist/libplist.mk b/package/libplist/libplist.mk index d07fb5dd2e..e7cecb612d 100644 --- a/package/libplist/libplist.mk +++ b/package/libplist/libplist.mk @@ -4,13 +4,13 @@ # ################################################################################ -LIBPLIST_VERSION = 2.1.0 -LIBPLIST_SITE = $(call github,libimobiledevice,libplist,$(LIBPLIST_VERSION)) +LIBPLIST_VERSION = 2.2.0 +LIBPLIST_SOURCE = libplist-$(LIBPLIST_VERSION).tar.bz2 +LIBPLIST_SITE = https://github.com/libimobiledevice/libplist/releases/download/$(LIBPLIST_VERSION) LIBPLIST_INSTALL_STAGING = YES LIBPLIST_LICENSE = LGPL-2.1+ LIBPLIST_LICENSE_FILES = COPYING -# github tarball does not include configure -LIBPLIST_AUTORECONF = YES +LIBPLIST_CPE_ID_VENDOR = libimobiledevice # Disable building Python bindings, because it requires host-cython, which # is not packaged in Buildroot at all. diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 5c30a4f9ad..e4e629bbb5 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -10,12 +10,13 @@ LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) LIBPNG_LICENSE = Libpng-2.0 LIBPNG_LICENSE_FILES = LICENSE +LIBPNG_CPE_ID_VENDOR = libpng LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) LIBPNG_CONF_OPTS += --enable-arm-neon else LIBPNG_CONF_OPTS += --disable-arm-neon diff --git a/package/libpwquality/libpwquality.hash b/package/libpwquality/libpwquality.hash index b63501fa16..1469bc0b7a 100644 --- a/package/libpwquality/libpwquality.hash +++ b/package/libpwquality/libpwquality.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a97d72b5c56b7e279c6e86dad70c1493ea5796f00a596fb9f3173b96f9bf5e46 libpwquality-1.4.1.tar.bz2 -sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING +sha256 d43baf23dc6887fe8f8e9b75cabaabc5f4bbbaa0f9eff44278d276141752a545 libpwquality-1.4.4.tar.bz2 +sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index bddafd59ca..7c0c5df38e 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPWQUALITY_VERSION = 1.4.1 +LIBPWQUALITY_VERSION = 1.4.4 LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2 LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION) LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index ce96721153..0bfc63f4a4 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 0316badec92ff32f51fe6278e6046968d2272a26608995deedd8e4afb563918a libqmi-1.24.4.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 cbb890893de1dee06ea5ebdac2d22f0469314a6f93f15f61f2f1206a1c9ae5fd libqmi-1.28.6.tar.xz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index 7e89d4a1ae..7b1d76a0c1 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,17 +4,24 @@ # ################################################################################ -LIBQMI_VERSION = 1.24.4 +LIBQMI_VERSION = 1.28.6 LIBQMI_SITE = http://www.freedesktop.org/software/libqmi LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB +LIBQMI_CPE_ID_VENDOR = libqmi_project LIBQMI_INSTALL_STAGING = YES LIBQMI_DEPENDENCIES = libglib2 -# we don't want -Werror -LIBQMI_CONF_OPTS = --enable-more-warnings=no +LIBQMI_CONF_OPTS = --disable-Werror + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBQMI_DEPENDENCIES += gobject-introspection +LIBQMI_CONF_OPTS += --enable-introspection +else +LIBQMI_CONF_OPTS += --disable-introspection +endif # if libgudev available, request udev support for a better # qmi-firmware-update experience @@ -33,6 +40,14 @@ else LIBQMI_CONF_OPTS += --disable-mbim-qmux endif +# if libqrtr-glib available, enable support for QMI over QRTR +ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y) +LIBQMI_DEPENDENCIES += libqrtr-glib +LIBQMI_CONF_OPTS += --enable-qrtr +else +LIBQMI_CONF_OPTS += --disable-qrtr +endif + # if ModemManager available, enable MM runtime check in # qmi-firmware-update (note that we don't need to build-depend on # anything else) diff --git a/package/libqrencode/libqrencode.hash b/package/libqrencode/libqrencode.hash index d8584c8ac7..ffcc537379 100644 --- a/package/libqrencode/libqrencode.hash +++ b/package/libqrencode/libqrencode.hash @@ -1,5 +1,5 @@ -# From http://fukuchi.org/works/qrencode/qrencode-4.0.2.tar.gz.sha -sha512 c3e3834574ec059a4b571427b29d6f5f26bd806fd7498b9bba778f4eceab6ebe5733eef0f3c4f6af91eb3f2e9310f93f6d7b337c28e85c72db7e59bd79be77a9 qrencode-4.0.2.tar.gz +# From http://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.gz.sha +sha512 209bb656ae3f391b03c7b3ceb03e34f7320b0105babf48b619e7a299528b8828449e0e7696f0b5db0d99170a81709d0518e34835229a748701e7df784e58a9ce qrencode-4.1.1.tar.gz # Hash for license file: -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/libqrencode/libqrencode.mk b/package/libqrencode/libqrencode.mk index 669c4193bd..0062a96a39 100644 --- a/package/libqrencode/libqrencode.mk +++ b/package/libqrencode/libqrencode.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQRENCODE_VERSION = 4.0.2 +LIBQRENCODE_VERSION = 4.1.1 LIBQRENCODE_SOURCE = qrencode-$(LIBQRENCODE_VERSION).tar.gz LIBQRENCODE_SITE = http://fukuchi.org/works/qrencode LIBQRENCODE_DEPENDENCIES = host-pkgconf diff --git a/package/libraw/Config.in b/package/libraw/Config.in index de763cd36a..631123c2d3 100644 --- a/package/libraw/Config.in +++ b/package/libraw/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBRAW bool "libraw" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_INSTALL_LIBSTDCPP help libraw is a raw image manipulation library @@ -7,4 +8,5 @@ config BR2_PACKAGE_LIBRAW http://www.libraw.org/ comment "libraw needs a toolchain w/ C++" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/libraw/libraw.hash b/package/libraw/libraw.hash index 3337396f5f..f2a01c277b 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5 LibRaw-0.19.5.tar.gz -sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL -sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL -sha256 ed971b7f1f57fd8e7d28419ff7749cfe0f296e701687756e798a69555fd76646 README.md +sha256 dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6 LibRaw-0.20.2.tar.gz +sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL +sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL +sha256 313415f7f48f6cd3cc78856626aab4bbe97dbb1e9a11db9c25396ca8d0e76cd9 README.md diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index 9a647f8d54..fc02c7915f 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,18 +4,19 @@ # ################################################################################ -LIBRAW_VERSION = 0.19.5 +LIBRAW_VERSION = 0.20.2 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES LIBRAW_CONF_OPTS += \ --disable-examples \ - --disable-openmp \ - --disable-demosaic-pack-gpl2 \ - --disable-demosaic-pack-gpl3 + --disable-openmp LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README.md +LIBRAW_CPE_ID_VENDOR = libraw LIBRAW_DEPENDENCIES = host-pkgconf +# https://github.com/LibRaw/LibRaw/issues/353 +LIBRAW_AUTORECONF = YES LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" @@ -43,4 +44,11 @@ else LIBRAW_CONF_OPTS += --disable-lcms endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBRAW_CONF_OPTS += --enable-zlib +LIBRAW_DEPENDENCIES += zlib +else +LIBRAW_CONF_OPTS += --disable-zlib +endif + $(eval $(autotools-package)) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index fcecc2b434..d046e89518 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 df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e libressl-3.0.2.tar.gz +sha256 0a51393f0df1cf27e070054a2788a4d073339f363d79cd594076a1b4c48be9a5 libressl-3.3.5.tar.gz # Locally computed -sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING +sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index c2491bb3a9..268ded69af 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,11 +4,13 @@ # ################################################################################ -LIBRESSL_VERSION = 3.0.2 +LIBRESSL_VERSION = 3.3.5 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING +LIBRESSL_CPE_ID_VENDOR = openbsd LIBRESSL_INSTALL_STAGING = YES +LIBRESSL_CONF_OPTS = -DOPENSSLDIR="/etc/ssl" ifeq ($(BR2_PACKAGE_LIBRESSL_BIN),) define LIBRESSL_REMOVE_BIN diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 735bf61259..3272ecd773 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBRSVG bool "librsvg" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 @@ -8,8 +9,9 @@ config BR2_PACKAGE_LIBRSVG depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_SCRIPT select BR2_PACKAGE_GDK_PIXBUF - select BR2_PACKAGE_LIBCROCO + select BR2_PACKAGE_HOST_RUSTC select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PANGO @@ -20,6 +22,7 @@ config BR2_PACKAGE_LIBRSVG https://wiki.gnome.org/Projects/LibRsvg comment "librsvg needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/librsvg/librsvg.hash b/package/librsvg/librsvg.hash index 366d9b0db6..8b32c6581e 100644 --- a/package/librsvg/librsvg.hash +++ b/package/librsvg/librsvg.hash @@ -1,4 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/librsvg-2.40.20.sha256sum -sha256 cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b librsvg-2.40.20.tar.xz +# From https://ftp.gnome.org/pub/gnome/sources/librsvg/2.50/librsvg-2.50.7.sha256sum +sha256 fffb61b08cd5282aaae147a02b305166a7426fad22a8b9427708f0f2fc426ebc librsvg-2.50.7.tar.xz + # Locally computed -sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index 470910d94c..e4b1942b79 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -4,20 +4,29 @@ # ################################################################################ -LIBRSVG_VERSION_MAJOR = 2.40 -LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).20 +LIBRSVG_VERSION_MAJOR = 2.50 +LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).7 LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR) LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz LIBRSVG_INSTALL_STAGING = YES -LIBRSVG_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) -LIBRSVG_CONF_OPTS = --disable-pixbuf-loader --disable-tools --enable-introspection=no +LIBRSVG_CONF_ENV = \ + LIBS=$(TARGET_NLS_LIBS) \ + RUST_TARGET=$(RUSTC_TARGET_NAME) +LIBRSVG_CONF_OPTS = --disable-pixbuf-loader --disable-tools HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no -LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \ - $(if $(BR2_PACKAGE_LIBGTK3),libgtk3) \ +LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf host-rustc libglib2 libxml2 pango \ $(TARGET_NLS_DEPENDENCIES) -HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libcroco host-libglib2 host-libxml2 host-pango -LIBRSVG_LICENSE = LGPL-2.0+ +HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml2 host-pango host-rustc +LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB +LIBRSVG_CPE_ID_VENDOR = gnome + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBRSVG_CONF_OPTS += --enable-introspection +LIBRSVG_DEPENDENCIES += gobject-introspection +else +LIBRSVG_CONF_OPTS += --disable-introspection +endif $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/librsync/librsync.hash b/package/librsync/librsync.hash index d00e5cd337..c8ca61e516 100644 --- a/package/librsync/librsync.hash +++ b/package/librsync/librsync.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b5ab8e2092b82b7d7bb9c1dd52e6a77083a89f8ad9b9309da611f490d0b49a71 librsync-2.2.1.tar.gz -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING +sha256 ef8ce23df38d5076d25510baa2cabedffbe0af460d887d86c2413a1c2b0c676f librsync-2.3.2.tar.gz +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk index bf0785b427..97f5c607b0 100644 --- a/package/librsync/librsync.mk +++ b/package/librsync/librsync.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBRSYNC_VERSION = 2.2.1 -LIBRSYNC_SITE = $(call github,librsync,librsync,v$(LIBRSYNC_VERSION)) +LIBRSYNC_VERSION = 2.3.2 +LIBRSYNC_SITE = https://github.com/librsync/librsync/releases/download/v$(LIBRSYNC_VERSION) LIBRSYNC_LICENSE = LGPL-2.1+ LIBRSYNC_LICENSE_FILES = COPYING +LIBRSYNC_CPE_ID_VENDOR = librsync_project LIBRSYNC_INSTALL_STAGING = YES LIBRSYNC_DEPENDENCIES = host-pkgconf zlib bzip2 popt diff --git a/package/librtas/librtas.hash b/package/librtas/librtas.hash index 086d0d7cbc..de0c0a476c 100644 --- a/package/librtas/librtas.hash +++ b/package/librtas/librtas.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a79fd9cdb2f03e7401027fb80a07f14e29b86cc2d363126d527b211fea85d025 librtas-2.0.1.tar.gz -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING.LESSER +sha256 b47b2a6f140347ac265e2c66ddf68293f6cdcc7c0c9a78c6e21ff52846465415 librtas-2.0.2.tar.gz +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING.LESSER diff --git a/package/librtas/librtas.mk b/package/librtas/librtas.mk index 48c8d0143f..c92a9e2fa4 100644 --- a/package/librtas/librtas.mk +++ b/package/librtas/librtas.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRTAS_VERSION = 2.0.1 +LIBRTAS_VERSION = 2.0.2 LIBRTAS_SITE = $(call github,ibm-power-utilities,librtas,v$(LIBRTAS_VERSION)) LIBRTAS_LICENSE = LGPL-2.1+ LIBRTAS_LICENSE_FILES = COPYING.LESSER diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch index b9f53d2393..2fb63465de 100644 --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch @@ -1,44 +1,47 @@ -From d47e3aed12414be59bf77177c93853ec4b24d705 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 2 Jun 2018 16:53:36 +0200 +From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Fri, 15 May 2020 16:14:48 +0200 Subject: [PATCH] disable shared library target in build Disable shared library target if BUILD_SHARED_LIBS if OFF. Patch retrieved from -https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2018.05 +https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2020.02.x -Patch has been updated to work with 0.5.4 and to be able to keep current +Patch has been updated to work with master and to be able to keep current behavior of building shared and static version of library if BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library will be install. -[Upstream status: https://github.com/steve-m/librtlsdr/pull/46] +[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-May/002075.html] Signed-off-by: Yuvaraj Patil Signed-off-by: Fabrice Fontaine +Signed-off-by: Gwenhael Goavec-Merou +Signed-off-by: Titouan Christophe --- - src/CMakeLists.txt | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) + src/CMakeLists.txt | 30 +++++++++++++++++++++--------- + 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 07d64ab..2b7cbae 100644 +index de93044..13b7b1a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -47,16 +47,22 @@ ENDIF(MSVC) +@@ -18,6 +18,8 @@ ######################################################################## # Setup shared library variant ######################################################################## +option(BUILD_SHARED_LIBS "Build shared library" ON) +if(BUILD_SHARED_LIBS) - add_library(rtlsdr_shared SHARED ${rtlsdr_srcs}) - target_link_libraries(rtlsdr_shared ${LIBUSB_LIBRARIES}) - set_target_properties(rtlsdr_shared PROPERTIES DEFINE_SYMBOL "rtlsdr_EXPORTS") - set_target_properties(rtlsdr_shared PROPERTIES OUTPUT_NAME rtlsdr) - set_target_properties(rtlsdr_shared PROPERTIES SOVERSION ${MAJOR_VERSION}) - set_target_properties(rtlsdr_shared PROPERTIES VERSION ${LIBVER}) -+list(APPEND rtlsdr_lib rtlsdr_shared) + add_library(rtlsdr SHARED librtlsdr.c + tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) + target_link_libraries(rtlsdr PkgConfig::LIBUSB) +@@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) + set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) + set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) + generate_export_header(rtlsdr) ++list(APPEND rtlsdr_lib rtlsdr) +endif() ######################################################################## @@ -46,60 +49,82 @@ index 07d64ab..2b7cbae 100644 ######################################################################## +option(BUILD_STATIC_LIBS "Build static library" ON) +if(BUILD_STATIC_LIBS) - add_library(rtlsdr_static STATIC ${rtlsdr_srcs}) - target_link_libraries(rtlsdr_static ${LIBUSB_LIBRARIES}) - set_property(TARGET rtlsdr_static APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) -@@ -64,6 +70,8 @@ if(NOT WIN32) - # Force same library filename for static and shared variants of the library + add_library(rtlsdr_static STATIC librtlsdr.c + tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) + target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) +@@ -47,6 +53,8 @@ if(NOT WIN32) set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) endif() + generate_export_header(rtlsdr_static) +list(APPEND rtlsdr_lib rtlsdr_static) +endif() ######################################################################## - # Setup libraries used in executables -@@ -91,33 +99,33 @@ add_executable(rtl_fm rtl_fm.c) - add_executable(rtl_eeprom rtl_eeprom.c) + # Set up Windows DLL resource files +@@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) add_executable(rtl_adsb rtl_adsb.c) add_executable(rtl_power rtl_power.c) --set(INSTALL_TARGETS rtlsdr_shared rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) + add_executable(rtl_biast rtl_biast.c) +-set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) ++set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) --target_link_libraries(rtl_sdr rtlsdr_shared convenience_static +-target_link_libraries(rtl_sdr rtlsdr convenience_static +target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_tcp rtlsdr_shared convenience_static +-target_link_libraries(rtl_tcp rtlsdr convenience_static +target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_test rtlsdr_shared convenience_static +-target_link_libraries(rtl_test rtlsdr convenience_static +target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_fm rtlsdr_shared convenience_static +-target_link_libraries(rtl_fm rtlsdr convenience_static +target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_eeprom rtlsdr_shared convenience_static +-target_link_libraries(rtl_eeprom rtlsdr convenience_static +target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_adsb rtlsdr_shared convenience_static +-target_link_libraries(rtl_adsb rtlsdr convenience_static +target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_power rtlsdr_shared convenience_static +-target_link_libraries(rtl_power rtlsdr convenience_static +target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) +-target_link_libraries(rtl_biast rtlsdr convenience_static ++target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +@@ -156,12 +164,16 @@ endif() + ######################################################################## + # Install built library files & utilities + ######################################################################## ++if(BUILD_SHARED_LIBS) + install(TARGETS rtlsdr EXPORT RTLSDR-export + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file + ) ++endif() ++if(BUILD_STATIC_LIBS) + install(TARGETS rtlsdr_static EXPORT RTLSDR-export + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file + ) ++endif() + install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast + DESTINATION ${CMAKE_INSTALL_BINDIR} + ) -- -2.14.1 +2.25.3 diff --git a/package/librtlsdr/Config.in b/package/librtlsdr/Config.in index c2bf1a9fb1..2f22c5b1c7 100644 --- a/package/librtlsdr/Config.in +++ b/package/librtlsdr/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBRTLSDR bool "librtlsdr" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Library and command line programs for accessing @@ -18,7 +19,16 @@ config BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER automatically detach any kernel driver associated to the RTL2832U USB device on startup if one is loaded. +config BR2_PACKAGE_LIBRTLSDR_ZEROCOPY + bool "Enable usbfs zero-copy support" + default y + help + This option allows to use kernel usbfs mmap instead + of buffers in userspace. If you experiment crash with + kernel < 5.6, disable this option. + endif -comment "librtlsdr needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "librtlsdr needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/librtlsdr/librtlsdr.hash b/package/librtlsdr/librtlsdr.hash index e7b0e84f4a..e4b0871db3 100644 --- a/package/librtlsdr/librtlsdr.hash +++ b/package/librtlsdr/librtlsdr.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 80a5155f3505bca8f1b808f8414d7dcd7c459b662a1cde84d3a2629a6e72ae55 librtlsdr-0.6.0.tar.gz +sha256 f09ff5ba2fa1780071321ba22885b9d1a16ac9d4b944a97e39b6921960439301 librtlsdr-ed0317e6a58c098874ac58b769cf2e609c18d9a5.tar.gz # License file, locally calculated -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index 500ccc5d17..7796d1096a 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRTLSDR_VERSION = 0.6.0 +LIBRTLSDR_VERSION = ed0317e6a58c098874ac58b769cf2e609c18d9a5 LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) LIBRTLSDR_LICENSE = GPL-2.0+ LIBRTLSDR_LICENSE_FILES = COPYING @@ -28,15 +28,10 @@ ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 endif -# In case of static-lib-only builds, CMake's FindThreads.cmake code tries to -# get the right flags, checking first for -lpthreads, then -lpthread, and lastly -# for -pthread. -# The 2 first link checks fail because of undefined symbols: __libc_setup_tls. -# In the later check, CMake successfully compiles and links the test program, -# but it also tries to run it, which is wrong when cross-compiling. -# -# The following CMake variable only disables the TRY_RUN call in the -pthread -# test. -LIBRTLSDR_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF +ifeq ($(BR2_PACKAGE_LIBRTLSDR_ZEROCOPY),y) +LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=ON +else +LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF +endif $(eval $(cmake-package)) diff --git a/package/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk index c107650cb4..146d57d15e 100644 --- a/package/libsamplerate/libsamplerate.mk +++ b/package/libsamplerate/libsamplerate.mk @@ -11,6 +11,7 @@ LIBSAMPLERATE_DEPENDENCIES = host-pkgconf LIBSAMPLERATE_CONF_OPTS = --disable-fftw --program-transform-name='' LIBSAMPLERATE_LICENSE = BSD-2-Clause LIBSAMPLERATE_LICENSE_FILES = COPYING +LIBSAMPLERATE_CPE_ID_VENDOR = libsamplerate_project ifeq ($(BR2_PACKAGE_ALSA_LIB),y) LIBSAMPLERATE_DEPENDENCIES += alsa-lib diff --git a/package/libseccomp/libseccomp.hash b/package/libseccomp/libseccomp.hash index 39c5f8aa38..2d07c1c1fa 100644 --- a/package/libseccomp/libseccomp.hash +++ b/package/libseccomp/libseccomp.hash @@ -1,3 +1,4 @@ +# From https://github.com/seccomp/libseccomp/releases/tag/v2.4.4 +sha256 4e79738d1ef3c9b7ca9769f1f8b8d84fc17143c2c1c432e53b9c64787e0ff3eb libseccomp-2.4.4.tar.gz # Locally calculated -sha256 36aa502c0461ae9efc6c93ec2430d6badd9bf91ecbe73806baf7b7c6f687ab4f libseccomp-2.4.1.tar.gz -sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b LICENSE +sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b LICENSE diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk index 491e51b375..e7512730d5 100644 --- a/package/libseccomp/libseccomp.mk +++ b/package/libseccomp/libseccomp.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBSECCOMP_VERSION = 2.4.1 -LIBSECCOMP_SITE = $(call github,seccomp,libseccomp,v$(LIBSECCOMP_VERSION)) +LIBSECCOMP_VERSION = 2.4.4 +LIBSECCOMP_SITE = https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE +LIBSECCOMP_CPE_ID_VENDOR = libseccomp_project LIBSECCOMP_INSTALL_STAGING = YES -LIBSECCOMP_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash index 3a256fd700..792ec838e3 100644 --- a/package/libsecret/libsecret.hash +++ b/package/libsecret/libsecret.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.20/libsecret-0.20.1.sha256sum -sha256 57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447 libsecret-0.20.1.tar.xz +# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.sha256sum +sha256 325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28 libsecret-0.20.4.tar.xz # Hash for license file: sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk index f87df47097..4d14c231d7 100644 --- a/package/libsecret/libsecret.mk +++ b/package/libsecret/libsecret.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSECRET_VERSION_MAJOR = 0.20 -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).1 +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).4 LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz LIBSECRET_INSTALL_STAGING = YES diff --git a/package/libselinux/0001-fix-musl-build.patch b/package/libselinux/0001-fix-musl-build.patch index 7af3a3c36f..44189e6400 100644 --- a/package/libselinux/0001-fix-musl-build.patch +++ b/package/libselinux/0001-fix-musl-build.patch @@ -1,4 +1,7 @@ -fix undefined macros in musl +From 78f7f09028fdd6a5e8e4e4b584749621eaef412f Mon Sep 17 00:00:00 2001 +From: Yann E. MORIN" +Date: Sat, 7 Dec 2019 17:24:50 -0800 +Subject: [PATCH] fix undefined macros in musl musl does not define glibc-specific macros, so use a simple version of the macro when it is not defined. @@ -9,11 +12,13 @@ Domain, and we want to avoid license propagation, so this macro is completely written from scratch, and non-optimal. Signed-off-by: "Yann E. MORIN" - -diff -durN libselinux-2.1.13.orig/src/booleans.c libselinux-2.1.13/src/booleans.c ---- libselinux-2.1.13.orig/src/booleans.c 2013-02-06 02:43:22.000000000 +0100 -+++ libselinux-2.1.13/src/booleans.c 2015-07-26 20:40:41.311801914 +0200 -@@ -62,6 +62,14 @@ +[Updated for 3.0] +Signed-off-by: Adam Duskett +diff --git a/src/booleans.c b/src/booleans.c +index ffa8d26..8569002 100644 +--- a/src/booleans.c ++++ b/src/booleans.c +@@ -65,6 +65,14 @@ int security_get_boolean_names(char ***names, int *len) goto bad; } @@ -26,5 +31,8 @@ diff -durN libselinux-2.1.13.orig/src/booleans.c libselinux-2.1.13/src/booleans. +#endif + for (i = 0; i < *len; i++) { - n[i] = (char *)malloc(_D_ALLOC_NAMLEN(namelist[i])); + n[i] = strdup(namelist[i]->d_name); if (!n[i]) { +-- +2.23.0 + diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index ed61ea8bd2..797b978ee1 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 1bccc8873e449587d9a2b2cf253de9b89a8291b9fbc7c59393ca9e5f5f4d2693 libselinux-2.9.tar.gz +sha256 df758ef1d9d4811051dd901ea6b029ae334ffd7c671c128beb16bce1e25ac161 libselinux-3.2.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 1461e34539..0f36db1cfd 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBSELINUX_VERSION = 2.9 -LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +LIBSELINUX_VERSION = 3.2 +LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE +LIBSELINUX_CPE_ID_VENDOR = selinuxproject LIBSELINUX_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) libsepol pcre @@ -27,18 +28,12 @@ LIBSELINUX_DEPENDENCIES += musl-fts LIBSELINUX_MAKE_OPTS += FTS_LDLIBS=-lfts endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBSELINUX_DEPENDENCIES += python3 host-swig -LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON),y) -LIBSELINUX_DEPENDENCIES += python host-swig -LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR) -endif LIBSELINUX_MAKE_OPTS += \ $(PKG_PYTHON_DISTUTILS_ENV) \ - PYTHON=$(LIBSELINUX_PYLIBVER) + PYTHON=python$(PYTHON3_VERSION_MAJOR) LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap @@ -49,14 +44,15 @@ define LIBSELINUX_BUILD_PYTHON_BINDINGS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(LIBSELINUX_MAKE_OPTS) swigify pywrap endef -endif # python || python3 +endif # python3 -# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc -# 2.22. We set CFLAGS and LDFLAGS here because we want to win over the -# CFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_DISTUTILS_ENV) +# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc 2.22. We +# set CFLAGS, CPPFLAGS and LDFLAGS here because we want to win over the +# CFLAGS/CPPFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_DISTUTILS_ENV) # when the python binding is enabled. LIBSELINUX_MAKE_OPTS += \ CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ + CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" \ LDFLAGS="$(TARGET_LDFLAGS) -lpcre -lpthread" define LIBSELINUX_BUILD_CMDS @@ -75,22 +71,12 @@ define LIBSELINUX_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) \ $(LIBSELINUX_MAKE_INSTALL_TARGETS) - # Create the selinuxfs mount point - if [ ! -d "$(TARGET_DIR)/selinux" ]; then mkdir $(TARGET_DIR)/selinux; fi if ! grep -q "selinuxfs" $(TARGET_DIR)/etc/fstab; then \ - echo "none /selinux selinuxfs noauto 0 0" >> $(TARGET_DIR)/etc/fstab ; fi + echo "none /sys/fs/selinux selinuxfs noauto 0 0" >> $(TARGET_DIR)/etc/fstab ; fi endef HOST_LIBSELINUX_DEPENDENCIES = \ - host-libsepol host-pcre host-swig - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_LIBSELINUX_DEPENDENCIES += host-python3 -HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) -else -HOST_LIBSELINUX_DEPENDENCIES += host-python -HOST_LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR) -endif + host-libsepol host-pcre host-swig host-python3 HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ @@ -98,7 +84,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ SHLIBDIR=$(HOST_DIR)/lib \ LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \ $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ - PYTHON=$(HOST_LIBSELINUX_PYLIBVER) + PYTHON=python$(PYTHON3_VERSION_MAJOR) define HOST_LIBSELINUX_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \ @@ -116,5 +102,36 @@ define HOST_LIBSELINUX_INSTALL_CMDS $(HOST_LIBSELINUX_MAKE_OPTS) install-pywrap endef +define LIBSELINUX_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT) + $(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_SECURITY_SELINUX) + $(call KCONFIG_ENABLE_OPT,CONFIG_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SELINUX) + $(call KCONFIG_SET_OPT,CONFIG_LSM,"selinux") + $(if $(BR2_TARGET_ROOTFS_EROFS), + $(call KCONFIG_ENABLE_OPT,CONFIG_EROFS_FS_XATTR) + $(call KCONFIG_ENABLE_OPT,CONFIG_EROFS_FS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_EXT2), + $(call KCONFIG_ENABLE_OPT,CONFIG_EXT2_FS_XATTR) + $(call KCONFIG_ENABLE_OPT,CONFIG_EXT2_FS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_EXT2_3), + $(call KCONFIG_ENABLE_OPT,CONFIG_EXT3_FS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_EXT2_4), + $(call KCONFIG_ENABLE_OPT,CONFIG_EXT4_FS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_F2FS), + $(call KCONFIG_ENABLE_OPT,CONFIG_F2FS_FS_XATTR) + $(call KCONFIG_ENABLE_OPT,CONFIG_F2FS_FS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_JFFS2), + $(call KCONFIG_ENABLE_OPT,CONFIG_JFS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_SQUASHFS), + $(call KCONFIG_ENABLE_OPT,CONFIG_SQUASHFS_XATTR)) + $(if $(BR2_TARGET_ROOTFS_UBIFS), + $(call KCONFIG_ENABLE_OPT,CONFIG_UBIFS_FS_XATTR) + $(call KCONFIG_ENABLE_OPT,CONFIG_UBIFS_FS_SECURITY)) +endef + $(eval $(generic-package)) $(eval $(host-generic-package)) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 871ed192c4..117fd40d6a 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 2576349d344492e73b468059767268dec1dabd8c35f3c7222c3ec2448737bc1c libsemanage-2.9.tar.gz +sha256 d722a55ca4fe2d4e2b30527720db657e6238b28079e69e2e4affeb8e733ee511 libsemanage-3.2.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index fd90346049..bbe976a2c9 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 2.9 -LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +LIBSEMANAGE_VERSION = 3.2 +LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION) LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux bzip2 +LIBSEMANAGE_CPE_ID_VENDOR = selinuxproject LIBSEMANAGE_INSTALL_STAGING = YES LIBSEMANAGE_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) @@ -31,27 +32,17 @@ HOST_LIBSEMANAGE_DEPENDENCIES = \ host-libsepol \ host-libselinux \ host-bzip2 \ - host-swig + host-swig \ + host-python3 HOST_LIBSEMANAGE_MAKE_OPTS += \ $(HOST_CONFIGURE_OPTS) \ PREFIX=$(HOST_DIR) \ SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/" \ - DEFAULT_SEMANAGE_CONF_LOCATION=$(HOST_DIR)/etc/selinux/semanage.conf - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_LIBSEMANAGE_DEPENDENCIES += host-python3 -HOST_LIBSEMANAGE_MAKE_OPTS += \ + DEFAULT_SEMANAGE_CONF_LOCATION=$(HOST_DIR)/etc/selinux/semanage.conf \ PYINC="-I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)/" \ PYTHONLIBDIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/" \ PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" -else -HOST_LIBSEMANAGE_DEPENDENCIES += host-python -HOST_LIBSEMANAGE_MAKE_OPTS += \ - PYINC="-I$(HOST_DIR)/include/python$(PYTHON_VERSION_MAJOR)/" \ - PYTHONLIBDIR="$(HOST_DIR)/lib/python$(PYTHON_VERSION_MAJOR)/" \ - PYLIBVER="python$(PYTHON_VERSION_MAJOR)" -endif define HOST_LIBSEMANAGE_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) all diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in index 21d4d7865c..04af880e67 100644 --- a/package/libsepol/Config.in +++ b/package/libsepol/Config.in @@ -11,6 +11,8 @@ if BR2_PACKAGE_LIBSEPOL config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION int "Policy version" + default 33 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + default 32 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 default 31 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 default 30 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 default 29 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 @@ -22,12 +24,14 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION Here's a handy table to help you choose: kernel version SElinux policy max version - <= 2.6.x 25 - > 2.6 <= 3.5 26 - > 3.5 <= 3.14 28 (27 and 28 were added at the same time) - > 3.14 <= 4.3 29 - > 4.3 <= 4.13 30 - > 4.13 31 + < 2.6.x 25 + >= 2.6 < 3.5 26 + >= 3.5 < 3.14 28 (27 and 28 were added at the same time) + >= 3.14 < 4.3 29 + >= 4.3 < 4.13 30 + >= 4.13 < 5.5 31 + >= 5.5 < 5.8 32 + >= 5.8 33 endif diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index 83eb63213e..b273f982b6 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 a34b12b038d121e3e459b1cbaca3c9202e983137819c16baf63658390e3f1d5d libsepol-2.9.tar.gz +sha256 dfc7f662af8000116e56a01de6a0394ed79be1b34b999e551346233c5dd19508 libsepol-3.2.tar.gz # Hash for license file -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 62b0744aa3..55125f2203 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBSEPOL_VERSION = 2.9 -LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +LIBSEPOL_VERSION = 3.2 +LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING +LIBSEPOL_CPE_ID_VENDOR = selinuxproject LIBSEPOL_INSTALL_STAGING = YES LIBSEPOL_DEPENDENCIES = host-flex diff --git a/package/libshout/libshout.hash b/package/libshout/libshout.hash index 06702891c0..ae43e0a9c8 100644 --- a/package/libshout/libshout.hash +++ b/package/libshout/libshout.hash @@ -1,5 +1,8 @@ -# From https://downloads.xiph.org/releases/libshout/SHA256SUMS -sha256 0d8af55d1141bf90710bcd41a768c9cc5adb251502a0af1dd22c8da215d40dfe libshout-2.4.3.tar.gz +# From https://ftp.osuosl.org/pub/xiph/releases/libshout/SHA512SUMS +sha512 290844185da16961f03434d3e341573dd6cb0139e5fa81902903021b641382d2629302d7c356bc591b35656754e07f4e44a8d9e782e092b17a051b9ae8f54341 libshout-2.4.5.tar.gz + +# From https://ftp.osuosl.org/pub/xiph/releases/libshout/SHA256SUMS +sha256 d9e568668a673994ebe3f1eb5f2bee06e3236a5db92b8d0c487e1c0f886a6890 libshout-2.4.5.tar.gz # Hash for license file -sha256 7a4436f9ec37603356791c87de3bc444989befd2682d29efb3d97604e04c1852 COPYING +sha256 7a4436f9ec37603356791c87de3bc444989befd2682d29efb3d97604e04c1852 COPYING diff --git a/package/libshout/libshout.mk b/package/libshout/libshout.mk index 6537a1fea3..4afb762de6 100644 --- a/package/libshout/libshout.mk +++ b/package/libshout/libshout.mk @@ -4,13 +4,17 @@ # ################################################################################ -LIBSHOUT_VERSION = 2.4.3 +LIBSHOUT_VERSION = 2.4.5 LIBSHOUT_SITE = https://downloads.xiph.org/releases/libshout LIBSHOUT_LICENSE = LGPL-2.0+ LIBSHOUT_LICENSE_FILES = COPYING LIBSHOUT_INSTALL_STAGING = YES LIBSHOUT_DEPENDENCIES = host-pkgconf libogg libvorbis -LIBSHOUT_CONF_OPTS = --disable-examples +# We're patching configure.ac +LIBSHOUT_AUTORECONF = YES +LIBSHOUT_CONF_OPTS = \ + --disable-examples \ + --disable-tools ifeq ($(BR2_PACKAGE_LIBTHEORA),y) LIBSHOUT_CONF_OPTS += --enable-theora @@ -29,9 +33,6 @@ endif ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSHOUT_CONF_OPTS += --with-openssl LIBSHOUT_DEPENDENCIES += openssl -else ifeq ($(BR2_PACKAGE_LIBRESSL),y) -LIBSHOUT_CONF_OPTS += --with-openssl=$(STAGING_DIR)/lib -LIBSHOUT_DEPENDENCIES += libressl else LIBSHOUT_CONF_OPTS += --without-openssl endif diff --git a/package/libsigc/Config.in b/package/libsigc/Config.in index 4bd762efce..e5157e87b4 100644 --- a/package/libsigc/Config.in +++ b/package/libsigc/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBSIGC signals to any callback function, either global or a member function, regardless of whether it is static or virtual. - http://libsigc.sourceforge.net/ + https://libsigcplusplus.github.io/libsigcplusplus/ comment "libsigc++ needs a toolchain w/ C++, gcc >= 4.8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/libsigc/libsigc.hash b/package/libsigc/libsigc.hash index bc3880f7c3..d631185a41 100644 --- a/package/libsigc/libsigc.hash +++ b/package/libsigc/libsigc.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/2.10/libsigc++-2.10.0.sha256sum -sha256 f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81 libsigc++-2.10.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/2.10/libsigc++-2.10.6.sha256sum +sha256 dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b libsigc++-2.10.6.tar.xz # Locally calculated -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk index d7cbd36da8..6539fdbdb6 100644 --- a/package/libsigc/libsigc.mk +++ b/package/libsigc/libsigc.mk @@ -5,18 +5,14 @@ ################################################################################ LIBSIGC_VERSION_MAJOR = 2.10 -LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).0 +LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).6 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) -LIBSIGC_DEPENDENCIES = host-m4 LIBSIGC_INSTALL_STAGING = YES LIBSIGC_LICENSE = LGPL-2.1+ LIBSIGC_LICENSE_FILES = COPYING +LIBSIGC_CONF_OPTS = \ + -Dbuild-examples=false \ + -Dvalidation=false -define LIBSIGC_INSTALL_TARGET_FIXUP - rm -rf $(TARGET_DIR)/usr/share/devhelp/books/libsigc++* -endef - -LIBSIGC_POST_INSTALL_TARGET_HOOKS += LIBSIGC_INSTALL_TARGET_FIXUP - -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libsigrokdecode/libsigrokdecode.mk b/package/libsigrokdecode/libsigrokdecode.mk index 8c9488784c..18f2cbfee3 100644 --- a/package/libsigrokdecode/libsigrokdecode.mk +++ b/package/libsigrokdecode/libsigrokdecode.mk @@ -10,5 +10,7 @@ LIBSIGROKDECODE_LICENSE = GPL-3.0+ LIBSIGROKDECODE_LICENSE_FILES = COPYING LIBSIGROKDECODE_INSTALL_STAGING = YES LIBSIGROKDECODE_DEPENDENCIES = host-pkgconf libglib2 python3 +# We're patching configure.ac +LIBSIGROKDECODE_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/package/libsigsegv/libsigsegv.hash b/package/libsigsegv/libsigsegv.hash index 47ba356821..c827e6b866 100644 --- a/package/libsigsegv/libsigsegv.hash +++ b/package/libsigsegv/libsigsegv.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.12.tar.gz.sig -sha256 3ae1af359eebaa4ffc5896a1aee3568c052c99879316a1ab57f8fe1789c390b6 libsigsegv-2.12.tar.gz +# https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.13.tar.gz.sig +sha256 be78ee4176b05f7c75ff03298d84874db90f4b6c9d5503f0da1226b3a3c48119 libsigsegv-2.13.tar.gz # Locally calculated -sha256 8f2983e9a940367f48999881c14775db725ee643bce1e2f1ba195eb629a33cde COPYING +sha256 8f2983e9a940367f48999881c14775db725ee643bce1e2f1ba195eb629a33cde COPYING diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk index 28c061dd73..87a5d7a124 100644 --- a/package/libsigsegv/libsigsegv.mk +++ b/package/libsigsegv/libsigsegv.mk @@ -4,16 +4,11 @@ # ################################################################################ -LIBSIGSEGV_VERSION = 2.12 +LIBSIGSEGV_VERSION = 2.13 LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv LIBSIGSEGV_INSTALL_STAGING = YES LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes LIBSIGSEGV_LICENSE = GPL-2.0+ LIBSIGSEGV_LICENSE_FILES = COPYING -# 0001-Improve-support-for-Linux-RISC-V.patch -# 0002-m4-stack-direction-RISC-V-stack-grows-downward.patch -# 0003-Improve-support-for-Linux-nds32.patch -# 0004-m4-stack-direction-NDS32-stack-grows-downward.patch -LIBSIGSEGV_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/package/libsilk/libsilk.hash b/package/libsilk/libsilk.hash index 6042096d82..14f6676262 100644 --- a/package/libsilk/libsilk.hash +++ b/package/libsilk/libsilk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 01de52aa123f7bd20e500a076046f6b30d55f8e98c4029ab424bc51c46d7083d libsilk-4268a02240c35c6055b0f237c46b09b2dcf79e45.tar.gz -sha256 62a5963f034024665641f4a9888b208f1e39aa7e29e87c9634fdcf07d3073baf COPYING +sha256 ac79eb4c154af25c0ab25e12d60d3b4165c399903fe88d82e066cf6d9827503e libsilk-4268a02240c35c6055b0f237c46b09b2dcf79e45-br1.tar.gz +sha256 62a5963f034024665641f4a9888b208f1e39aa7e29e87c9634fdcf07d3073baf COPYING diff --git a/package/libsndfile/libsndfile.hash b/package/libsndfile/libsndfile.hash index c744a7675a..14dfe823f9 100644 --- a/package/libsndfile/libsndfile.hash +++ b/package/libsndfile/libsndfile.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9 libsndfile-1.0.28.tar.gz +sha256 a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163 libsndfile-1.0.31.tar.bz2 # Locally calculated -sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index 7d1dca0599..ed9e8e3d14 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -4,41 +4,31 @@ # ################################################################################ -LIBSNDFILE_VERSION = 1.0.28 -LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files +LIBSNDFILE_VERSION = 1.0.31 +LIBSNDFILE_SOURCE = libsndfile-$(LIBSNDFILE_VERSION).tar.bz2 +LIBSNDFILE_SITE = https://github.com/libsndfile/libsndfile/releases/download/$(LIBSNDFILE_VERSION) LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPL-2.1+ LIBSNDFILE_LICENSE_FILES = COPYING +LIBSNDFILE_CPE_ID_VENDOR = libsndfile_project + +# 0001-ms_adpcm-Fix-and-extend-size-checks.patch +LIBSNDFILE_IGNORE_CVES += CVE-2021-3246 -# 0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-14634 -# 0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch -LIBSNDFILE_IGNORE_CVES += CVE-2018-13139 CVE-2018-19432 -# 0003-a-ulaw-fix-multiple-buffer-overflows-432.patch -LIBSNDFILE_IGNORE_CVES += \ - CVE-2017-14245 CVE-2017-14246 CVE-2017-17456 CVE-2017-17457 \ - CVE-2018-19661 CVE-2018-19662 # disputed, https://github.com/erikd/libsndfile/issues/398 LIBSNDFILE_IGNORE_CVES += CVE-2018-13419 -# 0004-src-wav.c-Fix-heap-read-overflow.patch -LIBSNDFILE_IGNORE_CVES += CVE-2018-19758 -# 0005-wav_write_header-don-t-read-past-the-array-end.patch -LIBSNDFILE_IGNORE_CVES += CVE-2019-3832 -# 0006-src-aiff.c-Fix-a-buffer-read-overflow.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-6892 -# 0007-FLAC-Fix-a-buffer-read-overrun.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-8361 -# 0008-src-flac.c-Fix-a-buffer-read-overflow.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-8362 CVE-2017-8365 -# 0009-src-flac-c-Fix-another-memory-leak.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-8363 -# 0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch -LIBSNDFILE_IGNORE_CVES += CVE-2017-12562 +LIBSNDFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBSNDFILE_CONF_OPTS = \ --disable-sqlite \ --disable-alsa \ - --disable-external-libs \ --disable-full-suite +ifeq ($(BR2_PACKAGE_FLAC)$(BR2_PACKAGE_LIBVORBIS)$(BR2_PACKAGE_OPUS),yyy) +LIBSNDFILE_DEPENDENCIES += flac host-pkgconf libvorbis opus +LIBSNDFILE_CONF_OPTS += --enable-external-libs +else +LIBSNDFILE_CONF_OPTS += --disable-external-libs +endif + $(eval $(autotools-package)) diff --git a/package/libsocketcan/libsocketcan.hash b/package/libsocketcan/libsocketcan.hash index 7e40493fbf..c2ad23554b 100644 --- a/package/libsocketcan/libsocketcan.hash +++ b/package/libsocketcan/libsocketcan.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 28923f47b3f3191ff966866aa45823325b6e3b4fce72f056e5d87d64e4d6699d libsocketcan-0.0.11.tar.bz2 -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE +sha256 be8280124707701935e6294d366e2474158b758fa4b2e3cae571d5b256d2fe34 libsocketcan-0.0.12.tar.bz2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE diff --git a/package/libsocketcan/libsocketcan.mk b/package/libsocketcan/libsocketcan.mk index dca8ede6e9..0261b33c11 100644 --- a/package/libsocketcan/libsocketcan.mk +++ b/package/libsocketcan/libsocketcan.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSOCKETCAN_VERSION = 0.0.11 +LIBSOCKETCAN_VERSION = 0.0.12 LIBSOCKETCAN_SITE = http://www.pengutronix.de/software/libsocketcan/download LIBSOCKETCAN_SOURCE = libsocketcan-$(LIBSOCKETCAN_VERSION).tar.bz2 LIBSOCKETCAN_INSTALL_STAGING = YES diff --git a/package/libsoundtouch/libsoundtouch.hash b/package/libsoundtouch/libsoundtouch.hash index a79e62f031..fe6a108e33 100644 --- a/package/libsoundtouch/libsoundtouch.hash +++ b/package/libsoundtouch/libsoundtouch.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c805e7a72b7758a8986b71e73d2f94a8c79c66c1246fa2af1743c4282702e096 libsoundtouch-010a91a59071c7fefd316fca62c0d980ec85b4b1.tar.gz -sha256 9c6a15d7433078e4c0d3cb9820f172bbf0bf829e7648d719dc85c1429815519b COPYING.TXT +sha256 f1ce96bac35779d3b752f4cc8696975b3d58f3deb9db47ffc45862767c2a2bdd libsoundtouch-2.2.tar.gz +sha256 6b73f6327136a924821ec044bbd9f17cf8677faf2f2a2b1366a9fff6188c9688 COPYING.TXT diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk index fcc2332fad..8a0e807d7a 100644 --- a/package/libsoundtouch/libsoundtouch.mk +++ b/package/libsoundtouch/libsoundtouch.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBSOUNDTOUCH_VERSION = 010a91a59071c7fefd316fca62c0d980ec85b4b1 -LIBSOUNDTOUCH_SITE = https://freeswitch.org/stash/scm/sd/libsoundtouch.git -LIBSOUNDTOUCH_SITE_METHOD = git +LIBSOUNDTOUCH_VERSION = 2.2 +LIBSOUNDTOUCH_SITE = $(call gitlab,soundtouch,soundtouch,$(LIBSOUNDTOUCH_VERSION)) LIBSOUNDTOUCH_LICENSE = LGPL-2.1+ LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT LIBSOUNDTOUCH_AUTORECONF = YES diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index f6f8fde968..02e8e8b578 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -1,10 +1,11 @@ config BR2_PACKAGE_LIBSOUP bool "libsoup" - depends on BR2_USE_WCHAR # glib2 and gnutls + depends on BR2_USE_WCHAR # glib2, gnutls and libpsl depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBPSL select BR2_PACKAGE_SQLITE help libsoup is an HTTP client/server library. It uses GObject @@ -23,8 +24,8 @@ config BR2_PACKAGE_LIBSOUP_GNOME config BR2_PACKAGE_LIBSOUP_SSL bool "https support" depends on !BR2_STATIC_LIBS # glib-networking, gnutls - select BR2_PACKAGE_GLIB_NETWORKING - select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_GLIB_NETWORKING # runtime + select BR2_PACKAGE_GNUTLS # runtime help Enable HTTPS (SSL) support. diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 666bbc278b..01bf419563 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.62/libsoup-2.62.3.sha256sum -sha256 d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172 libsoup-2.62.3.tar.xz +# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.72/libsoup-2.72.0.sha256sum +sha256 170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387 libsoup-2.72.0.tar.xz # Locally calculated sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 07c9d787bd..964488f430 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,35 +4,53 @@ # ################################################################################ -LIBSOUP_VERSION_MAJOR = 2.62 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).3 +LIBSOUP_VERSION_MAJOR = 2.72 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPL-2.0+ LIBSOUP_LICENSE_FILES = COPYING +LIBSOUP_CPE_ID_VENDOR = gnome LIBSOUP_INSTALL_STAGING = YES -LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) -LIBSOUP_CONF_OPTS = --disable-glibtest --enable-vala=no --with-gssapi=no -LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \ - libglib2 libxml2 sqlite host-intltool +LIBSOUP_DEPENDENCIES = \ + host-intltool \ + host-libglib2 \ + host-pkgconf \ + libglib2 \ + libpsl \ + libxml2 \ + sqlite \ + $(TARGET_NLS_DEPENDENCIES) + +LIBSOUP_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + +LIBSOUP_CONF_OPTS = \ + -Dgssapi=disabled \ + -Dgtk_doc=false \ + -Dntlm=disabled \ + -Dsysprof=disabled \ + -Dtests=false \ + -Dtls_check=false \ + -Dvapi=disabled + +ifeq ($(BR2_PACKAGE_BROTLI),y) +LIBSOUP_CONF_OPTS += -Dbrotli=enabled +LIBSOUP_DEPENDENCIES += brotli +else +LIBSOUP_CONF_OPTS += -Dbrotli=disabled +endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBSOUP_CONF_OPTS += --with-introspection +LIBSOUP_CONF_OPTS += -Dintrospection=enabled LIBSOUP_DEPENDENCIES += gobject-introspection else -LIBSOUP_CONF_OPTS += --without-introspection +LIBSOUP_CONF_OPTS += -Dintrospection=disabled endif ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) -LIBSOUP_CONF_OPTS += --with-gnome +LIBSOUP_CONF_OPTS += -Dgnome=true else -LIBSOUP_CONF_OPTS += --without-gnome +LIBSOUP_CONF_OPTS += -Dgnome=false endif -ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y) -LIBSOUP_DEPENDENCIES += glib-networking -else -LIBSOUP_CONF_OPTS += --disable-tls-check -endif - -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libspatialindex/libspatialindex.hash b/package/libspatialindex/libspatialindex.hash index 4eda28237d..ca679db968 100644 --- a/package/libspatialindex/libspatialindex.hash +++ b/package/libspatialindex/libspatialindex.hash @@ -1,5 +1,5 @@ -# From https://github.com/libspatialindex/libspatialindex/releases/download/1.9.0/spatialindex-src-1.9.0.tar.bz2.sha512sum -sha512 dbf9601c878f245899d7336347674e96e8eeb715ec33a36ade44f3cc821c1dca7995cb09197a382bfd97da75c38f37b04f4d8f81ffbf38fef65fff82c5d1d2f3 spatialindex-src-1.9.0.tar.bz2 +# From https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2.sha512sum +sha512 7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066 spatialindex-src-1.9.3.tar.bz2 # Hash for license file -sha256 b63ebfaca9d7ce582580f3e11acabc9d2e37c46ce234533f7fa8a6c7278898a0 COPYING +sha256 b63ebfaca9d7ce582580f3e11acabc9d2e37c46ce234533f7fa8a6c7278898a0 COPYING diff --git a/package/libspatialindex/libspatialindex.mk b/package/libspatialindex/libspatialindex.mk index 57088a2e12..0ff313d817 100644 --- a/package/libspatialindex/libspatialindex.mk +++ b/package/libspatialindex/libspatialindex.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSPATIALINDEX_VERSION = 1.9.0 +LIBSPATIALINDEX_VERSION = 1.9.3 LIBSPATIALINDEX_SITE = \ https://github.com/libspatialindex/libspatialindex/releases/download/$(LIBSPATIALINDEX_VERSION) LIBSPATIALINDEX_SOURCE = spatialindex-src-$(LIBSPATIALINDEX_VERSION).tar.bz2 diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index f816f4c3e0..5cbd97957a 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -9,6 +9,7 @@ LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause LIBSRTP_LICENSE_FILES = LICENSE +LIBSRTP_CPE_ID_VENDOR = cisco ifeq ($(BR2_STATIC_LIBS),y) LIBSRTP_MAKE_OPTS = libsrtp2.a diff --git a/package/libssh/Config.in b/package/libssh/Config.in index cde73a0d87..1f271a692e 100644 --- a/package/libssh/Config.in +++ b/package/libssh/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBSSH depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_MBEDTLS || BR2_PACKAGE_LIBGCRYPT) + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help libssh is a multiplatform C library implementing the SSHv2 and SSHv1 protocol on client and server side. With libssh, diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash index ca296701bf..4dbab11374 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.9/libssh-0.9.3.tar.xz.asc +# https://www.libssh.org/files/0.9/libssh-0.9.6.tar.xz.asc # with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D -sha256 2c8b5f894dced58b3d629f16f3afa6562c20b4bdc894639163cf657833688f0c libssh-0.9.3.tar.xz -sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING +sha256 86bcf885bd9b80466fe0e05453c58b877df61afa8ba947a58c356d7f0fab829b libssh-0.9.6.tar.xz +sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 52517a5dd0..4cadf83aee 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -5,20 +5,18 @@ ################################################################################ LIBSSH_VERSION_MAJOR = 0.9 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).3 +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 LIBSSH_LICENSE_FILES = COPYING +LIBSSH_CPE_ID_VENDOR = libssh LIBSSH_INSTALL_STAGING = YES LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO LIBSSH_CONF_OPTS = \ -DWITH_STACK_PROTECTOR=OFF \ -DWITH_EXAMPLES=OFF -# cmake older than 3.10 require this to avoid try_run() in FindThreads -LIBSSH_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_PACKAGE_LIBSSH_SERVER),y) LIBSSH_CONF_OPTS += -DWITH_SERVER=ON else diff --git a/package/libssh2/Config.in b/package/libssh2/Config.in index 90c38813b3..ce2dd303fa 100644 --- a/package/libssh2/Config.in +++ b/package/libssh2/Config.in @@ -27,6 +27,7 @@ config BR2_PACKAGE_LIBSSH2_LIBGCRYPT config BR2_PACKAGE_LIBSSH2_OPENSSL bool "openssl" depends on BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL endchoice endif diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index 3819c1aa31..6147583a9e 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -8,13 +8,14 @@ LIBSSH2_VERSION = 1.9.0 LIBSSH2_SITE = https://www.libssh2.org/download LIBSSH2_LICENSE = BSD LIBSSH2_LICENSE_FILES = COPYING +LIBSSH2_CPE_ID_VENDOR = libssh2 LIBSSH2_INSTALL_STAGING = YES LIBSSH2_CONF_OPTS = --disable-examples-build # 0003-packet-c-improve-message-parsing.patch LIBSSH2_IGNORE_CVES += CVE-2019-17498 -# building from a git clone +# patch touching configure.ac and acinclude.m4 LIBSSH2_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBSSH2_MBEDTLS),y) diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index 1e46a82bc9..d5f151660f 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8a3b79f62177ed59c01d4d4108357ff20bd933d53b845ee4e350d304c051a4fe libstrophe-0.9.3.tar.gz -sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt +sha256 5bf0bbc555cb6059008f1b748370d4d2ee1e1fabd3eeab68475263556405ba39 libstrophe-0.10.1.tar.gz +sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index d5434f5033..e078eb25cd 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.9.3 +LIBSTROPHE_VERSION = 0.10.1 LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION)) LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf # Doesn't ship configure diff --git a/package/libsvgtiny/libsvgtiny.hash b/package/libsvgtiny/libsvgtiny.hash index 86096cef3b..ba4b4cae97 100644 --- a/package/libsvgtiny/libsvgtiny.hash +++ b/package/libsvgtiny/libsvgtiny.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 082a2e8849f05e2364a942eec51a798d637c6eca44db8c73350a038ebd1fd268 libsvgtiny-ea9d99fc8b231c22d06168135e181d61f4eb2f06.tar.gz -sha256 92b965c77be71661cae51425a6b40a5ca274f44cc13c723c90fb471a9a26a828 README +sha256 917850350d014c953f2af0fb92f0eeb25652619710922d467c98f8109fb92baf libsvgtiny-ea9d99fc8b231c22d06168135e181d61f4eb2f06-br1.tar.gz +sha256 92b965c77be71661cae51425a6b40a5ca274f44cc13c723c90fb471a9a26a828 README diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk index 13edc9a4ea..6cff8bf5fe 100644 --- a/package/libsysfs/libsysfs.mk +++ b/package/libsysfs/libsysfs.mk @@ -10,5 +10,7 @@ LIBSYSFS_SOURCE = sysfsutils-$(LIBSYSFS_VERSION).tar.gz LIBSYSFS_INSTALL_STAGING = YES LIBSYSFS_LICENSE = GPL-2.0 (utilities), LGPL-2.1+ (library) LIBSYSFS_LICENSE_FILES = cmd/GPL lib/LGPL +LIBSYSFS_CPE_ID_VENDOR = sysfsutils_project +LIBSYSFS_CPE_ID_PRODUCT = sysfsutils $(eval $(autotools-package)) diff --git a/package/libtasn1/libtasn1.hash b/package/libtasn1/libtasn1.hash index e25e18abf8..fc3610b965 100644 --- a/package/libtasn1/libtasn1.hash +++ b/package/libtasn1/libtasn1.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.14.tar.gz.sig -sha256 9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08 libtasn1-4.14.tar.gz +# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.17.0.tar.gz.sig +sha256 ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5 libtasn1-4.17.0.tar.gz # Locally calculated -sha256 7446831f659f7ebfd8d497acc7f05dfa8e31c6cb6ba1b45df33d4895ab80f5a6 LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 doc/COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER +sha256 7446831f659f7ebfd8d497acc7f05dfa8e31c6cb6ba1b45df33d4895ab80f5a6 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 doc/COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk index 50afc4cdf9..d9d14fde83 100644 --- a/package/libtasn1/libtasn1.mk +++ b/package/libtasn1/libtasn1.mk @@ -4,13 +4,20 @@ # ################################################################################ -LIBTASN1_VERSION = 4.14 +LIBTASN1_VERSION = 4.17.0 LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1 -LIBTASN1_DEPENDENCIES = host-bison +LIBTASN1_DEPENDENCIES = host-bison host-pkgconf LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPL-2.1+ (library) -LIBTASN1_LICENSE_FILES = LICENSE doc/COPYING doc/COPYING.LESSER +LIBTASN1_LICENSE_FILES = COPYING doc/COPYING doc/COPYING.LESSER +LIBTASN1_CPE_ID_VENDOR = gnu LIBTASN1_INSTALL_STAGING = YES + +# We're patching fuzz/Makefile.am +LIBTASN1_AUTORECONF = YES + # 'missing' fallback logic botched so disable it completely LIBTASN1_CONF_ENV = MAKEINFO="true" +LIBTASN1_CONF_OPTS = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" + $(eval $(autotools-package)) diff --git a/package/libtirpc/Config.in b/package/libtirpc/Config.in index 2e9c939fa8..31f1636ef5 100644 --- a/package/libtirpc/Config.in +++ b/package/libtirpc/Config.in @@ -7,5 +7,19 @@ config BR2_PACKAGE_LIBTIRPC http://sourceforge.net/projects/libtirpc/ +config BR2_PACKAGE_LIBTIRPC_GSS + bool "gss" + depends on BR2_USE_MMU # libkrb5 + depends on !BR2_STATIC_LIBS # libkrb5 + depends on BR2_PACKAGE_LIBTIRPC + select BR2_PACKAGE_LIBKRB5 + help + Enable GSSAPI support + comment "libtirpc needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS + +comment "libtirpc gss support needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS + depends on BR2_PACKAGE_LIBTIRPC diff --git a/package/libtirpc/libtirpc.hash b/package/libtirpc/libtirpc.hash index a7907dc7b2..56c1d9de3f 100644 --- a/package/libtirpc/libtirpc.hash +++ b/package/libtirpc/libtirpc.hash @@ -1,5 +1,5 @@ # From sourceforge's info on download page: -sha1 ab80619b214d93e5cfbf22a0d01e1ee06d434326 libtirpc-1.2.5.tar.bz2 +sha1 51d75be0e5acc094a888f40042b23e128d163cb5 libtirpc-1.3.2.tar.bz2 # Locally computed -sha256 f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca libtirpc-1.2.5.tar.bz2 -sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING +sha256 e24eb88b8ce7db3b7ca6eb80115dd1284abc5ec32a8deccfed2224fc2532b9fd libtirpc-1.3.2.tar.bz2 +sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 879b21e665..9d3c4b5a94 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -4,26 +4,26 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.2.5 +LIBTIRPC_VERSION = 1.3.2 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause LIBTIRPC_LICENSE_FILES = COPYING +LIBTIRPC_CPE_ID_VENDOR = libtirpc_project -LIBTIRPC_DEPENDENCIES = host-nfs-utils LIBTIRPC_INSTALL_STAGING = YES -LIBTIRPC_AUTORECONF = YES # getrpcby{number,name} are only provided if 'GQ' is defined LIBTIRPC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DGQ" -LIBTIRPC_CONF_OPTS = --disable-gssapi - -define HOST_LIBTIRPC_INSTALL_CMDS - $(INSTALL) -D -m 0644 $(@D)/tirpc/rpc/types.h $(HOST_DIR)/include/rpc/types.h - $(INSTALL) -D -m 0644 $(@D)/tirpc/netconfig.h $(HOST_DIR)/include/netconfig.h -endef +ifeq ($(BR2_PACKAGE_LIBTIRPC_GSS),y) +LIBTIRPC_CONF_ENV += KRB5_CONFIG=$(STAGING_DIR)/usr/bin/krb5-config +LIBTIRPC_CONF_OPTS += --enable-gssapi +LIBTIRPC_DEPENDENCIES += libkrb5 +else +LIBTIRPC_CONF_OPTS += --disable-gssapi +endif +HOST_LIBTIRPC_CONF_OPTS = --disable-gssapi $(eval $(autotools-package)) -# We are only copying headers; no need for the autotools infrastructure -$(eval $(host-generic-package)) +$(eval $(host-autotools-package)) diff --git a/package/libtomcrypt/Config.in b/package/libtomcrypt/Config.in index a7c5f50015..2459cd21e8 100644 --- a/package/libtomcrypt/Config.in +++ b/package/libtomcrypt/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBTOMCRYPT functions, chaining modes, pseudo-random number generators, public key cryptography and a plethora of other routines. - http://www.libtom.net + https://www.libtom.net diff --git a/package/libtomcrypt/libtomcrypt.mk b/package/libtomcrypt/libtomcrypt.mk index c2f1babb49..fa2a585047 100644 --- a/package/libtomcrypt/libtomcrypt.mk +++ b/package/libtomcrypt/libtomcrypt.mk @@ -9,6 +9,7 @@ LIBTOMCRYPT_SITE = https://github.com/libtom/libtomcrypt/releases/download/v$(LI LIBTOMCRYPT_SOURCE = crypt-$(LIBTOMCRYPT_VERSION).tar.xz LIBTOMCRYPT_LICENSE = WTFPL LIBTOMCRYPT_LICENSE_FILES = LICENSE +LIBTOMCRYPT_CPE_ID_VENDOR = libtom LIBTOMCRYPT_INSTALL_STAGING = YES LIBTOMCRYPT_INSTALL_TARGET = NO # only static library LIBTOMCRYPT_DEPENDENCIES = libtommath @@ -18,14 +19,17 @@ LIBTOMCRYPT_IGNORE_CVES += CVE-2019-17362 LIBTOMCRYPT_CFLAGS = -I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE -DLTM_DESC +ifeq ($(BR2_STATIC_LIBS),) +LIBTOMCRYPT_CFLAGS += -fPIC +endif + define LIBTOMCRYPT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(LIBTOMCRYPT_CFLAGS)" + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f makefile.unix $(TARGET_CONFIGURE_OPTS) CFLAGS="$(LIBTOMCRYPT_CFLAGS)" endef define LIBTOMCRYPT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" \ - PREFIX=/usr NODOCS=1 INSTALL_USER=$(shell id -u) \ - INSTALL_GROUP=$(shell id -g) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f makefile.unix \ + DESTDIR="$(STAGING_DIR)" PREFIX=/usr install endef $(eval $(generic-package)) diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index 10af8cf715..6342e70a39 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -7,6 +7,7 @@ LIBTOOL_VERSION = 2.4.6 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.xz LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool +LIBTOOL_CPE_ID_VENDOR = gnu # For the target variant, we only want to build/install libltdl LIBTOOL_SUBDIR = libltdl diff --git a/package/libtorrent-rasterbar/Config.in b/package/libtorrent-rasterbar/Config.in index b2508b8b70..fe9a9fc027 100644 --- a/package/libtorrent-rasterbar/Config.in +++ b/package/libtorrent-rasterbar/Config.in @@ -1,8 +1,8 @@ comment "libtorrent-rasterbar needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - !BR2_HOST_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 comment "libtorrent-rasterbar needs exception_ptr" depends on BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK @@ -11,7 +11,6 @@ comment "libtorrent-rasterbar needs exception_ptr" config BR2_PACKAGE_LIBTORRENT_RASTERBAR bool "libtorrent-rasterbar" depends on BR2_INSTALL_LIBSTDCPP # boost - depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.hash b/package/libtorrent-rasterbar/libtorrent-rasterbar.hash index 78dbdf8ae4..8198a1ff9d 100644 --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.hash +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8759bddb589006ee164438588adaf007325b3bcaf6ae4c64d87a2b914409c680 libtorrent-rasterbar-1.2.4.tar.gz +sha256 c3744ac9fa41f6e6ebf79538a2ea678df76a2cbbaf3ac6ae2c05455314e5cce8 libtorrent-rasterbar-1.2.12.tar.gz sha256 f3a5dd1558cce616b12edad521427ec8976ce2bb0af33f7f359cfa648bf55ad8 COPYING diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk index 5b80e99238..7f60252e9b 100644 --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk @@ -4,10 +4,13 @@ # ################################################################################ -LIBTORRENT_RASTERBAR_VERSION = 1.2.4 -LIBTORRENT_RASTERBAR_SITE = https://github.com/arvidn/libtorrent/releases/download/libtorrent-$(subst .,_,$(LIBTORRENT_RASTERBAR_VERSION)) +LIBTORRENT_RASTERBAR_VERSION = 1.2.12 +LIBTORRENT_RASTERBAR_SITE = \ + https://github.com/arvidn/libtorrent/releases/download/v$(LIBTORRENT_RASTERBAR_VERSION) LIBTORRENT_RASTERBAR_LICENSE = BSD-3-Clause LIBTORRENT_RASTERBAR_LICENSE_FILES = COPYING +LIBTORRENT_RASTERBAR_CPE_ID_VENDOR = libtorrent +LIBTORRENT_RASTERBAR_CPE_ID_PRODUCT = libtorrent LIBTORRENT_RASTERBAR_DEPENDENCIES = host-pkgconf boost openssl LIBTORRENT_RASTERBAR_INSTALL_STAGING = YES LIBTORRENT_RASTERBAR_CONF_OPTS = \ diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in index 4787f9c60d..de6487a758 100644 --- a/package/libtorrent/Config.in +++ b/package/libtorrent/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBTORRENT depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_SYNC_1 && BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL help BitTorrent library written in C++ for *nix diff --git a/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch b/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch index c1196d615a..9040e1267e 100644 --- a/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch +++ b/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch @@ -22,25 +22,34 @@ EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON" Signed-off-by: Pierre-Jean Texier [Upstream status: http://patchwork.ozlabs.org/patch/1103437/] --- - src/CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + src/CMakeLists.txt | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 051732b..c5f6dcb 100644 +index 4b71bc5..0b515f4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -10,10 +10,9 @@ SET(include_HEADERS - libuboot.h - ) +@@ -12,18 +12,16 @@ SET(include_HEADERS + + include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable -add_library(ubootenv SHARED ${libubootenv_SOURCES} ${include_HEADERS}) +add_library(ubootenv ${libubootenv_SOURCES} ${include_HEADERS}) - SET_TARGET_PROPERTIES(ubootenv PROPERTIES SOVERSION ${SOVERSION}) + SET_TARGET_PROPERTIES(ubootenv PROPERTIES VERSION ${VERSION} SOVERSION ${SOVERSION}) -ADD_LIBRARY(ubootenv_static STATIC ${libubootenv_SOURCES} ${include_HEADERS}) +-SET_TARGET_PROPERTIES(ubootenv_static PROPERTIES OUTPUT_NAME ubootenv) add_executable(fw_printenv fw_printenv.c) add_executable(fw_setenv fw_setenv.c) - target_link_libraries(fw_printenv ubootenv z) + target_link_libraries(ubootenv z) + target_link_libraries(fw_printenv ubootenv) + target_link_libraries(fw_setenv ubootenv) + +-install (TARGETS ubootenv ubootenv_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install (TARGETS ubootenv DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install (FILES libuboot.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install (TARGETS fw_printenv DESTINATION ${CMAKE_INSTALL_BINDIR}) + install (TARGETS fw_setenv DESTINATION ${CMAKE_INSTALL_BINDIR}) -- -2.7.4 +2.30.2 diff --git a/package/libubootenv/libubootenv.hash b/package/libubootenv/libubootenv.hash index d7d71fc717..d6de614612 100644 --- a/package/libubootenv/libubootenv.hash +++ b/package/libubootenv/libubootenv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1afd4e70242a8196bf25622a4558d0baf9db5652d37d217156c08f6e37fd8e80 libubootenv-f4b9cde3815abe84a98079cedd515283ea08c16b.tar.gz +sha256 662ef1efe058e2d5a07498f7b63aff7b2a521c0f6f199c499fb3ae84b54121bd libubootenv-0.3.2.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt diff --git a/package/libubootenv/libubootenv.mk b/package/libubootenv/libubootenv.mk index 2a7c0e7415..295226b9aa 100644 --- a/package/libubootenv/libubootenv.mk +++ b/package/libubootenv/libubootenv.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBUBOOTENV_VERSION = f4b9cde3815abe84a98079cedd515283ea08c16b -LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,$(LIBUBOOTENV_VERSION)) +LIBUBOOTENV_VERSION = 0.3.2 +LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,v$(LIBUBOOTENV_VERSION)) LIBUBOOTENV_LICENSE = LGPL-2.1 LIBUBOOTENV_LICENSE_FILES = Licenses/lgpl-2.1.txt LIBUBOOTENV_INSTALL_STAGING = YES diff --git a/package/libubox/Config.in b/package/libubox/Config.in index 25ef4bb89a..1f0b691e13 100644 --- a/package/libubox/Config.in +++ b/package/libubox/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBUBOX also be used for the same purposes in projects other than OpenWrt. - http://nbd.name/gitweb.cgi?p=luci2/libubox.git;a=summary + https://openwrt.org/docs/techref/libubox comment "libubox needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index d3e3b709dc..20da5c2ec2 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBUBOX_VERSION = 723730214732862de7e892bae2f7a7889e66bf1b -LIBUBOX_SITE = git://git.openwrt.org/project/libubox.git +LIBUBOX_VERSION = 551d75b5662cccd0466b990d58136bdf799a804d +LIBUBOX_SITE = https://git.openwrt.org/project/libubox.git +LIBUBOX_SITE_METHOD = git LIBUBOX_LICENSE = ISC, BSD-3-Clause LIBUBOX_INSTALL_STAGING = YES LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c) diff --git a/package/libuci/Config.in b/package/libuci/Config.in index 2f4ad40487..f94d7dc391 100644 --- a/package/libuci/Config.in +++ b/package/libuci/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_LIBUCI This package will also install CLI tool uci. - http://wiki.openwrt.org/doc/techref/uci + https://openwrt.org/docs/techref/uci comment "libuci needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/libuci/libuci.hash b/package/libuci/libuci.hash index d4c839eb80..54bdb023aa 100644 --- a/package/libuci/libuci.hash +++ b/package/libuci/libuci.hash @@ -1,2 +1,4 @@ # Locally computed -sha256 bb9827863c6b7b6cf986a3de42b5716edb8a280e44b3ce39541de18062c3c00e libuci-49ec6efbdac4819033d34f08927d795f83a3932d.tar.gz +sha256 76ef826df2961420cd7a4f1702bef06c37563d9807a2d8e84557963aab21ac80 libuci-52bbc99f69ea6f67b6fe264f424dac91bde5016c-br1.tar.gz +sha256 53672dbbd32466fe6c7ad7cb35b54f666f3f1b41273cd3bd00a42054608aa512 cli.c +sha256 69d4eea4de19d27014f3d6ed723081b4039700bfd73cd0a5e39e2c4f19a58c66 libuci.c diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk index 55afd53c10..4515e3f21c 100644 --- a/package/libuci/libuci.mk +++ b/package/libuci/libuci.mk @@ -4,12 +4,18 @@ # ################################################################################ -LIBUCI_VERSION = 49ec6efbdac4819033d34f08927d795f83a3932d -LIBUCI_SITE = git://git.openwrt.org/project/uci.git +LIBUCI_VERSION = 52bbc99f69ea6f67b6fe264f424dac91bde5016c +LIBUCI_SITE = https://git.openwrt.org/project/uci.git +LIBUCI_SITE_METHOD = git LIBUCI_LICENSE = LGPL-2.1, GPL-2.0 (tools) +LIBUCI_LICENSE_FILES = cli.c libuci.c +LIBUCI_CPE_ID_VENDOR = openwrt LIBUCI_INSTALL_STAGING = YES LIBUCI_DEPENDENCIES = libubox +# Fixed in commit 19e29ffc15dbd958e8e6a648ee0982c68353516f, older than LIBUCI_VERSION +LIBUCI_IGNORE_CVES += CVE-2019-15513 + ifeq ($(BR2_PACKAGE_LUA_5_1),y) LIBUCI_DEPENDENCIES += lua LIBUCI_CONF_OPTS += -DBUILD_LUA=ON \ diff --git a/package/libudfread/libudfread.hash b/package/libudfread/libudfread.hash index 9a68f62089..332b472d59 100644 --- a/package/libudfread/libudfread.hash +++ b/package/libudfread/libudfread.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c4c5ee6b65be051fb1f2a738f726f2afc8601620e8f013d087769dc13aab6d4c libudfread-1.0.0.tar.bz2 +sha256 cd062016d78902da53a34c4d536479dbb70b2a05116354d46ead4d0c498ed375 libudfread-1.1.2.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libudfread/libudfread.mk b/package/libudfread/libudfread.mk index 53ee4a578e..55d4fb8e47 100644 --- a/package/libudfread/libudfread.mk +++ b/package/libudfread/libudfread.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUDFREAD_VERSION = 1.0.0 +LIBUDFREAD_VERSION = 1.1.2 LIBUDFREAD_SOURCE = libudfread-$(LIBUDFREAD_VERSION).tar.bz2 LIBUDFREAD_SITE = https://code.videolan.org/videolan/libudfread/-/archive/$(LIBUDFREAD_VERSION) LIBUDFREAD_AUTORECONF = YES diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index 1ab39c5878..9159341d89 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBUHTTPD bool "libuhttpd" select BR2_PACKAGE_LIBEV + select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL help A lightweight and fully asynchronous HTTP server library based on libev diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash index 49b40688b5..98bd6e513b 100644 --- a/package/libuhttpd/libuhttpd.hash +++ b/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cd76cf9a5d8c7f81832ab1b229ce3ff10137f161085f0170c128e43c49e905a4 libuhttpd-3.1.4.tar.gz +sha256 c234dd3d491c4daa047e28870c6e740529b2eff2dd027dafb6bf02d8dba286b0 libuhttpd-3.12.1.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index d3499373a6..3a99fe0613 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.1.4 +LIBUHTTPD_VERSION = 3.12.1 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE @@ -14,26 +14,35 @@ LIBUHTTPD_DEPENDENCIES = libev ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBUHTTPD_DEPENDENCIES += openssl LIBUHTTPD_CONF_OPTS += \ - -DUHTTPD_SSL_SUPPORT=ON \ - -DUHTTPD_USE_MBEDTLS=OFF \ - -DUHTTPD_USE_OPENSSL=ON \ - -DUHTTPD_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=ON \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_WOLFSSL),y) LIBUHTTPD_DEPENDENCIES += wolfssl LIBUHTTPD_CONF_OPTS += \ - -DUHTTPD_SSL_SUPPORT=ON \ - -DUHTTPD_USE_MBEDTLS=OFF \ - -DUHTTPD_USE_OPENSSL=OFF \ - -DUHTTPD_USE_WOLFSSL=ON + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=ON else ifeq ($(BR2_PACKAGE_MBEDTLS),y) LIBUHTTPD_DEPENDENCIES += mbedtls LIBUHTTPD_CONF_OPTS += \ - -DUHTTPD_SSL_SUPPORT=ON \ - -DUHTTPD_USE_MBEDTLS=ON \ - -DUHTTPD_USE_OPENSSL=OFF \ - -DUHTTPD_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=ON \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=OFF else -LIBUHTTPD_CONF_OPTS += -DUHTTPD_SSL_SUPPORT=OFF +LIBUHTTPD_CONF_OPTS += \ + -DSSL_SUPPORT=OFF +endif + +# BUILD_STATIC builds *only* the static lib, which is not what we want for +# BR2_SHARED_STATIC. +ifeq ($(BR2_STATIC_LIBS),y) +LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC=ON +else +LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC=OFF endif $(eval $(cmake-package)) diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index fa51447170..1ed7ecf906 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -10,6 +10,7 @@ LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES LIBUNISTRING_LICENSE = LGPL-3.0+ or GPL-2.0 LIBUNISTRING_LICENSE_FILES = COPYING COPYING.LIB +LIBUNISTRING_CPE_ID_VENDOR = gnu $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/libunwind/Config.in b/package/libunwind/Config.in index be576d13c4..5284b5864c 100644 --- a/package/libunwind/Config.in +++ b/package/libunwind/Config.in @@ -10,13 +10,14 @@ config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS bool default y if BR2_TOOLCHAIN_USES_GLIBC && \ - (BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el || BR2_powerpc || BR2_sh || BR2_i386 || BR2_x86_64) + (BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || BR2_mips || BR2_mipsel || \ + BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_sh || \ + BR2_i386 || BR2_x86_64) default y if BR2_TOOLCHAIN_USES_UCLIBC && \ (BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || \ BR2_mips64 || BR2_mips64el || BR2_x86_64) default y if BR2_TOOLCHAIN_USES_MUSL && \ - (BR2_ARM_CPU_HAS_ARM || BR2_x86_64) + (BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || BR2_x86_64) config BR2_PACKAGE_LIBUNWIND bool "libunwind" diff --git a/package/libunwind/libunwind.hash b/package/libunwind/libunwind.hash index e3709b1b1a..de00c59988 100644 --- a/package/libunwind/libunwind.hash +++ b/package/libunwind/libunwind.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435 libunwind-1.4.0.tar.gz +sha256 90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017 libunwind-1.5.0.tar.gz # Hash for license file sha256 6a0dbbdaec2b3136b7bf045586f4212bdf74e7af688bf9dfe9154607cf5ec156 COPYING diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index a5bcec6be6..5f6b87b9db 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNWIND_VERSION = 1.4.0 +LIBUNWIND_VERSION = 1.5.0 LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING @@ -16,7 +16,7 @@ LIBUNWIND_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cxx-exceptions,--disable-cxx-exceptions) ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) -LIBUNWIND_DEPENDENCIES = libatomic_ops +LIBUNWIND_DEPENDENCIES += libatomic_ops endif $(eval $(autotools-package)) diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index e52b7ea9d7..f7fdb6d521 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c5a300b86775435c076d58a79cc0d5a977d76027d2a7d721590729b7f369fa43 libupnp-1.6.25.tar.bz2 -sha256 0375955c8a79d6e8fa0792d45d00fc4e7710d7ac95bcbd27f9225a83f5c946fd LICENSE +sha256 7b66ac4a86bc0e218e2771ac274b2945bc4154bf9054e57b14afb67c26ac7c24 libupnp-1.14.7.tar.bz2 +sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index 8831885ba4..7457d2644a 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,12 +4,27 @@ # ################################################################################ -LIBUPNP_VERSION = 1.6.25 +LIBUPNP_VERSION = 1.14.7 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 -LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION) +LIBUPNP_SITE = \ + http://downloads.sourceforge.net/project/pupnp/release-$(LIBUPNP_VERSION) LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no LIBUPNP_INSTALL_STAGING = YES LIBUPNP_LICENSE = BSD-3-Clause -LIBUPNP_LICENSE_FILES = LICENSE +LIBUPNP_LICENSE_FILES = COPYING +LIBUPNP_CPE_ID_VENDOR = libupnp_project +LIBUPNP_DEPENDENCIES = host-pkgconf + +# Bind the internal miniserver socket with reuseaddr to allow clean restarts. +LIBUPNP_CONF_OPTS += \ + --disable-samples \ + --enable-reuseaddr + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBUPNP_CONF_OPTS += --enable-open-ssl +LIBUPNP_DEPENDENCIES += openssl +else +LIBUPNP_CONF_OPTS += --disable-open-ssl +endif $(eval $(autotools-package)) diff --git a/package/libupnpp/Config.in b/package/libupnpp/Config.in index a71eff5423..41afa9300f 100644 --- a/package/libupnpp/Config.in +++ b/package/libupnpp/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_LIBUPNPP bool "libupnpp" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp + depends on BR2_TOOLCHAIN_HAS_THREADS # libnpupnp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP + select BR2_PACKAGE_LIBNPUPNP help The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay. diff --git a/package/libupnpp/libupnpp.hash b/package/libupnpp/libupnpp.hash index 993dbc89ae..5bc282f270 100644 --- a/package/libupnpp/libupnpp.hash +++ b/package/libupnpp/libupnpp.hash @@ -1,5 +1,5 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.17.2.tar.gz.sha256 -sha256 5abaaf353a1e9c3482d61ef2627b650285d59f27c1ee60d35b8951952261374f libupnpp-0.17.2.tar.gz +# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.21.0.tar.gz.sha256 +sha256 e43dbe5020ed25152aaec71b325dd80498e72038da5aeb50ed7dd51e213cd903 libupnpp-0.21.0.tar.gz # Hash for license file: sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/package/libupnpp/libupnpp.mk b/package/libupnpp/libupnpp.mk index c9c103d9b5..fc76a43a11 100644 --- a/package/libupnpp/libupnpp.mk +++ b/package/libupnpp/libupnpp.mk @@ -4,12 +4,11 @@ # ################################################################################ -LIBUPNPP_VERSION = 0.17.2 +LIBUPNPP_VERSION = 0.21.0 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBUPNPP_LICENSE = LGPL-2.1+ LIBUPNPP_LICENSE_FILES = COPYING LIBUPNPP_INSTALL_STAGING = YES -LIBUPNPP_DEPENDENCIES = host-pkgconf expat libcurl \ - $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18) +LIBUPNPP_DEPENDENCIES = host-pkgconf expat libcurl libnpupnp $(eval $(autotools-package)) diff --git a/package/liburcu/Config.in b/package/liburcu/Config.in index 7d29642084..5dc8528971 100644 --- a/package/liburcu/Config.in +++ b/package/liburcu/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be || \ BR2_i386 || BR2_mips || BR2_mips64 || BR2_mipsel || \ BR2_mips64el || BR2_nios2 || BR2_powerpc || BR2_powerpc64 || \ - BR2_powerpc64le || BR2_riscv || BR2_sparc64 || BR2_x86_64 + BR2_powerpc64le || BR2_riscv || BR2_sparc64 || BR2_s390x || BR2_x86_64 depends on BR2_USE_MMU # fork() in test config BR2_PACKAGE_LIBURCU diff --git a/package/liburcu/liburcu.hash b/package/liburcu/liburcu.hash index 5c2f7e52a8..da7d12a76c 100644 --- a/package/liburcu/liburcu.hash +++ b/package/liburcu/liburcu.hash @@ -1,8 +1,8 @@ -# http://www.lttng.org/files/urcu/userspace-rcu-0.11.1.tar.bz2.sha256 -sha256 92b9971bf3f1c443edd6c09e7bf5ff3b43531e778841f16377a812c8feeb3350 userspace-rcu-0.11.1.tar.bz2 +# http://www.lttng.org/files/urcu/userspace-rcu-0.12.1.tar.bz2.sha256 +sha256 bbfaead0345642b97e0de90f889dfbab4b2643a6a5e5c6bb59cd0d26fc0bcd0e userspace-rcu-0.12.1.tar.bz2 # Hash for license files -sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt -sha256 8ef8121eddd2fc0779d94331a1d0f1ead9c796343d845e564cd8c8c4ae3d6f6e lgpl-relicensing.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt -sha256 e8c070cb093be4b2eaf938a5f1c11621163b2d9cfa2790460cf925d81e442fa7 LICENSE +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt +sha256 8ef8121eddd2fc0779d94331a1d0f1ead9c796343d845e564cd8c8c4ae3d6f6e lgpl-relicensing.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 e8c070cb093be4b2eaf938a5f1c11621163b2d9cfa2790460cf925d81e442fa7 LICENSE diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk index 217e90a1b1..fa2ad0de83 100644 --- a/package/liburcu/liburcu.mk +++ b/package/liburcu/liburcu.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURCU_VERSION = 0.11.1 +LIBURCU_VERSION = 0.12.1 LIBURCU_SITE = http://lttng.org/files/urcu LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 4216f1f17f..60acca2215 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 28af4adb05e811192ab5f04566bebc5ebf1c30d9ec19138f944963d52419e28f uriparser-0.9.3.tar.bz2 -sha256 ee90029e62d11f48faa59360d15c3ad8e7c094c74cc25b055716d92340da561f COPYING +sha256 dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c uriparser-0.9.5.tar.bz2 +sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index 4a68814e00..c7bc604ece 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,11 +4,13 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.3 +LIBURIPARSER_VERSION = 0.9.5 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING +LIBURIPARSER_CPE_ID_VENDOR = uriparser_project +LIBURIPARSER_CPE_ID_PRODUCT = uriparser LIBURIPARSER_INSTALL_STAGING = YES LIBURIPARSER_CONF_OPTS = -DURIPARSER_BUILD_DOCS=OFF -DURIPARSER_BUILD_TESTS=OFF diff --git a/package/libusb-compat/libusb-compat.hash b/package/libusb-compat/libusb-compat.hash index 26c3a80ebc..3acf3c3408 100644 --- a/package/libusb-compat/libusb-compat.hash +++ b/package/libusb-compat/libusb-compat.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a libusb-compat-0.1.5.tar.bz2 +sha256 8259f8d5b084fe43c47823a939e955e0ba21942b8d112266c39d228cc14764d6 libusb-compat-0.1.7.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk index 61d4c203e7..7c87b3c9d8 100644 --- a/package/libusb-compat/libusb-compat.mk +++ b/package/libusb-compat/libusb-compat.mk @@ -5,9 +5,9 @@ ################################################################################ LIBUSB_COMPAT_VERSION_MAJOR = 0.1 -LIBUSB_COMPAT_VERSION = $(LIBUSB_COMPAT_VERSION_MAJOR).5 +LIBUSB_COMPAT_VERSION = $(LIBUSB_COMPAT_VERSION_MAJOR).7 LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2 -LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-$(LIBUSB_COMPAT_VERSION_MAJOR)/libusb-compat-$(LIBUSB_COMPAT_VERSION) +LIBUSB_COMPAT_SITE = https://github.com/libusb/libusb-compat-0.1/releases/download/v$(LIBUSB_COMPAT_VERSION) LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb HOST_LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf host-libusb LIBUSB_COMPAT_INSTALL_STAGING = YES @@ -15,5 +15,11 @@ LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config LIBUSB_COMPAT_LICENSE = LGPL-2.1+ LIBUSB_COMPAT_LICENSE_FILES = COPYING +ifeq ($(BR2_STATIC_LIBS),) +LIBUSB_COMPAT_CONF_ENV += \ + LIBUSB_1_0_SONAME=`LC_ALL=C readelf -d $(STAGING_DIR)/usr/lib/libusb-1.0.so \ + |sed -r -e '/\(SONAME\)/!d; s/.*\[(.+)\]$$/\1/'` +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/libusb/Config.in b/package/libusb/Config.in index d31a717fdf..5a04ac128b 100644 --- a/package/libusb/Config.in +++ b/package/libusb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBUSB bool "libusb" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Thread_local help Userspace library for accessing USB devices @@ -13,5 +14,6 @@ config BR2_PACKAGE_LIBUSB_EXAMPLES endif -comment "libusb needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libusb needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index 272dfb0877..6169a186a5 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d libusb-1.0.23.tar.bz2 -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING +sha256 7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a libusb-1.0.24.tar.bz2 +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index ddc6b27b6c..28efcadefc 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,11 +5,12 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).23 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).24 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ LIBUSB_LICENSE_FILES = COPYING +LIBUSB_CPE_ID_VENDOR = libusb LIBUSB_DEPENDENCIES = host-pkgconf LIBUSB_INSTALL_STAGING = YES diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 270fba722d..042dd9dc34 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ff84a26c79559e511f087aa67925c3b4e0f0aac60cd8039d4d38b292f208ff58 libuv-1.35.0.tar.gz +sha256 6cfeb5f4bab271462b4a2cc77d4ecec847fdbdc26b72019c27ae21509e6f94fa libuv-1.41.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 7e75dcb194..d3c58d4dd4 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,13 +6,14 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.35.0 +LIBUV_VERSION = 1.41.0 LIBUV_SITE = $(call github,libuv,libuv,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_CPE_ID_VENDOR = libuv # Upstream needs tests to be run sequentially. This is the default in # automake 1.11 and before, but not starting in 1.12. To maintain diff --git a/package/libuwsc/libuwsc.mk b/package/libuwsc/libuwsc.mk index 83d05a96ec..cad351529d 100644 --- a/package/libuwsc/libuwsc.mk +++ b/package/libuwsc/libuwsc.mk @@ -36,11 +36,18 @@ else LIBUWSC_CONF_OPTS += -DUWSC_SSL_SUPPORT=OFF endif -ifeq ($(BR2_PACKAGE_LUA),y) +ifeq ($(BR2_PACKAGE_LUA):$(BR2_STATIC_LIBS),y:) LIBUWSC_DEPENDENCIES += lua LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=ON else LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=OFF endif +# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LIBUWSC_CONF_OPTS += -DBUILD_STATIC_LIBS=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LIBUWSC_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF +endif + $(eval $(cmake-package)) diff --git a/package/libv4l/libv4l.hash b/package/libv4l/libv4l.hash index 5b29d7d65a..e45dd576bd 100644 --- a/package/libv4l/libv4l.hash +++ b/package/libv4l/libv4l.hash @@ -1,9 +1,9 @@ # Locally calculated after checking signature -# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.18.0.tar.bz2.asc +# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2.asc # with key 05D0169C26E41593418129DF199A64FADFB500FF -sha256 6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d v4l-utils-1.18.0.tar.bz2 +sha256 956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7 v4l-utils-1.20.0.tar.bz2 # Locally calculated -sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l -sha256 34229b5aadfb768d0d083987cba54203a920904a3ec8320823c6125b9831acd1 lib/libv4l1/libv4l1-kernelcode-license.txt +sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l +sha256 34229b5aadfb768d0d083987cba54203a920904a3ec8320823c6125b9831acd1 lib/libv4l1/libv4l1-kernelcode-license.txt diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index e095e3d7e1..7b61823cec 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBV4L_VERSION = 1.18.0 +LIBV4L_VERSION = 1.20.0 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES diff --git a/package/libva-intel-driver/libva-intel-driver.hash b/package/libva-intel-driver/libva-intel-driver.hash index 555aa9473b..4bf827748f 100644 --- a/package/libva-intel-driver/libva-intel-driver.hash +++ b/package/libva-intel-driver/libva-intel-driver.hash @@ -1,5 +1,5 @@ # From https://github.com/intel/intel-vaapi-driver/releases -sha1 5f805f6a040f5beab6693d11765618cc92d2076b intel-vaapi-driver-2.4.0.tar.bz2 +sha1 c998e06f13238c6419bb38ede9a13e453312737b intel-vaapi-driver-2.4.1.tar.bz2 # Locally computed -sha256 71e2ddd985af6b221389db1018c4e8ca27a7f939fb51dcdf49d0efcb5ff3d089 intel-vaapi-driver-2.4.0.tar.bz2 -sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING +sha256 0081fce08eb3a83f7d99c3b853c8fdfa0af437b8f5b0fb7c66faeb83bcbe0c19 intel-vaapi-driver-2.4.1.tar.bz2 +sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva-intel-driver/libva-intel-driver.mk b/package/libva-intel-driver/libva-intel-driver.mk index 1cf113c406..ad801dc957 100644 --- a/package/libva-intel-driver/libva-intel-driver.mk +++ b/package/libva-intel-driver/libva-intel-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_INTEL_DRIVER_VERSION = 2.4.0 +LIBVA_INTEL_DRIVER_VERSION = 2.4.1 LIBVA_INTEL_DRIVER_SOURCE = intel-vaapi-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2 LIBVA_INTEL_DRIVER_SITE = \ https://github.com/intel/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 4addb7be3a..18a078dc1c 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,5 @@ +# From https://github.com/intel/libva-utils/releases/download/2.13.0/libva-utils-2.13.0.tar.bz2.sha1sum +sha1 7ab945cf232387f762891f9e4f7a6cb41e0766e8 libva-utils-2.13.0.tar.bz2 # Locally computed -sha256 9cf35b971001e7143dda14207b6891c12619a72a2ab99a9133b3da5b9c4d97dd libva-utils-2.7.1.tar.gz -sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING +sha256 db3ae0bd63c2a3f6ef498450c29ffc99c387ce611e1eb5db6a8da1f88845d612 libva-utils-2.13.0.tar.bz2 +sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index dee29c9891..e6e31df8bd 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,12 +4,11 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.7.1 -LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) +LIBVA_UTILS_VERSION = 2.13.0 +LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2 +LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING -# github tarball does not include configure -LIBVA_UTILS_AUTORECONF = YES LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva $(eval $(autotools-package)) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 53a9f3cceb..7b66a7709d 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,3 +1,5 @@ +# From https://github.com/intel/libva/releases/download/2.13.0/libva-2.13.0.tar.bz2.sha1sum +sha1 2adb2c023371dd68fe0d23e58afcf0b072b79828 libva-2.13.0.tar.bz2 # Locally computed -sha256 0952ee21069c560f48ebafcba91e1ffb72e5a8736dbab3559af959221b51598f libva-2.7.0.tar.gz -sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING +sha256 fad383f39f36115814bd0eda1496a4cc01761643bd962635400df2d4470ad460 libva-2.13.0.tar.bz2 +sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index f430847b2f..6ac5386540 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,13 +4,12 @@ # ################################################################################ -LIBVA_VERSION = 2.7.0 -LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) +LIBVA_VERSION = 2.13.0 +LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 +LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING LIBVA_INSTALL_STAGING = YES -# github tarball does not include configure -LIBVA_AUTORECONF = YES LIBVA_DEPENDENCIES = host-pkgconf libdrm # libdrm is a hard-dependency diff --git a/package/libvips/libvips.hash b/package/libvips/libvips.hash index ba40e6dbbe..1ba242d1cf 100644 --- a/package/libvips/libvips.hash +++ b/package/libvips/libvips.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c5e4dd5a5c6a777c129037d19ca606769b3f1d405fcc9c8eeda906a61491f790 vips-8.8.3.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 2468088d958e0e2de1be2991ff8940bf45664a826c0dad12342e1804e2805a6e vips-8.10.6.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index 001a148a7e..f7b15e8e06 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBVIPS_VERSION = 8.8.3 +LIBVIPS_VERSION = 8.10.6 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 # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported @@ -21,26 +22,46 @@ LIBVIPS_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) $(LIBVIPS_CXXFLAGS)" \ LIBS=$(TARGET_NLS_LIBS) LIBVIPS_CONF_OPTS = \ - --disable-introspection \ --without-dmalloc \ --without-gsf \ - --without-magick \ - --without-orc \ - --without-lcms \ --without-OpenEXR \ --without-openslide \ - --without-matio \ --without-cfitsio \ - --without-libwebp \ --without-pangoft2 \ - --without-x \ - --without-zip \ - --without-python + --without-x LIBVIPS_INSTALL_STAGING = YES LIBVIPS_DEPENDENCIES = \ host-pkgconf expat libglib2 \ $(TARGET_NLS_DEPENDENCIES) +ifeq ($(BR2_PACKAGE_GIFLIB),y) +LIBVIPS_CONF_OPTS += --with-giflib +LIBVIPS_DEPENDENCIES += giflib +else +LIBVIPS_CONF_OPTS += --without-giflib +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBVIPS_CONF_OPTS += --enable-introspection +LIBVIPS_DEPENDENCIES += gobject-introspection +else +LIBVIPS_CONF_OPTS += --disable-introspection +endif + +ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y) +LIBVIPS_CONF_OPTS += \ + --with-magick \ + --with-magickpackage=MagickCore +LIBVIPS_DEPENDENCIES += imagemagick +else ifeq ($(BR2_PACKAGE_GRAPHICSMAGICK),y) +LIBVIPS_CONF_OPTS += \ + --with-magick \ + --with-magickpackage=GraphicsMagick +LIBVIPS_DEPENDENCIES += graphicsmagick +else +LIBVIPS_CONF_OPTS += --without-magick +endif + ifeq ($(BR2_PACKAGE_JPEG),y) LIBVIPS_CONF_OPTS += --with-jpeg LIBVIPS_DEPENDENCIES += jpeg @@ -48,6 +69,13 @@ else LIBVIPS_CONF_OPTS += --without-jpeg endif +ifeq ($(BR2_PACKAGE_LCMS2),y) +LIBVIPS_CONF_OPTS += --with-lcms +LIBVIPS_DEPENDENCIES += lcms2 +else +LIBVIPS_CONF_OPTS += --without-lcms +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) LIBVIPS_CONF_OPTS += --with-png LIBVIPS_DEPENDENCIES += libpng @@ -55,6 +83,34 @@ else LIBVIPS_CONF_OPTS += --without-png endif +ifeq ($(BR2_PACKAGE_LIBRSVG),y) +LIBVIPS_CONF_OPTS += --with-rsvg +LIBVIPS_DEPENDENCIES += librsvg +else +LIBVIPS_CONF_OPTS += --without-rsvg +endif + +ifeq ($(BR2_PACKAGE_MATIO),y) +LIBVIPS_CONF_OPTS += --with-matio +LIBVIPS_DEPENDENCIES += matio +else +LIBVIPS_CONF_OPTS += --without-matio +endif + +ifeq ($(BR2_PACKAGE_ORC),y) +LIBVIPS_CONF_OPTS += --with-orc +LIBVIPS_DEPENDENCIES += orc +else +LIBVIPS_CONF_OPTS += --without-orc +endif + +ifeq ($(BR2_PACKAGE_POPPLER),y) +LIBVIPS_CONF_OPTS += --with-poppler +LIBVIPS_DEPENDENCIES += poppler +else +LIBVIPS_CONF_OPTS += --without-poppler +endif + ifeq ($(BR2_PACKAGE_TIFF),y) LIBVIPS_CONF_OPTS += --with-tiff LIBVIPS_DEPENDENCIES += tiff @@ -76,4 +132,18 @@ else LIBVIPS_CONF_OPTS += --without-libexif endif +ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) +LIBVIPS_CONF_OPTS += --with-libwebp +LIBVIPS_DEPENDENCIES += webp +else +LIBVIPS_CONF_OPTS += --without-libwebp +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBVIPS_CONF_OPTS += --with-zlib +LIBVIPS_DEPENDENCIES += zlib +else +LIBVIPS_CONF_OPTS += --without-zlib +endif + $(eval $(autotools-package)) diff --git a/package/libvncserver/Config.in b/package/libvncserver/Config.in index 2d5bf8a182..6189b379d2 100644 --- a/package/libvncserver/Config.in +++ b/package/libvncserver/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBVNCSERVER depends on !BR2_nios2 depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LZO + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help libvncserver is a VNC server/client library. diff --git a/package/libvncserver/libvncserver.hash b/package/libvncserver/libvncserver.hash index d98d78d766..8e61a3d0ea 100644 --- a/package/libvncserver/libvncserver.hash +++ b/package/libvncserver/libvncserver.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 33cbbb4e15bb390f723c311b323cef4a43bcf781984f92d92adda3243a116136 LibVNCServer-0.9.12.tar.gz +sha256 0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a LibVNCServer-0.9.13.tar.gz sha256 4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f COPYING diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index 5b8648fa6d..ead809d19c 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -4,24 +4,20 @@ # ################################################################################ -LIBVNCSERVER_VERSION = 0.9.12 +LIBVNCSERVER_VERSION = 0.9.13 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ LIBVNCSERVER_LICENSE_FILES = COPYING +LIBVNCSERVER_CPE_ID_VENDOR = libvncserver_project LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON -# 0003-Limit-lenght-to-INT_MAX-bytes-in-rfbProcessFileTransferReadBuffer.patch -LIBVNCSERVER_IGNORE_CVES += CVE-2018-20750 - -# 0004-rfbserver-don-t-leak-stack-memory-to-the-remote.patch -LIBVNCSERVER_IGNORE_CVES += CVE-2019-15681 - # only used for examples LIBVNCSERVER_CONF_OPTS += \ -DWITH_FFMPEG=OFF \ + -DWITH_GTK=OFF \ -DWITH_SDL=OFF ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) diff --git a/package/libvorbis/libvorbis.hash b/package/libvorbis/libvorbis.hash index 15bd01f22a..2e44ba33af 100644 --- a/package/libvorbis/libvorbis.hash +++ b/package/libvorbis/libvorbis.hash @@ -1,4 +1,4 @@ # From http://www.xiph.org/downloads/ -sha256 af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415 libvorbis-1.3.6.tar.xz +sha256 b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b libvorbis-1.3.7.tar.xz # License files, locally calculated -sha256 29e9914e6173b7061b7d48c25e6159fc1438326738bc047cc7248abc01b271f6 COPYING +sha256 ec1815db59fcd302846df949d7424876cb2e2dc5ed1606c5fb0b36787b1cf43a COPYING diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk index 708f3364ec..c1baa18515 100644 --- a/package/libvorbis/libvorbis.mk +++ b/package/libvorbis/libvorbis.mk @@ -4,19 +4,14 @@ # ################################################################################ -LIBVORBIS_VERSION = 1.3.6 +LIBVORBIS_VERSION = 1.3.7 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz -LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis +LIBVORBIS_SITE = https://downloads.xiph.org/releases/vorbis LIBVORBIS_INSTALL_STAGING = YES LIBVORBIS_CONF_OPTS = --disable-oggtest LIBVORBIS_DEPENDENCIES = host-pkgconf libogg LIBVORBIS_LICENSE = BSD-3-Clause LIBVORBIS_LICENSE_FILES = COPYING - -# 0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch -LIBVORBIS_IGNORE_CVES += CVE-2018-10393 - -# 0002-Sanity-check-number-of-channels-in-setup.patch -LIBVORBIS_IGNORE_CVES += CVE-2018-10392 +LIBVORBIS_CPE_ID_VENDOR = xiph.org $(eval $(autotools-package)) diff --git a/package/libvpx/libvpx.hash b/package/libvpx/libvpx.hash index b75cd8d474..5b9568837c 100644 --- a/package/libvpx/libvpx.hash +++ b/package/libvpx/libvpx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 8735d9fcd1a781ae6917f28f239a8aa358ce4864ba113ea18af4bb2dc8b474ac libvpx-1.8.2.tar.gz -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE -sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS +sha256 85803ccbdbdd7a3b03d930187cb055f1353596969c1f92ebec2db839fa4f834a libvpx-1.10.0.tar.gz +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE +sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS diff --git a/package/libvpx/libvpx.mk b/package/libvpx/libvpx.mk index 689ad6f05f..6ad558bc99 100644 --- a/package/libvpx/libvpx.mk +++ b/package/libvpx/libvpx.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBVPX_VERSION = 1.8.2 +LIBVPX_VERSION = 1.10.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 # ld is being used with cc options. therefore, pretend ld is cc. @@ -20,6 +21,13 @@ LIBVPX_CONF_OPTS = \ --disable-docs \ --disable-unit-tests +# vp9/ratectrl_rtc.cc +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +LIBVPX_CONF_OPTS += --enable-vp9-encoder +else +LIBVPX_CONF_OPTS += --disable-vp9-encoder +endif + # This is not a true autotools package. It is based on the ffmpeg build system define LIBVPX_CONFIGURE_CMDS (cd $(LIBVPX_SRCDIR) && rm -rf config.cache && \ diff --git a/package/libwebsockets/Config.in b/package/libwebsockets/Config.in index 2b350bf389..d7b529cafd 100644 --- a/package/libwebsockets/Config.in +++ b/package/libwebsockets/Config.in @@ -1,10 +1,13 @@ config BR2_PACKAGE_LIBWEBSOCKETS bool "libwebsockets" - depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_ZLIB help Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions. - http://libwebsockets.org/ + https://libwebsockets.org/ + +comment "libwebsockets needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index ca0c1db2d5..1761a7658a 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c libwebsockets-3.2.2.tar.gz -sha256 4d092cd5e062c5ab0cf6408963d74619b5baf1571344410be6aa5bcef512eb70 LICENSE +sha256 6ece1f422c6d38aabedec2476f2ac12e9aede8691b08137068ad85545ce3ff78 libwebsockets-4.0.21.tar.gz +sha256 5756db345eb9c21cb06dd7cb69c38ec234657a233f9a186b4f5fa453681bd394 LICENSE diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index dedd03347d..c25686d385 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,13 +4,17 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = 3.2.2 +LIBWEBSOCKETS_VERSION = 4.0.21 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) -LIBWEBSOCKETS_LICENSE = LGPL-2.1 with exceptions +LIBWEBSOCKETS_LICENSE = MIT with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE LIBWEBSOCKETS_DEPENDENCIES = zlib LIBWEBSOCKETS_INSTALL_STAGING = YES -LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON +LIBWEBSOCKETS_CONF_OPTS = \ + -DLWS_WITHOUT_TESTAPPS=ON \ + -DLWS_IPV6=ON \ + -DLWS_UNIX_SOCK=ON \ + -DLWS_WITHOUT_EXTENSIONS=OFF # If LWS_MAX_SMP=1, then there is no code related to pthreads compiled # in the library. If unset, LWS_MAX_SMP defaults to 32 and a small @@ -44,6 +48,20 @@ LIBWEBSOCKETS_CONF_OPTS += \ -DLWS_WITH_LIBEVENT=OFF endif +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +LIBWEBSOCKETS_DEPENDENCIES += libglib2 +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_GLIB=ON +else +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_GLIB=OFF +endif + +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) +LIBWEBSOCKETS_DEPENDENCIES += util-linux +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_FSMOUNT=ON +else +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_FSMOUNT=OFF +endif + ifeq ($(BR2_PACKAGE_LIBUV),y) LIBWEBSOCKETS_DEPENDENCIES += libuv LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBUV=ON @@ -51,10 +69,6 @@ else LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBUV=OFF endif -ifeq ($(BR2_STATIC_LIBS),y) -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SHARED=OFF -endif - ifeq ($(BR2_SHARED_LIBS),y) LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_STATIC=OFF endif diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash index e138c06f2b..200b6c2798 100644 --- a/package/libwpe/libwpe.hash +++ b/package/libwpe/libwpe.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.6.0.tar.xz.sums -md5 6e8a2c279dcc3617db5ec7ac4c03d628 libwpe-1.6.0.tar.xz -sha1 e8424d5e29f35861d85acdc5962d8b59b53bb1ad libwpe-1.6.0.tar.xz -sha256 3587c6b8a807f4bb76b268ba74ca82c6b395b90235db41ad8252224456193c90 libwpe-1.6.0.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.10.1.tar.xz.sums +md5 f60fc13b519a66d262afb76c77441870 libwpe-1.10.1.tar.xz +sha1 1a8085b9a172d37e952c07bbb09b1654d4161ab2 libwpe-1.10.1.tar.xz +sha256 a327b3ffcf2356dbe8148c1db4bbdc5359d7e7163d177f67551a8393b144adf0 libwpe-1.10.1.tar.xz # Hashes for license files: sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk index fd4f3d0cbd..6396fe696d 100644 --- a/package/libwpe/libwpe.mk +++ b/package/libwpe/libwpe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWPE_VERSION = 1.6.0 +LIBWPE_VERSION = 1.10.1 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES @@ -12,11 +12,13 @@ LIBWPE_LICENSE = BSD-2-Clause LIBWPE_LICENSE_FILES = COPYING LIBWPE_DEPENDENCIES = libegl libxkbcommon +LIBWPE_CFLAGS = $(TARGET_CFLAGS) +LIBWPE_CXXFLAGS = $(TARGET_CXXFLAGS) + # Workaround for https://github.com/raspberrypi/userland/issues/316 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -LIBWPE_CONF_OPTS += \ - -DCMAKE_C_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE' \ - -DCMAKE_CXX_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE' +LIBWPE_CFLAGS += -D_GNU_SOURCE +LIBWPE_CXXFLAGS += -D_GNU_SOURCE endif -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index 5d4c3af10a..40cad4d0b7 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,7 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-January/041133.html -md5 2d9ad3a46b317138b5e72a91cf105451 libxkbcommon-0.10.0.tar.xz -sha1 d8f956f4bc5382d5d8e0e4dd590c4f090e0e985a libxkbcommon-0.10.0.tar.xz -sha256 57c3630cdc38fb4734cd57fa349e92244f5ae3862813e533cedbd86721a0b6f2 libxkbcommon-0.10.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2021-March/041747.html +sha256 412cfcca596f92914ea1a66ad244804d73a5ff20b6d86459951e7ad20576c246 libxkbcommon-1.1.0.tar.xz # License file: -sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE +sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index 3923d69c8d..8780706c7e 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,14 +4,17 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 0.10.0 +LIBXKBCOMMON_VERSION = 1.1.0 LIBXKBCOMMON_SITE = http://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 LIBXKBCOMMON_LICENSE_FILES = LICENSE LIBXKBCOMMON_INSTALL_STAGING = YES LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex -LIBXKBCOMMON_CONF_OPTS = -Denable-docs=false -Denable-wayland=false +LIBXKBCOMMON_CONF_OPTS = \ + -Denable-docs=false \ + -Denable-wayland=false \ + -Denable-xkbregistry=false ifeq ($(BR2_PACKAGE_XORG7),y) LIBXKBCOMMON_CONF_OPTS += -Denable-x11=true diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk index fcde5fc939..37cef2e418 100644 --- a/package/libxml-parser-perl/libxml-parser-perl.mk +++ b/package/libxml-parser-perl/libxml-parser-perl.mk @@ -12,9 +12,14 @@ LIBXML_PARSER_PERL_LICENSE = Artistic or GPL-1.0+ LIBXML_PARSER_PERL_LICENSE_FILES = README LIBXML_PARSER_PERL_RUN_PERL = `which perl` +HOST_LIBXML_PARSER_PERL_CONFIGURE_OPTS = \ + $(HOST_CONFIGURE_OPTS) \ + LD="$(HOSTCC)" + define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS (cd $(@D) ; \ - $(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \ + $(HOST_LIBXML_PARSER_PERL_CONFIGURE_OPTS) \ + $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \ PREFIX=$(HOST_DIR) \ EXPATLIBPATH=$(HOST_DIR)/lib \ EXPATINCPATH=$(HOST_DIR)/include \ @@ -25,7 +30,7 @@ define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS endef define HOST_LIBXML_PARSER_PERL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) + $(HOST_MAKE_ENV) $(MAKE) $(HOST_LIBXML_PARSER_PERL_CONFIGURE_OPTS) -C $(@D) endef define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index d890713a7c..ce6c3c4825 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f libxml2-2.9.10.tar.gz +sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 libxml2-2.9.12.tar.gz # License files, locally calculated -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index ea6a8c1f6d..5d688acae5 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,15 +4,12 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.10 +LIBXML2_VERSION = 2.9.12 LIBXML2_SITE = http://xmlsoft.org/sources LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING -# 0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch -LIBXML2_IGNORE_CVES += CVE-2020-7595 -# 0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch -LIBXML2_IGNORE_CVES += CVE-2019-20388 +LIBXML2_CPE_ID_VENDOR = xmlsoft LIBXML2_CONFIG_SCRIPTS = xml2-config # relocation truncated to fit: R_68K_GOT16O @@ -49,6 +46,11 @@ else LIBXML2_CONF_OPTS += --without-iconv endif +define LIBXML2_CLEANUP_XML2CONF + rm -f $(TARGET_DIR)/usr/lib/xml2Conf.sh +endef +LIBXML2_POST_INSTALL_TARGET_HOOKS += LIBXML2_CLEANUP_XML2CONF + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/libxmlrpc/Config.in b/package/libxmlrpc/Config.in index d24a79163d..33d512328e 100644 --- a/package/libxmlrpc/Config.in +++ b/package/libxmlrpc/Config.in @@ -10,5 +10,18 @@ config BR2_PACKAGE_LIBXMLRPC http://xmlrpc-c.sourceforge.net/ +if BR2_PACKAGE_LIBXMLRPC + +config BR2_PACKAGE_LIBXMLRPC_TOOLS_XMLRPC + bool "install cli tool" + depends on !BR2_STATIC_LIBS + help + Command line tool xmlrpc. + +comment "cli tool needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + +endif # BR2_PACKAGE_LIBXMLRPC + comment "libxmlrpc needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libxmlrpc/libxmlrpc.hash b/package/libxmlrpc/libxmlrpc.hash index 093da67bbf..5d42dc0558 100644 --- a/package/libxmlrpc/libxmlrpc.hash +++ b/package/libxmlrpc/libxmlrpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c9f5b584a42493877ae0f09ed680d94e035ab389e8fa1873b1ec42118d5cfca3 xmlrpc-c-1.43.08.tgz -sha256 db7a6d3f187b218c3534010a83424c6bcdef88e6a0b6b1aa3a8762238bd642e6 doc/COPYING +sha256 626e36295f43b320082bc7bdd961b46f39fbe2719535b5a417975a8e50c8f7f3 libxmlrpc-r3119-br2.tar.gz +sha256 db7a6d3f187b218c3534010a83424c6bcdef88e6a0b6b1aa3a8762238bd642e6 doc/COPYING diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk index 54db9f1f89..c1b0eae8ee 100644 --- a/package/libxmlrpc/libxmlrpc.mk +++ b/package/libxmlrpc/libxmlrpc.mk @@ -4,9 +4,10 @@ # ################################################################################ -LIBXMLRPC_VERSION = 1.43.08 -LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz -LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(LIBXMLRPC_VERSION) +# 1.58.02 (code/advanced@r3119) +LIBXMLRPC_VERSION = r3119 +LIBXMLRPC_SITE = https://svn.code.sf.net/p/xmlrpc-c/code/advanced +LIBXMLRPC_SITE_METHOD = svn LIBXMLRPC_LICENSE = BSD-3-Clause (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c) LIBXMLRPC_LICENSE_FILES = doc/COPYING LIBXMLRPC_INSTALL_STAGING = YES @@ -39,10 +40,29 @@ ifeq ($(BR2_STATIC_LIBS),y) LIBXMLRPC_STATIC_OPTS = SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBXMLRPC_DEPENDENCIES += host-pkgconf openssl +LIBXMLRPC_CONF_OPTS += --enable-abyss-openssl +else +LIBXMLRPC_CONF_OPTS += --disable-abyss-openssl +endif + LIBXMLRPC_MAKE_OPTS += $(LIBXMLRPC_STATIC_OPTS) LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \ DESTDIR=$(STAGING_DIR) install LIBXMLRPC_INSTALL_TARGET_OPTS = $(LIBXMLRPC_STATIC_OPTS) \ DESTDIR=$(TARGET_DIR) install +ifeq ($(BR2_PACKAGE_LIBXMLRPC_TOOLS_XMLRPC),y) +define LIBXMLRPC_TOOLS_XMLRPC_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(LIBXMLRPC_MAKE_OPTS) -C $(@D)/tools/xmlrpc +endef +LIBXMLRPC_POST_BUILD_HOOKS += LIBXMLRPC_TOOLS_XMLRPC_BUILD_CMDS +define LIBXMLRPC_TOOLS_XMLRPC_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(LIBXMLRPC_MAKE_OPTS) -C $(@D)/tools/xmlrpc \ + DESTDIR=$(TARGET_DIR) install +endef +LIBXMLRPC_POST_INSTALL_TARGET_HOOKS += LIBXMLRPC_TOOLS_XMLRPC_INSTALL_TARGET_CMDS +endif + $(eval $(autotools-package)) diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 2f37f303ac..d0f79d2521 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -9,6 +9,9 @@ LIBXSLT_SITE = http://xmlsoft.org/sources LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT LIBXSLT_LICENSE_FILES = COPYING +LIBXSLT_CPE_ID_VENDOR = xmlsoft +# We're patching configure.ac +LIBXSLT_AUTORECONF = YES LIBXSLT_CONF_OPTS = \ --with-gnu-ld \ diff --git a/package/libyaml/libyaml.hash b/package/libyaml/libyaml.hash index 49693b507b..0de9e527a5 100644 --- a/package/libyaml/libyaml.hash +++ b/package/libyaml/libyaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4a9100ab61047fd9bd395bcef3ce5403365cafd55c1e0d0299cde14958e47be9 yaml-0.2.2.tar.gz -sha256 a2adb9c959b797494a0ef80bdf60e22db2749ee3e0c0908556e3eb548f967c56 LICENSE +sha256 c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4 yaml-0.2.5.tar.gz +sha256 c40112449f254b9753045925248313e9270efa36d226b22d82d4cc6c43c57f29 License diff --git a/package/libyaml/libyaml.mk b/package/libyaml/libyaml.mk index 1ba069a1b2..cf3d44cac3 100644 --- a/package/libyaml/libyaml.mk +++ b/package/libyaml/libyaml.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBYAML_VERSION = 0.2.2 +LIBYAML_VERSION = 0.2.5 LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz LIBYAML_SITE = http://pyyaml.org/download/libyaml LIBYAML_INSTALL_STAGING = YES LIBYAML_LICENSE = MIT -LIBYAML_LICENSE_FILES = LICENSE +LIBYAML_LICENSE_FILES = License +LIBYAML_CPE_ID_VENDOR = pyyaml $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index c5426042bb..755ecf390a 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,2 +1,3 @@ -sha256 1686a381a8cce775102e60c8eb93f7ba64c6d4ae10591fc05d9f969a07815f60 libyang-1.0.109.tar.gz -sha256 f942fe693e03e4e3ff67a351c00dc8f468a042e0d7273b0aa6bc53060b568112 LICENSE +# Locally calculated +sha256 8576cad398b451b1c622b0652a2030fcf83ee1d9a39e6cd93d17b0a5a43118d6 libyang-1.0.240.tar.gz +sha256 f942fe693e03e4e3ff67a351c00dc8f468a042e0d7273b0aa6bc53060b568112 LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 648ffeb6a3..f784367ea3 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,18 +4,20 @@ # ################################################################################ -LIBYANG_VERSION = 1.0.109 +LIBYANG_VERSION = 1.0.240 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE LIBYANG_INSTALL_STAGING = YES +LIBYANG_CPE_ID_VENDOR = cesnet LIBYANG_SUPPORTS_IN_SOURCE_BUILD = NO LIBYANG_DEPENDENCIES = pcre HOST_LIBYANG_DEPENDENCIES = host-pcre LIBYANG_CONF_OPTS = \ -DENABLE_VALGRIND_TESTS=OFF \ - -DGEN_PYTHON_BINDINGS=OFF + -DGEN_PYTHON_BINDINGS=OFF \ + -DENABLE_LYD_PRIV=ON HOST_LIBYANG_CONF_OPTS = \ -DENABLE_VALGRIND_TESTS=OFF \ diff --git a/package/libyuv/libyuv.hash b/package/libyuv/libyuv.hash index e0d4e57e1a..4b70e63ade 100644 --- a/package/libyuv/libyuv.hash +++ b/package/libyuv/libyuv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 395075bed7e048f5f7d4fe9cb9255ce0afcee3f8f093741a7af1a2b1c579d089 libyuv-413a8d8041f1cc5a350a47c0d81cc721e64f9fd0.tar.gz -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f LICENSE +sha256 7bb4118ef050ca3e9a27f49b7d21e068922bf57cf973f2c7b1476cadf73ac66a libyuv-413a8d8041f1cc5a350a47c0d81cc721e64f9fd0-br1.tar.gz +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f LICENSE diff --git a/package/libzip/Config.in b/package/libzip/Config.in index c6ddabe6b5..a603d9abf1 100644 --- a/package/libzip/Config.in +++ b/package/libzip/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBZIP This package also contains zipcmp, ziptorrent and zipmerge utilities. - http://www.nih.at/libzip/ + https://libzip.org/ comment "libzip needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash index eb11b526fb..a298b9aba9 100644 --- a/package/libzip/libzip.hash +++ b/package/libzip/libzip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b3de4d4bd49a01e0cab3507fc163f88e1651695b6b9cb25ad174dbe319d4a3b4 libzip-1.5.2.tar.xz -sha256 04464e729973cf58189051e7a3e8bca2acce9a1058c735e9e2eb1fdbe0fbbf50 LICENSE +sha256 a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132 libzip-1.7.3.tar.xz +sha256 deae392de70503672793ee784d603bfa8069dcd5974a325dfbf91160f3a147d6 LICENSE diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk index a312dd90df..4a028f970a 100644 --- a/package/libzip/libzip.mk +++ b/package/libzip/libzip.mk @@ -4,19 +4,21 @@ # ################################################################################ -LIBZIP_VERSION = 1.5.2 -LIBZIP_SITE = http://www.nih.at/libzip +LIBZIP_VERSION = 1.7.3 +LIBZIP_SITE = https://libzip.org/download LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz LIBZIP_LICENSE = BSD-3-Clause LIBZIP_LICENSE_FILES = LICENSE +LIBZIP_CPE_ID_VENDOR = libzip LIBZIP_INSTALL_STAGING = YES LIBZIP_DEPENDENCIES = zlib HOST_LIBZIP_DEPENDENCIES = host-zlib ifeq ($(BR2_PACKAGE_BZIP2),y) LIBZIP_DEPENDENCIES += bzip2 +LIBZIP_CONF_OPTS += -DENABLE_BZIP2=ON else -LIBZIP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_BZIP2=TRUE +LIBZIP_CONF_OPTS += -DENABLE_BZIP2=OFF endif ifeq ($(BR2_PACKAGE_GNUTLS),y) @@ -26,6 +28,13 @@ else LIBZIP_CONF_OPTS += -DENABLE_GNUTLS=OFF endif +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBZIP_DEPENDENCIES += mbedtls +LIBZIP_CONF_OPTS += -DENABLE_MBEDTLS=ON +else +LIBZIP_CONF_OPTS += -DENABLE_MBEDTLS=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBZIP_DEPENDENCIES += openssl LIBZIP_CONF_OPTS += -DENABLE_OPENSSL=ON @@ -38,5 +47,12 @@ LIBZIP_DEPENDENCIES += musl-fts LIBZIP_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lfts endif +ifeq ($(BR2_PACKAGE_XZ),y) +LIBZIP_DEPENDENCIES += xz +LIBZIP_CONF_OPTS += -DENABLE_LZMA=ON +else +LIBZIP_CONF_OPTS += -DENABLE_LZMA=OFF +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index eea0c12f22..a10fc748d1 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -11,6 +11,8 @@ LIBZLIB_LICENSE = Zlib LIBZLIB_LICENSE_FILES = README LIBZLIB_INSTALL_STAGING = YES LIBZLIB_PROVIDES = zlib +LIBZLIB_CPE_ID_VENDOR = gnu +LIBZLIB_CPE_ID_PRODUCT = zlib # It is not possible to build only a shared version of zlib, so we build both # shared and static, unless we only want the static libs, and we eventually diff --git a/package/lightning/lightning.mk b/package/lightning/lightning.mk index 3bd17bef56..da8c07e61f 100644 --- a/package/lightning/lightning.mk +++ b/package/lightning/lightning.mk @@ -9,6 +9,7 @@ LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning LIGHTNING_LICENSE = LGPL-3.0+ LIGHTNING_LICENSE_FILES = COPYING.LESSER LIGHTNING_INSTALL_STAGING = YES +LIGHTNING_CPE_ID_VENDOR = gnu # We're patching include/Makefile.am LIGHTNING_AUTORECONF = YES diff --git a/package/lighttpd/0001-Fix-default-config-file.patch b/package/lighttpd/0001-Fix-default-config-file.patch index ada1589760..47a859770d 100644 --- a/package/lighttpd/0001-Fix-default-config-file.patch +++ b/package/lighttpd/0001-Fix-default-config-file.patch @@ -3,8 +3,6 @@ Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames * Disable IPv6 * Do not setuid to a user that doesn't exist on the system - * Disable pdf ranges fix for Adobe Reader since it uses regex and we - don't always have pcre support * Change the network backend to writev since linux-sendfile fails on buildroot Signed-off-by: Maxime Ripard @@ -35,7 +33,7 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con -var.server_root = "/srv/www" +var.log_root = "/var/log" +var.server_root = "/var/www" - var.state_dir = "/var/run" + var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" @@ -90,7 +90,7 @@ @@ -56,9 +54,9 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con +server.username = "www-data" +server.groupname = "www-data" - ## - ## enable core files. -@@ -112,7 +112,7 @@ + ## + ## Enable lighttpd to serve requests on sockets received from systemd +@@ -118,7 +118,7 @@ ## ## Document root ## @@ -67,7 +65,7 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con ## ## The value for the "Server:" response field. -@@ -138,7 +138,7 @@ +@@ -144,7 +144,7 @@ ## ## Path to the error log file ## @@ -76,7 +74,7 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con ## ## If you want to log to syslog you have to unset the -@@ -188,7 +188,7 @@ +@@ -195,7 +195,7 @@ ## sendfile - is recommended for small files. ## writev - is recommended for sending many large files ## @@ -85,16 +83,3 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con ## ## As lighttpd is a single-threaded server, its main resource limit is -@@ -311,9 +311,9 @@ - ## disable range requests for pdf files - ## workaround for a bug in the Acrobat Reader plugin. - ## --$HTTP["url"] =~ "\.pdf$" { -- server.range-requests = "disable" --} -+# $HTTP["url"] =~ "\.pdf$" { -+# server.range-requests = "disable" -+# } - - ## - ## url handling modules (rewrite, redirect) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 7d75663629..e9a5aa34f0 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_LIGHTTPD webserver-software for every server that is suffering load problems. - http://www.lighttpd.net/ + https://www.lighttpd.net/ if BR2_PACKAGE_LIGHTTPD diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 7f20bf9dce..cc192f1a9e 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.55.sha256sum -sha256 6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927 lighttpd-1.4.55.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.59.sha256sum +sha256 fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5 lighttpd-1.4.59.tar.xz # Locally calculated -sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING +sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 7181465c66..fbbca00b0c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,11 +5,12 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).55 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).59 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause LIGHTTPD_LICENSE_FILES = COPYING +LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf LIGHTTPD_CONF_OPTS = \ --without-wolfssl \ diff --git a/package/linknx/linknx.hash b/package/linknx/linknx.hash index 79113e6e70..86ec522809 100644 --- a/package/linknx/linknx.hash +++ b/package/linknx/linknx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3c3aaf8c409538153b15f5fb975a4485e58c4820cfea289a3f20777ba69782ab linknx-0.0.1.37.tar.gz -sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE +sha256 00c53776c2e871295459ede922402d8ad0208367d2364781fdb92ddafad94d3d linknx-0.0.1.38.tar.gz +sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk index c75f0655d6..dbee0742fe 100644 --- a/package/linknx/linknx.mk +++ b/package/linknx/linknx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINKNX_VERSION = 0.0.1.37 +LINKNX_VERSION = 0.0.1.38 LINKNX_SITE = $(call github,linknx,linknx,$(LINKNX_VERSION)) LINKNX_LICENSE = GPL-2.0+ LINKNX_LICENSE_FILES = LICENSE @@ -17,7 +17,9 @@ LINKNX_CONF_OPTS = \ --with-pth=$(STAGING_DIR)/usr \ --disable-smtp +# add host-gettext for AM_ICONV macro LINKNX_DEPENDENCIES = \ + host-gettext \ host-pkgconf \ libpthsem \ $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) \ diff --git a/package/links/Config.in b/package/links/Config.in index 713f53da4e..cc2389c9f1 100644 --- a/package/links/Config.in +++ b/package/links/Config.in @@ -10,11 +10,15 @@ if BR2_PACKAGE_LINKS config BR2_PACKAGE_LINKS_GRAPHICS bool "use graphics" - depends on BR2_PACKAGE_DIRECTFB || BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_GPM || BR2_PACKAGE_DIRECTFB || BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBPNG help - Enable graphics output for DirectFB or X11. + Enable graphics output for framebuffer, DirectFB or X11. + Framebuffer output requires GPM (console mouse). Otherwise links will be text-mode only. +comment "links graphics needs GPM, DirectFB or X11" + depends on !BR2_PACKAGE_GPM && !BR2_PACKAGE_DIRECTFB && !BR2_PACKAGE_XORG7 + endif diff --git a/package/links/links.hash b/package/links/links.hash index a23adc087e..6dbb9d13c0 100644 --- a/package/links/links.hash +++ b/package/links/links.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424 links-2.20.2.tar.bz2 -sha256 92deeb70791366630095d4e0714fe37d6e2bd5db0e6ef498ebb8de328f45b253 COPYING +sha256 9b12f5ba2d068306d7ff7385b520cdcafdc0e55c87eec877abb0e78288525430 links-2.24.tar.bz2 +sha256 92deeb70791366630095d4e0714fe37d6e2bd5db0e6ef498ebb8de328f45b253 COPYING diff --git a/package/links/links.mk b/package/links/links.mk index 228a8ed0ee..5f075a70da 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -4,12 +4,13 @@ # ################################################################################ -LINKS_VERSION = 2.20.2 +LINKS_VERSION = 2.24 LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2 LINKS_SITE = http://links.twibright.com/download LINKS_DEPENDENCIES = host-pkgconf LINKS_LICENSE = GPL-2.0+ LINKS_LICENSE_FILES = COPYING +LINKS_CPE_ID_VENDOR = twibright ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y) LINKS_CONF_OPTS += --enable-graphics diff --git a/package/linphone/Config.in b/package/linphone/Config.in index c7683b829e..3fe25c1659 100644 --- a/package/linphone/Config.in +++ b/package/linphone/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_LINPHONE # belr, belle-sip, mediastreamer depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 depends on BR2_USE_WCHAR # belle-sip + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # mediastreamer select BR2_PACKAGE_BELLE_SIP select BR2_PACKAGE_BELR select BR2_PACKAGE_LIBXML2 @@ -30,10 +31,11 @@ config BR2_PACKAGE_LINPHONE http://www.linphone.org/ -comment "linphone needs a toolchain w/ threads, C++, dynamic library, wchar" +comment "linphone needs a toolchain w/ threads, C++, dynamic library, wchar, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "linphone needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/linphone/linphone.hash b/package/linphone/linphone.hash index 9aa03078d2..6d456ac9c9 100644 --- a/package/linphone/linphone.hash +++ b/package/linphone/linphone.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 bfb195845ae23311667d5631c470310a63818fe46029cea2f1b77a5ed84e6e21 linphone-4.3.1.tar.gz +sha256 9956f6785a787041328da000cee5fcc1e41d6f17956ffe5e0402fac0f9a9676b linphone-4.4.8.tar.gz # Locally computed sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk index 9fd69670e5..bb79e2f782 100644 --- a/package/linphone/linphone.mk +++ b/package/linphone/linphone.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINPHONE_VERSION = 4.3.1 +LINPHONE_VERSION = 4.4.8 LINPHONE_SITE = \ https://gitlab.linphone.org/BC/public/liblinphone/-/archive/$(LINPHONE_VERSION) LINPHONE_CONF_OPTS = \ @@ -18,7 +18,8 @@ LINPHONE_CONF_OPTS = \ -DENABLE_TUTORIALS=OFF \ -DENABLE_UNIT_TESTS=OFF \ -DENABLE_VCARD=OFF \ - -DENABLE_VIDEO=OFF + -DENABLE_VIDEO=OFF \ + -DGIT_EXECUTABLE=OFF LINPHONE_INSTALL_STAGING = YES LINPHONE_DEPENDENCIES = \ belle-sip \ diff --git a/package/linux-backports/Config.in b/package/linux-backports/Config.in index 362e6e4bc7..251d202fd2 100644 --- a/package/linux-backports/Config.in +++ b/package/linux-backports/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LINUX_BACKPORTS recent kernels, backported to older ones. This version of linux-backports supports kernels starting - from 3.0. + from 3.10. https://backports.wiki.kernel.org diff --git a/package/linux-backports/linux-backports.hash b/package/linux-backports/linux-backports.hash index f39bc2ed27..3e103424f5 100644 --- a/package/linux-backports/linux-backports.hash +++ b/package/linux-backports/linux-backports.hash @@ -1,4 +1,6 @@ -# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v4.4.2/sha256sums.asc -sha256 a979e194c2ed9fdfca092a448e626d85c5af0e4de5ad993c0967afd15af01285 backports-4.4.2-1.tar.xz +# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v5.8/sha256sums.asc +sha256 19b4174d89bf11ee221458e11f1e8dace26558498774b823051156f522d2036b backports-5.8-1.tar.xz # Locally computed -sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING +sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING +sha256 8e378ab93586eb55135d3bc119cce787f7324f48394777d00c34fa3d0be3303f LICENSES/exceptions/Linux-syscall-note +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/preferred/GPL-2.0 diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk index 1d7d6e7f00..068dcffcc8 100644 --- a/package/linux-backports/linux-backports.mk +++ b/package/linux-backports/linux-backports.mk @@ -4,12 +4,23 @@ # ################################################################################ -LINUX_BACKPORTS_VERSION_MAJOR = 4.4.2 +LINUX_BACKPORTS_VERSION_MAJOR = 5.8 LINUX_BACKPORTS_VERSION = $(LINUX_BACKPORTS_VERSION_MAJOR)-1 LINUX_BACKPORTS_SOURCE = backports-$(LINUX_BACKPORTS_VERSION).tar.xz LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stable/v$(LINUX_BACKPORTS_VERSION_MAJOR) LINUX_BACKPORTS_LICENSE = GPL-2.0 -LINUX_BACKPORTS_LICENSE_FILES = COPYING +LINUX_BACKPORTS_LICENSE_FILES = \ + COPYING \ + LICENSES/exceptions/Linux-syscall-note \ + LICENSES/preferred/GPL-2.0 + +# flex and bison are needed to generate kconfig parser. We use the +# same logic as the linux kernel (we add host dependencies only if +# host does not have them). See linux/linux.mk and +# support/dependencies/check-host-bison-flex.mk. +LINUX_BACKPORTS_DEPENDENCIES = \ + $(BR2_BISON_HOST_DEPENDENCY) \ + $(BR2_FLEX_HOST_DEPENDENCY) ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG),y) LINUX_BACKPORTS_KCONFIG_FILE = $(LINUX_BACKPORTS_DIR)/defconfigs/$(call qstrip,$(BR2_PACKAGE_LINUX_BACKPORTS_DEFCONFIG)) @@ -33,6 +44,8 @@ LINUX_BACKPORTS_KCONFIG_OPTS = $(LINUX_BACKPORTS_MAKE_OPTS) # LINUX_BACKPORTS_MODULE_MAKE_OPTS is used by the kernel-module infra. # LINUX_BACKPORTS_MAKE_OPTS = \ + LEX=flex \ + YACC=bison \ BACKPORT_DIR=$(@D) \ KLIB_BUILD=$(LINUX_DIR) \ KLIB=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED) \ @@ -75,25 +88,30 @@ $(eval $(kconfig-package)) # not have been parsed yet, so the Linux build dir LINUX_DIR is not yet # known. Thus, we use a "secondary expansion" so the rule is re-evaluated # after all Makefiles are parsed, and thus at that time we will have the -# LINUX_DIR variable set to the proper value. +# LINUX_DIR variable set to the proper value. Moreover, since linux-4.19, +# the kernel's build system internally touches its .config file, so we +# can't use it as a stamp file. We use the LINUX_KCONFIG_STAMP_DOTCONFIG +# instead. # # Furthermore, we want to check the kernel version, since linux-backports -# only supports kernels >= 3.0. To avoid overriding linux-backports' -# .config rule defined in the kconfig-package infra, we use an -# intermediate stamp-file. +# only supports kernels >= 3.10. To avoid overriding linux-backports' +# KCONFIG_STAMP_DOTCONFIG rule defined in the kconfig-package infra, we +# use an intermediate stamp-file. # # Finally, it must also come after the call to kconfig-package, so we get # LINUX_BACKPORTS_DIR properly defined (because the target part of the # rule is not re-evaluated). # -$(LINUX_BACKPORTS_DIR)/.config: $(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version +$(LINUX_BACKPORTS_DIR)/$(LINUX_BACKPORTS_KCONFIG_STAMP_DOTCONFIG): $(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version .SECONDEXPANSION: -$(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version: $$(LINUX_DIR)/.config - $(Q)LINUX_VERSION_PROBED=$(LINUX_VERSION_PROBED); \ - if [ $${LINUX_VERSION_PROBED%%.*} -lt 3 ]; then \ - printf "Linux version '%s' is too old for linux-backports (needs 3.0 or later)\n" \ - "$${LINUX_VERSION_PROBED}"; \ +$(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version: $$(LINUX_DIR)/$$(LINUX_KCONFIG_STAMP_DOTCONFIG) + $(Q)KVER=$(LINUX_VERSION_PROBED); \ + KVER_MAJOR=`echo $${KVER} | sed 's/^\([0-9]*\)\..*/\1/'`; \ + KVER_MINOR=`echo $${KVER} | sed 's/^[0-9]*\.\([0-9]*\).*/\1/'`; \ + if [ $${KVER_MAJOR} -lt 3 -o \( $${KVER_MAJOR} -eq 3 -a $${KVER_MINOR} -lt 10 \) ]; then \ + printf "Linux version '%s' is too old for linux-backports (needs 3.10 or later)\n" \ + "$${KVER}"; \ exit 1; \ fi $(Q)touch $(@) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index fb884842d6..4376d44bda 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -44,6 +44,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO help Firmware files for Qualcomm Adreno GPU firmware +config BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8 + bool "Samsung MFC video encoder/decoder v8 firmware" + help + Firmware files for Samsung MFC video encoder/decoder driver v8 + endmenu # Video menu "Bluetooth firmware" @@ -74,6 +79,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_AR3012_USB help Firmware files for Atheros bluetooth chipset AR3012 on USB. +config BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT + bool "Realtek 87xx Bluetooth" + help + Realtek 8723a/8723b/8723bs/8723d/8723ds/8761a + +config BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT + bool "Realtek 88xx Bluetooth" + help + Realtek 8821a/8821c/8822b/8822cs/8822cu/8852au + config BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560 bool "TI CC2560" help @@ -113,16 +128,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271 help Firmware files for the Atheros 9271 module +config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA9377 + bool "Atheros 10k (QCA9377)" + help + Firmware files for the Atheros QCA9377 module + config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X bool "Atheros 10k (QCA998X)" help Firmware files for the Atheros QCA988X module -config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174 - bool "Atheros 10k (QCA6174)" - help - Firmware files for the Atheros QCA6174 module - config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX bool "Broadcom BRCM bcm43xx" help @@ -133,6 +148,22 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX help Firmware files for the Broadcom bcm43xxx, SoftMAC and FullMAC. +config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366B1 + bool "Broadcom 4366b1" + help + Firmware file for the Broadcom 4366b1 FullMAC chip. + +config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366C0 + bool "Broadcom 4366c0" + help + Firmware file for the Broadcom 4366c0 FullMAC chip. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 + bool "Intel iwlwifi 22260" + help + Firmware files for the Intel Wifi 22260 devices supported by + the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160 bool "Intel iwlwifi 3160" help @@ -273,11 +304,28 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897 help Firmware files for the Marvell Wifi-Ex 8897 module on PCI-E. +config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIEUART8997 + bool "Marvell Wifi-Ex 8997 PCI-E/UART" + help + Firmware files for the Marvell Wifi-Ex 8997 module on + PCI-E/UART. + +config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIEUSB8997 + bool "Marvell Wifi-Ex 8997 PCI-E/USB" + help + Firmware files for the Marvell Wifi-Ex 8997 module on + PCI-E/USB. + config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U bool "MediaTek MT7601U" help MediaTek MT7601U +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7610E + bool "MediaTek MT7610E" + help + MediaTek MT7610E + config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT76X2E bool "MediaTek MT76x2e" help @@ -345,10 +393,21 @@ config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX help Firmware files for WLAN and Bluetooth modules wl18xx +config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_WIL6210 + bool "Qualcomm Atheros wil6210" + help + Firmware files for Qualcomm Atheros 11ad family of chips + endmenu menu "Ethernet firmware" +config BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3 + bool "Broadcom NetXtreme/Tigon3" + help + Firmware files for Broadcom Tigon3 ethernet cards + (tigon) + config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X bool "Broadcom NetXtremeII" help @@ -422,15 +481,6 @@ config BR2_PACKAGE_LINUX_FIRMWARE_XCx000 endmenu -menu "SoC Firmware" - -config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA - bool "Freescale i.MX SDMA" - help - Firmware files for i.MX SDMA. - -endmenu - menu "Fibre Channel Adapter Firmware" config BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX @@ -459,4 +509,23 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QAT_C62X endmenu +menu "USB to Serial Firmware" + +config BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI + bool "USB TI 3410/5052 Serial Firmware" + help + Firmware files for TI 3410/5052 + +endmenu + +menu "V4L Firmware" + +config BR2_PACKAGE_LINUX_FIRMWARE_CX231XX + bool "Conexant Cx23100/101/102 USB broadcast A/V decoder" + help + Firmware files for Conexant Cx23100/101/102 USB broadcast + A/V decoder needed by the Linux CX231XX driver. + +endmenu + endif diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 3878d92881..41a17b021e 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,34 +1,37 @@ -# Locally calculated -sha256 83646c58fc4e3ee9a73f4fa74213c849109f48c719322346393f3e5b0fa55044 linux-firmware-20200122.tar.gz -sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis -sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu -sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell -sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware -sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt -sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx -sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware -sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 -sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware -sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x -sha256 e295020afd7597dc1b3bbe50a84a7e432d9cb92bc053c1c5e657b50d2517627b LICENCE.iwlwifi_firmware -sha256 0fc67bd715b3395f3f2af464781910e9e69c4ba23da304352229b42dc9e986c3 LICENCE.microchip -sha256 2051d5bf0755a0668f8c3d9a0d1c41d4b8cc411aba70f720fda71ae9e3b4d25c LICENCE.qat_firmware -sha256 4071a11d878dbc0ac6d9e71203d03b151638f9d7a8bc47a54c3cb964100d5822 LICENCE.qla2xxx -sha256 d7bec70668ddd4aae8fb4aa32870e54b49fcdb0b9b007aa9f54b53a1ac7461bd LICENCE.ralink-firmware.txt -sha256 8568352b57f3574f9d5b2753cdb7c6e5eb2b79e82fbb9c9ba6566947467ef508 LICENCE.ralink_a_mediatek_company_firmware -sha256 a61351665b4f264f6c631364f85b907d8f8f41f8b369533ef4021765f9f3b62e LICENCE.rtlwifi_firmware.txt -sha256 106bef96470001e877fcf7ba0337fa6766a317650eb47fcaeb743eeebd62c4ff LICENCE.ti-connectivity -sha256 8ea9f4aee5f53ad877041ff089e8c95d34d615ce19a3111e5e1ea70d990ed7ff LICENCE.xc4000 -sha256 30ec8a66503dc73f83937564ae70ca23aa03259e64727ff4195b5b6f695e782f LICENCE.xc5000 -sha256 f8822049f32fef2e90a197bd8cf259f476db75d549456bdca8567616a9c07ace LICENCE.xc5000c -sha256 a064cbf83e10d72579d236a1e36032681adb8e442943ff75b57020a82992a5ed LICENSE.QualcommAtheros_ar3k -sha256 337a55102138d7baa143ee4a4c6c91693e0113fece35d380b2a12109e8c23b3f LICENSE.QualcommAtheros_ath10k -sha256 630fd46c95d3ac6544590c2265ba7348fbc930fb386261a1c04dcd9f403645b8 LICENSE.dib0700 -sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENSE.i915 -sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom -sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon -sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 74d203d2fd433b73b63e8e31d8928e3817f6eaf3407c9e607802c20a5c02e6c4 WHENCE -sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt -sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 +# From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc +sha256 2aa6ae8b9808408f9811ac38f00c188e53e984a2b3990254f6c9c02c1ab13417 linux-firmware-20210511.tar.xz + +# Hash for license files +sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis +sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu +sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell +sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware +sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt +sha256 631065703055d11b099477c508508f20a80b202aad548a7726564bfa59a96c91 ath10k/QCA6174/hw2.1/notice_ath10k_firmware-5.txt +sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt +sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware +sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 +sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware +sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x +sha256 e295020afd7597dc1b3bbe50a84a7e432d9cb92bc053c1c5e657b50d2517627b LICENCE.iwlwifi_firmware +sha256 0fc67bd715b3395f3f2af464781910e9e69c4ba23da304352229b42dc9e986c3 LICENCE.microchip +sha256 2051d5bf0755a0668f8c3d9a0d1c41d4b8cc411aba70f720fda71ae9e3b4d25c LICENCE.qat_firmware +sha256 4071a11d878dbc0ac6d9e71203d03b151638f9d7a8bc47a54c3cb964100d5822 LICENCE.qla2xxx +sha256 d7bec70668ddd4aae8fb4aa32870e54b49fcdb0b9b007aa9f54b53a1ac7461bd LICENCE.ralink-firmware.txt +sha256 8568352b57f3574f9d5b2753cdb7c6e5eb2b79e82fbb9c9ba6566947467ef508 LICENCE.ralink_a_mediatek_company_firmware +sha256 a61351665b4f264f6c631364f85b907d8f8f41f8b369533ef4021765f9f3b62e LICENCE.rtlwifi_firmware.txt +sha256 106bef96470001e877fcf7ba0337fa6766a317650eb47fcaeb743eeebd62c4ff LICENCE.ti-connectivity +sha256 8ea9f4aee5f53ad877041ff089e8c95d34d615ce19a3111e5e1ea70d990ed7ff LICENCE.xc4000 +sha256 30ec8a66503dc73f83937564ae70ca23aa03259e64727ff4195b5b6f695e782f LICENCE.xc5000 +sha256 f8822049f32fef2e90a197bd8cf259f476db75d549456bdca8567616a9c07ace LICENCE.xc5000c +sha256 a064cbf83e10d72579d236a1e36032681adb8e442943ff75b57020a82992a5ed LICENSE.QualcommAtheros_ar3k +sha256 337a55102138d7baa143ee4a4c6c91693e0113fece35d380b2a12109e8c23b3f LICENSE.QualcommAtheros_ath10k +sha256 630fd46c95d3ac6544590c2265ba7348fbc930fb386261a1c04dcd9f403645b8 LICENSE.dib0700 +sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENSE.i915 +sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom +sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon +sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware +sha256 dcc87a24f18d46a73985e68c378ec6d7e7fd4083eb4d4f3130a34fe3f75aff6f WHENCE +sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt +sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 21300ddc72..f29d9cf65d 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,9 +4,12 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20200122 -LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git -LINUX_FIRMWARE_SITE_METHOD = git +LINUX_FIRMWARE_VERSION = 20210511 +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) @@ -39,6 +42,17 @@ LINUX_FIRMWARE_FILES += qcom/a* LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom qcom/NOTICE.txt endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8),y) +LINUX_FIRMWARE_FILES += \ + s5p-mfc.fw \ + s5p-mfc-v6.fw \ + s5p-mfc-v6-v2.fw \ + s5p-mfc-v7.fw \ + s5p-mfc-v8.fw +# No license file; the license is in the file WHENCE +# which is installed unconditionally +endif + # Intel Wireless Bluetooth ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IBT),y) LINUX_FIRMWARE_FILES += intel/ibt-* @@ -51,10 +65,25 @@ LINUX_FIRMWARE_FILES += qca/rampatch_usb_00000302.bin qca/nvm_usb_00000302.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom endif -# Freescale i.MX SDMA -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA),y) -LINUX_FIRMWARE_FILES += imx/sdma/sdma-imx6q.bin imx/sdma/sdma-imx7d.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.sdma_firmware +# Realtek 87xx Bluetooth +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT),y) +LINUX_FIRMWARE_FILES += \ + rtl_bt/rtl8723a_fw.bin rtl_bt/rtl8723b_fw.bin \ + rtl_bt/rtl8723bs_config-OBDA8723.bin \ + rtl_bt/rtl8723bs_fw.bin rtl_bt/rtl8723d_config.bin \ + rtl_bt/rtl8723d_fw.bin rtl_bt/rtl8761a_fw.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt +endif + +# Realtek 88xx Bluetooth +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT),y) +LINUX_FIRMWARE_FILES += \ + rtl_bt/rtl8812ae_fw.bin rtl_bt/rtl8821a_fw.bin \ + rtl_bt/rtl8821c_config.bin rtl_bt/rtl8821c_fw.bin \ + rtl_bt/rtl8822b_config.bin rtl_bt/rtl8822b_fw.bin \ + rtl_bt/rtl8822cs_config.bin rtl_bt/rtl8822cs_fw.bin \ + rtl_bt/rtl8822cu_config.bin rtl_bt/rtl8822cu_fw.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif # rt2501/rt61 @@ -189,6 +218,15 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware endif # ath10k +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA9377),y) +LINUX_FIRMWARE_FILES += ath10k/QCA9377/hw1.0/board-2.bin \ + ath10k/QCA9377/hw1.0/board.bin \ + ath10k/QCA9377/hw1.0/firmware-5.bin \ + ath10k/QCA9377/hw1.0/firmware-6.bin \ + ath10k/QCA9377/hw1.0/firmware-sdio-5.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X),y) LINUX_FIRMWARE_FILES += ath10k/QCA988X/hw2.0/board.bin \ ath10k/QCA988X/hw2.0/firmware-4.bin \ @@ -196,17 +234,6 @@ LINUX_FIRMWARE_FILES += ath10k/QCA988X/hw2.0/board.bin \ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware endif -# ath10k-qca6174 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174),y) -LINUX_FIRMWARE_FILES += ath10k/QCA6174/hw3.0/board.bin \ - ath10k/QCA6174/hw3.0/board-2.bin \ - ath10k/QCA6174/hw3.0/firmware-4.bin \ - ath10k/QCA6174/hw3.0/firmware-6.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware \ - ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt \ - ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt -endif - # sd8686 v8 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8),y) LINUX_FIRMWARE_FILES += libertas/sd8686_v8.bin libertas/sd8686_v8_helper.bin @@ -291,12 +318,30 @@ LINUX_FIRMWARE_FILES += mrvl/pcie8897_uapsta.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell endif +# pcieuart8997 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIEUART8997),y) +LINUX_FIRMWARE_FILES += mrvl/pcieuart8997_combo_v4.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + +# pcieusb8997 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIEUSB8997),y) +LINUX_FIRMWARE_FILES += mrvl/pcieusb8997_combo_v4.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + # MT7601 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U),y) LINUX_FIRMWARE_FILES += mt7601u.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware endif +# MT7610 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7610E),y) +LINUX_FIRMWARE_FILES += mediatek/mt7610e.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware +endif + # MT7650 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650),y) LINUX_FIRMWARE_FILES += mt7650.bin @@ -312,7 +357,11 @@ endif # qca6174 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174),y) LINUX_FIRMWARE_FILES += ath10k/QCA6174 -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k +LINUX_FIRMWARE_ALL_LICENSE_FILES += \ + LICENSE.QualcommAtheros_ath10k \ + ath10k/QCA6174/hw2.1/notice_ath10k_firmware-5.txt \ + ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt \ + ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt endif # CC2560(A) @@ -373,6 +422,16 @@ LINUX_FIRMWARE_FILES += \ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_WIL6210),y) +LINUX_FIRMWARE_FILES += wil6210.* +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260),y) +LINUX_FIRMWARE_FILES += iwlwifi-cc-a0-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y) LINUX_FIRMWARE_FILES += iwlwifi-3160-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware @@ -432,6 +491,12 @@ LINUX_FIRMWARE_FILES += iwlwifi-9???-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3),y) +LINUX_FIRMWARE_FILES += tigon/* +# No license file; the license is in the file WHENCE +# which is installed unconditionally +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y) LINUX_FIRMWARE_FILES += bnx2x/* # No license file; the license is in the file WHENCE @@ -525,26 +590,60 @@ endif # brcm43xx ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX),y) LINUX_FIRMWARE_FILES += \ - brcm/bcm43xx-0.fw brcm/bcm43xx_hdr-0.fw \ - brcm/bcm4329-fullmac-4.bin brcm/brcmfmac4329-sdio.bin \ - brcm/brcmfmac4330-sdio.bin brcm/brcmfmac4334-sdio.bin \ - brcm/brcmfmac4335-sdio.bin brcm/brcmfmac4339-sdio.bin \ - brcm/brcmfmac4350-pcie.bin brcm/brcmfmac4354-sdio.bin \ - brcm/brcmfmac4356-pcie.bin brcm/brcmfmac4371-pcie.bin + brcm/bcm4329-fullmac-4.bin \ + brcm/brcmfmac4329-sdio.bin \ + brcm/brcmfmac4330-sdio.bin \ + brcm/brcmfmac4334-sdio.bin \ + brcm/brcmfmac4335-sdio.bin \ + brcm/brcmfmac4350c2-pcie.bin \ + brcm/brcmfmac4350-pcie.bin \ + brcm/brcmfmac4358-pcie.bin \ + brcm/brcmfmac4371-pcie.bin \ + brcm/brcmfmac4373.bin \ + brcm/brcmfmac4330-sdio.Prowise-PT301.txt \ + brcm/brcmfmac4356-pcie.gpd-win-pocket.txt \ + brcm/brcmfmac4356-sdio.vamrs,rock960.txt LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx endif # brcm43xxx ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX),y) LINUX_FIRMWARE_FILES += \ - brcm/brcmfmac43143.bin brcm/brcmfmac43143-sdio.bin \ - brcm/brcmfmac43236b.bin brcm/brcmfmac43241b0-sdio.bin \ - brcm/brcmfmac43241b4-sdio.bin brcm/brcmfmac43241b5-sdio.bin \ - brcm/brcmfmac43242a.bin brcm/brcmfmac43340-sdio.bin \ - brcm/brcmfmac43362-sdio.bin brcm/brcmfmac43430-sdio.bin \ - brcm/brcmfmac43430a0-sdio.bin brcm/brcmfmac43455-sdio.bin \ - brcm/brcmfmac43569.bin brcm/brcmfmac43570-pcie.bin \ - brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin + brcm/brcmfmac43143.bin \ + brcm/brcmfmac43143-sdio.bin \ + brcm/brcmfmac43236b.bin \ + brcm/brcmfmac43241b0-sdio.bin \ + brcm/brcmfmac43241b4-sdio.bin \ + brcm/brcmfmac43241b5-sdio.bin \ + brcm/brcmfmac43242a.bin \ + brcm/brcmfmac43430a0-sdio.bin \ + brcm/brcmfmac43569.bin \ + brcm/brcmfmac43602-pcie.ap.bin \ + brcm/brcmfmac43602-pcie.bin \ + brcm/brcmfmac43340-sdio.meegopad-t08.txt \ + brcm/brcmfmac43340-sdio.pov-tab-p1006w-data.txt \ + brcm/brcmfmac43340-sdio.predia-basic.txt \ + brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt \ + brcm/brcmfmac43430a0-sdio.ilife-S806.txt \ + brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt \ + brcm/brcmfmac43430-sdio.AP6212.txt \ + brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt \ + brcm/brcmfmac43430-sdio.MUR1DX.txt \ + brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt \ + brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \ + brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx +endif + +# brcm4366b1 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366B1),y) +LINUX_FIRMWARE_FILES += brcm/brcmfmac4366b-pcie.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx +endif + +# brcm4366c0 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366C0),y) +LINUX_FIRMWARE_FILES += brcm/brcmfmac4366c-pcie.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx endif @@ -580,27 +679,29 @@ LINUX_FIRMWARE_FILES += qat_c62x.bin qat_c62x_mmp.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware endif -ifneq ($(LINUX_FIRMWARE_FILES),) -define LINUX_FIRMWARE_INSTALL_FILES - cd $(@D) && \ - $(TAR) cf install.tar $(sort $(LINUX_FIRMWARE_FILES)) && \ - $(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware -endef +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI),y) +LINUX_FIRMWARE_FILES += ti_3410.fw ti_5052.fw \ + mts_cdma.fw mts_gsm.fw mts_edge.fw mts_mt9234mu.fw mts_mt9234zba.fw \ + moxa/moxa-1110.fw moxa/moxa-1130.fw moxa/moxa-1131.fw \ + moxa/moxa-1150.fw moxa/moxa-1151.fw +# Some firmware's license is in the file WHENCE +# which is installed unconditionally +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.moxa endif -ifneq ($(LINUX_FIRMWARE_DIRS),) -# We need to rm-rf the destination directory to avoid copying -# into it in itself, should we re-install the package. -define LINUX_FIRMWARE_INSTALL_DIRS - $(foreach d,$(LINUX_FIRMWARE_DIRS), \ - rm -rf $(TARGET_DIR)/lib/firmware/$(d); \ - mkdir -p $(dir $(TARGET_DIR)/lib/firmware/$(d)); \ - cp -a $(@D)/$(d) $(TARGET_DIR)/lib/firmware/$(d)$(sep)) -endef +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CX231XX),y) +LINUX_FIRMWARE_FILES += v4l-cx231xx-avcore-01.fw +# No license file; the license is in the file WHENCE +# which is installed unconditionally endif ifneq ($(LINUX_FIRMWARE_FILES)$(LINUX_FIRMWARE_DIRS),) +define LINUX_FIRMWARE_BUILD_CMDS + cd $(@D) && \ + $(TAR) cf br-firmware.tar $(sort $(LINUX_FIRMWARE_FILES) $(LINUX_FIRMWARE_DIRS)) +endef + # Most firmware files are under a proprietary license, so no need to # repeat it for every selections above. Those firmwares that have more # lax licensing terms may still add them on a per-case basis. @@ -615,8 +716,6 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += WHENCE # duplicates LINUX_FIRMWARE_LICENSE_FILES = $(sort $(LINUX_FIRMWARE_ALL_LICENSE_FILES)) -endif - # Some firmware are distributed as a symlink, for drivers to load them using a # defined name other than the real one. Since 9cfefbd7fbda ("Remove duplicate # symlinks") those symlink aren't distributed in linux-firmware but are created @@ -628,22 +727,27 @@ endif # sure we canonicalize the pointed-to file, to cover the symlinks of the form # a/foo -> ../b/foo where a/ (the directory where to put the symlink) does # not yet exist. -define LINUX_FIRMWARE_CREATE_SYMLINKS - cd $(TARGET_DIR)/lib/firmware/ ; \ +define LINUX_FIRMWARE_INSTALL_FW + mkdir -p $(1) + $(TAR) xf $(@D)/br-firmware.tar -C $(1) + cd $(1) ; \ sed -r -e '/^Link: (.+) -> (.+)$$/!d; s//\1 \2/' $(@D)/WHENCE | \ while read f d; do \ - if test -f $$(readlink -m $$(dirname $$f)/$$d); then \ - mkdir -p $$(dirname $$f) || exit 1; \ - ln -sf $$d $$f || exit 1; \ + if test -f $$(readlink -m $$(dirname "$$f")/$$d); then \ + mkdir -p $$(dirname "$$f") || exit 1; \ + ln -sf $$d "$$f" || exit 1; \ fi ; \ done endef +endif # LINUX_FIRMWARE_FILES || LINUX_FIRMWARE_DIRS + define LINUX_FIRMWARE_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware - $(LINUX_FIRMWARE_INSTALL_FILES) - $(LINUX_FIRMWARE_INSTALL_DIRS) - $(LINUX_FIRMWARE_CREATE_SYMLINKS) + $(call LINUX_FIRMWARE_INSTALL_FW, $(TARGET_DIR)/lib/firmware) +endef + +define LINUX_FIRMWARE_INSTALL_IMAGES_CMDS + $(call LINUX_FIRMWARE_INSTALL_FW, $(BINARIES_DIR)) endef $(eval $(generic-package)) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index d2b9b5155a..f128da5f41 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_5_6 + default BR2_KERNEL_HEADERS_5_13 help Select the kernel version to get headers from. @@ -53,16 +53,24 @@ config BR2_KERNEL_HEADERS_4_19 config BR2_KERNEL_HEADERS_5_4 bool "Linux 5.4.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + +config BR2_KERNEL_HEADERS_5_10 + bool "Linux 5.10.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + +config BR2_KERNEL_HEADERS_5_11 + bool "Linux 5.11.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 + +config BR2_KERNEL_HEADERS_5_12 + bool "Linux 5.12.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12 + +config BR2_KERNEL_HEADERS_5_13 + bool "Linux 5.13.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13 select BR2_KERNEL_HEADERS_LATEST -config BR2_KERNEL_HEADERS_5_5 - bool "Linux 5.5.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 - -config BR2_KERNEL_HEADERS_5_6 - bool "Linux 5.6.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 - config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" help @@ -135,8 +143,36 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13 + bool "5.13.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12 + bool "5.12.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11 + bool "5.11.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10 + bool "5.10.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9 + bool "5.9.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8 + bool "5.8.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7 + bool "5.7.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6 - bool "5.6.x or later" + bool "5.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5 @@ -334,13 +370,15 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.218" if BR2_KERNEL_HEADERS_4_4 - default "4.9.218" if BR2_KERNEL_HEADERS_4_9 - default "4.14.175" if BR2_KERNEL_HEADERS_4_14 - default "4.19.114" if BR2_KERNEL_HEADERS_4_19 - default "5.4.31" if BR2_KERNEL_HEADERS_5_4 - default "5.5.16" if BR2_KERNEL_HEADERS_5_5 - default "5.6.3" if BR2_KERNEL_HEADERS_5_6 + default "4.4.291" if BR2_KERNEL_HEADERS_4_4 + default "4.9.289" if BR2_KERNEL_HEADERS_4_9 + default "4.14.254" if BR2_KERNEL_HEADERS_4_14 + default "4.19.215" if BR2_KERNEL_HEADERS_4_19 + default "5.4.157" if BR2_KERNEL_HEADERS_5_4 + default "5.10.77" if BR2_KERNEL_HEADERS_5_10 + default "5.11.22" if BR2_KERNEL_HEADERS_5_11 + default "5.12.19" if BR2_KERNEL_HEADERS_5_12 + default "5.13.19" if BR2_KERNEL_HEADERS_5_13 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk index 80a077537b..a8d1c2ccaf 100644 --- a/package/linux-headers/linux-headers.mk +++ b/package/linux-headers/linux-headers.mk @@ -17,6 +17,11 @@ LINUX_HEADERS_CUSTOM_SVN = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_SVN)) LINUX_HEADERS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION)) LINUX_HEADERS_CUSTOM_TARBALL_LOCATION = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION)) LINUX_HEADERS_REPO_URL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) +LINUX_HEADERS_CIP = $(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION) +ifneq ($(LINUX_HEADERS_OVERRIDE_SRCDIR),) +$(error LINUX_HEADERS_OVERRIDE_SRCDIR must not be set when BR2_KERNEL_HEADERS_AS_KERNEL=y) +endif +LINUX_HEADERS_OVERRIDE_SRCDIR = $(LINUX_OVERRIDE_SRCDIR) else # ! BR2_KERNEL_HEADERS_AS_KERNEL LINUX_HEADERS_CUSTOM_TARBALL = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_TARBALL)) LINUX_HEADERS_CUSTOM_GIT = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_GIT)) @@ -25,6 +30,7 @@ LINUX_HEADERS_CUSTOM_SVN = LINUX_HEADERS_VERSION = $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS)) LINUX_HEADERS_CUSTOM_TARBALL_LOCATION = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_TARBALL_LOCATION)) LINUX_HEADERS_REPO_URL = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_REPO_URL)) +LINUX_HEADERS_CIP = endif # BR2_KERNEL_HEADERS_AS_KERNEL # Compute LINUX_HEADERS_SOURCE and LINUX_HEADERS_SITE from the configuration @@ -32,7 +38,7 @@ ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL),y) LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION)) LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION))) else ifeq ($(LINUX_HEADERS_CUSTOM_GIT),y) -LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz +LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION)$(BR_FMT_VERSION_git).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = git else ifeq ($(LINUX_HEADERS_CUSTOM_HG),y) @@ -40,9 +46,12 @@ LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = hg else ifeq ($(LINUX_HEADERS_CUSTOM_SVN),y) -LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz +LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION)$(BR_FMT_VERSION_svn).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = svn +else ifeq ($(LINUX_HEADERS_CIP),y) +LINUX_HEADERS_SOURCE = linux-cip-$(LINUX_HEADERS_VERSION).tar.gz +LINUX_HEADERS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot else ifneq ($(findstring -rc,$(LINUX_HEADERS_VERSION)),) # Since 4.12-rc1, -rc kernels are generated from cgit. This also works for # older -rc kernels. @@ -97,6 +106,8 @@ LINUX_HEADERS_LICENSE_FILES = \ LICENSES/preferred/GPL-2.0 \ LICENSES/exceptions/Linux-syscall-note endif +LINUX_HEADERS_CPE_ID_VENDOR = linux +LINUX_HEADERS_CPE_ID_PRODUCT = linux_kernel LINUX_HEADERS_INSTALL_STAGING = YES diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 1396549366..84aee5cdd4 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LINUX_PAM bool "linux-pam" depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FLEX help @@ -11,6 +10,6 @@ config BR2_PACKAGE_LINUX_PAM http://linux-pam.org -comment "linux-pam needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS diff --git a/package/linux-pam/linux-pam.hash b/package/linux-pam/linux-pam.hash index cfe58ce28e..be7cabf6dc 100644 --- a/package/linux-pam/linux-pam.hash +++ b/package/linux-pam/linux-pam.hash @@ -1,6 +1,6 @@ # Locally computed hashes after checking signature at -# https://github.com/linux-pam/linux-pam/releases/download/v1.3.1/Linux-PAM-1.3.1.tar.xz.asc +# https://github.com/linux-pam/linux-pam/releases/download/v1.5.0/Linux-PAM-1.5.1.tar.xz.asc # signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB -sha256 eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db Linux-PAM-1.3.1.tar.xz +sha256 201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc Linux-PAM-1.5.1.tar.xz # Locally computed sha256 133d98e7a2ab3ffd330b4debb0bfc10fea21e4b2b5a5b09de2e924293be5ff08 Copyright diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 63610fcc57..389d32a9a8 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_PAM_VERSION = 1.3.1 +LINUX_PAM_VERSION = 1.5.1 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.xz LINUX_PAM_SITE = https://github.com/linux-pam/linux-pam/releases/download/v$(LINUX_PAM_VERSION) LINUX_PAM_INSTALL_STAGING = YES @@ -17,11 +17,14 @@ LINUX_PAM_CONF_OPTS = \ --enable-securedir=/lib/security \ --libdir=/lib LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ $(TARGET_NLS_DEPENDENCIES) -LINUX_PAM_AUTORECONF = YES LINUX_PAM_LICENSE = BSD-3-Clause LINUX_PAM_LICENSE_FILES = Copyright LINUX_PAM_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) +LINUX_PAM_CPE_ID_VENDOR = linux-pam +# We're patching configure.ac +LINUX_PAM_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBSELINUX),y) LINUX_PAM_CONF_OPTS += --enable-selinux @@ -41,13 +44,6 @@ else LINUX_PAM_CONF_OPTS += --disable-audit endif -ifeq ($(BR2_PACKAGE_CRACKLIB),y) -LINUX_PAM_CONF_OPTS += --enable-cracklib -LINUX_PAM_DEPENDENCIES += cracklib -else -LINUX_PAM_CONF_OPTS += --disable-cracklib -endif - # Install default pam config (deny everything except login) define LINUX_PAM_INSTALL_CONFIG $(INSTALL) -m 0644 -D package/linux-pam/login.pam \ diff --git a/package/linux-serial-test/linux-serial-test.hash b/package/linux-serial-test/linux-serial-test.hash index 5cbf00a7e4..38b98a610f 100644 --- a/package/linux-serial-test/linux-serial-test.hash +++ b/package/linux-serial-test/linux-serial-test.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bfc25088e960c18e151f978b13d893dbee9a3e377e062bd56caab1bd409e4dcb linux-serial-test-13bea838f2a7573d2a68a6d95fc9d1f153b580be.tar.gz +sha256 bd612ad9c10cb8090765487d5e2969be09dd0d024e7215dc764e770fbb5cc9e0 linux-serial-test-bf865c37ccf9cbb1826ada61037c036dc1990b7b.tar.gz sha256 a2a6760c2c6fa779a635e4a7ad00f668862ebcadb2a8a57d16662543e103e08c LICENSES/MIT diff --git a/package/linux-serial-test/linux-serial-test.mk b/package/linux-serial-test/linux-serial-test.mk index b0f5fe4ebf..ccb39280ec 100644 --- a/package/linux-serial-test/linux-serial-test.mk +++ b/package/linux-serial-test/linux-serial-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_SERIAL_TEST_VERSION = 13bea838f2a7573d2a68a6d95fc9d1f153b580be +LINUX_SERIAL_TEST_VERSION = bf865c37ccf9cbb1826ada61037c036dc1990b7b LINUX_SERIAL_TEST_SITE = $(call github,cbrake,linux-serial-test,$(LINUX_SERIAL_TEST_VERSION)) LINUX_SERIAL_TEST_LICENSE = MIT LINUX_SERIAL_TEST_LICENSE_FILES = LICENSES/MIT diff --git a/package/linux-syscall-support/linux-syscall-support.hash b/package/linux-syscall-support/linux-syscall-support.hash index 2371dffb12..3445bf1398 100644 --- a/package/linux-syscall-support/linux-syscall-support.hash +++ b/package/linux-syscall-support/linux-syscall-support.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e5088b81011e30b567b6bde6bb7c22ad529c4ee8890cc5e93d58b21f2c4df56a linux-syscall-support-3f6478ac95edf86cd3da300c2c0d34a438f5dbeb.tar.gz +sha256 498efb6915ac6e65c82c712fadd3c30f9472764114c835849e02f2c092bacd2d linux-syscall-support-3f6478ac95edf86cd3da300c2c0d34a438f5dbeb-br1.tar.gz sha256 4c1fc9acc9f3867e5c81b5d5f57c52fb9a932662bd4e2e5e43b3fe95390035f5 linux_syscall_support.h diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index ceb58c668a..2287ef5888 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -5,6 +5,28 @@ menu "Linux Kernel Tools" config BR2_PACKAGE_LINUX_TOOLS bool +config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL + bool "bpftool" + depends on !BR2_nios2 # binutils + depends on BR2_USE_WCHAR # binutils, elfutils + depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + select BR2_PACKAGE_LINUX_TOOLS + select BR2_PACKAGE_BINUTILS + select BR2_PACKAGE_ELFUTILS + help + bpftool is a tool for for inspection and simple manipulation + of eBPF programs and maps. + + These tools are available only from kernel version 4.15. + +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" + depends on !BR2_nios2 + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + config BR2_PACKAGE_LINUX_TOOLS_CPUPOWER bool "cpupower" select BR2_PACKAGE_LINUX_TOOLS diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index 7106b622cb..efa747cf8d 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -21,7 +21,6 @@ PERF_MAKE_FLAGS = \ DESTDIR=$(TARGET_DIR) \ prefix=/usr \ WERROR=0 \ - NO_LIBAUDIT=1 \ NO_GTK2=1 \ NO_LIBPERL=1 \ NO_LIBPYTHON=1 \ @@ -64,6 +63,16 @@ else PERF_MAKE_FLAGS += NO_NEWT=1 NO_SLANG=1 endif +ifeq ($(BR2_PACKAGE_AUDIT),y) +PERF_DEPENDENCIES += audit +else +PERF_MAKE_FLAGS += NO_LIBAUDIT=1 +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +PERF_DEPENDENCIES += zstd +endif + ifeq ($(BR2_PACKAGE_LIBUNWIND),y) PERF_DEPENDENCIES += libunwind else @@ -158,3 +167,7 @@ define PERF_INSTALL_TARGET_CMDS $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/ $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/ endef + +define PERF_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS) +endef diff --git a/package/linux-tools/linux-tools.mk b/package/linux-tools/linux-tools.mk index 65d9e850e0..81b1fbc176 100644 --- a/package/linux-tools/linux-tools.mk +++ b/package/linux-tools/linux-tools.mk @@ -42,6 +42,13 @@ LINUX_TOOLS_POST_INSTALL_TARGET_HOOKS += $(foreach tool,$(LINUX_TOOLS),\ $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ $(call UPPERCASE,$(tool))_INSTALL_TARGET_CMDS)) +define LINUX_TOOLS_LINUX_CONFIG_FIXUPS + $(foreach tool,$(LINUX_TOOLS),\ + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $($(call UPPERCASE,$(tool))_LINUX_CONFIG_FIXUPS)) + ) +endef + define LINUX_TOOLS_INSTALL_INIT_SYSTEMD $(foreach tool,$(LINUX_TOOLS),\ $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ diff --git a/package/linuxptp/Config.in b/package/linuxptp/Config.in index 3e18a0cb13..c88b7a0619 100644 --- a/package/linuxptp/Config.in +++ b/package/linuxptp/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LINUXPTP bool "linuxptp" + depends on BR2_TOOLCHAIN_HAS_THREADS help The Linux PTP Project is the Precision Time Protocol implementation according to IEEE standard 1588 for Linux. @@ -11,3 +12,6 @@ config BR2_PACKAGE_LINUXPTP not a goal. http://linuxptp.sourceforge.net/ + +comment "linuxptp needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/linuxptp/linuxptp.hash b/package/linuxptp/linuxptp.hash index 5e6c7741cd..a5479b0ebc 100644 --- a/package/linuxptp/linuxptp.hash +++ b/package/linuxptp/linuxptp.hash @@ -1,9 +1,9 @@ -# From https://sourceforge.net/projects/linuxptp/files/v2.0/ -sha1 592ca42c6146a79c1fcabed7c19fa7af4803d4f6 linuxptp-2.0.tgz -md5 d8bb7374943bb747db7786ac26f17f11 linuxptp-2.0.tgz +# From https://sourceforge.net/projects/linuxptp/files/v3.1.1/ +sha1 f905eabc6fd0f03c6a353f9c4ba188a3bd1b774c linuxptp-3.1.1.tgz +md5 3b79ab5e77c5b5cf06bc1c8350d405bb linuxptp-3.1.1.tgz # Locally computed: -sha256 0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d linuxptp-2.0.tgz +sha256 94d6855f9b7f2d8e9b0ca6d384e3fae6226ce6fc012dbad02608bdef3be1c0d9 linuxptp-3.1.1.tgz # Hash for license file: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/linuxptp/linuxptp.mk b/package/linuxptp/linuxptp.mk index 921c55ad59..048dd0b896 100644 --- a/package/linuxptp/linuxptp.mk +++ b/package/linuxptp/linuxptp.mk @@ -4,11 +4,12 @@ # ################################################################################ -LINUXPTP_VERSION = 2.0 +LINUXPTP_VERSION = 3.1.1 LINUXPTP_SOURCE = linuxptp-$(LINUXPTP_VERSION).tgz LINUXPTP_SITE = http://downloads.sourceforge.net/linuxptp LINUXPTP_LICENSE = GPL-2.0+ LINUXPTP_LICENSE_FILES = COPYING +LINUXPTP_CPE_ID_VENDOR = linuxptp_project LINUXPTP_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index d66f4e9925..27aa5b97cc 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -9,6 +9,7 @@ LIRC_TOOLS_SOURCE = lirc-$(LIRC_TOOLS_VERSION).tar.bz2 LIRC_TOOLS_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/$(LIRC_TOOLS_VERSION) LIRC_TOOLS_LICENSE = GPL-2.0+ LIRC_TOOLS_LICENSE_FILES = COPYING +LIRC_TOOLS_SELINUX_MODULES = lircd LIRC_TOOLS_DEPENDENCIES = host-libxslt host-pkgconf host-python3 LIRC_TOOLS_INSTALL_STAGING = YES # Patching configure.ac and Makefile.am diff --git a/package/live555/live555.hash b/package/live555/live555.hash index f5df69f24f..d4fa93d029 100644 --- a/package/live555/live555.hash +++ b/package/live555/live555.hash @@ -1,5 +1,5 @@ # From http://www.live555.com/liveMedia/public/live555-latest-md5.txt -md5 12e105c8fef9d34658d68367dc26a3d9 live.2019.09.30.tar.gz +md5 3c1992b0e9b871bcad7491a3da541781 live.2021.05.03.tar.gz # Locally generated -sha256 ef44f48a84324525cebc2081dd2d0f1e908f2d0a79d9d30dd41967e142dfb06b live.2019.09.30.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 ae73241f9cc4ab740d60737c0438d62a7635af3822de5d84acf275793de42029 live.2021.05.03.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER diff --git a/package/live555/live555.mk b/package/live555/live555.mk index cbe1c1bc0d..effd4517cf 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -4,11 +4,17 @@ # ################################################################################ -LIVE555_VERSION = 2019.09.30 +LIVE555_VERSION = 2021.05.03 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz LIVE555_SITE = http://www.live555.com/liveMedia/public -LIVE555_LICENSE = LGPL-2.1+ -LIVE555_LICENSE_FILES = COPYING +# There is a COPYING file with the GPL-3.0 license text, but none of +# the source files appear to be released under GPL-3.0, and the +# project web site says it's licensed under the LGPL: +# http://live555.com/liveMedia/faq.html#copyright-and-license +LIVE555_LICENSE = LGPL-3.0+ +LIVE555_LICENSE_FILES = COPYING.LESSER +LIVE555_CPE_ID_VENDOR = live555 +LIVE555_CPE_ID_PRODUCT = streaming_media LIVE555_INSTALL_STAGING = YES LIVE555_CFLAGS = $(TARGET_CFLAGS) @@ -22,6 +28,17 @@ LIVE555_LIBRARY_LINK = $(TARGET_CC) -o LIVE555_CFLAGS += -fPIC endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIVE555_DEPENDENCIES += host-pkgconf openssl +LIVE555_CONSOLE_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs openssl` +# passed to ar for static linking, which gets confused by -L +ifneq ($(BR2_STATIC_LIBS),y) +LIVE555_LIVEMEDIA_LIBS = $(LIVE555_CONSOLE_LIBS) +endif +else +LIVE555_CFLAGS += -DNO_OPENSSL +endif + ifndef ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif @@ -37,6 +54,8 @@ define LIVE555_CONFIGURE_CMDS # Must have a whitespace at the end of LIBRARY_LINK, otherwise static link # fails echo 'LIBRARY_LINK = $(LIVE555_LIBRARY_LINK) ' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'LIBS_FOR_CONSOLE_APPLICATION = $(LIVE555_CONSOLE_LIBS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'LIBS_FOR_LIVEMEDIA_LIB = $(LIVE555_LIVEMEDIA_LIBS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) (cd $(@D); ./genMakefiles $(LIVE555_CONFIG_TARGET)) endef diff --git a/package/lld/lld.mk b/package/lld/lld.mk index ea09c5d340..cd1a03c1d3 100644 --- a/package/lld/lld.mk +++ b/package/lld/lld.mk @@ -19,6 +19,9 @@ HOST_LLD_DEPENDENCIES = host-llvm # https://reviews.llvm.org/D57264 HOST_LLD_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON +# build as static libs as is done in llvm & clang +HOST_LLD_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF + # GCC looks for tools in a different path from LLD's default installation path define HOST_LLD_CREATE_SYMLINKS mkdir -p $(HOST_DIR)/$(GNU_TARGET_NAME)/bin diff --git a/package/lldpd/lldpd.hash b/package/lldpd/lldpd.hash index c12e004784..6e809b2796 100644 --- a/package/lldpd/lldpd.hash +++ b/package/lldpd/lldpd.hash @@ -1,3 +1,5 @@ -# Locally computed -sha256 5319bc032fabf1008d5d91e280276aa7f1bbfbb70129d8526cd4526d7c22724f lldpd-1.0.4.tar.gz -sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE +# Locally computed after checking gpg key +# https://media.luffy.cx/files/lldpd/lldpd-1.0.9.tar.gz.gpg +# using key AEF2348766F371C689A7360095A42FE8353525F9 +sha256 6b64eb3125952b1e33472198b054e8aa0dee45f45d3d4be22789090a474949f5 lldpd-1.0.9.tar.gz +sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk index 264323a879..b88dd002e4 100644 --- a/package/lldpd/lldpd.mk +++ b/package/lldpd/lldpd.mk @@ -4,8 +4,8 @@ # ################################################################################ -LLDPD_VERSION = 1.0.4 -LLDPD_SITE = http://media.luffy.cx/files/lldpd +LLDPD_VERSION = 1.0.9 +LLDPD_SITE = https://media.luffy.cx/files/lldpd LLDPD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_CHECK),check) \ host-pkgconf \ @@ -14,6 +14,7 @@ LLDPD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_VALGRIND),valgrind) LLDPD_LICENSE = ISC LLDPD_LICENSE_FILES = LICENSE +LLDPD_CPE_ID_VENDOR = lldpd_project # Detection of c99 support in configure fails without WCHAR. To enable # automatic detection of c99 support by configure, we need to enable diff --git a/package/llvm/Config.in b/package/llvm/Config.in index 1d21d879da..6ec2ffcfe6 100644 --- a/package/llvm/Config.in +++ b/package/llvm/Config.in @@ -47,6 +47,12 @@ config BR2_PACKAGE_LLVM_RTTI https://llvm.org/docs/HowToSetUpLLVMStyleRTTI.html +config BR2_PACKAGE_LLVM_BPF + bool "BPF backend" + help + Build BPF target. Select this option if you are going + to install bcc on the target. + endif comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk index 24d033d124..6c721c30b9 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm/llvm.mk @@ -10,6 +10,7 @@ LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLV LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz LLVM_LICENSE = Apache-2.0 with exceptions LLVM_LICENSE_FILES = LICENSE.TXT +LLVM_CPE_ID_VENDOR = llvm LLVM_SUPPORTS_IN_SOURCE_BUILD = NO LLVM_INSTALL_STAGING = YES @@ -61,6 +62,11 @@ ifeq ($(BR2_PACKAGE_LLVM_AMDGPU),y) LLVM_TARGETS_TO_BUILD += AMDGPU endif +# Build BPF backend +ifeq ($(BR2_PACKAGE_LLVM_BPF),y) +LLVM_TARGETS_TO_BUILD += BPF +endif + # Use native llvm-tblgen from host-llvm (needed for cross-compilation) LLVM_CONF_OPTS += -DLLVM_TABLEGEN=$(HOST_DIR)/bin/llvm-tblgen diff --git a/package/lm-sensors/lm-sensors.hash b/package/lm-sensors/lm-sensors.hash index d41af2745f..0ca07b7e69 100644 --- a/package/lm-sensors/lm-sensors.hash +++ b/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f671c1d63a4cd8581b3a4a775fd7864a740b15ad046fe92038bcff5c5134d7e0 lm-sensors-3-5-0.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index f8059be47e..8975efaffa 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -4,7 +4,7 @@ # ################################################################################ -LM_SENSORS_VERSION = 3-5-0 +LM_SENSORS_VERSION = 3-6-0 LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex @@ -20,7 +20,7 @@ LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect LM_SENSORS_MAKE_OPTS = \ - MACHINE=$(KERNEL_ARCH) \ + $(TARGET_CONFIGURE_OPTS) \ PREFIX=/usr ifeq ($(BR2_STATIC_LIBS),y) @@ -36,7 +36,7 @@ LM_SENSORS_MAKE_OPTS += BUILD_STATIC_LIB=1 endif define LM_SENSORS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(LM_SENSORS_MAKE_OPTS) -C $(@D) endef define LM_SENSORS_INSTALL_STAGING_CMDS diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk index 2f3b19b5f8..b0f99ff106 100644 --- a/package/lmbench/lmbench.mk +++ b/package/lmbench/lmbench.mk @@ -18,6 +18,10 @@ LMBENCH_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` LMBENCH_LDLIBS = `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` endif +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101915),y) +LMBENCH_CFLAGS += -O0 +endif + LMBENCH_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK define LMBENCH_CONFIGURE_CMDS diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 1093e106fa..d8dfdffaa2 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,13 +7,14 @@ # 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.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91 +LOCALEDEF_VERSION = 2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc HOST_LOCALEDEF_DEPENDENCIES = \ $(BR2_MAKE_HOST_DEPENDENCY) \ + $(BR2_PYTHON3_HOST_DEPENDENCY) \ host-bison \ host-gawk diff --git a/package/log4cplus/log4cplus.hash b/package/log4cplus/log4cplus.hash index 43ff401da6..a668eca37a 100644 --- a/package/log4cplus/log4cplus.hash +++ b/package/log4cplus/log4cplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6046f0867ce4734f298418c7b7db0d35c27403090bb751d98e6e76aa4935f1af log4cplus-2.0.5.tar.xz +sha256 8f74a0a5920ba044b24e2ebeb0f1e5e36d85d5c23ed48d9fe328882b16130db8 log4cplus-2.0.7.tar.xz sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk index 8a613efaee..56a85025cb 100644 --- a/package/log4cplus/log4cplus.mk +++ b/package/log4cplus/log4cplus.mk @@ -4,14 +4,12 @@ # ################################################################################ -LOG4CPLUS_VERSION = 2.0.5 +LOG4CPLUS_VERSION = 2.0.7 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) LOG4CPLUS_LICENSE_FILES = LICENSE LOG4CPLUS_INSTALL_STAGING = YES -# We're patching configure.ac -LOG4CPLUS_AUTORECONF = YES ifeq ($(BR2_GCC_ENABLE_LTO),y) LOG4CPLUS_CONF_OPTS += --enable-lto diff --git a/package/log4cxx/log4cxx.hash b/package/log4cxx/log4cxx.hash index 90fa2e73d3..535a0c4aac 100644 --- a/package/log4cxx/log4cxx.hash +++ b/package/log4cxx/log4cxx.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c apache-log4cxx-0.10.0.tar.gz +# From https://www.apache.org/dist/logging/log4cxx/0.11.0/apache-log4cxx-0.11.0.tar.gz.sha512 +sha512 f8aa37c9c094e7a4d6ca92dff13c032f69f1e078c51ea55e284fcb931c13256b08950af3ea6eaf7a12282240f6073e9acab19bfe217f88dbd62a5d2360f3fbdd apache-log4cxx-0.11.0.tar.gz # Locally computed sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index 7d7e2e9bb2..0ddea9466a 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -4,12 +4,14 @@ # ################################################################################ -LOG4CXX_VERSION = 0.10.0 +LOG4CXX_VERSION = 0.11.0 LOG4CXX_SITE = http://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES LOG4CXX_LICENSE = Apache-2.0 LOG4CXX_LICENSE_FILES = LICENSE +# error: required file './compile' not found +LOG4CXX_AUTORECONF = YES LOG4CXX_CONF_OPTS = \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ diff --git a/package/logrotate/logrotate.hash b/package/logrotate/logrotate.hash index 6da14797fe..2af46d60b7 100644 --- a/package/logrotate/logrotate.hash +++ b/package/logrotate/logrotate.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a7b20f5184c9598c36546f9200d3bd616d561478a0423ab8074e97a1cd7b1c25 logrotate-3.15.1.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 841f81bf09d0014e4a2e11af166bb33fcd8429cc0c2d4a7d3d9ceb3858cfccc5 logrotate-3.18.0.tar.xz diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index 831e23935d..4d1344c2cd 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -4,13 +4,14 @@ # ################################################################################ -LOGROTATE_VERSION = 3.15.1 -LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION)) +LOGROTATE_VERSION = 3.18.0 +LOGROTATE_SOURCE = logrotate-3.18.0.tar.xz +LOGROTATE_SITE = https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION) LOGROTATE_LICENSE = GPL-2.0+ LOGROTATE_LICENSE_FILES = COPYING +LOGROTATE_CPE_ID_VENDOR = logrotate_project LOGROTATE_DEPENDENCIES = popt host-pkgconf -# tarball does not have a generated configure script -LOGROTATE_AUTORECONF = YES +LOGROTATE_SELINUX_MODULES = logrotate LOGROTATE_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`" ifeq ($(BR2_PACKAGE_LIBSELINUX),y) diff --git a/package/lrzip/Config.in b/package/lrzip/Config.in index 885b84dbb0..870094796b 100644 --- a/package/lrzip/Config.in +++ b/package/lrzip/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LRZIP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LZ4 select BR2_PACKAGE_LZO select BR2_PACKAGE_BZIP2 help diff --git a/package/lrzip/lrzip.hash b/package/lrzip/lrzip.hash index bdf63f0ed8..19295383c3 100644 --- a/package/lrzip/lrzip.hash +++ b/package/lrzip/lrzip.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 10315c20d5a47590e7220c210735ba169677824d5672509266682eccec84d952 lrzip-0.631.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 9b6b4bb1ae76dafbaab96ec9d50d41af5fed45a6c4f2e06feea828c2cd8025c0 lrzip-0.641.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/lrzip/lrzip.mk b/package/lrzip/lrzip.mk index 24edc847d3..409d9912d8 100644 --- a/package/lrzip/lrzip.mk +++ b/package/lrzip/lrzip.mk @@ -4,11 +4,18 @@ # ################################################################################ -LRZIP_VERSION = 0.631 +LRZIP_VERSION = 0.641 LRZIP_SITE = $(call github,ckolivas,lrzip,v$(LRZIP_VERSION)) LRZIP_AUTORECONF = YES LRZIP_LICENSE = GPL-2.0+ LRZIP_LICENSE_FILES = COPYING -LRZIP_DEPENDENCIES = zlib lzo bzip2 +LRZIP_DEPENDENCIES = zlib lz4 lzo bzip2 + +ifeq ($(BR2_i386)$(BR2_x86_64),y) +LRZIP_DEPENDENCIES += host-nasm +LRZIP_CONF_OPTS += --enable-asm +else +LRZIP_CONF_OPTS += --disable-asm +endif $(eval $(autotools-package)) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 6c68232852..45c88619e0 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -9,6 +9,7 @@ LRZSZ_SITE = http://www.ohse.de/uwe/releases LRZSZ_CONF_OPTS = --disable-timesync LRZSZ_LICENSE = GPL-2.0+ LRZSZ_LICENSE_FILES = COPYING +LRZSZ_CPE_ID_VENDOR = lrzsz_project LRZSZ_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LRZSZ_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/lshw/lshw.hash b/package/lshw/lshw.hash index a8352d4283..0b60b3b572 100644 --- a/package/lshw/lshw.hash +++ b/package/lshw/lshw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f lshw-B.02.18.tar.gz +sha256 9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80 lshw-B.02.19.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk index 3e8cee2e2e..9f1ff8938a 100644 --- a/package/lshw/lshw.mk +++ b/package/lshw/lshw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LSHW_VERSION = 02.18 +LSHW_VERSION = 02.19.2 LSHW_SITE = http://ezix.org/software/files LSHW_SOURCE = lshw-B.$(LSHW_VERSION).tar.gz LSHW_LICENSE = GPL-2.0 diff --git a/package/lsscsi/lsscsi.hash b/package/lsscsi/lsscsi.hash index fe1bc5d8b4..d444c7e059 100644 --- a/package/lsscsi/lsscsi.hash +++ b/package/lsscsi/lsscsi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 619a2187405f02c5f57682f3478bffc75326803cd08839e39d434250c5518b15 lsscsi-0.30.tgz -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 12bf1973014803c6fd6d547e7594a4c049f0eef3bf5d22190d4be29d7c09f3ca lsscsi-0.31.tgz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/lsscsi/lsscsi.mk b/package/lsscsi/lsscsi.mk index 70c5226d9b..e9a5255397 100644 --- a/package/lsscsi/lsscsi.mk +++ b/package/lsscsi/lsscsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LSSCSI_VERSION = 0.30 +LSSCSI_VERSION = 0.31 LSSCSI_SOURCE = lsscsi-$(LSSCSI_VERSION).tgz LSSCSI_SITE = http://sg.danny.cz/scsi LSSCSI_LICENSE = GPL-2.0+ diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index 4f373c0ce4..ed2a50cd4f 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,4 +1,5 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20200120/ltp-full-20200120.tar.xz.sha1 -sha1 8f622383907e2e64e60b69fd305fecb34311d6b6 ltp-full-20200120.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20210524/ltp-full-20210524.tar.xz.sha1 +sha1 08d84f8ac3ba0c800f3070768c651703869105d7 ltp-full-20210524.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 831678c64b85a8c24957c71632752537b2266890f2d2f352da9ed0ec45458189 ltp-full-20210524.tar.xz diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 88b2e88293..badd161d5a 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,14 +4,16 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20200120 +LTP_TESTSUITE_VERSION = 20210524 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) + LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+ LTP_TESTSUITE_LICENSE_FILES = COPYING LTP_TESTSUITE_CONF_OPTS += \ - --with-realtime-testsuite --with-open-posix-testsuite + --with-realtime-testsuite --with-open-posix-testsuite \ + --disable-metadata ifeq ($(BR2_LINUX_KERNEL),y) LTP_TESTSUITE_DEPENDENCIES += linux @@ -63,46 +65,29 @@ LTP_TESTSUITE_CONF_ENV += \ SYSROOT="$(STAGING_DIR)" # uclibc: bessel support normally not enabled -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \ testcases/misc/math/float/bessel/ \ testcases/misc/math/float/float_bessel.c -else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ - testcases/kernel/pty/pty01.c \ - testcases/kernel/pty/pty02.c \ - testcases/kernel/pty/ptem01.c \ + +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_MUSL) += \ testcases/kernel/sched/process_stress/process.c \ - testcases/kernel/syscalls/accept4/accept4_01.c \ testcases/kernel/syscalls/confstr/confstr01.c \ testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ testcases/kernel/syscalls/getcontext/getcontext01.c \ - testcases/kernel/syscalls/getdents/getdents01.c \ - testcases/kernel/syscalls/getdents/getdents02.c \ - testcases/kernel/syscalls/ioctl/ioctl01.c \ - testcases/kernel/syscalls/ioctl/ioctl02.c \ testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \ - testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c \ testcases/kernel/syscalls/timer_create/timer_create01.c \ - testcases/kernel/syscalls/timer_create/timer_create03.c \ - testcases/misc/crash/crash01.c \ - utils/benchmark/ebizzy-0.3 -endif + testcases/kernel/syscalls/timer_create/timer_create03.c + +# ldd command build system tries to build a shared library unconditionally. +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_STATIC_LIBS) += \ + testcases/commands/ldd define LTP_TESTSUITE_REMOVE_UNSUPPORTED_TESTCASES - $(foreach f,$(LTP_TESTSUITE_UNSUPPORTED_TEST_CASES), + $(foreach f,$(LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_y), rm -rf $(@D)/$(f) ) endef LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_UNSUPPORTED_TESTCASES -# ldd command build system tries to build a shared library unconditionally. -ifeq ($(BR2_STATIC_LIBS),y) -define LTP_TESTSUITE_REMOVE_LDD - rm -rf $(@D)/testcases/commands/ldd -endef -LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_LDD -endif - $(eval $(autotools-package)) diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in index 667338a26e..ce5a85edcf 100644 --- a/package/ltrace/Config.in +++ b/package/ltrace/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_LTRACE bool "ltrace" depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS select BR2_PACKAGE_ELFUTILS @@ -25,7 +26,8 @@ config BR2_PACKAGE_LTRACE http://ltrace.org -comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library" +comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/ltrace/ltrace.hash b/package/ltrace/ltrace.hash index f795f53bfb..a677ed3511 100644 --- a/package/ltrace/ltrace.hash +++ b/package/ltrace/ltrace.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 894333bb7d347066c4e398d9f4a202af5f2faf80754905dd0e6a2259695baba0 ltrace-c22d359433b333937ee3d803450dc41998115685.tar.gz +sha256 4aecf69e4a33331aed1e50ce4907e73a98cbccc4835febc3473863474304d547 ltrace-82c66409c7a93ca6ad2e4563ef030dfb7e6df4d4.tar.gz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk index b71215e43b..b3bd90daaa 100644 --- a/package/ltrace/ltrace.mk +++ b/package/ltrace/ltrace.mk @@ -4,8 +4,11 @@ # ################################################################################ -LTRACE_VERSION = c22d359433b333937ee3d803450dc41998115685 -LTRACE_SITE = git://anonscm.debian.org/collab-maint/ltrace.git +# This github version has some extra fixes on top of https://ltrace.org/ +# in particular the following commit to avoid a crash: +# 192e0a6 void struct members are now ignored +LTRACE_VERSION = 82c66409c7a93ca6ad2e4563ef030dfb7e6df4d4 +LTRACE_SITE = $(call github,dkogan,ltrace,$(LTRACE_VERSION)) LTRACE_DEPENDENCIES = elfutils LTRACE_CONF_OPTS = --disable-werror LTRACE_LICENSE = GPL-2.0 diff --git a/package/ltris/ltris.hash b/package/ltris/ltris.hash index 25fc04c6cb..f696e3af17 100644 --- a/package/ltris/ltris.hash +++ b/package/ltris/ltris.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8f6a9e7719d22004aee153db29ffd9ca41c7a6cd87fc791591994eecc2e625a1 ltris-1.0.19.tar.gz +sha256 a7bc6c5fc6539b88505077a1b4580edc9b179ce0a6b829c58fbd9416cf456195 ltris-1.2.tar.gz sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk index fb0d4c34d2..9b59613417 100644 --- a/package/ltris/ltris.mk +++ b/package/ltris/ltris.mk @@ -5,7 +5,7 @@ ################################################################################ LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris -LTRIS_VERSION = 1.0.19 +LTRIS_VERSION = 1.2 LTRIS_LICENSE = GPL-2.0+ LTRIS_LICENSE_FILES = COPYING diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash index 85e1acc261..40bd870e86 100644 --- a/package/lttng-libust/lttng-libust.hash +++ b/package/lttng-libust/lttng-libust.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-ust/lttng-ust-2.11.0.tar.bz2.sha256 -sha256 683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8 lttng-ust-2.11.0.tar.bz2 +# From https://lttng.org/files/lttng-ust/lttng-ust-2.12.1.tar.bz2.sha256 +sha256 48a3948b168195123a749d22818809bd25127bb5f1a66458c3c012b210d2a051 lttng-ust-2.12.1.tar.bz2 # Hash for license file -sha256 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e COPYING +sha256 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e COPYING diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index 0c2fdb57ef..608e8781b1 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -5,13 +5,16 @@ ################################################################################ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust -LTTNG_LIBUST_VERSION = 2.11.0 +LTTNG_LIBUST_VERSION = 2.12.1 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond) LTTNG_LIBUST_LICENSE_FILES = COPYING LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux -LTTNG_LIBUST_CONF_OPTS += --disable-man-pages --disable-examples +LTTNG_LIBUST_CONF_OPTS = \ + --disable-man-pages \ + --disable-examples \ + --with-lttng-system-rundir=/run/lttng ifeq ($(BR2_PACKAGE_PYTHON),y) LTTNG_LIBUST_DEPENDENCIES += python diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash index f5f9fdbbdc..a94ecc4a35 100644 --- a/package/lttng-tools/lttng-tools.hash +++ b/package/lttng-tools/lttng-tools.hash @@ -1,6 +1,10 @@ -# From https://lttng.org/files/lttng-tools/lttng-tools-2.11.0.tar.bz2.sha256 -sha256 dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc lttng-tools-2.11.0.tar.bz2 +# From https://lttng.org/files/lttng-tools/lttng-tools-2.12.3.tar.bz2.sha256 +sha256 2890da230edd523fcf497e9eb28133b7606d64fa01bcbffadbfcba42104db153 lttng-tools-2.12.3.tar.bz2 + # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt -sha256 051be1f11b508ef7bb839994f6b58be19a827c56bd9bddfe36d77d3d4be55abe lgpl-2.1.txt -sha256 f07515677547da5f3ee2396bdf491affc1accd5e4765a5378b6e1e98392fd5e7 LICENSE +sha256 068e55c7dbe597400199aee75ac5e71bdb2ca88c4c9a4cfa8e1fbc61f933eda5 LICENSE +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSES/BSD-2-Clause +sha256 7a83b1aeb460458db9a4bd521d7f237c45b1650f6e60ea5ffc71e49472454de3 LICENSES/BSD-3-Clause +sha256 6841c85b94f9dab319356e3aaf9e969fcedad51d3aaadf665bf86f34f4186b62 LICENSES/GPL-2.0 +sha256 d72921266bc8452a8789f8a04a82755373990d00b7e0b0f1a8edb8f854e94d1c LICENSES/LGPL-2.1 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/MIT diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index f85f6bcbce..fdc5c33bd2 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -4,14 +4,19 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.11.0 +LTTNG_TOOLS_VERSION = 2.12.3 LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES -LTTNG_TOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ (include/lttng/*, src/lib/lttng-ctl/*) -LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE -LTTNG_TOOLS_CONF_OPTS += --disable-man-pages +LTTNG_TOOLS_LICENSE = GPL-2.0, LGPL-2.1 (include/lttng/*, src/lib/lttng-ctl/*) +LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix LICENSES/,BSD-2-Clause BSD-3-Clause GPL-2.0 LGPL-2.1 MIT) LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux +# We're patching configure.ac +LTTNG_TOOLS_AUTORECONF = YES +LTTNG_TOOLS_CONF_OPTS = \ + --disable-man-pages \ + --disable-tests \ + --with-lttng-system-rundir=/run/lttng ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) LTTNG_TOOLS_CONF_OPTS += --with-lttng-ust diff --git a/package/lua-bit32/lua-bit32.hash b/package/lua-bit32/lua-bit32.hash index 22d5b01be3..9a4f64b66c 100644 --- a/package/lua-bit32/lua-bit32.hash +++ b/package/lua-bit32/lua-bit32.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 fe7bc70d1e48183d95ccfb6741e70a676283075173122cb161303d77059b27a6 bit32-5.3.0-1.src.rock -sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66 lua-compat-5.2/LICENSE +sha256 0e273427f2b877270f9cec5642ebe2670242926ba9638d4e6df7e4e1263ca12c bit32-5.3.5.1-1.src.rock +sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.10/LICENSE diff --git a/package/lua-bit32/lua-bit32.mk b/package/lua-bit32/lua-bit32.mk index 14851a5138..0fa5048d79 100644 --- a/package/lua-bit32/lua-bit32.mk +++ b/package/lua-bit32/lua-bit32.mk @@ -4,9 +4,9 @@ # ################################################################################ -LUA_BIT32_VERSION = 5.3.0-1 +LUA_BIT32_VERSION = 5.3.5.1-1 LUA_BIT32_NAME_UPSTREAM = bit32 -LUA_BIT32_SUBDIR = lua-compat-5.2 +LUA_BIT32_SUBDIR = lua-compat-5.3-0.10 LUA_BIT32_LICENSE = MIT LUA_BIT32_LICENSE_FILES = $(LUA_BIT32_SUBDIR)/LICENSE diff --git a/package/lua-compat53/Config.in b/package/lua-compat53/Config.in index 76c5b3fd71..de468fcf66 100644 --- a/package/lua-compat53/Config.in +++ b/package/lua-compat53/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LUA_COMPAT53 bool "lua-compat53" - depends on !BR2_PACKAGE_LUA_5_3 + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 help Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1. diff --git a/package/lua-compat53/lua-compat53.hash b/package/lua-compat53/lua-compat53.hash index b40596f86a..07783820cc 100644 --- a/package/lua-compat53/lua-compat53.hash +++ b/package/lua-compat53/lua-compat53.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 cb5fdca362780a30405c4134310ea78627a092b0ee8445a52456f2fceeeaea4e compat53-0.7-1.src.rock -sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.7/LICENSE +sha256 e513e75ba0ef4923a1ec0d4f0beb5972a11cc9bd7ac1b0953b5e4f037b259c92 compat53-0.8-1.src.rock +sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.8/LICENSE diff --git a/package/lua-compat53/lua-compat53.mk b/package/lua-compat53/lua-compat53.mk index 13e24391b0..0e8f1c3600 100644 --- a/package/lua-compat53/lua-compat53.mk +++ b/package/lua-compat53/lua-compat53.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_COMPAT53_VERSION_UPSTREAM = 0.7 +LUA_COMPAT53_VERSION_UPSTREAM = 0.8 LUA_COMPAT53_VERSION = $(LUA_COMPAT53_VERSION_UPSTREAM)-1 LUA_COMPAT53_NAME_UPSTREAM = compat53 LUA_COMPAT53_SUBDIR = lua-compat-5.3-$(LUA_COMPAT53_VERSION_UPSTREAM) diff --git a/package/lua-cqueues/lua-cqueues.hash b/package/lua-cqueues/lua-cqueues.hash index 69d8ec1c10..5803a60d50 100644 --- a/package/lua-cqueues/lua-cqueues.hash +++ b/package/lua-cqueues/lua-cqueues.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 24f1aa69b539e6796445c2228f921744ad64f9336498c7537bee97719d914804 lua-cqueues-20190813.tar.gz -sha256 5f4b1f94047790eadf8fd0f9a8e3bd2895bea4c9a2c0f8bf7cd8c8e57caa5219 LICENSE +sha256 9e112edd246da5cfca264314b70325a0b63665cb87a00e45ee3ae4f194000d52 lua-cqueues-20200726.tar.gz +sha256 5f4b1f94047790eadf8fd0f9a8e3bd2895bea4c9a2c0f8bf7cd8c8e57caa5219 LICENSE diff --git a/package/lua-cqueues/lua-cqueues.mk b/package/lua-cqueues/lua-cqueues.mk index fc2c85c11f..6d842eca97 100644 --- a/package/lua-cqueues/lua-cqueues.mk +++ b/package/lua-cqueues/lua-cqueues.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CQUEUES_VERSION = 20190813 +LUA_CQUEUES_VERSION = 20200726 LUA_CQUEUES_SITE = $(call github,wahern,cqueues,rel-$(LUA_CQUEUES_VERSION)) LUA_CQUEUES_LICENSE = MIT LUA_CQUEUES_LICENSE_FILES = LICENSE diff --git a/package/lua-curl/lua-curl.hash b/package/lua-curl/lua-curl.hash index 33cc68e32e..32f0506bbd 100644 --- a/package/lua-curl/lua-curl.hash +++ b/package/lua-curl/lua-curl.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 01578439ba90338abba86ec77641a4998450dbc42c06cff41eeefa119a6962bc lua-curl-0.3.11-1.src.rock -sha256 3049265c5c05a5e2a40eb28dbf3fe46a51cd03e5f62cc1a419e352130e278e02 Lua-cURLv3-0.3.11/LICENSE +sha256 6b2cc48621fac3cb7c1669705475e67a6932829ba46efb9ac5864604848f8ea2 lua-curl-0.3.13-1.src.rock +sha256 0f92f4c4665aadffb023de44b16022282040fe4409d5cd3148f1812dec30cdff Lua-cURLv3-0.3.13/LICENSE diff --git a/package/lua-curl/lua-curl.mk b/package/lua-curl/lua-curl.mk index 3a0f1c69bf..2120d33ab5 100644 --- a/package/lua-curl/lua-curl.mk +++ b/package/lua-curl/lua-curl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CURL_VERSION_UPSTREAM = 0.3.11 +LUA_CURL_VERSION_UPSTREAM = 0.3.13 LUA_CURL_VERSION = $(LUA_CURL_VERSION_UPSTREAM)-1 LUA_CURL_SUBDIR = Lua-cURLv3-$(LUA_CURL_VERSION_UPSTREAM) LUA_CURL_LICENSE = MIT diff --git a/package/lua-flu/Config.in b/package/lua-flu/Config.in index 526dc90087..9b55ce5ab0 100644 --- a/package/lua-flu/Config.in +++ b/package/lua-flu/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LUA_FLU depends on !BR2_STATIC_LIBS # libfuse depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse depends on BR2_USE_MMU # libfuse + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_ATTR select BR2_PACKAGE_LIBFUSE help @@ -13,6 +14,6 @@ config BR2_PACKAGE_LUA_FLU http://piratery.net/flu/ -comment "lua-flu needs a toolchain w/ threads, dynamic library" +comment "lua-flu needs a toolchain w/ threads, dynamic library, Lua <= 5.3" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || BR2_PACKAGE_LUA_5_4 diff --git a/package/lua-gd/lua-gd.hash b/package/lua-gd/lua-gd.hash index d1bab37bc1..512573b474 100644 --- a/package/lua-gd/lua-gd.hash +++ b/package/lua-gd/lua-gd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 114f273a64da6ccbf6e0555757b952f84ab8c134416dd7aae1aeb666ca0e964d lua-gd-e60b13b7977bb3424d7044976ccba5d42c256934.tar.gz +sha256 928fa036b37595d773db1999c9ff43195c4290f0722298fa5b0c3e619c678525 lua-gd-2ce8e478a8591afd71e607506bc8c64b161bbd30.tar.gz sha256 b0ca41d88ddb0ca785436d37b08b8f413055755eb6bfd3ea0a6ff3214303aa43 COPYING diff --git a/package/lua-gd/lua-gd.mk b/package/lua-gd/lua-gd.mk index e9a51a1677..099df31f7f 100644 --- a/package/lua-gd/lua-gd.mk +++ b/package/lua-gd/lua-gd.mk @@ -4,17 +4,37 @@ # ################################################################################ -LUA_GD_VERSION = e60b13b7977bb3424d7044976ccba5d42c256934 +LUA_GD_VERSION = 2ce8e478a8591afd71e607506bc8c64b161bbd30 LUA_GD_SITE = $(call github,ittner,lua-gd,$(LUA_GD_VERSION)) LUA_GD_LICENSE = MIT LUA_GD_LICENSE_FILES = COPYING LUA_GD_DEPENDENCIES = luainterpreter gd +ifeq ($(BR2_PACKAGE_FONTCONFIG),y) +LUA_GD_FEATURES += -DGD_FONTCONFIG +endif + +ifeq ($(BR2_PACKAGE_FREETYPE),y) +LUA_GD_FEATURES += -DGD_FREETYPE +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +LUA_GD_FEATURES += -DGD_JPEG +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +LUA_GD_FEATURES += -DGD_PNG +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) +LUA_GD_FEATURES += -DGD_XPM +endif + # VERSION follows the scheme described on https://ittner.github.io/lua-gd/manual.html#intro, # the current version of the binding is 3. define LUA_GD_BUILD_CMDS $(MAKE) -C $(@D) gd.so \ - GDLIBCONFIG="$(STAGING_DIR)/usr/bin/gdlib-config" \ + GDFEATURES="$(LUA_GD_FEATURES)" \ CC=$(TARGET_CC) \ CFLAGS="$(TARGET_CFLAGS) -fPIC -DVERSION=\\\"$(GD_VERSION)r3\\\"" \ LFLAGS="-shared -lgd" diff --git a/package/lua-http/Config.in b/package/lua-http/Config.in index cbf71563b0..e4d359ad3f 100644 --- a/package/lua-http/Config.in +++ b/package/lua-http/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LUA_HTTP select BR2_PACKAGE_LPEG # runtime select BR2_PACKAGE_LUA_BASEXX # runtime select BR2_PACKAGE_LUA_BINARYHEAP # runtime - select BR2_PACKAGE_LUA_COMPAT53 if !BR2_PACKAGE_LUA_5_3 # runtime + select BR2_PACKAGE_LUA_COMPAT53 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # runtime select BR2_PACKAGE_LUA_CQUEUES # runtime select BR2_PACKAGE_LUA_FIFO # runtime select BR2_PACKAGE_LUA_LPEG_PATTERNS # runtime @@ -13,7 +13,7 @@ config BR2_PACKAGE_LUA_HTTP help HTTP library for Lua. - https://daurnimator.github.io/lua-http/ + https://github.com/daurnimator/lua-http comment "lua-http needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/lua-http/lua-http.hash b/package/lua-http/lua-http.hash index d41b494e98..491167eeda 100644 --- a/package/lua-http/lua-http.hash +++ b/package/lua-http/lua-http.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 98318213be7b5ca60780c39f4736d5a3328631bc2c5dbfb8949b0db80e32746f http-0.3-0.src.rock -sha256 817cdf831c9d7cd1a2706b4b99dcc6f61a7a2345b7c9d39ed99e87d36338f4c8 lua-http-0.3/LICENSE.md +sha256 dbe1b29ff89fb937059e4398c9a628361d97d856acc87fd8cd85cb9340cde328 http-0.4-0.src.rock +sha256 1b486781068bcfd373f8c54f8d78eeab76d900bdf32e589e8330a4c563c2874b lua-http-0.4/LICENSE.md diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index 00dcefa0d0..7fbb09038e 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_HTTP_VERSION_UPSTREAM = 0.3 +LUA_HTTP_VERSION_UPSTREAM = 0.4 LUA_HTTP_VERSION = $(LUA_HTTP_VERSION_UPSTREAM)-0 LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) diff --git a/package/lua-livr/lua-livr.hash b/package/lua-livr/lua-livr.hash index a891420b49..73b0fefa71 100644 --- a/package/lua-livr/lua-livr.hash +++ b/package/lua-livr/lua-livr.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 a3890301ed5f393b585cab26ac944eddc9df41bfa2ab87c11785925193453493 lua-livr-0.2.1-1.src.rock -sha256 8f09089acf52cfabcc2a44ec3a492dc261e0ae9df3c618f43b33805e696e02d8 lua-LIVR-0.2.1/COPYRIGHT +sha256 e2f39316b8a1e66420c56e8ddc9ce4c0118c1a240582f2ba52d7627da6dfb76d lua-livr-0.2.2-1.src.rock +sha256 69fd426251454ea43a8068e58ac25d882922372de6b22e249bb56e00ea2cd834 lua-LIVR-0.2.2/COPYRIGHT diff --git a/package/lua-livr/lua-livr.mk b/package/lua-livr/lua-livr.mk index 25034b897b..3f114c725e 100644 --- a/package/lua-livr/lua-livr.mk +++ b/package/lua-livr/lua-livr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LIVR_VERSION = 0.2.1-1 +LUA_LIVR_VERSION = 0.2.2-1 LUA_LIVR_NAME_UPSTREAM = lua-LIVR LUA_LIVR_LICENSE = MIT LUA_LIVR_LICENSE_FILES = $(LUA_LIVR_SUBDIR)/COPYRIGHT diff --git a/package/lua-lyaml/lua-lyaml.hash b/package/lua-lyaml/lua-lyaml.hash index dd19783852..af3d0ae6da 100644 --- a/package/lua-lyaml/lua-lyaml.hash +++ b/package/lua-lyaml/lua-lyaml.hash @@ -1,3 +1,3 @@ # locally computed -sha256 f4015ba47a389fc4fe0656cbcb8a216239275ec53309a0df79b0733c843e7bba lua-lyaml-6.2.4.tar.gz -sha256 c7ec2f52d258088437cddeeee38cfc97d60d464c8801aa77decefb993400ec6e LICENSE +sha256 9bb489cefae48b150d66f6bab4141d8d5831fcb7465bfc52a9845fa01efc63b0 lua-lyaml-6.2.7.tar.gz +sha256 81e4ea1d897e259b31111adc2d3c185fe23e435942ff3e9de8c8c9c5d01247d0 LICENSE diff --git a/package/lua-lyaml/lua-lyaml.mk b/package/lua-lyaml/lua-lyaml.mk index c88a438d5e..77980f5312 100644 --- a/package/lua-lyaml/lua-lyaml.mk +++ b/package/lua-lyaml/lua-lyaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LYAML_VERSION = 6.2.4 +LUA_LYAML_VERSION = 6.2.7 LUA_LYAML_NAME_UPSTREAM = lyaml LUA_LYAML_SITE = $(call github,gvvaughan,$(LUA_LYAML_NAME_UPSTREAM),v$(LUA_LYAML_VERSION)) LUA_LYAML_LICENSE = MIT diff --git a/package/lua-messagepack/lua-messagepack.mk b/package/lua-messagepack/lua-messagepack.mk index f393a8d028..33d460b4fc 100644 --- a/package/lua-messagepack/lua-messagepack.mk +++ b/package/lua-messagepack/lua-messagepack.mk @@ -6,7 +6,7 @@ LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.5.2 LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y) LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack-lua53 else LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack diff --git a/package/lua-rotas/lua-rotas.hash b/package/lua-rotas/lua-rotas.hash index 6f8d0df41e..2633f3b728 100644 --- a/package/lua-rotas/lua-rotas.hash +++ b/package/lua-rotas/lua-rotas.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 be47e72ec703ffc319fe4fd539b531bbe8a8c0c52e0cc9774273028f1599a0cf lua-rotas-0.2.0-1.src.rock -sha256 4a7fdc0e44509d79c9bf18560cfb98368f70bb3832abe07e3cdba5c06466b0bb lua-Rotas-0.2.0/COPYRIGHT +sha256 a947026be3552cbf676a0cef36a618111712257d306cbd9d340ed8895a4cbd2b lua-rotas-0.2.1-1.src.rock +sha256 ac8bb87b7b5e803ae27510b9c6fd284f1b00e741258bc59fc78d3bc107d96fbb lua-Rotas-0.2.1/COPYRIGHT diff --git a/package/lua-rotas/lua-rotas.mk b/package/lua-rotas/lua-rotas.mk index 6ace963a4b..84d6c9a582 100644 --- a/package/lua-rotas/lua-rotas.mk +++ b/package/lua-rotas/lua-rotas.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_ROTAS_VERSION = 0.2.0-1 +LUA_ROTAS_VERSION = 0.2.1-1 LUA_ROTAS_NAME_UPSTREAM = lua-Rotas LUA_ROTAS_LICENSE = MIT LUA_ROTAS_LICENSE_FILES = $(LUA_ROTAS_SUBDIR)/COPYRIGHT diff --git a/package/lua-sdl2/Config.in b/package/lua-sdl2/Config.in index 65f9e7ff41..d0c1b91eb1 100644 --- a/package/lua-sdl2/Config.in +++ b/package/lua-sdl2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LUA_SDL2 bool "lua-sdl2" depends on !BR2_STATIC_LIBS + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_SDL2 help Lua-SDL2 is a pure C binding of SDL2 to Lua 5.1, Lua 5.2, @@ -8,5 +9,5 @@ config BR2_PACKAGE_LUA_SDL2 https://github.com/Tangent128/luasdl2 -comment "lua-sdl2 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "lua-sdl2 needs a toolchain w/ dynamic library, Lua <= 5.3" + depends on BR2_STATIC_LIBS || BR2_PACKAGE_LUA_5_4 diff --git a/package/lua-silva/lua-silva.hash b/package/lua-silva/lua-silva.hash index 7bb04da95c..bcd0d3071d 100644 --- a/package/lua-silva/lua-silva.hash +++ b/package/lua-silva/lua-silva.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 89cfdf6c67b69ff5e18591fb79cfe10c7e5f4923494ed92f426f44e475a9b522 lua-silva-0.1.6-1.src.rock -sha256 166beeb47e49a35b3ff8c6af91a399046a9cc5e29a8072618b4ca90f5b7a6c95 lua-Silva-0.1.6/COPYRIGHT +sha256 0e656c42c71b64285d4a375fa7b8b1a910b05c4ab6d30f5b427b078fff204e1f lua-silva-0.1.8-1.src.rock +sha256 5b59ffbfc12d9d1cb907dd65b0f16d3453e1a43cc018c6128a00b00e08f6c485 lua-Silva-0.1.8/COPYRIGHT diff --git a/package/lua-silva/lua-silva.mk b/package/lua-silva/lua-silva.mk index 949e2d36de..91b1b77476 100644 --- a/package/lua-silva/lua-silva.mk +++ b/package/lua-silva/lua-silva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_SILVA_VERSION = 0.1.6-1 +LUA_SILVA_VERSION = 0.1.8-1 LUA_SILVA_NAME_UPSTREAM = lua-Silva LUA_SILVA_LICENSE = MIT LUA_SILVA_LICENSE_FILES = $(LUA_SILVA_SUBDIR)/COPYRIGHT diff --git a/package/lua-std-normalize/lua-std-normalize.hash b/package/lua-std-normalize/lua-std-normalize.hash index 7c11f4914c..84cdfca422 100644 --- a/package/lua-std-normalize/lua-std-normalize.hash +++ b/package/lua-std-normalize/lua-std-normalize.hash @@ -1,3 +1,3 @@ -# Locally calculated -sha256 50baac6fbcbc6bbe72b63ce0871ec36176d75c04dccc6e368590ba6ef107c67a std.normalize-2.0.2-1.src.rock -sha256 a6a0a0ddc04f7437806a52cbd637c819144df7626a2e8a496cd3a2e20c8effb3 normalize-2.0.2/LICENSE.md +# computed by luarocks/buildroot +sha256 3a040b6ca43297367c527e12c1aab37acab86289f9415ffb130544c48b17f802 std.normalize-2.0.3-1.src.rock +sha256 9c9094f0cea86c2c62b893e59a78d5eaed69df0d7da24e122ef9753baeef0f04 normalize-2.0.3/LICENSE.md diff --git a/package/lua-std-normalize/lua-std-normalize.mk b/package/lua-std-normalize/lua-std-normalize.mk index d3a58aa0d4..0eb215bf80 100644 --- a/package/lua-std-normalize/lua-std-normalize.mk +++ b/package/lua-std-normalize/lua-std-normalize.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_STD_NORMALIZE_VERSION_UPSTREAM = 2.0.2 +LUA_STD_NORMALIZE_VERSION_UPSTREAM = 2.0.3 LUA_STD_NORMALIZE_VERSION = $(LUA_STD_NORMALIZE_VERSION_UPSTREAM)-1 LUA_STD_NORMALIZE_NAME_UPSTREAM = std.normalize LUA_STD_NORMALIZE_SUBDIR = normalize-$(LUA_STD_NORMALIZE_VERSION_UPSTREAM) diff --git a/package/lua-testmore/lua-testmore.hash b/package/lua-testmore/lua-testmore.hash index 673e1cf607..4ff577e528 100644 --- a/package/lua-testmore/lua-testmore.hash +++ b/package/lua-testmore/lua-testmore.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 163055ef92df9e01d9ae57cd45d6f6aace1ff4dd3abf7e29b9e30ecb1ab76ae2 lua-testmore-0.3.3-1.src.rock -sha256 0fa63370a149eda33e25987dd63bd096a616a3e47d2cfc45ca2fd66e8d2bfb35 lua-TestMore-0.3.3/COPYRIGHT +sha256 b3e57955888aba3974d6f5a21219214e2803a38e4623671f7d9d9e0f1851e608 lua-testmore-0.3.6-1.src.rock +sha256 37a3afb014325b98f0ad919cb40bc9d5a948120e5260e75b9d00c198d350da6d lua-TestMore-0.3.6/COPYRIGHT diff --git a/package/lua-testmore/lua-testmore.mk b/package/lua-testmore/lua-testmore.mk index 7904776115..e3cc7b7bdb 100644 --- a/package/lua-testmore/lua-testmore.mk +++ b/package/lua-testmore/lua-testmore.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_TESTMORE_VERSION = 0.3.3-1 +LUA_TESTMORE_VERSION = 0.3.6-1 LUA_TESTMORE_NAME_UPSTREAM = lua-TestMore LUA_TESTMORE_LICENSE = MIT LUA_TESTMORE_LICENSE_FILES = $(LUA_TESTMORE_SUBDIR)/COPYRIGHT diff --git a/package/lua-utf8/lua-utf8.hash b/package/lua-utf8/lua-utf8.hash index e119f94352..135574f36d 100644 --- a/package/lua-utf8/lua-utf8.hash +++ b/package/lua-utf8/lua-utf8.hash @@ -1,2 +1,3 @@ # computed by luarocks/buildroot -sha256 c9ceb3a9f327b3215cdf959eebf616970b5b0427ca3fde05b19f8236defa4b91 utf8-1.2-0.src.rock +sha256 88c456bc0f00d28201b33551d83fa6e5c3ae6025aebec790c37afb317290e4fa luautf8-0.1.3-1.src.rock +sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.3/LICENSE diff --git a/package/lua-utf8/lua-utf8.mk b/package/lua-utf8/lua-utf8.mk index 7ed4f3fbed..52aaf5c71e 100644 --- a/package/lua-utf8/lua-utf8.mk +++ b/package/lua-utf8/lua-utf8.mk @@ -4,9 +4,9 @@ # ################################################################################ -LUA_UTF8_VERSION = 1.2-0 -LUA_UTF8_NAME_UPSTREAM = utf8 -LUA_UTF8_SUBDIR = luautf8 +LUA_UTF8_VERSION = 0.1.3-1 +LUA_UTF8_NAME_UPSTREAM = luautf8 LUA_UTF8_LICENSE = MIT +LUA_UTF8_LICENSE_FILES = $(LUA_UTF8_SUBDIR)/LICENSE $(eval $(luarocks-package)) diff --git a/package/lua/Config.in b/package/lua/Config.in index ce2e439f63..5d4cee5d5b 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -20,17 +20,19 @@ choice config BR2_PACKAGE_LUA_5_1 bool "Lua 5.1.x" + select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 config BR2_PACKAGE_LUA_5_3 bool "Lua 5.3.x" + select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3 + +config BR2_PACKAGE_LUA_5_4 + bool "Lua 5.4.x" + select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4 endchoice -config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION - default "5.1" if BR2_PACKAGE_LUA_5_1 - default "5.3" if BR2_PACKAGE_LUA_5_3 - -if BR2_PACKAGE_LUA_5_3 +if BR2_PACKAGE_LUA_5_3 || BR2_PACKAGE_LUA_5_4 config BR2_PACKAGE_LUA_32BITS bool "Use 32 bit numbers" default y if !BR2_ARCH_IS_64 diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 8a5f9258a0..844e165df0 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -4,25 +4,30 @@ # ################################################################################ -ifeq ($(BR2_PACKAGE_LUA_5_3),y) -LUA_VERSION = 5.3.5 +ifeq ($(BR2_PACKAGE_LUA_5_4),y) +LUA_VERSION = 5.4.3 +else ifeq ($(BR2_PACKAGE_LUA_5_3),y) +LUA_VERSION = 5.3.6 else LUA_VERSION = 5.1.5 endif -LUA_SITE = http://www.lua.org/ftp +LUA_SITE = https://www.lua.org/ftp LUA_INSTALL_STAGING = YES LUA_LICENSE = MIT -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y) LUA_LICENSE_FILES = doc/readme.html else LUA_LICENSE_FILES = COPYRIGHT endif +LUA_CPE_ID_VENDOR = lua LUA_PROVIDES = luainterpreter LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_4),y) +LUA_CFLAGS += -DLUA_COMPAT_5_3 +else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_CFLAGS += -DLUA_COMPAT_5_2 endif @@ -35,12 +40,12 @@ LUA_MYLIBS += -ldl endif ifeq ($(BR2_PACKAGE_LUA_READLINE),y) -LUA_DEPENDENCIES = readline ncurses +LUA_DEPENDENCIES += readline ncurses LUA_MYLIBS += -lreadline -lhistory -lncurses LUA_CFLAGS += -DLUA_USE_READLINE else ifeq ($(BR2_PACKAGE_LUA_LINENOISE),y) -LUA_DEPENDENCIES = linenoise +LUA_DEPENDENCIES += linenoise LUA_MYLIBS += -llinenoise LUA_CFLAGS += -DLUA_USE_LINENOISE endif @@ -54,7 +59,15 @@ endef LUA_POST_PATCH_HOOKS += LUA_32BITS_LUACONF endif +define HOST_LUA_LUACONF + $(SED) 's|#define LUA_ROOT.*|#define LUA_ROOT "$(HOST_DIR)/usr/"|' $(@D)/src/luaconf.h +endef +HOST_LUA_POST_PATCH_HOOKS += HOST_LUA_LUACONF + HOST_LUA_CFLAGS = -Wall -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX +ifeq ($(BR2_PACKAGE_LUA_5_3),y) +HOST_LUA_CFLAGS += -DLUA_COMPAT_5_2 +endif HOST_LUA_MYLIBS = -ldl define LUA_BUILD_CMDS @@ -74,7 +87,7 @@ define HOST_LUA_BUILD_CMDS CFLAGS="$(HOST_LUA_CFLAGS)" \ MYLDFLAGS="$(HOST_LDFLAGS)" \ MYLIBS="$(HOST_LUA_MYLIBS)" \ - BUILDMODE=static \ + BUILDMODE=dynamic \ PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all sed -e "s/@VERSION@/$(LUA_VERSION)/;s/@ABI@/$(LUAINTERPRETER_ABIVER)/;s/@MYLIBS@/$(HOST_LUA_MYLIBS)/" \ package/lua/lua.pc.in > $(@D)/lua.pc diff --git a/package/luabitop/Config.in b/package/luabitop/Config.in index a819fe8ae7..656b1c7391 100644 --- a/package/luabitop/Config.in +++ b/package/luabitop/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_LUABITOP bool "luabitop" - depends on !BR2_PACKAGE_LUA_5_3 + depends on BR2_PACKAGE_LUA_5_1 help Lua BitOp is a C extension module for Lua 5.1/5.2 which adds bitwise operations on numbers. http://bitop.luajit.org -comment "luabitop needs a Lua 5.1/5.2 interpreter" - depends on BR2_PACKAGE_LUA_5_3 +comment "luabitop needs Lua 5.1" + depends on !BR2_PACKAGE_LUA_5_1 diff --git a/package/luafilesystem/luafilesystem.hash b/package/luafilesystem/luafilesystem.hash index 9afc05c256..747b984802 100644 --- a/package/luafilesystem/luafilesystem.hash +++ b/package/luafilesystem/luafilesystem.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 65e6d437e577a1d6cd509b6cd224d2cb9501d58d32a72cafbd4fd3f911681576 luafilesystem-1.7.0-2.src.rock +sha256 576270a55752894254c2cba0d49d73595d37ec4ea8a75e557fdae7aff80e19cf luafilesystem-1.8.0-1.src.rock sha256 beb2c9eed6466d572c3888028a77421206053a3c023429cbd69e5015badba842 luafilesystem/LICENSE diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk index 37f265e2b6..b8b07176c6 100644 --- a/package/luafilesystem/luafilesystem.mk +++ b/package/luafilesystem/luafilesystem.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAFILESYSTEM_VERSION = 1.7.0-2 +LUAFILESYSTEM_VERSION = 1.8.0-1 LUAFILESYSTEM_SUBDIR = luafilesystem LUAFILESYSTEM_LICENSE = MIT LUAFILESYSTEM_LICENSE_FILES = $(LUAFILESYSTEM_SUBDIR)/LICENSE diff --git a/package/luainterpreter/Config.in b/package/luainterpreter/Config.in index 7bc54d862f..873fb345b9 100644 --- a/package/luainterpreter/Config.in +++ b/package/luainterpreter/Config.in @@ -7,6 +7,18 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION string + default "5.1" if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 + default "5.3" if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3 + default "5.4" if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4 + +config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 + bool + +config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3 + bool + +config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4 + bool config BR2_PACKAGE_PROVIDES_HOST_LUAINTERPRETER string diff --git a/package/luainterpreter/luainterpreter.mk b/package/luainterpreter/luainterpreter.mk index 58d421b183..9d9f85a579 100644 --- a/package/luainterpreter/luainterpreter.mk +++ b/package/luainterpreter/luainterpreter.mk @@ -7,15 +7,11 @@ LUAINTERPRETER_ABIVER = $(call qstrip,$(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION)) # Lua packages often install documentation, clean that up globally -# Since luainterpreter is a virtual package, we can't use -# LUAINTERPRETER_TARGET_FINALIZE_HOOKS -ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y) define LUAINTERPRETER_REMOVE_DOC rm -rf $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/doc endef -TARGET_FINALIZE_HOOKS += LUAINTERPRETER_REMOVE_DOC -endif +LUAINTERPRETER_TARGET_FINALIZE_HOOKS += LUAINTERPRETER_REMOVE_DOC $(eval $(virtual-package)) $(eval $(host-virtual-package)) diff --git a/package/luajit/Config.in b/package/luajit/Config.in index f4d6001586..eb3eb01998 100644 --- a/package/luajit/Config.in +++ b/package/luajit/Config.in @@ -19,6 +19,7 @@ config BR2_PACKAGE_LUAJIT # binaries, so check if that option is supported. See # luajit.mk for details. select BR2_PACKAGE_HAS_LUAINTERPRETER + select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 help LuaJIT implements the full set of language features defined @@ -33,9 +34,6 @@ if BR2_PACKAGE_LUAJIT config BR2_PACKAGE_PROVIDES_LUAINTERPRETER default "luajit" -config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION - default "5.1" - config BR2_PACKAGE_LUAJIT_COMPAT52 bool "Lua 5.2 compatibility" help diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 68e6af4f5e..defa21dd3f 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -17,12 +17,6 @@ ifeq ($(BR2_PACKAGE_LUAJIT_COMPAT52),y) LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_LUA52COMPAT endif -ifeq ($(BR2_STATIC_LIBS),y) -LUAJIT_BUILDMODE = static -else -LUAJIT_BUILDMODE = dynamic -endif - # The luajit build procedure requires the host compiler to have the # same bitness as the target compiler. Therefore, on a x86 build # machine, we can't build luajit for x86_64, which is checked in @@ -50,7 +44,7 @@ define LUAJIT_BUILD_CMDS HOST_CC="$(LUAJIT_HOST_CC)" \ HOST_CFLAGS="$(HOST_CFLAGS)" \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \ - BUILDMODE=$(LUAJIT_BUILDMODE) \ + BUILDMODE=dynamic \ XCFLAGS=$(LUAJIT_XCFLAGS) \ -C $(@D) amalg endef diff --git a/package/lualogging/Config.in b/package/lualogging/Config.in index a1ed775fb1..b12b95142e 100644 --- a/package/lualogging/Config.in +++ b/package/lualogging/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LUALOGGING supports, through the use of appenders, console, file, rolling file, email, socket and SQL outputs. - https://github.com/Neopallium/lualogging + https://lunarmodules.github.io/lualogging/ diff --git a/package/lualogging/lualogging.hash b/package/lualogging/lualogging.hash index e2ba5df3a8..45f1868856 100644 --- a/package/lualogging/lualogging.hash +++ b/package/lualogging/lualogging.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 6ca3827c4903814626b96011e17ad99b42ecfa983b605aa75bf58f17e90ed58d lualogging-1.3.0-1.src.rock -sha256 4e86086c032a006ce1289565cc9d9afff26b5117891cd26ffa15aa866bd28ee5 lualogging/COPYRIGHT +sha256 70451dbec500dbc760f0eae666a10b19a0ba9bcbfa5dd8d3134908e5ae6d28b1 lualogging-1.5.1-1.src.rock +sha256 4d95b123e667a13615f567a829aa39211dd55b0b48c9f247bf3fcc5c0b485da7 lualogging/COPYRIGHT diff --git a/package/lualogging/lualogging.mk b/package/lualogging/lualogging.mk index 3444a29886..9c94e588a9 100644 --- a/package/lualogging/lualogging.mk +++ b/package/lualogging/lualogging.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUALOGGING_VERSION = 1.3.0-1 +LUALOGGING_VERSION = 1.5.1-1 LUALOGGING_SUBDIR = lualogging LUALOGGING_LICENSE = MIT LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT diff --git a/package/luaossl/Config.in b/package/luaossl/Config.in index d8763e76a3..f84c59f2a0 100644 --- a/package/luaossl/Config.in +++ b/package/luaossl/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LUAOSSL bool "luaossl" depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help luaossl is a comprehensive binding to OpenSSL for Lua 5.1, 5.2, and later. diff --git a/package/luaossl/luaossl.hash b/package/luaossl/luaossl.hash index 9b959f6fcf..c8fa7942ed 100644 --- a/package/luaossl/luaossl.hash +++ b/package/luaossl/luaossl.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b558790c0d1c965bd98b98a91a44eef9f72a0b784dbb4978810a1e52206d593d luaossl-20190731-0.src.rock -sha256 7bd585fba3ae52943e0915e4c8ca049acde9f1e5cea101ef6b294427c8f0ee7d luaossl-rel-20190731/LICENSE +sha256 ea6d624e557939e30b93355dd1dc11465e81aa38a5542ab3c04b48608ac3cd78 luaossl-20200709-0.src.rock +sha256 7bd585fba3ae52943e0915e4c8ca049acde9f1e5cea101ef6b294427c8f0ee7d luaossl-rel-20200709/LICENSE diff --git a/package/luaossl/luaossl.mk b/package/luaossl/luaossl.mk index 128c320d1e..d241bce85c 100644 --- a/package/luaossl/luaossl.mk +++ b/package/luaossl/luaossl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAOSSL_VERSION_UPSTREAM = 20190731 +LUAOSSL_VERSION_UPSTREAM = 20200709 LUAOSSL_VERSION = $(LUAOSSL_VERSION_UPSTREAM)-0 LUAOSSL_SUBDIR = luaossl-rel-$(LUAOSSL_VERSION_UPSTREAM) LUAOSSL_LICENSE = MIT diff --git a/package/luaposix/Config.in b/package/luaposix/Config.in index 1e2291b3f5..85943f9915 100644 --- a/package/luaposix/Config.in +++ b/package/luaposix/Config.in @@ -3,9 +3,9 @@ config BR2_PACKAGE_LUAPOSIX # "bit32" is included in Lua 5.2+. luajit has an equivalent # "bit" module, but since it has a different name, luaposix # doesn't find it. - select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT # runtime + select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # runtime help - This is a POSIX binding for LuaJIT, Lua 5.1, 5.2 and 5.3; + This is a POSIX binding for LuaJIT, Lua 5.1 through 5.4; like most libraries it simply binds to C APIs on the underlying system, so it won't work on non-POSIX systems. However, it does try to detect the level of POSIX conformance diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index ee72bfe321..54617853a8 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7948f4ac8b953172e928753632e37ad97cc3014df74b524fe7839f71216a7e90 luaposix-34.1.1.tar.gz -sha256 a868e95dd14f832eb63c4580c5fed42d78a6bd11785e3605211f446b05904a18 LICENSE +sha256 a4edf2f715feff65acb009e8d1689e57ec665eb79bc36a6649fae55eafd56809 luaposix-35.0.tar.gz +sha256 e5d496c903dc3989bb2f6f175cda52d26e3494ad1fdd67ae1c3b3e5f76ffb86f LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index ab6b030fca..d04881dfd9 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 34.1.1 +LUAPOSIX_VERSION = 35.0 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE diff --git a/package/luarocks/buildroot.lua b/package/luarocks/buildroot.lua index 67dac33aa2..2d160f02b6 100644 --- a/package/luarocks/buildroot.lua +++ b/package/luarocks/buildroot.lua @@ -380,8 +380,8 @@ function buildroot.command(args) if #licenses == 0 then for i = 1, #files do local v = files[i] - if v:match('^doc/LICENSE') - or v:match('^doc/license') + if v:match('^docs?/LICENSE') + or v:match('^docs?/license') or v:match('^doc/us/license') then licenses[#licenses+1] = v digest[v], err = get_digest(v) diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index 069d181d61..42e039214c 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eb20cd9814df05535d9aae98da532217c590fc07d48d90ca237e2a7cdcf284fe luarocks-3.3.1.tar.gz -sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING +sha256 9255d97fee95cec5b54fc6ac718b11bf5029e45bed7873e053314919cd448551 luarocks-3.7.0.tar.gz +sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 123f8c0734..28a421925e 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 3.3.1 +LUAROCKS_VERSION = 3.7.0 LUAROCKS_SITE = http://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING @@ -12,15 +12,12 @@ LUAROCKS_LICENSE_FILES = COPYING HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter LUAROCKS_CONFIG_DIR = $(HOST_DIR)/etc -LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/config-$(LUAINTERPRETER_ABIVER).lua -LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC -ifeq ($(BR2_PACKAGE_LUA_5_3),y) -LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2 -endif +LUAROCKS_CONFIG_FILE_DEFAULT = $(LUAROCKS_CONFIG_DIR)/luarocks/config-$(LUAINTERPRETER_ABIVER).lua +LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/config.lua +HOST_LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/host-config.lua define LUAROCKS_ADDON_EXTRACT - mkdir $(@D)/src/luarocks/cmd/external - cp package/luarocks/buildroot.lua $(@D)/src/luarocks/cmd/external/buildroot.lua + $(INSTALL) -D -m 0644 package/luarocks/buildroot.lua $(@D)/src/luarocks/cmd/external/buildroot.lua endef HOST_LUAROCKS_POST_EXTRACT_HOOKS += LUAROCKS_ADDON_EXTRACT @@ -33,28 +30,19 @@ define HOST_LUAROCKS_CONFIGURE_CMDS cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPTS) endef -ifeq ($(BR2_PACKAGE_LUAJIT),y) -define LUAROCKS_CONFIGURE_INTERPRETER_LUAJIT - echo "lua_interpreter = [[luajit]]" >> $(LUAROCKS_CONFIG_FILE) -endef -endif - define HOST_LUAROCKS_INSTALL_CMDS - rm -f $(LUAROCKS_CONFIG_FILE) + rm -f $(LUAROCKS_CONFIG_FILE_DEFAULT) $(MAKE1) -C $(@D) install - cat $(HOST_LUAROCKS_PKGDIR)/luarocks-br-config.lua >> $(LUAROCKS_CONFIG_FILE) - $(LUAROCKS_CONFIGURE_INTERPRETER_LUAJIT) + cp $(LUAROCKS_CONFIG_FILE_DEFAULT) $(LUAROCKS_CONFIG_FILE) + echo "-- BR cross-compilation" >> $(LUAROCKS_CONFIG_FILE) + echo "gcc_rpath = false" >> $(LUAROCKS_CONFIG_FILE) + echo "wrap_bin_scripts = false" >> $(LUAROCKS_CONFIG_FILE) + cp $(LUAROCKS_CONFIG_FILE_DEFAULT) $(HOST_LUAROCKS_CONFIG_FILE) + rm -f $(LUAROCKS_CONFIG_FILE_DEFAULT) endef $(eval $(host-generic-package)) -LUAROCKS_RUN_ENV = \ - LUA_PATH="$(HOST_DIR)/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" \ - TARGET_CC="$(TARGET_CC)" \ - TARGET_CFLAGS="$(LUAROCKS_CFLAGS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS)" -LUAROCKS_RUN_CMD = $(LUA_RUN) $(HOST_DIR)/bin/luarocks - define LUAROCKS_FINALIZE_TARGET rm -rf $(TARGET_DIR)/usr/lib/luarocks endef diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index c50da8b9a2..1ea422aa9b 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b87c7d3bc5f07f5ad6fcf90f32f182d9a4a3f5f6b07e19221a86e89179ebd702 luasec-0.9-1.src.rock -sha256 4e1b2e7a46c756febf3ea76440fb5456c17e6c0312fd0135bd4649f4a2cd0d41 luasec/LICENSE +sha256 b7e18f475c64896fe4921d367adabae765914f7526a68487a5fa6831040e7138 luasec-1.0-1.src.rock +sha256 0d3431dad143f41c8902e4ee867e386a702ebad856c45239fb86460e27dabfbf luasec/LICENSE diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index 42d292245d..3ef0c14daf 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASEC_VERSION = 0.9-1 +LUASEC_VERSION = 1.0-1 LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE diff --git a/package/luasyslog/Config.in b/package/luasyslog/Config.in index 326fa6bf9b..ca098cb4f6 100644 --- a/package/luasyslog/Config.in +++ b/package/luasyslog/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_LUASYSLOG bool "luasyslog" select BR2_PACKAGE_LUALOGGING # runtime help - Syslog logging for Lua. + syslog appender for LuaLogging. - https://luarocks.org/modules/luarocks/luasyslog + https://github.com/ntd/luasyslog diff --git a/package/luasyslog/luasyslog.hash b/package/luasyslog/luasyslog.hash index 02a0d838a2..bcb6a7e025 100644 --- a/package/luasyslog/luasyslog.hash +++ b/package/luasyslog/luasyslog.hash @@ -1,3 +1,3 @@ -# computed by luarocks/buildroot -sha256 e807a614b77108ca25aeed061faf73b7ef00708f5bfebb9e4f03d27f3d453e7b luasyslog-1.0.0-2.src.rock -sha256 c1ed5cbf3fc02836d3fc5d2354818a5c151c1cd75fcc0bf240dbf8d2b36a3c1d luasyslog-1.0.0/COPYING +# Locally computed +sha256 7f7dad64117407f2484ff5b53e90804f923a99fcbde5872e54f6aba53f482da0 luasyslog-2.2.0.tar.gz +sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING diff --git a/package/luasyslog/luasyslog.mk b/package/luasyslog/luasyslog.mk index 1d88b60561..049e068a13 100644 --- a/package/luasyslog/luasyslog.mk +++ b/package/luasyslog/luasyslog.mk @@ -4,8 +4,13 @@ # ################################################################################ -LUASYSLOG_VERSION = 1.0.0-2 +LUASYSLOG_VERSION = 2.2.0 +LUASYSLOG_SITE = $(call github,ntd,luasyslog,$(LUASYSLOG_VERSION)) +LUASYSLOG_DEPENDENCIES = host-luarocks luainterpreter LUASYSLOG_LICENSE = MIT -LUASYSLOG_LICENSE_FILES = $(LUASYSLOG_SUBDIR)/COPYING +LUASYSLOG_LICENSE_FILES = COPYING +# fetching from github +# 0001-remove-AX_LUA_LIBS.patch touches configure.ac +LUASYSLOG_AUTORECONF = YES -$(eval $(luarocks-package)) +$(eval $(autotools-package)) diff --git a/package/lugaru/Config.in b/package/lugaru/Config.in index 521c89aeb0..4454ebcd06 100644 --- a/package/lugaru/Config.in +++ b/package/lugaru/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LUGARU depends on BR2_PACKAGE_HAS_LIBGL # libglu depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_PACKAGE_XORG7 # SDL2 OpenGL (GLX) - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on BR2_USE_MMU # SDL2 OpenGL (GLX) depends on !BR2_STATIC_LIBS # SDL2 @@ -29,10 +29,10 @@ config BR2_PACKAGE_LUGARU https://osslugaru.gitlab.io/ -comment "lugaru needs X11 and a toolchain w/ C++, OpenGL backend, gcc >= 4.7, NPTL, dynamic library" +comment "lugaru needs X11 and a toolchain w/ C++, OpenGL backend, gcc >= 4.9, NPTL, dynamic library" depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGL || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ BR2_STATIC_LIBS diff --git a/package/luv/luv.hash b/package/luv/luv.hash index f41325c8c5..a619db2c76 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7aff212985527248522411c3830234fe7b5e98593a4cc439b962c17da46681d5 luv-1.34.2-2.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 4018f293d71c2d75757b64fcdacf982729c9dc8b0bf8eda4015a8818a5a29321 luv-1.41.0-0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luv/luv.mk b/package/luv/luv.mk index d028519fe7..1a24a33bb2 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.34.2-2 +LUV_VERSION = 1.41.0-0 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt diff --git a/package/luvi/Config.in b/package/luvi/Config.in index c9fd417394..6e96f85f32 100644 --- a/package/luvi/Config.in +++ b/package/luvi/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_LUVI depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LUV + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help A project in-between luv and luvit. The goal of this is to make building luvit and derivatives much easier. diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash index f08883c068..fcc81430db 100644 --- a/package/luvi/luvi.hash +++ b/package/luvi/luvi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ec4eff7aaf2f36879a5fc8eb86706818a75faf07a18451a6fb44e05bbe00817f luvi-src-v2.11.0.tar.gz +sha256 4149c87646f487f9076c29e9861f64468637b1d1361b777b093e6204a83e1ed9 luvi-src-v2.12.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index d6384cb484..386daafc31 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUVI_VERSION = 2.11.0 +LUVI_VERSION = 2.12.0 LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) LUVI_LICENSE = Apache-2.0 diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in index de5b972e99..cc740dd40c 100644 --- a/package/lvm2/Config.in +++ b/package/lvm2/Config.in @@ -26,7 +26,7 @@ if BR2_PACKAGE_LVM2 config BR2_PACKAGE_LVM2_STANDARD_INSTALL bool "standard install instead of only dmsetup" - default y if !BR2_PACKAGE_LVM2_DMSETUP_ONLY # legacy 2013.11 + default y # http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html depends on !BR2_TOOLCHAIN_USES_MUSL help @@ -36,17 +36,6 @@ config BR2_PACKAGE_LVM2_STANDARD_INSTALL comment "lvm2 standard install needs a glibc or uClibc toolchain" depends on BR2_TOOLCHAIN_USES_MUSL -config BR2_PACKAGE_LVM2_APP_LIBRARY - bool "install application library" - # http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html - depends on !BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_LVM2_STANDARD_INSTALL - help - Install application library (liblvm2app). - -comment "lvm2 application library needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL - endif comment "lvm2 needs a toolchain w/ threads, dynamic library" diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 3d560c4be3..1260669480 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,5 +1,5 @@ -# From ftp://sources.redhat.com/pub/lvm2/sha512.sum -sha512 f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf LVM2.2.02.185.tgz +# From http://sources.redhat.com/pub/lvm2/sha512.sum +sha512 e4d3bfb38b346251a2ea2cee7b79f2e12ed407652b659b35b65f58c8bb252943cee1c511713aeec8ff3400790e0e99ea6b83e8740050defe5cbb118f18bf7700 LVM2.2.03.12.tgz # Locally computed sha256 checksums sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 43370b03bf..a5724328ff 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,12 +4,15 @@ # ################################################################################ -LVM2_VERSION = 2.02.185 +LVM2_VERSION = 2.03.12 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz -LVM2_SITE = ftp://sources.redhat.com/pub/lvm2 +LVM2_SITE = http://sources.redhat.com/pub/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB +LVM2_CPE_ID_PRODUCT = redhat +# parallel build issues +LVM2_MAKE = $(MAKE1) # Make sure that binaries and libraries are installed with write # permissions for the owner. We disable NLS because it's broken, and @@ -20,7 +23,7 @@ LVM2_CONF_OPTS += \ --enable-cmdlib \ --enable-dmeventd \ --disable-nls \ - --disable-symvers + --with-symvers=no LVM2_DEPENDENCIES += host-pkgconf libaio @@ -31,6 +34,9 @@ LVM2_MAKE_ENV = $(TARGET_CONFIGURE_OPTS) # package/readline is GPL-3.0+, so not license compatible LVM2_CONF_OPTS += --disable-readline +LVM2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) +LVM2_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) LVM2_CONF_OPTS += --enable-udev_rules endif @@ -42,16 +48,16 @@ else LVM2_CONF_OPTS += --disable-selinux endif -ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),) -LVM2_MAKE_OPTS = device-mapper -LVM2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install_device-mapper -LVM2_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install_device-mapper +ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),y) +LVM2_INSTALL_STAGING_OPTS += install +LVM2_INSTALL_TARGET_OPTS += install +ifeq ($(BR2_INIT_SYSTEMD),y) +LVM2_INSTALL_TARGET_OPTS += install_systemd_units install_systemd_generators endif - -ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y) -LVM2_CONF_OPTS += --enable-applib else -LVM2_CONF_OPTS += --disable-applib +LVM2_MAKE_OPTS = device-mapper +LVM2_INSTALL_STAGING_OPTS += install_device-mapper +LVM2_INSTALL_TARGET_OPTS += install_device-mapper endif ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) @@ -64,12 +70,10 @@ HOST_LVM2_CONF_OPTS = \ --enable-pkgconfig \ --disable-cmdlib \ --disable-dmeventd \ - --disable-applib \ --disable-fsadm \ --disable-readline \ - --disable-selinux -HOST_LVM2_MAKE_OPTS = device-mapper -HOST_LVM2_INSTALL_OPTS = install_device-mapper + --disable-selinux \ + --with-confdir=$(HOST_DIR)/etc $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/lxc/Config.in b/package/lxc/Config.in index 72b675113d..a3f9be0c90 100644 --- a/package/lxc/Config.in +++ b/package/lxc/Config.in @@ -21,4 +21,4 @@ comment "lxc needs a glibc or musl toolchain w/ threads, headers >= 3.0, dynamic || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 \ || BR2_STATIC_LIBS \ - || BR2_TOOLCHAN_USES_UCLIBC + || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index d5ea799776..efd7a8e42c 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 5f903986a4b17d607eea28c0aa56bf1e76e8707747b1aa07d31680338b1cc3d4 lxc-3.2.1.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 53e3c85c6d..93f6d2535f 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,16 +4,18 @@ # ################################################################################ -LXC_VERSION = 3.2.1 +LXC_VERSION = 4.0.10 LXC_SITE = https://linuxcontainers.org/downloads/lxc -LXC_LICENSE = LGPL-2.1+ -LXC_LICENSE_FILES = COPYING +LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ +LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 +LXC_CPE_ID_VENDOR = linuxcontainers LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES -# We're patching configure.ac -LXC_AUTORECONF = YES -LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ +LXC_CONF_OPTS = \ + --disable-apparmor \ + --disable-examples \ + --with-distro=buildroot \ --disable-werror \ $(if $(BR2_PACKAGE_BASH),,--disable-bash) diff --git a/package/lynx/lynx.hash b/package/lynx/lynx.hash index 76d7614a7c..62e2555a99 100644 --- a/package/lynx/lynx.hash +++ b/package/lynx/lynx.hash @@ -1,3 +1,4 @@ # Locally calculated: sha256 387f193d7792f9cfada14c60b0e5c0bff18f227d9257a39483e14fa1aaf79595 lynx2.8.9rel.1.tar.bz2 +sha256 b2207e757dbbefc34a20a32b1b4a216b4a4316e1dc812bceca4ac6294871119a 90_CVE-2021-38165.patch sha256 8406a30ff3134ec23cf752d1ceda92ddaabbe41b4f2dc07ea3cfa139de12d6d6 COPYING diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk index 07a3ddfcf0..44d52d90a5 100644 --- a/package/lynx/lynx.mk +++ b/package/lynx/lynx.mk @@ -7,11 +7,22 @@ LYNX_VERSION = 2.8.9rel.1 LYNX_SOURCE = lynx$(LYNX_VERSION).tar.bz2 LYNX_SITE = ftp://ftp.invisible-island.net/lynx/tarballs +LYNX_PATCH = \ + https://salsa.debian.org/lynx-team/lynx/-/raw/debian/2.9.0dev.6-3_deb11u1/debian/patches/90_CVE-2021-38165.patch +# 90_CVE-2021-38165.patch +LYNX_IGNORE_CVES += CVE-2021-38165 LYNX_LICENSE = GPL-2.0 LYNX_LICENSE_FILES = COPYING LYNX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) +ifeq ($(BR2_REPRODUCIBLE),y) +# configuration info leaks build paths +LYNX_CONF_OPTS += --disable-config-info +# disable build timestamp +LYNX_CFLAGS += -DNO_BUILDSTAMP +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) LYNX_DEPENDENCIES += ncurses LYNX_CONF_OPTS += --with-screen=ncurses$(if $(BR2_PACKAGE_NCURSES_WCHAR),w) @@ -41,6 +52,6 @@ LYNX_DEPENDENCIES += libidn LYNX_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libidn` endif -LYNX_CONF_ENV = LIBS="$(LYNX_LIBS)" +LYNX_CONF_ENV = LIBS="$(LYNX_LIBS)" CFLAGS="$(TARGET_CFLAGS) $(LYNX_CFLAGS)" $(eval $(autotools-package)) diff --git a/package/lz4/Config.in b/package/lz4/Config.in index 9f12299ceb..06a4e93dc1 100644 --- a/package/lz4/Config.in +++ b/package/lz4/Config.in @@ -8,3 +8,12 @@ config BR2_PACKAGE_LZ4 speed limits on multi-core systems. http://www.lz4.org/ + +if BR2_PACKAGE_LZ4 + +config BR2_PACKAGE_LZ4_PROGS + bool "install programs" + help + lz4, lz4c, unlz4 and lz4cat binaries + +endif diff --git a/package/lz4/lz4.hash b/package/lz4/lz4.hash index 01d0107b3f..0b03089ecd 100644 --- a/package/lz4/lz4.hash +++ b/package/lz4/lz4.hash @@ -1,4 +1,4 @@ # sha256 locally computed -sha256 658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc lz4-1.9.2.tar.gz +sha256 030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1 lz4-1.9.3.tar.gz sha256 d15d99c8dc6b0ec22174c0e563a95bc40f9363ca7f9d9d793bb5c5a8e8d0af71 lib/LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 programs/COPYING diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index 1d32666ccc..9b9b6198c3 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -4,11 +4,12 @@ # ################################################################################ -LZ4_VERSION = 1.9.2 +LZ4_VERSION = 1.9.3 LZ4_SITE = $(call github,lz4,lz4,v$(LZ4_VERSION)) LZ4_INSTALL_STAGING = YES LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs) LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING +LZ4_CPE_ID_VENDOR = yann_collet # CVE-2014-4715 is misclassified (by our CVE tracker) as affecting version # 1.9.2, while in fact this issue has been fixed since lz4-r130: @@ -16,6 +17,9 @@ LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING # See https://github.com/lz4/lz4/issues/818 LZ4_IGNORE_CVES += CVE-2014-4715 +# 0001-Fix-potential-memory-corruption-with-negative-memmov.patch +LZ4_IGNORE_CVES += CVE-2021-3520 + ifeq ($(BR2_STATIC_LIBS),y) LZ4_MAKE_OPTS += BUILD_SHARED=no else ifeq ($(BR2_SHARED_LIBS),y) @@ -32,21 +36,31 @@ define HOST_LZ4_INSTALL_CMDS install -C $(@D) endef +LZ4_DIRS = lib + +ifeq ($(BR2_PACKAGE_LZ4_PROGS),y) +LZ4_DIRS += programs +endif + define LZ4_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LZ4_MAKE_OPTS) \ - -C $(@D) lib - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LZ4_MAKE_OPTS) \ - -C $(@D) lz4 + $(foreach dir,$(LZ4_DIRS),\ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LZ4_MAKE_OPTS) \ + -C $(@D)/$(dir) + ) endef define LZ4_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(STAGING_DIR) \ - PREFIX=/usr $(LZ4_MAKE_OPTS) install -C $(@D) + $(foreach dir,$(LZ4_DIRS),\ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(STAGING_DIR) \ + PREFIX=/usr $(LZ4_MAKE_OPTS) -C $(@D)/$(dir) install + ) endef define LZ4_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \ - PREFIX=/usr $(LZ4_MAKE_OPTS) install -C $(@D) + $(foreach dir,$(LZ4_DIRS),\ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \ + PREFIX=/usr $(LZ4_MAKE_OPTS) -C $(@D)/$(dir) install + ) endef $(eval $(generic-package)) diff --git a/package/lzip/Config.in b/package/lzip/Config.in index d406e7710d..c07ef8d676 100644 --- a/package/lzip/Config.in +++ b/package/lzip/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_LZIP perspective. Lzip is a clean implementation of the LZMA algorithm. - http://www.nongnu.org/lzip/lzip.html + https://www.nongnu.org/lzip/lzip.html diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index 9945f9cfe5..57e7eb43f4 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,4 +1,4 @@ -# From http://lists.nongnu.org/archive/html/lzip-bug/2018-02/msg00006.html -sha256 c93b81a5a7788ef5812423d311345ba5d3bd4f5ebf1f693911e3a13553c1290c lzip-1.20.tar.gz +# From https://lists.nongnu.org/archive/html/lzip-bug/2021-01/msg00008.html +sha256 c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948 lzip-1.22.tar.gz # Locally calculated -sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index 72742240a5..cca6da07d0 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LZIP_VERSION = 1.20 +LZIP_VERSION = 1.22 LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING diff --git a/package/lzlib/lzlib.hash b/package/lzlib/lzlib.hash index f983862e41..4bb4c52c8c 100644 --- a/package/lzlib/lzlib.hash +++ b/package/lzlib/lzlib.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 cbb0cac5825e940b4ea2f31a336d2aaf6db39847d456920afd8e443804420dbb lzlib-0.4.3.tar.gz +sha256 cbb0cac5825e940b4ea2f31a336d2aaf6db39847d456920afd8e443804420dbb lzlib-0.4.3.tar.gz +sha256 f817d4a37077e94e9adf379f46ba5cc0b68775d7add2bbd5b2ca68ba140ad5bb lzlib.c diff --git a/package/lzlib/lzlib.mk b/package/lzlib/lzlib.mk index f468a1c839..74624d5019 100644 --- a/package/lzlib/lzlib.mk +++ b/package/lzlib/lzlib.mk @@ -8,6 +8,7 @@ LZLIB_VERSION = 0.4.3 LZLIB_SITE = $(call github,LuaDist,lzlib,$(LZLIB_VERSION)) LZLIB_DEPENDENCIES = lua zlib LZLIB_LICENSE = MIT +LZLIB_LICENSE_FILES = lzlib.c LZLIB_CONF_OPTS = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \ -DINSTALL_LMOD="/usr/share/lua/$(LUAINTERPRETER_ABIVER)" diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index 0ead92725a..0682d8d0ff 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -8,6 +8,7 @@ LZO_VERSION = 2.10 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download LZO_LICENSE = GPL-2.0+ LZO_LICENSE_FILES = COPYING +LZO_CPE_ID_VENDOR = lzo_project LZO_INSTALL_STAGING = YES LZO_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/package/make/make.mk b/package/make/make.mk index 10082353a2..f289c5c3d9 100644 --- a/package/make/make.mk +++ b/package/make/make.mk @@ -10,6 +10,8 @@ MAKE_SITE = $(BR2_GNU_MIRROR)/make MAKE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-pkgconf MAKE_LICENSE = GPL-3.0+ MAKE_LICENSE_FILES = COPYING +MAKE_CPE_ID_VENDOR = gnu + # Patching configure.ac MAKE_AUTORECONF = YES diff --git a/package/makedevs/makedevs.mk b/package/makedevs/makedevs.mk index 36837a191e..9b0f44610c 100644 --- a/package/makedevs/makedevs.mk +++ b/package/makedevs/makedevs.mk @@ -15,8 +15,12 @@ HOST_MAKEDEVS_CFLAGS += -DEXTENDED_ATTRIBUTES HOST_MAKEDEVS_LDFLAGS += -lcap endif +define HOST_MAKEDEVS_EXTRACT_CMDS + cp $(HOST_MAKEDEVS_PKGDIR)/makedevs.c $(@D) +endef + define HOST_MAKEDEVS_BUILD_CMDS - $(HOSTCC) $(HOST_MAKEDEVS_CFLAGS) package/makedevs/makedevs.c \ + $(HOSTCC) $(HOST_MAKEDEVS_CFLAGS) $(@D)/makedevs.c \ -o $(@D)/makedevs $(HOST_MAKEDEVS_LDFLAGS) endef diff --git a/package/mariadb/0001-add-extra-check-for-librt.patch b/package/mariadb/0001-add-extra-check-for-librt.patch index 90aa626a0b..0dd4c546fb 100644 --- a/package/mariadb/0001-add-extra-check-for-librt.patch +++ b/package/mariadb/0001-add-extra-check-for-librt.patch @@ -1,4 +1,4 @@ -From e6244400dfd3547531a3a3289fadbbe19873f096 Mon Sep 17 00:00:00 2001 +From 960c74ec60962f707bd41724edaa2640c0324400 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Thu, 27 Oct 2016 20:33:21 -0700 Subject: [PATCH] add extra check for librt @@ -6,24 +6,26 @@ Subject: [PATCH] add extra check for librt https://jira.mariadb.org/browse/MDEV-10841 Signed-off-by: Ryan Coe +[Rebased on mariadb-10.3.30] +Signed-off-by: Peter Seiderer --- configure.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.cmake b/configure.cmake -index 896226de954f4642a238ca6a72e0930590dc1681..77ca485fb05e6b63bb69f9561b4eabfaa208a419 100644 +index 1b85c31b..4a1cd847 100644 --- a/configure.cmake +++ b/configure.cmake -@@ -126,6 +126,9 @@ IF(UNIX) +@@ -134,6 +134,9 @@ IF(UNIX) IF(NOT LIBRT) MY_SEARCH_LIBS(clock_gettime rt LIBRT) ENDIF() + IF(NOT LIBRT) + MY_SEARCH_LIBS(posix_spawn_file_actions_addclose rt LIBRT) + ENDIF() + set(THREADS_PREFER_PTHREAD_FLAG ON) FIND_PACKAGE(Threads) - SET(CMAKE_REQUIRED_LIBRARIES -- -2.9.3 +2.32.0 diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 679643887f..4025be317f 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,9 +1,7 @@ -# From https://downloads.mariadb.org/mariadb/10.3.22 -md5 f712a5e6fde038d0c9c6d2a2cd88b84e mariadb-10.3.22.tar.gz -sha1 f92f517fc2ea893ffb3d599ade219bf0a0045265 mariadb-10.3.22.tar.gz -sha256 3200055dbdc27746981b3bb4bc182e2cb79dcf28ea88014b641a5b81280ccec7 mariadb-10.3.22.tar.gz -sha512 57a6551b8939f54742963202d50a537e69e8ab9b2dca42ce3d2a09c0f7af368fded71f36af26f6cbd956d54fe43853981ba8fe28b7a3ba97c7d52ea4a0d233f6 mariadb-10.3.22.tar.gz +# From https://downloads.mariadb.org/mariadb/10.3.30 +sha256 bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b mariadb-10.3.30.tar.gz +sha512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc mariadb-10.3.30.tar.gz # Hash for license files -sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md -sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING +sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md +sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index d5f4ef6bb5..d08b768a2e 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,12 +4,14 @@ # ################################################################################ -MARIADB_VERSION = 10.3.22 +MARIADB_VERSION = 10.3.30 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 # https://jira.mariadb.org/browse/MDEV-12297 MARIADB_LICENSE_FILES = README.md COPYING +MARIADB_CPE_ID_VENDOR = mariadb +MARIADB_SELINUX_MODULES = mysql MARIADB_INSTALL_STAGING = YES MARIADB_PROVIDES = mysql @@ -134,5 +136,13 @@ endef MARIADB_POST_INSTALL_TARGET_HOOKS += MARIADB_POST_INSTALL +# overwrite cross-compiled mariadb_config executable by an native one +define MARIADB_POST_STAGING_INSTALL + $(HOSTCC) -I$(@D)/libmariadb/include \ + -o $(STAGING_DIR)/usr/bin/mariadb_config \ + $(@D)/libmariadb/mariadb_config/mariadb_config.c +endef +MARIADB_POST_INSTALL_STAGING_HOOKS += MARIADB_POST_STAGING_INSTALL + $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/matchbox/matchbox.hash b/package/matchbox/matchbox.hash index f00ed4e4f3..fdb8f7d119 100644 --- a/package/matchbox/matchbox.hash +++ b/package/matchbox/matchbox.hash @@ -1,2 +1,6 @@ # From http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2.md5 -md5 3e158dcf57823b55c926d95b245500fb matchbox-window-manager-1.2.tar.bz2 +md5 3e158dcf57823b55c926d95b245500fb matchbox-window-manager-1.2.tar.bz2 + +# Locally computed +sha256 81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff matchbox-window-manager-1.2.tar.bz2 +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index c0a2778b67..4d30a42ca3 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -10,7 +10,7 @@ MATCHBOX_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-win MATCHBOX_LICENSE = GPL-2.0+ MATCHBOX_LICENSE_FILES = COPYING -MATCHBOX_DEPENDENCIES = matchbox-lib +MATCHBOX_DEPENDENCIES = expat matchbox-lib MATCHBOX_CONF_OPTS = \ --enable-expat \ --disable-gconf \ diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 92e7d35a64..b93da164f9 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,5 +1,4 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.5-and-2.7.14-released -sha1 c36962183e05467aa1dadafcaacf90216a737866 mbedtls-2.16.5-apache.tgz -sha256 65b4c6cec83e048fd1c675e9a29a394ea30ad0371d37b5742453f74084e7b04d mbedtls-2.16.5-apache.tgz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.11: +sha256 c18e7e9abf95e69e425260493720470021384a1728417042060a35d0b7b18b41 mbedtls-2.16.11.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 5d0dd87339..9207daf186 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,15 +4,16 @@ # ################################################################################ -MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.16.5 -MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz +MBEDTLS_VERSION = 2.16.11 +MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ -DENABLE_TESTING=OFF MBEDTLS_INSTALL_STAGING = YES MBEDTLS_LICENSE = Apache-2.0 MBEDTLS_LICENSE_FILES = apache-2.0.txt +MBEDTLS_CPE_ID_VENDOR = arm +MBEDTLS_CPE_ID_PRODUCT = mbed_tls # This is mandatory for hiawatha ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) diff --git a/package/mc/Config.in b/package/mc/Config.in index 61f351c41d..ac512116ca 100644 --- a/package/mc/Config.in +++ b/package/mc/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_MC select BR2_PACKAGE_LIBGLIB2 # mc prefers slang, but can use ncurses too select BR2_PACKAGE_SLANG if !BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR if BR2_PACKAGE_NCURSES help GNU Midnight Commander is a visual file manager, licensed under GNU General Public License. It can use either SLang diff --git a/package/mc/mc.hash b/package/mc/mc.hash index 963b2ad2f9..6400f64b99 100644 --- a/package/mc/mc.hash +++ b/package/mc/mc.hash @@ -1,4 +1,4 @@ -# Hash from http://ftp.midnight-commander.org/mc-4.8.23.sha256: -sha256 dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c mc-4.8.23.tar.xz +# Hash from http://ftp.midnight-commander.org/mc-4.8.27.sha256 +sha256 31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4 mc-4.8.27.tar.xz # sha256 locally computed: sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING diff --git a/package/mc/mc.mk b/package/mc/mc.mk index 24f6ac36ac..678d687bcf 100644 --- a/package/mc/mc.mk +++ b/package/mc/mc.mk @@ -4,12 +4,20 @@ # ################################################################################ -MC_VERSION = 4.8.23 +MC_VERSION = 4.8.27 MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ MC_LICENSE_FILES = COPYING -MC_DEPENDENCIES = libglib2 host-pkgconf +MC_DEPENDENCIES = libglib2 host-pkgconf $(TARGET_NLS_DEPENDENCIES) +MC_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) + +ifeq ($(BR2_PACKAGE_GPM),y) +MC_CONF_OPTS += --with-gpm-mouse +MC_DEPENDENCIES += gpm +else +MC_CONF_OPTS += --without-gpm-mouse +endif ifeq ($(BR2_PACKAGE_LIBSSH2),y) MC_CONF_OPTS += --enable-vfs-sftp diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash index c323d681cc..49f29e2445 100644 --- a/package/mcelog/mcelog.hash +++ b/package/mcelog/mcelog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a18fdef9cfe2dfaefa09087c616c376a301dc87b1fa14a37476d97370962c668 mcelog-165.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 d21dfddaaa8e6f4ebd59ce353165c8d8079d0d5ed563492a0415af2248d8b3a5 mcelog-172.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk index cedf474ac0..9245825430 100644 --- a/package/mcelog/mcelog.mk +++ b/package/mcelog/mcelog.mk @@ -4,10 +4,11 @@ # ################################################################################ -MCELOG_VERSION = 165 +MCELOG_VERSION = 172 MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION)) MCELOG_LICENSE = GPL-2.0 MCELOG_LICENSE_FILES = LICENSE +MCELOG_SELINUX_MODULES = mcelog define MCELOG_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all @@ -17,4 +18,9 @@ define MCELOG_INSTALL_TARGET_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install endef +define MCELOG_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/mcelog.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mcelog.service +endef + $(eval $(generic-package)) diff --git a/package/mdevd/mdevd.hash b/package/mdevd/mdevd.hash index 2b36740fb4..93950304be 100644 --- a/package/mdevd/mdevd.hash +++ b/package/mdevd/mdevd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 ad93048afbd8394d709da35934a62ef5826143b6baa13d37115a3b265f9038b7 mdevd-0.1.1.1.tar.gz -sha256 2e59eb9754eaece119072a4379d8b320900cc8c4a1a488d2d7788768b95e89ae COPYING +sha256 ffd3b223b4cf0e51253b4a8f09cb88d70bf22693228ab0818af174a3f099dcd2 mdevd-0.1.4.0.tar.gz +sha256 31b60c66aba1fa0a7f8847339ac35c28638e25ff96da700d995533ad810e3995 COPYING diff --git a/package/mdevd/mdevd.mk b/package/mdevd/mdevd.mk index 48de724924..a0cd71e76e 100644 --- a/package/mdevd/mdevd.mk +++ b/package/mdevd/mdevd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MDEVD_VERSION = 0.1.1.1 +MDEVD_VERSION = 0.1.4.0 MDEVD_SITE = http://skarnet.org/software/mdevd MDEVD_LICENSE = ISC MDEVD_LICENSE_FILES = COPYING @@ -12,11 +12,11 @@ MDEVD_INSTALL_STAGING = YES MDEVD_DEPENDENCIES = skalibs MDEVD_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ + --prefix=/ \ + --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/include \ + --with-dynlib=$(STAGING_DIR)/lib \ + --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ $(SHARED_STATIC_LIBS_OPTS) diff --git a/package/mediastreamer/Config.in b/package/mediastreamer/Config.in index b3ba5a0cb0..471d8ad91a 100644 --- a/package/mediastreamer/Config.in +++ b/package/mediastreamer/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_MEDIASTREAMER depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS # ortp depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # ortp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 select BR2_PACKAGE_MBEDTLS select BR2_PACKAGE_ORTP help @@ -16,9 +17,10 @@ config BR2_PACKAGE_MEDIASTREAMER http://www.linphone.org/technical-corner/mediastreamer2 -comment "mediastreamer needs a toolchain w/ threads, C++, dynamic library" +comment "mediastreamer needs a toolchain w/ threads, C++, dynamic library, gcc >= 5" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "mediastreamer needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/mediastreamer/mediastreamer.hash b/package/mediastreamer/mediastreamer.hash index 5b72426781..dfa469d8dd 100644 --- a/package/mediastreamer/mediastreamer.hash +++ b/package/mediastreamer/mediastreamer.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b7251495c0bf2c71508b7cdf29999326af0bd215ec4c647b3ebb60796ee72503 mediastreamer-4.3.1.tar.gz +sha256 64bdfe9dd6bfa64b492b21a45ad4bb36d67626a7f3b3ab2084a708864f129e84 mediastreamer-4.4.8.tar.gz sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index 982eadf099..5d66a09880 100644 --- a/package/mediastreamer/mediastreamer.mk +++ b/package/mediastreamer/mediastreamer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEDIASTREAMER_VERSION = 4.3.1 +MEDIASTREAMER_VERSION = 4.4.8 MEDIASTREAMER_SITE = \ https://gitlab.linphone.org/BC/public/mediastreamer2/-/archive/$(MEDIASTREAMER_VERSION) MEDIASTREAMER_LICENSE = GPL-3.0+ diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 98e47d6c07..a86a6f9f73 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.5.19.tar.gz.sha1 -sha1 14e6a02e743838696fcb620edf6a2fd7e60cabec memcached-1.5.19.tar.gz +# From http://www.memcached.org/files/memcached-1.6.9.tar.gz.sha1 +sha1 42ae062094fdf083cfe7b21ff377c781011c2be1 memcached-1.6.9.tar.gz # Locally computed -sha256 3ddcdaa2d14d215f3111a7448b79c889c57618a26e97ad989581f1880a5a4be0 memcached-1.5.19.tar.gz -sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING +sha256 d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1 memcached-1.6.9.tar.gz +sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 9b362d2a36..f233e11806 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,16 +4,15 @@ # ################################################################################ -MEMCACHED_VERSION = 1.5.19 +MEMCACHED_VERSION = 1.6.9 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' MEMCACHED_CONF_OPTS = --disable-coverage MEMCACHED_LICENSE = BSD-3-Clause MEMCACHED_LICENSE_FILES = COPYING -# 0001-configure-Fix-cross-compilation-errors.patch -# 0002-configure-Simplify-pointer-size-check.patch -MEMCACHED_AUTORECONF = YES +MEMCACHED_CPE_ID_VENDOR = memcached +MEMCACHED_SELINUX_MODULES = memcached ifeq ($(BR2_ENDIAN),"BIG") MEMCACHED_CONF_ENV += ac_cv_c_endian=big diff --git a/package/memtester/memtester.hash b/package/memtester/memtester.hash index da8c1c02c9..7d7820e746 100644 --- a/package/memtester/memtester.hash +++ b/package/memtester/memtester.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88 memtester-4.3.0.tar.gz +sha256 8ed52b0d06d4aeb61954994146e2a5b2d20448a8f3ce3ee995120e6dbde2ae37 memtester-4.5.0.tar.gz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk index 0e64d8cde2..ec515f6392 100644 --- a/package/memtester/memtester.mk +++ b/package/memtester/memtester.mk @@ -4,16 +4,18 @@ # ################################################################################ -MEMTESTER_VERSION = 4.3.0 +MEMTESTER_VERSION = 4.5.0 MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions MEMTESTER_LICENSE = GPL-2.0 MEMTESTER_LICENSE_FILES = COPYING +MEMTESTER_CPE_ID_VENDOR = pryopus MEMTESTER_TARGET_INSTALL_OPTS = INSTALLPATH=$(TARGET_DIR)/usr define MEMTESTER_BUILD_CMDS - $(SED) "s,^cc,$(TARGET_CC)," $(@D)/conf-* - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(SED) "s%^cc%$(TARGET_CC) $(TARGET_CFLAGS)%" $(@D)/conf-cc + $(SED) "s%^cc%$(TARGET_CC) $(TARGET_LDFLAGS)%" $(@D)/conf-ld + $(MAKE) -C $(@D) endef define MEMTESTER_INSTALL_TARGET_CMDS diff --git a/package/mender-artifact/mender-artifact.hash b/package/mender-artifact/mender-artifact.hash index cd178483d1..175865bb67 100644 --- a/package/mender-artifact/mender-artifact.hash +++ b/package/mender-artifact/mender-artifact.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 6b9fe6f427c43ac92e1fc88dc8c6cac323eaf9ea5854078a06c4313e090e83f8 3.3.0.tar.gz -sha256 be22e200d0826c94bfd71cc5c1d4995449a6e3bd527090c1cfe953bc81427573 LIC_FILES_CHKSUM.sha256 +sha256 8f5b69a6598dc071e6a0f2102dbd38a003e7db6be5794116d701531d6a740a46 mender-artifact-3.5.1.tar.gz +sha256 0afbd1092d57f70da125041350363c3761802e807be80c7f1dfc005fea962b25 LIC_FILES_CHKSUM.sha256 # License hash extracted from LIC_FILES_CHKSUM.sha256 using the # following command: @@ -8,8 +8,9 @@ sha256 be22e200d0826c94bfd71cc5c1d4995449a6e3bd527090c1cfe953bc81427573 LIC_FILE # sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache 2.0 licenses. -sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 LICENSE -sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mendertesting/LICENSE +sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE +sha256 f4a394d9345ba64dd2796dc552c31af99c4b686a46c0eeda6538038732f771a9 vendor/github.com/mendersoftware/progressbar/LICENSE # # BSD 2 Clause licenses. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE @@ -19,11 +20,18 @@ sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE sha256 a284e538f3e5649ae6a8f32da2bbd18e9daabf2c1ebbfb99ed92e797b159be1a vendor/github.com/remyoudompheng/go-liblzma/LICENSE +sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE +sha256 75e1ca97a84a9da6051dee0114333388216f2c4a5a028296b882ff3d57274735 vendor/github.com/russross/blackfriday/v2/LICENSE.txt # # ISC licenses. -sha256 3525392c6db3b804af76980b2c560ee9ec1abdadd907d76a26091df7c78f3a25 vendor/github.com/davecgh/go-spew/LICENSE +sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE # # MIT licenses. -sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENSE +sha256 f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189 vendor/github.com/stretchr/testify/LICENSE sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/LICENSE sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE +sha256 6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685 vendor/github.com/klauspost/pgzip/LICENSE +sha256 a55959c4e3e8917bfa857359bb641115336276a6cc97408fd8197e079fb18470 vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md +sha256 c8024e31c1de453fea90f22a221968835cc7af9d520274a2576c9ec9976055b0 vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE +sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE +sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor/github.com/mattn/go-isatty/LICENSE diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk index 14cbe53d4c..8a77e67b8c 100644 --- a/package/mender-artifact/mender-artifact.mk +++ b/package/mender-artifact/mender-artifact.mk @@ -4,26 +4,41 @@ # ################################################################################ -HOST_MENDER_ARTIFACT_VERSION = 3.3.0 -HOST_MENDER_ARTIFACT_SITE = https://github.com/mendersoftware/mender-artifact/archive -HOST_MENDER_ARTIFACT_SOURCE = $(HOST_MENDER_ARTIFACT_VERSION).tar.gz +HOST_MENDER_ARTIFACT_VERSION = 3.5.1 +HOST_MENDER_ARTIFACT_SITE = $(call github,mendersoftware,mender-artifact,$(HOST_MENDER_ARTIFACT_VERSION)) HOST_MENDER_ARTIFACT_LICENSE = Apache2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT HOST_MENDER_ARTIFACT_LICENSE_FILES = \ LICENSE \ LIC_FILES_CHKSUM.sha256 \ - vendor/github.com/mendersoftware/mendertesting/LICENSE \ + vendor/github.com/minio/sha256-simd/LICENSE \ + vendor/github.com/mendersoftware/progressbar/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ vendor/golang.org/x/sys/LICENSE \ vendor/golang.org/x/crypto/LICENSE \ vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ + vendor/github.com/klauspost/compress/LICENSE \ + vendor/github.com/russross/blackfriday/v2/LICENSE.txt \ vendor/github.com/davecgh/go-spew/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ vendor/github.com/urfave/cli/LICENSE \ - vendor/github.com/sirupsen/logrus/LICENSE + vendor/github.com/sirupsen/logrus/LICENSE \ + vendor/github.com/klauspost/pgzip/LICENSE \ + vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md \ + vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE \ + vendor/gopkg.in/yaml.v3/LICENSE \ + vendor/github.com/mattn/go-isatty/LICENSE HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz +# By default, go will attempt to download needed modules before building, which +# is not desirable. This behavior also causes permission issues when cleaning, +# as go downloads modules as read-only by default. Because mender-artifact +# includes the modules in the vendor directory, mod=vendor prevents the package +# from downloading the go modules during the build process and prevents +# permission issues when cleaning. +HOST_MENDER_ARTIFACT_GO_ENV = GOFLAGS="-mod=vendor" + HOST_MENDER_ARTIFACT_LDFLAGS = -X main.Version=$(HOST_MENDER_ARTIFACT_VERSION) HOST_MENDER_ARTIFACT_BUILD_TARGETS = cli/mender-artifact diff --git a/package/mender-grubenv/mender-grubenv.hash b/package/mender-grubenv/mender-grubenv.hash index 1b1eaa758a..b6b9db72a7 100644 --- a/package/mender-grubenv/mender-grubenv.hash +++ b/package/mender-grubenv/mender-grubenv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e50cc18a844e3fd1edef7af9224733b0338a34d51f1186ee19803ef7af1a5065 mender-grubenv-1.3.0.tar.gz -sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSE +sha256 5be4222a6934813da431ae472a633e766b73f4614020745b777c15c65bcfd032 mender-grubenv-f39c2c7ec7c9c24aae0108a9b04a0e6e61a3e96b.tar.gz +sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 LICENSE diff --git a/package/mender-grubenv/mender-grubenv.mk b/package/mender-grubenv/mender-grubenv.mk index 6e38557eb3..f06dbbe35c 100644 --- a/package/mender-grubenv/mender-grubenv.mk +++ b/package/mender-grubenv/mender-grubenv.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_GRUBENV_VERSION = 1.3.0 +MENDER_GRUBENV_VERSION = f39c2c7ec7c9c24aae0108a9b04a0e6e61a3e96b MENDER_GRUBENV_SITE = $(call github,mendersoftware,grub-mender-grubenv,$(MENDER_GRUBENV_VERSION)) MENDER_GRUBENV_LICENSE = Apache-2.0 MENDER_GRUBENV_LICENSE_FILES = LICENSE @@ -30,7 +30,7 @@ MENDER_GRUBENV_DEFINES = \ # These grub modules must be built in for the grub scripts to work properly. # Without them, the system will not boot. -MENDER_GRUBENV_MANDATORY_MODULES=loadenv hashsum echo halt gcry_sha256 test +MENDER_GRUBENV_MANDATORY_MODULES=loadenv hashsum echo halt gcry_sha256 test regexp MENDER_GRUBENV_MODULES_MISSING = \ $(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES)),\ $(MENDER_GRUBENV_MANDATORY_MODULES)) @@ -55,11 +55,20 @@ define MENDER_GRUBENV_INSTALL_TARGET_CMDS endef # Overwrite the default grub2 config files with the ones in this package. +ifeq ($(BR2_TARGET_GRUB2_I386_PC)$(BR2_TARGET_GRUB2_ARM_UBOOT),y) +define MENDER_GRUBENV_INSTALL_IMAGES_CMDS + mkdir -p $(BINARIES_DIR)/boot-part/grub + cp -dpfr $(TARGET_DIR)/boot/grub/grub.cfg \ + $(TARGET_DIR)/boot/grub/mender_grubenv* \ + $(BINARIES_DIR)/boot-part/grub +endef +else define MENDER_GRUBENV_INSTALL_IMAGES_CMDS mkdir -p $(BINARIES_DIR)/efi-part/EFI/BOOT cp -dpfr $(TARGET_DIR)/boot/EFI/BOOT/grub.cfg \ $(TARGET_DIR)/boot/EFI/BOOT/mender_grubenv* \ $(BINARIES_DIR)/efi-part/EFI/BOOT endef +endif $(eval $(generic-package)) diff --git a/package/mender/Config.in b/package/mender/Config.in index 5cb3a3f2e0..cccb46361b 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -3,15 +3,37 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_XZ - select BR2_PACKAGE_UBOOT_TOOLS if BR2_TARGET_UBOOT # runtime - select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV if BR2_TARGET_UBOOT # runtime + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help Mender is an open source over-the-air (OTA) software updater for embedded Linux devices. Mender comprises a client running at the embedded device, as well as a server that manages deployments across many devices. + Notes: + For systems using uboot as the bootloader: + - uboot must have the mender uboot patches applied. + - uboot-tools must be selected. + - fw_printenv must be functional on the device. + The Mender Uboot patches are at: + https://github.com/mendersoftware/meta-mender/ + + For more information on Manual U-Boot integration, see: + https://docs.mender.io/2.6/system-updates-yocto-project/board-integration/bootloader-support/u-boot/manual-u-boot-integration + + For systems using Grub2 as the bootloader: + - Mender depends on the mender-grubenv package. + - The mender-grubenv package provides a fw_printenv script, + which is not compatible with the uboot-tools fw_printenv + script. + + The mender project recommends using uboot to load Grub2 as a + secondary bootloader whenever possible. Using Grub2 as a + secondary bootloader prevents users from porting the patches + for uboot to each new device. + https://github.com/mendersoftware/mender comment "mender needs a toolchain w/ threads" diff --git a/package/mender/mender.hash b/package/mender/mender.hash index 6a258cf206..c2bbbe5fc1 100644 --- a/package/mender/mender.hash +++ b/package/mender/mender.hash @@ -1,41 +1,44 @@ # Locally computed: -sha256 fe3567107d1dc9b3f3961f3a19d426bd7728fbc1525b72b8204765670234f4b6 2.2.0.tar.gz +sha256 d68839eb493175a05371eec8e6ec8691ccc22c999614b9954923a0b5ebe56840 2.6.0.tar.gz # Vendor licenses # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache-2.0 license. -sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 LICENSE -sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mendertesting/LICENSE -sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 vendor/github.com/mendersoftware/log/LICENSE -sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 vendor/github.com/mendersoftware/scopestack/LICENSE -sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mender-artifact/LICENSE +sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE +sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mender-artifact/LICENSE +sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/mendersoftware/openssl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE +sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor/github.com/mendersoftware/progressbar/LICENSE # # BSD 2 Clause license. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE +sha256 e4646a82a976369d7ae8f6ed5c11d35dc0af18433a8ccc24c85b459ad8b95128 vendor/github.com/godbus/dbus/LICENSE # # BSD 3 Clause license. +sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/net/LICENSE sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/text/LICENSE sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/LICENSE # # ISC license. sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE # # MIT license. +sha256 6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685 vendor/github.com/klauspost/pgzip/LICENSE sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE -sha256 dad2b0b2cc2dbdbf95ad5d800ef7588956e74dc2479014829d42be295125c25d vendor/github.com/stretchr/testify/LICENSE -sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENCE.txt -sha256 fde7d610b9b95fc5a6304055c4dae951025b630aaa42a24e95ebf76675ae832c vendor/github.com/stretchr/objx/LICENSE.md +sha256 f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189 vendor/github.com/stretchr/testify/LICENSE sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE -sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/LICENSE +sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/v2/LICENSE +sha256 b2663894033a05fd80261176cd8da1d72546e25842d5c1abcc852ca23b6b61b0 vendor/github.com/stretchr/objx/LICENSE +sha256 95b8ef9c4137a8f75ddd3101ffdc4cfd594fa875b261697b68baddc16b0e537c vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE +sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE +sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor/github.com/mattn/go-isatty/LICENSE # # OpenLDAP Public License sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md # sha256 of all the vendor licenses combined -sha256 8edc8cda9cc06270f44d2d75f7810a6ccc3d71c251cadb5e1a3065eb057a3132 LIC_FILES_CHKSUM.sha256 +sha256 4f3541ea69b9b6e3959679576c146b42ba9a840a9dc4e593bff43e5e3a313d24 LIC_FILES_CHKSUM.sha256 diff --git a/package/mender/mender.mk b/package/mender/mender.mk index 6543402f07..a110caf551 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_VERSION = 2.2.0 +MENDER_VERSION = 2.6.0 MENDER_SITE = https://github.com/mendersoftware/mender/archive MENDER_SOURCE = $(MENDER_VERSION).tar.gz MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 @@ -14,34 +14,44 @@ MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 MENDER_LICENSE_FILES = \ LICENSE \ LIC_FILES_CHKSUM.sha256 \ - vendor/github.com/mendersoftware/mendertesting/LICENSE \ - vendor/github.com/mendersoftware/log/LICENSE \ - vendor/github.com/mendersoftware/scopestack/LICENSE \ vendor/github.com/mendersoftware/mender-artifact/LICENSE \ + vendor/github.com/mendersoftware/openssl/LICENSE \ + vendor/github.com/minio/sha256-simd/LICENSE \ + vendor/github.com/mendersoftware/progressbar/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ + vendor/github.com/godbus/dbus/LICENSE \ + vendor/github.com/klauspost/compress/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ vendor/golang.org/x/crypto/LICENSE \ vendor/golang.org/x/sys/LICENSE \ - vendor/golang.org/x/net/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \ - vendor/golang.org/x/text/LICENSE \ vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ + vendor/github.com/klauspost/pgzip/LICENSE \ vendor/github.com/sirupsen/logrus/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ - vendor/github.com/stretchr/testify/LICENCE.txt \ - vendor/github.com/stretchr/objx/LICENSE.md \ vendor/github.com/ungerik/go-sysfs/LICENSE \ - vendor/github.com/urfave/cli/LICENSE \ + vendor/github.com/urfave/cli/v2/LICENSE \ + vendor/github.com/stretchr/objx/LICENSE \ + vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE \ + vendor/gopkg.in/yaml.v3/LICENSE \ + vendor/github.com/mattn/go-isatty/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md -MENDER_DEPENDENCIES = xz +MENDER_DEPENDENCIES = host-pkgconf openssl -MENDER_LDFLAGS = -X main.Version=$(MENDER_VERSION) +MENDER_LDFLAGS = -X github.com/mendersoftware/mender/conf.Version=$(MENDER_VERSION) + +MENDER_UPDATE_MODULES_FILES = \ + directory \ + script \ + single-file \ + $(if $(BR2_PACKAGE_DOCKER_CLI),docker) \ + $(if $(BR2_PACKAGE_RPM),rpm) define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/mender/scripts - echo -n "2" > $(TARGET_DIR)/etc/mender/scripts/version + echo -n "3" > $(TARGET_DIR)/etc/mender/scripts/version $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender.conf \ $(TARGET_DIR)/etc/mender/mender.conf @@ -55,25 +65,46 @@ define MENDER_INSTALL_CONFIG_FILES $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) ) - $(INSTALL) -D -m 0755 package/mender/artifact_info \ + $(INSTALL) -D -m 0755 $(MENDER_PKGDIR)/artifact_info \ $(TARGET_DIR)/etc/mender/artifact_info - $(INSTALL) -D -m 0755 package/mender/device_type \ + $(INSTALL) -D -m 0755 $(MENDER_PKGDIR)/device_type \ $(TARGET_DIR)/etc/mender/device_type mkdir -p $(TARGET_DIR)/var/lib ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender + $(foreach f,$(MENDER_UPDATE_MODULES_FILES), \ + $(INSTALL) -D -m 0755 $(@D)/support/modules/$(notdir $(f)) \ + $(TARGET_DIR)/usr/share/mender/modules/v3/$(notdir $(f)) + ) endef MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES +ifeq ($(BR2_PACKAGE_XZ),y) +MENDER_DEPENDENCIES += xz +else +MENDER_TAGS += nolzma +endif + +ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBGLIB2),yy) +MENDER_DEPENDENCIES += libglib2 +define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF + $(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.AuthenticationManager.conf +endef +MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF +else +MENDER_TAGS += nodbus +endif + define MENDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender.service \ - $(TARGET_DIR)/usr/lib/systemd/system/mender.service + $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender-client.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mender-client.service endef define MENDER_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/mender/S42mender \ + $(INSTALL) -D -m 755 $(MENDER_PKGDIR)/S42mender \ $(TARGET_DIR)/etc/init.d/S42mender endef diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index e9aa44dc2e..4289acfffb 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -61,7 +61,7 @@ ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr # osmesa support depends on glut -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) MESA3D_DEMOS_CONF_OPTS += --enable-osmesa else MESA3D_DEMOS_CONF_OPTS += --disable-osmesa diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 077798ac77..64587b4bcd 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,12 +12,14 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 20.0.4 +MESA3D_HEADERS_VERSION = 21.1.6 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz -MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive +MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos -MESA3D_HEADERS_LICENSE_FILES = docs/license.html +MESA3D_HEADERS_LICENSE_FILES = docs/license.rst +MESA3D_HEADERS_CPE_ID_VENDOR = mesa3d +MESA3D_HEADERS_CPE_ID_PRODUCT = mesa # Only installs header files MESA3D_HEADERS_INSTALL_STAGING = YES @@ -34,13 +36,8 @@ ifeq ($(BR2_PACKAGE_XORG7),y) # Not using $(SED) because we do not want to work in-place, and $(SED) # contains -i. define MESA3D_HEADERS_BUILD_DRI_PC - sed -e 's:@\(exec_\)\?prefix@:/usr:' \ - -e 's:@libdir@:$${exec_prefix}/lib:' \ - -e 's:@includedir@:$${prefix}/include:' \ - -e 's:@DRI_DRIVER_INSTALL_DIR@:$${libdir}/dri:' \ - -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ - -e 's:@DRI_PC_REQ_PRIV@::' \ - $(@D)/src/mesa/drivers/dri/dri.pc.in \ + sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ + package/mesa3d-headers/dri.pc \ >$(@D)/src/mesa/drivers/dri/dri.pc endef diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 16d77f42c2..82a40511f1 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -4,8 +4,9 @@ menuconfig BR2_PACKAGE_MESA3D depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_PACKAGE_LIBDRM + depends on !BR2_m68k || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # m68k needs gcc >= 7.x select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_ZLIB help @@ -63,10 +64,10 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER select BR2_PACKAGE_MESA3D_DRIVER select BR2_PACKAGE_MESA3D_GBM if \ !BR2_PACKAGE_MESA3D_OPENGL_GLX && \ - !BR2_PACKAGE_MESA3D_OPENGL_EGL && \ - !BR2_PACKAGE_MESA3D_OSMESA_CLASSIC + !BR2_PACKAGE_MESA3D_OPENGL_EGL select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \ - (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4) + (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4 && \ + !BR2_RISCV_32) config BR2_PACKAGE_MESA3D_VULKAN_DRIVER bool @@ -81,11 +82,6 @@ config BR2_PACKAGE_MESA3D_DRIVER config BR2_PACKAGE_MESA3D_NEEDS_XA bool -# Quote from mesa3d meson.build: "kmsro driver requires one or more -# renderonly drivers (vc4, etnaviv, freedreno)". -config BR2_PACKAGE_MESA3D_GALLIUM_KMSRO - bool - # OpenGL GLX and Gallium VDPAU both needs X11 config BR2_PACKAGE_MESA3D_NEEDS_X11 bool @@ -105,15 +101,19 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV bool "Gallium Etnaviv driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_ETNAVIV - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO - select BR2_PACKAGE_MESA3D_OPENGL_EGL help Mesa driver for Vivante GPUs. config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO bool "Gallium freedreno driver" + depends on BR2_arm || BR2_aarch64 || BR2_aarch64_be # libdrm-freedreno + # libdrm's freedreno option depends on LIBDRM_HAS_ATOMIC. Propagating + # that dependency here causes a circular dependency that Kconfig + # can't see is just spurious. However, that dependency is about + # the toolchain having sync4 primitives, which is always a given + # for arm/aarch64. select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO + select BR2_PACKAGE_LIBDRM_FREEDRENO help Mesa driver for Freedreno GPUs. @@ -137,20 +137,9 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS help Mesa driver for iris-based Intel GPUs. -config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO - bool "Gallium KMSRO driver" - depends on BR2_PACKAGE_MESA3D_GALLIUM_KMSRO - help - Support various sorts of KMS displays with the - renderonly layer used to attach a GPU. - -comment "Gallium KMSRO needs one or more renderonly drivers" - depends on !BR2_PACKAGE_MESA3D_GALLIUM_KMSRO - config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA bool "Gallium lima driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO help Mesa driver for ARM Mali Utgard GPUs. @@ -166,7 +155,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST bool "Gallium panfrost driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO help Mesa driver for ARM Mali Midgard and Bifrost GPUs. @@ -236,15 +224,11 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST bool "Gallium swrast driver" - depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help This is a software opengl implementation using the Gallium3D infrastructure. -comment "Gallium swrast: Only one swrast provider can be built" - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST - config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA bool "Gallium tegra driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER @@ -258,11 +242,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D bool "Gallium v3d driver" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO select BR2_PACKAGE_LIBDRM_VC4 select BR2_PACKAGE_MESA3D_OPENGL_EGL help - Driver for Broadcom VC6 (rpi4) GPUs (needs kmsro and vc4). + Driver for Broadcom VC6 (rpi4) GPUs (needs vc4). It requires a kernel 4.18+ with DRM V3D support enabled: @@ -273,7 +256,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" depends on BR2_arm || BR2_aarch64 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO select BR2_PACKAGE_LIBDRM_VC4 select BR2_PACKAGE_MESA3D_OPENGL_EGL help @@ -314,6 +296,7 @@ config BR2_PACKAGE_MESA3D_XVMC depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + select BR2_PACKAGE_MESA3D_NEEDS_X11 select BR2_PACKAGE_XLIB_LIBXV select BR2_PACKAGE_XLIB_LIBXVMC help @@ -327,13 +310,6 @@ comment "Gallium XvMC state tracker needs X.org and gallium drivers r600 or nouv comment "DRI drivers" -config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST - bool "DRI swrast driver" - select BR2_PACKAGE_MESA3D_DRI_DRIVER - help - This is a software opengl implementation using the DRI - infrastructure. - config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 bool "DRI i915 driver" depends on BR2_i386 || BR2_x86_64 @@ -363,7 +339,13 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU Support for Nvidia-based GPUs. config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON - bool "DRI radeon driver" + bool "DRI radeon r100 driver" + depends on BR2_i386 || BR2_x86_64 + # libdrm's radeon option depends on LIBDRM_HAS_ATOMIC. Propagating + # that dependency here causes a circular dependency that Kconfig + # can't see is just spurious. However, that dependency is about + # the toolchain having sync4 primitives, which is always a given + # for i386 and x86_64. select BR2_PACKAGE_MESA3D_DRI_DRIVER select BR2_PACKAGE_LIBDRM_RADEON help @@ -392,11 +374,11 @@ comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= comment "Off-screen Rendering" -config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC - bool "OSMesa (classic) library" +config BR2_PACKAGE_MESA3D_OSMESA_GALLIUM + bool "OSMesa (Gallium) library" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST help - The OSMesa classic API provides functions for - making off-screen renderings. + The OSMesa API provides functions for off-screen rendering. if BR2_PACKAGE_MESA3D_DRIVER @@ -460,3 +442,7 @@ comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ BR2_STATIC_LIBS 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/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index de8e92bc39..4b63e0cece 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2020-April/000577.html -sha256 c4ed491517a94118a7a611810eeb92645d42ffd82280dcd51be8cc2ba1aabba5 mesa-20.0.4.tar.xz -sha512 17d8bc3b56779a8e5648d81da9ee97b66bcec015710801edce4e8055fbb314cd9ebc1d112e3035480ba844c7d9ae6b5b1f1eac0cc0817e69e9253a7748451a55 mesa-20.0.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2021-July/000640.html +sha256 b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37 mesa-21.1.6.tar.xz +sha512 5daf389aad4fe7ab3574f6af3aabc62ba8b3034004a0a0853dcc18ef6c8003d2f2195cc377dc57b30863ae4cf158149e3156247445ca2b11e401700011cb878c mesa-21.1.6.tar.xz # License -sha256 1ddae7da415352a5b5360ff3a9d7ecf23ba81408f62eeecce0011f32e3ef9da6 docs/license.html +sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 111151d342..3cabc42cc4 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,11 +5,13 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 20.0.4 +MESA3D_VERSION = 21.1.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz -MESA3D_SITE = https://mesa.freedesktop.org/archive +MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -MESA3D_LICENSE_FILES = docs/license.html +MESA3D_LICENSE_FILES = docs/license.rst +MESA3D_CPE_ID_VENDOR = mesa3d +MESA3D_CPE_ID_PRODUCT = mesa MESA3D_INSTALL_STAGING = YES @@ -25,16 +27,21 @@ MESA3D_DEPENDENCIES = \ MESA3D_CONF_OPTS = \ -Dgallium-omx=disabled \ - -Dpower8=false \ - -Dvalgrind=false + -Dpower8=disabled + +# Codesourcery ARM 2014.05 fail to link libmesa_dri_drivers.so with --as-needed linker +# flag due to a linker bug between binutils 2.24 and 2.25 (2.24.51.20140217). +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM),y) +MESA3D_CONF_OPTS += -Db_asneeded=false +endif ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm MESA3D_MESON_EXTRA_BINARIES += llvm-config='$(STAGING_DIR)/usr/bin/llvm-config' -MESA3D_CONF_OPTS += -Dllvm=true +MESA3D_CONF_OPTS += -Dllvm=enabled else # Avoid automatic search of llvm-config -MESA3D_CONF_OPTS += -Dllvm=false +MESA3D_CONF_OPTS += -Dllvm=disabled endif # Disable opencl-icd: OpenCL lib will be named libOpenCL instead of @@ -59,14 +66,14 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. MESA3D_CONF_OPTS += -Dglx=dri ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) -MESA3D_CONF_OPTS += -Dgallium-xa=true +MESA3D_CONF_OPTS += -Dgallium-xa=enabled else -MESA3D_CONF_OPTS += -Dgallium-xa=false +MESA3D_CONF_OPTS += -Dgallium-xa=disabled endif else MESA3D_CONF_OPTS += \ -Dglx=disabled \ - -Dgallium-xa=false + -Dgallium-xa=disabled endif ifeq ($(BR2_ARM_CPU_HAS_NEON),y) @@ -82,7 +89,6 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV) += etnaviv MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedreno MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915) += i915 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS) += iris -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO) += kmsro MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA) += lima MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST) += panfrost @@ -96,7 +102,6 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D) += v3d MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl # DRI Drivers -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau @@ -110,23 +115,23 @@ MESA3D_CONF_OPTS += \ -Dgallium-extra-hud=false else MESA3D_CONF_OPTS += \ - -Dshared-glapi=true \ + -Dshared-glapi=enabled \ -Dgallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ -Dgallium-extra-hud=true endif ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) MESA3D_CONF_OPTS += \ - -Ddri-drivers= -Ddri3=false + -Ddri-drivers= -Ddri3=disabled else ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) MESA3D_DEPENDENCIES += xlib_libxshmfence -MESA3D_CONF_OPTS += -Ddri3=true +MESA3D_CONF_OPTS += -Ddri3=enabled else -MESA3D_CONF_OPTS += -Ddri3=false +MESA3D_CONF_OPTS += -Ddri3=disabled endif MESA3D_CONF_OPTS += \ - -Dshared-glapi=true \ + -Dshared-glapi=enabled \ -Dglx-direct=true \ -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) endif @@ -137,16 +142,16 @@ MESA3D_CONF_OPTS += \ else MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ - -Ddri3=true \ + -Ddri3=enabled \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif # APIs -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) -MESA3D_CONF_OPTS += -Dosmesa=classic +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) +MESA3D_CONF_OPTS += -Dosmesa=true else -MESA3D_CONF_OPTS += -Dosmesa=none +MESA3D_CONF_OPTS += -Dosmesa=false endif # Always enable OpenGL: @@ -155,7 +160,7 @@ MESA3D_CONF_OPTS += -Dopengl=true # libva and mesa3d have a circular dependency # we do not need libva support in mesa3d, therefore disable this option -MESA3D_CONF_OPTS += -Dgallium-va=false +MESA3D_CONF_OPTS += -Dgallium-va=disabled # libGL is only provided for a full xorg stack ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) @@ -168,33 +173,6 @@ endef MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_HEADERS endif -MESA3D_PLATFORMS = surfaceless -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI),y) -MESA3D_PLATFORMS += drm -endif -ifeq ($(BR2_PACKAGE_WAYLAND),y) -MESA3D_DEPENDENCIES += wayland wayland-protocols -MESA3D_PLATFORMS += wayland -MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner -endif ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_X11),y) MESA3D_DEPENDENCIES += \ xlib_libX11 \ @@ -207,67 +185,85 @@ MESA3D_DEPENDENCIES += \ libxcb MESA3D_PLATFORMS += x11 endif +ifeq ($(BR2_PACKAGE_WAYLAND),y) +MESA3D_DEPENDENCIES += wayland wayland-protocols +MESA3D_PLATFORMS += wayland +endif MESA3D_CONF_OPTS += \ -Dplatforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) MESA3D_CONF_OPTS += \ - -Dgbm=true + -Dgbm=enabled else MESA3D_CONF_OPTS += \ - -Dgbm=false + -Dgbm=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) MESA3D_PROVIDES += libegl MESA3D_CONF_OPTS += \ - -Degl=true + -Degl=enabled else MESA3D_CONF_OPTS += \ - -Degl=false + -Degl=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) MESA3D_PROVIDES += libgles -MESA3D_CONF_OPTS += -Dgles1=true -Dgles2=true +MESA3D_CONF_OPTS += -Dgles1=enabled -Dgles2=enabled else -MESA3D_CONF_OPTS += -Dgles1=false -Dgles2=false +MESA3D_CONF_OPTS += -Dgles1=disabled -Dgles2=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) MESA3D_DEPENDENCIES += xlib_libXv xlib_libXvMC -MESA3D_CONF_OPTS += -Dgallium-xvmc=true +MESA3D_CONF_OPTS += -Dgallium-xvmc=enabled else -MESA3D_CONF_OPTS += -Dgallium-xvmc=false +MESA3D_CONF_OPTS += -Dgallium-xvmc=disabled +endif + +ifeq ($(BR2_PACKAGE_VALGRIND),y) +MESA3D_CONF_OPTS += -Dvalgrind=enabled +MESA3D_DEPENDENCIES += valgrind +else +MESA3D_CONF_OPTS += -Dvalgrind=disabled endif ifeq ($(BR2_PACKAGE_LIBUNWIND),y) -MESA3D_CONF_OPTS += -Dlibunwind=true +MESA3D_CONF_OPTS += -Dlibunwind=enabled MESA3D_DEPENDENCIES += libunwind else -MESA3D_CONF_OPTS += -Dlibunwind=false +MESA3D_CONF_OPTS += -Dlibunwind=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_VDPAU),y) MESA3D_DEPENDENCIES += libvdpau -MESA3D_CONF_OPTS += -Dgallium-vdpau=true +MESA3D_CONF_OPTS += -Dgallium-vdpau=enabled else -MESA3D_CONF_OPTS += -Dgallium-vdpau=false +MESA3D_CONF_OPTS += -Dgallium-vdpau=disabled endif ifeq ($(BR2_PACKAGE_LM_SENSORS),y) -MESA3D_CONF_OPTS += -Dlmsensors=true +MESA3D_CONF_OPTS += -Dlmsensors=enabled MESA3D_DEPENDENCIES += lm-sensors else -MESA3D_CONF_OPTS += -Dlmsensors=false +MESA3D_CONF_OPTS += -Dlmsensors=disabled endif ifeq ($(BR2_PACKAGE_ZSTD),y) -MESA3D_CONF_OPTS += -Dzstd=true +MESA3D_CONF_OPTS += -Dzstd=enabled MESA3D_DEPENDENCIES += zstd else -MESA3D_CONF_OPTS += -Dzstd=false +MESA3D_CONF_OPTS += -Dzstd=disabled +endif + +MESA3D_CFLAGS = $(TARGET_CFLAGS) + +# m68k needs 32-bit offsets in switch tables to build +ifeq ($(BR2_m68k),y) +MESA3D_CFLAGS += -mlong-jump-table-offsets endif $(eval $(meson-package)) diff --git a/package/meson/cross-compilation.conf.in b/package/meson/cross-compilation.conf.in index 369e225b3e..37b49eea3b 100644 --- a/package/meson/cross-compilation.conf.in +++ b/package/meson/cross-compilation.conf.in @@ -9,18 +9,23 @@ cpp = '@TARGET_CROSS@g++' ar = '@TARGET_CROSS@ar' strip = '@TARGET_CROSS@strip' pkgconfig = '@HOST_DIR@/bin/pkgconf' +g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' +g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' -[properties] -needs_exe_wrapper = true +[built-in options] c_args = [@TARGET_CFLAGS@] c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] + +[properties] +needs_exe_wrapper = true sys_root = '@STAGING_DIR@' pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' +pkg_config_static = '@STATIC@' [host_machine] system = 'linux' -cpu_family ='@TARGET_ARCH@' +cpu_family = '@TARGET_ARCH@' cpu = '@TARGET_CPU@' endian = '@TARGET_ENDIAN@' diff --git a/package/meson/meson.hash b/package/meson/meson.hash index bbb031957b..96ca379a25 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.54.0/meson-0.54.0.tar.gz.asc -sha256 dde5726d778112acbd4a67bb3633ab2ee75d33d1e879a6283a7b4a44c3363c27 meson-0.54.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.58.2/meson-0.58.2.tar.gz.asc +sha256 7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7 meson-0.58.2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 2e6c4cea71..d093dc9fea 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.54.0 +MESON_VERSION = 0.58.2 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING @@ -25,6 +25,10 @@ else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) HOST_MESON_TARGET_CPU_FAMILY = aarch64 else ifeq ($(BR2_i386),y) HOST_MESON_TARGET_CPU_FAMILY = x86 +else ifeq ($(BR2_m68k),y) +HOST_MESON_TARGET_CPU_FAMILY = m68k +else ifeq ($(BR2_microblazeel)$(BR2_microblazebe),y) +HOST_MESON_TARGET_CPU_FAMILY = microblaze else ifeq ($(BR2_mips)$(BR2_mipsel),y) HOST_MESON_TARGET_CPU_FAMILY = mips else ifeq ($(BR2_mips64)$(BR2_mips64el),y) @@ -35,6 +39,8 @@ else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) HOST_MESON_TARGET_CPU_FAMILY = ppc64 else ifeq ($(BR2_riscv),y) HOST_MESON_TARGET_CPU_FAMILY = riscv64 +else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) +HOST_MESON_TARGET_CPU_FAMILY = sh4 else ifeq ($(BR2_sparc),y) HOST_MESON_TARGET_CPU_FAMILY = sparc else ifeq ($(BR2_sparc64),y) diff --git a/package/mfgtools/Config.in.host b/package/mfgtools/Config.in.host index 6f2f3a3268..2b506c8f67 100644 --- a/package/mfgtools/Config.in.host +++ b/package/mfgtools/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_MFGTOOLS bool "host mfgtools" depends on BR2_arm + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help This package contains the Freescale manufacturing tool. It is designed to program firmware to i.MX boards during @@ -8,3 +9,7 @@ config BR2_PACKAGE_HOST_MFGTOOLS Freescale UTP protocol. https://github.com/codeauroraforum/mfgtools + +comment "host mfgtools needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index 49fd903fab..fe47ee09c4 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,3 @@ #locally computed -sha256 330cd32c7b67cb6b531d158eabcf68af3a7d7ad7b5a4b0ce3c73da3d241da6a2 micropython-1.12.tar.gz -sha256 afde3432122205e8e08d615fcb920aca58631c52b6c0c01813854287a457b298 LICENSE +sha256 542eb120df8d9eb6f200bcd856294e143813adea9dda0d7189405c218d4b16f7 micropython-1.14.tar.gz +sha256 9c6089e26c8638a0645bcb0db2c85051f82de8022dcd07fb22baa0c5f9362085 LICENSE diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 8328992090..03811be714 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,9 +4,12 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.12 +MICROPYTHON_VERSION = 1.14 MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) -MICROPYTHON_LICENSE = MIT +# 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 $(BR2_PYTHON3_HOST_DEPENDENCY) @@ -21,26 +24,31 @@ ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb),) MICROPYTHON_CFLAGS = -DMICROPY_GCREGS_SETJMP=1 endif +# xtensa has problems with nlr_push, use setjmp based implementation instead +ifeq ($(BR2_xtensa),y) +MICROPYTHON_CFLAGS = -DMICROPY_NLR_SETJMP=1 +endif + # When building from a tarball we don't have some of the dependencies that are in # the git repository as submodules -MICROPYTHON_MAKE_OPTS = MICROPY_PY_BTREE=0 -MICROPYTHON_MAKE_OPTS += MICROPY_PY_USSL=0 +MICROPYTHON_MAKE_OPTS += \ + MICROPY_PY_BTREE=0 \ + MICROPY_PY_USSL=0 \ + CROSS_COMPILE=$(TARGET_CROSS) \ + CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \ + CWARN= define MICROPYTHON_BUILD_CMDS $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ - $(MICROPYTHON_MAKE_OPTS) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) + $(MICROPYTHON_MAKE_OPTS) endef define MICROPYTHON_INSTALL_TARGET_CMDS $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \ DESTDIR=$(TARGET_DIR) \ - PREFIX=$(TARGET_DIR)/usr \ + PREFIX=/usr \ install endef diff --git a/package/midori/Config.in b/package/midori/Config.in index 64139ce49e..e2cc2ac612 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -1,15 +1,19 @@ -comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6" +comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7, host gcc >= 4.9" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_MIDORI bool "midori" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2 depends on BR2_PACKAGE_LIBGTK3 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # webkitgtk depends on BR2_INSTALL_LIBSTDCPP # webkitgtk - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # webkitgtk + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # webkitgtk depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS # GCR can only be used with the X11 backend diff --git a/package/midori/midori.mk b/package/midori/midori.mk index 1755f1241a..eebec815c0 100644 --- a/package/midori/midori.mk +++ b/package/midori/midori.mk @@ -9,6 +9,7 @@ MIDORI_SOURCE = midori_$(MIDORI_VERSION)_all_.tar.bz2 MIDORI_SITE = http://midori-browser.org/downloads MIDORI_LICENSE = LGPL-2.1+ MIDORI_LICENSE_FILES = COPYING +MIDORI_CPE_ID_VENDOR = midori-browser MIDORI_DEPENDENCIES = \ host-intltool \ host-librsvg \ diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk index 6efd5be80d..a7c6483221 100644 --- a/package/mii-diag/mii-diag.mk +++ b/package/mii-diag/mii-diag.mk @@ -10,6 +10,7 @@ MII_DIAG_PATCH = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz MII_DIAG_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/m/mii-diag MII_DIAG_LICENSE = GPL # No version specified MII_DIAG_LICENSE_FILES = mii-diag.c +MII_DIAG_CPE_ID_VENDOR = debian MII_DIAG_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) diff --git a/package/minetest-game/minetest-game.hash b/package/minetest-game/minetest-game.hash index a618f32d11..3f057e4ee5 100644 --- a/package/minetest-game/minetest-game.hash +++ b/package/minetest-game/minetest-game.hash @@ -1,35 +1,35 @@ # Locally calculated -sha256 f165fac0081bf4797cf9094282cc25034b2347b3ea94e6bb8d9329c5ee63f41b minetest-game-5.1.0.tar.gz +sha256 b4bfa0755b88230cf4bdb6af6a0951dd1248f6cdf87fecc340e43ac12c80b0b2 minetest-game-5.4.1.tar.gz -sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt -sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt -sha256 559749ba0d269b768e1b85bdac0f8b7a0cf100ecb3edd0df8529fe57cd4bfc0d mods/binoculars/license.txt -sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt -sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt -sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt -sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/butterflies/license.txt -sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt -sha256 b6c3aca8da2f6c272fe431740dda0a349cff419f1f72e55c6de677379fc04169 mods/creative/license.txt -sha256 66f93a58a7418b86f2ca54e8de931f5c38d9f3e07d407c2c095b632fcda72956 mods/default/license.txt -sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt -sha256 33d0b8726dd27c8f0c96d6dfd611e0e980bbdbb8075fac7476d055518319ec1c mods/dungeon_loot/license.txt -sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt -sha256 29a05b102726b9a3115f7ec06d5188dac7b1c005d8cf1c4d6dc2d5544405a45c mods/env_sounds/license.txt -sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt -sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt -sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/fireflies/license.txt -sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt -sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt -sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt -sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt -sha256 8acd4a18781a508f641b9364a0b491fccb0affd4c638b74b215238d0b0ee7b76 mods/player_api/license.txt -sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt -sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt -sha256 478b9944a446b4d88496d10736ddcd8ad5a3ca52f8b75f747315583d4012cb3c mods/sfinv/license.txt -sha256 e361fc900d9203859391d35c38c3284c91600d23c1617076c641ff7e9fe10b15 mods/spawn/license.txt -sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/stairs/license.txt -sha256 e8593deed04ed4199ce9303db900f32276e0b629fd7f0089074d13370c12d00a mods/tnt/license.txt -sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt -sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt -sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt -sha256 c71155c9a68a5242223c5f814c1b9b1270492729b0ff0add770b6418bccf17c9 mods/xpanes/license.txt +sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt +sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt +sha256 559749ba0d269b768e1b85bdac0f8b7a0cf100ecb3edd0df8529fe57cd4bfc0d mods/binoculars/license.txt +sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt +sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt +sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt +sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/butterflies/license.txt +sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt +sha256 b6c3aca8da2f6c272fe431740dda0a349cff419f1f72e55c6de677379fc04169 mods/creative/license.txt +sha256 f78424e0872260d3f3af98e74faf1bbe6b9387cd5464b7ae931d1fc1cc93223c mods/default/license.txt +sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt +sha256 33d0b8726dd27c8f0c96d6dfd611e0e980bbdbb8075fac7476d055518319ec1c mods/dungeon_loot/license.txt +sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt +sha256 29a05b102726b9a3115f7ec06d5188dac7b1c005d8cf1c4d6dc2d5544405a45c mods/env_sounds/license.txt +sha256 bdb104cdbe72a27407ade35144a8d1d52dd60c3ca626b5a87555b9d5d5c8af98 mods/farming/license.txt +sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt +sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/fireflies/license.txt +sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt +sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt +sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt +sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt +sha256 88385cd60d15c4fb4856c3c4c551c76c30958268c5c1160c1aa4e520c037a623 mods/player_api/license.txt +sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt +sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt +sha256 478b9944a446b4d88496d10736ddcd8ad5a3ca52f8b75f747315583d4012cb3c mods/sfinv/license.txt +sha256 e361fc900d9203859391d35c38c3284c91600d23c1617076c641ff7e9fe10b15 mods/spawn/license.txt +sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/stairs/license.txt +sha256 e8593deed04ed4199ce9303db900f32276e0b629fd7f0089074d13370c12d00a mods/tnt/license.txt +sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt +sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt +sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt +sha256 c71155c9a68a5242223c5f814c1b9b1270492729b0ff0add770b6418bccf17c9 mods/xpanes/license.txt diff --git a/package/minetest-game/minetest-game.mk b/package/minetest-game/minetest-game.mk index 1e6bb4d0c4..df118b9e52 100644 --- a/package/minetest-game/minetest-game.mk +++ b/package/minetest-game/minetest-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_GAME_VERSION = 5.1.0 +MINETEST_GAME_VERSION = 5.4.1 MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) diff --git a/package/minetest/Config.in b/package/minetest/Config.in index 085525534d..b8ee175d52 100644 --- a/package/minetest/Config.in +++ b/package/minetest/Config.in @@ -5,11 +5,10 @@ config BR2_PACKAGE_MINETEST depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_XORG7 # irrlicht depends on BR2_PACKAGE_HAS_LIBGL # irrlicht - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_LUAJIT select BR2_PACKAGE_IRRLICHT select BR2_PACKAGE_GMP select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_LUAJIT select BR2_PACKAGE_SQLITE select BR2_PACKAGE_ZLIB # At least one option must be enabled @@ -59,7 +58,6 @@ comment "minetest needs a toolchain w/ C++, gcc >= 4.9, threads" || !BR2_TOOLCHAIN_HAS_THREADS comment "minetest needs X11 and an OpenGL provider" - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on (BR2_INSTALL_LIBSTDCPP \ && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash index bedc7633c6..7eb57cb2a9 100644 --- a/package/minetest/minetest.hash +++ b/package/minetest/minetest.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ca53975eecf6a39383040658f41d697c8d7f8d5fe9176460f564979c73b53906 minetest-5.1.0.tar.gz +sha256 de9e4410583c845c104b4be25f9d0b8743d8573c120149b8910ae2519f9ab14e minetest-5.4.1.tar.gz -sha256 03ec12b2ba71d5e31c37bcf2700af2f278141df62e5a2ac0ce056c53bf266e44 LICENSE.txt +sha256 5bc4bb4ff369d5039bcfff5a83a378335240ca86c58299e7de25097153c70132 LICENSE.txt diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk index 3264792137..e046ec2851 100644 --- a/package/minetest/minetest.mk +++ b/package/minetest/minetest.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_VERSION = 5.1.0 +MINETEST_VERSION = 5.4.1 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds) MINETEST_LICENSE_FILES = LICENSE.txt @@ -18,7 +18,8 @@ MINETEST_CONF_OPTS = \ -DENABLE_CURSES=OFF \ -DAPPLY_LOCALE_BLACKLIST=OFF \ -DENABLE_SYSTEM_GMP=ON \ - -DENABLE_SYSTEM_JSONCPP=ON + -DENABLE_SYSTEM_JSONCPP=ON \ + -DBUILD_UNITTESTS=OFF ifeq ($(BR2_PACKAGE_MINETEST_CLIENT),y) MINETEST_DEPENDENCIES += bzip2 jpeg libgl libpng xlib_libXxf86vm diff --git a/package/mini-snmpd/mini-snmpd.mk b/package/mini-snmpd/mini-snmpd.mk index 570241c256..1f6e5c1919 100644 --- a/package/mini-snmpd/mini-snmpd.mk +++ b/package/mini-snmpd/mini-snmpd.mk @@ -8,6 +8,8 @@ MINI_SNMPD_VERSION = 1.6 MINI_SNMPD_SITE = $(call github,troglobit,mini-snmpd,v$(MINI_SNMPD_VERSION)) MINI_SNMPD_LICENSE = GPL-2.0 MINI_SNMPD_LICENSE_FILES = COPYING +MINI_SNMPD_CPE_ID_VENDOR = minisnmpd_project +MINI_SNMPD_CPE_ID_PRODUCT = minisnmpd MINI_SNMPD_AUTORECONF = YES MINI_SNMPD_DEPENDENCIES = host-pkgconf diff --git a/package/minicom/minicom.hash b/package/minicom/minicom.hash index dafc9da4f4..42a4499c85 100644 --- a/package/minicom/minicom.hash +++ b/package/minicom/minicom.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 66af38ae98cdf965b9a591013df4256773f18338613ec22bbb83440968289a8a minicom-23292150e07ec264827fb6cf237ddb0ac9fc043b.tar.gz -sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15 COPYING +sha256 38cea30913a20349326ff3f1763ee1512b7b41601c24f065f365e18e9db0beba minicom-2.8.tar.bz2 +sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15 COPYING diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk index bdbeb53775..5cd1d6b8b8 100644 --- a/package/minicom/minicom.mk +++ b/package/minicom/minicom.mk @@ -4,17 +4,16 @@ # ################################################################################ -MINICOM_VERSION = 23292150e07ec264827fb6cf237ddb0ac9fc043b -MINICOM_SITE = https://salsa.debian.org/minicom-team/minicom.git -MINICOM_SITE_METHOD = git +MINICOM_VERSION = 2.8 +MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.bz2 +MINICOM_SITE = \ + https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION) MINICOM_LICENSE = GPL-2.0+ MINICOM_LICENSE_FILES = COPYING -MINICOM_AUTORECONF = YES +MINICOM_CPE_ID_VENDOR = minicom_project MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \ $(TARGET_NLS_DEPENDENCIES) host-pkgconf -# add host-gettext for AM_ICONV macro -MINICOM_DEPENDENCIES += host-gettext MINICOM_CONF_OPTS = \ --enable-dfl-port=/dev/ttyS1 \ diff --git a/package/minidlna/minidlna.hash b/package/minidlna/minidlna.hash index 608970b1c3..175fe67304 100644 --- a/package/minidlna/minidlna.hash +++ b/package/minidlna/minidlna.hash @@ -1,7 +1,6 @@ -# From https://sourceforge.net/projects/minidlna/files/minidlna/1.2.1/ -md5 a968d3d84971322471cabda3669cc0f8 minidlna-1.2.1.tar.gz -sha1 79d0032c7055aefd4c8e5178bc86fbf258d449d2 minidlna-1.2.1.tar.gz +# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.0/ +sha1 6563a881884879b2aef52611934e08bb42985964 minidlna-1.3.0.tar.gz # Locally computed -sha256 67388ba23ab0c7033557a32084804f796aa2a796db7bb2b770fb76ac2a742eec minidlna-1.2.1.tar.gz +sha256 47d9b06b4c48801a4c1112ec23d24782728b5495e95ec2195bbe5c81bc2d3c63 minidlna-1.3.0.tar.gz sha256 79146b7f558e56510b9a714ff75318c05ab93aeccfd6597497b9bce212cf92ea COPYING sha256 94876d7886116e176e702b4902bd9f19731a6883db5f229ac2a7058a22aa6529 LICENCE.miniupnpd diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index c66e97b073..adea200f4f 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -4,10 +4,13 @@ # ################################################################################ -MINIDLNA_VERSION = 1.2.1 +MINIDLNA_VERSION = 1.3.0 MINIDLNA_SITE = https://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION) MINIDLNA_LICENSE = GPL-2.0, BSD-3-Clause MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd +MINIDLNA_CPE_ID_VENDOR = readymedia_project +MINIDLNA_CPE_ID_PRODUCT = readymedia +MINIDLNA_SELINUX_MODULES = minidlna MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ diff --git a/package/minidlna/minidlnad.service b/package/minidlna/minidlnad.service index f69476b303..4e968d3858 100644 --- a/package/minidlna/minidlnad.service +++ b/package/minidlna/minidlnad.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking ExecStart=/usr/sbin/minidlnad -PIDFile=/var/run/minidlna/minidlna.pid +PIDFile=/run/minidlna/minidlna.pid [Install] WantedBy=multi-user.target diff --git a/package/minissdpd/minissdpd.hash b/package/minissdpd/minissdpd.hash index 695f652b32..385a5a0c2a 100644 --- a/package/minissdpd/minissdpd.hash +++ b/package/minissdpd/minissdpd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 07feea19dfa7d79d144e0f4a19a859a21cdb58445b77dc2d6222f2434e0ac92c minissdpd-1.5.20190824.tar.gz -sha256 00c8368dd1574b025df65f24f61c32d1297ff9b6dc695fda964b1b1efc7a53d3 LICENSE +sha256 177ab1907cc0fd20c8cafd13ca8674c7ec1828aa6101da9bb066408ccada7350 minissdpd-1.5.20200928.tar.gz +sha256 00c8368dd1574b025df65f24f61c32d1297ff9b6dc695fda964b1b1efc7a53d3 LICENSE diff --git a/package/minissdpd/minissdpd.mk b/package/minissdpd/minissdpd.mk index 55973752c0..159c5855c1 100644 --- a/package/minissdpd/minissdpd.mk +++ b/package/minissdpd/minissdpd.mk @@ -4,10 +4,12 @@ # ################################################################################ -MINISSDPD_VERSION = 1.5.20190824 +MINISSDPD_VERSION = 1.5.20200928 MINISSDPD_SITE = http://miniupnp.free.fr/files MINISSDPD_LICENSE = BSD-3-Clause MINISSDPD_LICENSE_FILES = LICENSE +MINISSDPD_CPE_ID_VENDOR = miniupnp_project +MINISSDPD_SELINUX_MODULES = minissdpd MINISSDPD_DEPENDENCIES = libnfnetlink define MINISSDPD_BUILD_CMDS diff --git a/package/minizip/minizip.hash b/package/minizip/minizip.hash index 0fed09735a..b006f32bfc 100644 --- a/package/minizip/minizip.hash +++ b/package/minizip/minizip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8425399277d9d5e39454e655cfd3eb004607960c8358a3e732f5e741a6b5df0a minizip-2.9.2.tar.gz +sha256 6ba4b6629c107c27ab526e517bdb105612232f0965a6747f60150e5a04c2fe5a minizip-3.0.2.tar.gz sha256 675181c03fc1302a1c8554c00f7be9bb420c5dbc9dcc2013433cec144413de03 LICENSE diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 313fe87a49..351aee464c 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -4,18 +4,17 @@ # ################################################################################ -MINIZIP_VERSION = 2.9.2 +MINIZIP_VERSION = 3.0.2 MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) -MINIZIP_DEPENDENCIES = \ - host-pkgconf \ - $(if $(BR2_PACKAGE_LIBBSD),libbsd) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) +MINIZIP_DEPENDENCIES = host-pkgconf MINIZIP_INSTALL_STAGING = YES MINIZIP_CONF_OPTS = \ $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DMZ_BUILD_TEST=ON) \ - -DMZ_COMPAT=OFF + -DMZ_COMPAT=OFF \ + -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE +MINIZIP_CPE_ID_VENDOR = minizip_project ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 @@ -24,11 +23,38 @@ else MINIZIP_CONF_OPTS += -DMZ_BZIP2=OFF endif +ifeq ($(BR2_PACKAGE_LIBICONV),y) +MINIZIP_DEPENDENCIES += libiconv +MINIZIP_CONF_OPTS += -DMZ_ICONV=ON +else +MINIZIP_CONF_OPTS += -DMZ_ICONV=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBBSD),y) +MINIZIP_DEPENDENCIES += libbsd +MINIZIP_CONF_OPTS += -DMZ_LIBBSD=ON +else +MINIZIP_CONF_OPTS += -DMZ_LIBBSD=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) MINIZIP_DEPENDENCIES += openssl -MINIZIP_CONF_OPTS += -DMZ_OPENSSL=ON +MINIZIP_CONF_OPTS += \ + -DMZ_OPENSSL=ON \ + -DMZ_PKCRYPT=ON \ + -DMZ_WZAES=ON else -MINIZIP_CONF_OPTS += -DMZ_OPENSSL=OFF +MINIZIP_CONF_OPTS += \ + -DMZ_OPENSSL=OFF \ + -DMZ_PKCRYPT=OFF \ + -DMZ_WZAES=OFF +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +MINIZIP_DEPENDENCIES += xz +MINIZIP_CONF_OPTS += -DMZ_LZMA=ON +else +MINIZIP_CONF_OPTS += -DMZ_LZMA=OFF endif ifeq ($(BR2_PACKAGE_ZLIB),y) @@ -38,4 +64,11 @@ else MINIZIP_CONF_OPTS += -DMZ_ZLIB=OFF endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +MINIZIP_DEPENDENCIES += zstd +MINIZIP_CONF_OPTS += -DMZ_ZSTD=ON +else +MINIZIP_CONF_OPTS += -DMZ_ZSTD=OFF +endif + $(eval $(cmake-package)) diff --git a/package/mjpg-streamer/mjpg-streamer.hash b/package/mjpg-streamer/mjpg-streamer.hash index 0a08151a4b..63dcdb9fbe 100644 --- a/package/mjpg-streamer/mjpg-streamer.hash +++ b/package/mjpg-streamer/mjpg-streamer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bd934363b5cb6ef3665aa2dfa15d08b72bbfe84ca60f7c342fe8ae1f94e19201 mjpg-streamer-501f6362c5afddcfb41055f97ae484252c85c912.tar.gz +sha256 5b427b07c03c2c0468cc782daf1510d315141170246828fcbb7c07f927879973 mjpg-streamer-5a6e0a2db163e6ae9461552b59079870d0959340.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 mjpg-streamer-experimental/LICENSE diff --git a/package/mjpg-streamer/mjpg-streamer.mk b/package/mjpg-streamer/mjpg-streamer.mk index d5980dbf15..46f3f50104 100644 --- a/package/mjpg-streamer/mjpg-streamer.mk +++ b/package/mjpg-streamer/mjpg-streamer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MJPG_STREAMER_VERSION = 501f6362c5afddcfb41055f97ae484252c85c912 +MJPG_STREAMER_VERSION = 5a6e0a2db163e6ae9461552b59079870d0959340 MJPG_STREAMER_SITE = $(call github,jacksonliam,mjpg-streamer,$(MJPG_STREAMER_VERSION)) MJPG_STREAMER_SUBDIR = mjpg-streamer-experimental MJPG_STREAMER_LICENSE = GPL-2.0+ @@ -23,7 +23,10 @@ MJPG_STREAMER_DEPENDENCIES += libv4l endif ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)$(BR2_PACKAGE_OPENCV3_LIB_VIDEOIO),yyy) -MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=ON +MJPG_STREAMER_CONF_OPTS += \ + -DPLUGIN_INPUT_OPENCV=ON \ + -DPLUGIN_CVFILTER_CPP=OFF \ + -DPLUGIN_CVFILTER_PY=OFF MJPG_STREAMER_DEPENDENCIES += host-pkgconf opencv3 else MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=OFF diff --git a/package/mkpasswd/mkpasswd.mk b/package/mkpasswd/mkpasswd.mk index b013390572..c1117ef65c 100644 --- a/package/mkpasswd/mkpasswd.mk +++ b/package/mkpasswd/mkpasswd.mk @@ -9,9 +9,13 @@ # at revision 5a0f08500fa51608b6d3b73ee338be38c692eadb HOST_MKPASSWD_LICENSE = GPL-2.0+ +define HOST_MKPASSWD_EXTRACT_CMDS + cp $(HOST_MKPASSWD_PKGDIR)/*.c $(HOST_MKPASSWD_PKGDIR)/*.h $(@D) +endef + define HOST_MKPASSWD_BUILD_CMDS $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ - package/mkpasswd/mkpasswd.c package/mkpasswd/utils.c \ + $(@D)/mkpasswd.c $(@D)/utils.c \ -o $(@D)/mkpasswd -lcrypt endef diff --git a/package/mkpimage/mkpimage.mk b/package/mkpimage/mkpimage.mk index 8e08013f91..71500f00f3 100644 --- a/package/mkpimage/mkpimage.mk +++ b/package/mkpimage/mkpimage.mk @@ -9,9 +9,13 @@ HOST_MKPIMAGE_LICENSE = GPL-2.0 # source included in the package # came from barebox's repository: # https://git.pengutronix.de/cgit/barebox/tree/scripts/socfpga_mkimage.c?id=55d29525146dcd280987dfd565bfd34f08858fb3 +define HOST_MKPIMAGE_EXTRACT_CMDS + cp $(HOST_MKPIMAGE_PKGDIR)/mkpimage.c $(@D) +endef + define HOST_MKPIMAGE_BUILD_CMDS $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ - package/mkpimage/mkpimage.c -o $(@D)/mkpimage + $(@D)/mkpimage.c -o $(@D)/mkpimage endef define HOST_MKPIMAGE_INSTALL_CMDS diff --git a/package/mksh/mksh.hash b/package/mksh/mksh.hash index 4e71a42634..d81deccb39 100644 --- a/package/mksh/mksh.hash +++ b/package/mksh/mksh.hash @@ -1,4 +1,4 @@ # From http://www.mirbsd.org/mksh.htm#build -sha256 3d101154182d52ae54ef26e1360c95bc89c929d28859d378cc1c84f3439dbe75 mksh-R57.tgz +sha256 77ae1665a337f1c48c61d6b961db3e52119b38e58884d1c89684af31f87bc506 mksh-R59c.tgz # Locally computed -sha256 4655d87a53a703ead36a52f166f065c23cf58dd02d7b14abd2474f9f49383a16 mksh.1 +sha256 abf44a61ec777c98f8ae7e08e4fe25fe258e0c470215e2eeb22816f6bae72c80 mksh.1 diff --git a/package/mksh/mksh.mk b/package/mksh/mksh.mk index 2aa8f70ff9..386b1bd016 100644 --- a/package/mksh/mksh.mk +++ b/package/mksh/mksh.mk @@ -4,7 +4,7 @@ # ################################################################################ -MKSH_VERSION = 57 +MKSH_VERSION = 59c MKSH_SOURCE = mksh-R$(MKSH_VERSION).tgz MKSH_SITE = https://www.mirbsd.org/MirOS/dist/mir/mksh # For MirOS License see https://www.mirbsd.org/TaC-mksh.txt diff --git a/package/mmc-utils/mmc-utils.hash b/package/mmc-utils/mmc-utils.hash index 86c644f774..e8b2826612 100644 --- a/package/mmc-utils/mmc-utils.hash +++ b/package/mmc-utils/mmc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 df8876e0e671f502bb8872cecca3cc6d1055253fa314f3544d22829e129e024e mmc-utils-d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8.tar.gz -sha256 c3165393bcd710624e2909327a6fbeb736c47bdbe66de1c1a364ac7324d3e4d6 mmc.h +sha256 ffc8f77233d1bd39ce4ec68835ad94aa6762624e4e96fb60102e87ba82db083e mmc-utils-d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8-br1.tar.gz +sha256 c3165393bcd710624e2909327a6fbeb736c47bdbe66de1c1a364ac7324d3e4d6 mmc.h diff --git a/package/moarvm/Config.in b/package/moarvm/Config.in index c370a0f229..acef8f5d61 100644 --- a/package/moarvm/Config.in +++ b/package/moarvm/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_MOARVM # See: https://github.com/MoarVM/MoarVM/issues/222 # dyncall does not work also on powerpc64 and powerpc64le select BR2_PACKAGE_LIBFFI if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_powerpc64 || BR2_powerpc64le + select BR2_PACKAGE_ZSTD help Short for "Metamodel On A Runtime", MoarVM is a virtual machine built especially for Rakudo Perl 6 and the NQP diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index 29c6ce77fd..44c54e35b4 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 82cb80b29ad7aebb0c0b42449d371eafa8935b07884526345f9788c8bcf4d632 MoarVM-2020.02.1.tar.gz -sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt +sha256 2300a921d504c9d33f111cbe08097d0011bfb06000c018b8d4353d97966772a7 MoarVM-2021.06.tar.gz +sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index a0c7766bf0..17b2a234e7 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,13 +4,13 @@ # ################################################################################ -MOARVM_VERSION = 2020.02.1 +MOARVM_VERSION = 2021.06 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 MOARVM_LICENSE_FILES = Artistic2.txt MOARVM_INSTALL_STAGING = YES -MOARVM_DEPENDENCIES = host-pkgconf libuv libtommath libatomic_ops +MOARVM_DEPENDENCIES = host-pkgconf libuv libtommath libatomic_ops zstd MOARVM_CONF_OPTS = \ --build=$(GNU_HOST_NAME) \ diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index f9d790cd0c..b840020f38 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2eb3353ee5518005c51d429308695c69d8c38cf2fd9102b04f785c03a0cc624c ModemManager-1.12.6.tar.xz +sha256 2a90b6260f66d3135609d62667ada73416694d717e7fd9b73223e3703a499617 ModemManager-1.16.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 75fc5811db..368b8464a5 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,11 +4,12 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.12.6 +MODEM_MANAGER_VERSION = 1.16.6 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB +MODEM_MANAGER_SELINUX_MODULES = modemmanager MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = --disable-more-warnings @@ -34,6 +35,13 @@ else MODEM_MANAGER_CONF_OPTS += --without-mbim endif +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +MODEM_MANAGER_DEPENDENCIES += gobject-introspection +MODEM_MANAGER_CONF_OPTS += --enable-introspection +else +MODEM_MANAGER_CONF_OPTS += --disable-introspection +endif + define MODEM_MANAGER_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/modem-manager/S44modem-manager \ $(TARGET_DIR)/etc/init.d/S44modem-manager diff --git a/package/mongodb/Config.in b/package/mongodb/Config.in index 9c5dba8347..493c592413 100644 --- a/package/mongodb/Config.in +++ b/package/mongodb/Config.in @@ -8,12 +8,11 @@ config BR2_PACKAGE_MONGODB_ARCH_SUPPORTS config BR2_PACKAGE_MONGODB bool "mongodb" depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS - depends on !BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_USES_GLIBC # needs glibc malloc_usable_size depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_IOSTREAMS @@ -35,9 +34,8 @@ config BR2_PACKAGE_MONGODB https://www.mongodb.org/ -comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 6" +comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 7" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_6 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS - depends on !BR2_PACKAGE_PYTHON3 diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash index f08ffffe3b..3b2580cc43 100644 --- a/package/mongodb/mongodb.hash +++ b/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 b39c5b7bb77a547804ab6f43f9b5f09add47574356b31512fd1cc641a08b4ea5 mongodb-r4.0.12.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt -sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt +sha256 ab5a8b6e967614a8ad67c0ca87124c4f380d4a476508973a7995d54ed902b02e mongodb-src-r4.2.11.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt +sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 22ca920e12..6a22acd12a 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -4,18 +4,23 @@ # ################################################################################ -MONGODB_VERSION_BASE = 4.0.12 -MONGODB_VERSION = r$(MONGODB_VERSION_BASE) -MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION)) +MONGODB_VERSION = 4.2.11 +MONGODB_SITE = https://fastdl.mongodb.org/src +MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz MONGODB_LICENSE = Apache-2.0 (drivers), SSPL (database) MONGODB_LICENSE_FILES = APACHE-2.0.txt LICENSE-Community.txt +MONGODB_CPE_ID_VENDOR = mongodb +MONGODB_SELINUX_MODULES = mongodb + MONGODB_DEPENDENCIES = \ boost \ - host-python-cheetah \ - host-python-pyyaml \ - host-python-typing \ + host-python3-cheetah \ + host-python3-psutil \ + host-python3-pyyaml \ + host-python3-regex \ + host-python3-requests \ host-scons \ pcre \ snappy \ @@ -29,6 +34,7 @@ MONGODB_SCONS_ENV = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \ -j"$(PARALLEL_JOBS)" MONGODB_SCONS_OPTS = \ + --disable-minimum-compiler-version-enforcement \ --disable-warnings-as-errors \ --use-system-boost \ --use-system-pcre \ @@ -38,7 +44,7 @@ MONGODB_SCONS_OPTS = \ --use-system-zlib # need to pass mongo version when not building from git repo -MONGODB_SCONS_OPTS += MONGO_VERSION=$(MONGODB_VERSION_BASE)- +MONGODB_SCONS_OPTS += MONGO_VERSION=$(MONGODB_VERSION)- # WiredTiger database storage engine only supported on 64 bits ifeq ($(BR2_ARCH_IS_64),y) @@ -60,21 +66,27 @@ endif ifeq ($(BR2_PACKAGE_LIBCURL),y) MONGODB_DEPENDENCIES += libcurl -MONGODB_SCONS_OPTS += --enable-free-mon=on +MONGODB_SCONS_OPTS += \ + --enable-free-mon=on \ + --enable-http-client=on else -MONGODB_SCONS_OPTS += --enable-free-mon=off +MONGODB_SCONS_OPTS += \ + --enable-free-mon=off \ + --enable-http-client=off endif ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGODB_DEPENDENCIES += openssl MONGODB_SCONS_OPTS += \ - --ssl \ + --ssl=on \ --ssl-provider=openssl +else +MONGODB_SCONS_OPTS += --ssl=off endif define MONGODB_BUILD_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python $(SCONS) \ + $(HOST_DIR)/bin/python3 $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ $(MONGODB_SCONS_TARGETS)) @@ -82,7 +94,7 @@ endef define MONGODB_INSTALL_TARGET_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python $(SCONS) \ + $(HOST_DIR)/bin/python3 $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ --prefix=$(TARGET_DIR)/usr \ diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index c5de11bec2..809f160cf0 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5bff3cc70bb2248cf87d06a3543f120f3b29b9368d25a7715443cb10612987cc mongoose-6.17.tar.gz -sha256 fdc34eeea97327d75c83492abd34f1a3200c53dec04422ecda8071dc60a36d10 LICENSE +sha256 8c5024a4e5b5a0c7fdae3c24ebc68e2b3ccfaba08cf25c2e76fc7f14f92fd4a5 mongoose-7.2.tar.gz +sha256 9553d057f2ba980642f2c18d87ed38896cff1c9612d77d684a73a11fe1443b05 LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 7944f5e534..2c5df1d0cc 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,10 +4,11 @@ # ################################################################################ -MONGOOSE_VERSION = 6.17 +MONGOOSE_VERSION = 7.2 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE +MONGOOSE_CPE_ID_VENDOR = cesenta MONGOOSE_INSTALL_STAGING = YES # static library MONGOOSE_INSTALL_TARGET = NO @@ -16,7 +17,10 @@ MONGOOSE_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGOOSE_DEPENDENCIES += openssl -MONGOOSE_CFLAGS += -DMG_ENABLE_SSL +MONGOOSE_CFLAGS += -DMG_ENABLE_OPENSSL=1 +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +MONGOOSE_DEPENDENCIES += mbedtls +MONGOOSE_CFLAGS += -DMG_ENABLE_MBEDTLS=1 endif define MONGOOSE_BUILD_CMDS diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in index a9b09b786c..60fee6f96d 100644 --- a/package/mongrel2/Config.in +++ b/package/mongrel2/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_MONGREL2 depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on !BR2_STATIC_LIBS # uses dlopen() depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS + select BR2_PACKAGE_MBEDTLS select BR2_PACKAGE_SQLITE select BR2_PACKAGE_ZEROMQ help diff --git a/package/mongrel2/mongrel2.hash b/package/mongrel2/mongrel2.hash index b1db917c57..ea3a1cb426 100644 --- a/package/mongrel2/mongrel2.hash +++ b/package/mongrel2/mongrel2.hash @@ -1,3 +1,6 @@ +# From https://mongrel2.org +sha1 6f81fa747a1e198d1a655c3677b6de686a5a51f7 mongrel2-v1.12.2.tar.bz2 + # Locally computed -sha256 543553c3082f2b992649a975f6cb7324ae2aea93af05288ea4f2c1262a7f63b2 mongrel2-v1.9.2.tar.bz2 +sha256 3bffeae198c37a1efc9c12f77d5f1eb61cdf62b35d661babc2527dd030aa7d8f mongrel2-v1.12.2.tar.bz2 sha256 eb6e2a2baa637d06f6aa762886fbc8939934eb5fdb0b3a5b3882f2a61e9a4357 LICENSE diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk index a35a87248e..cbe7e3fb91 100644 --- a/package/mongrel2/mongrel2.mk +++ b/package/mongrel2/mongrel2.mk @@ -4,37 +4,22 @@ # ################################################################################ -MONGREL2_VERSION = 1.9.2 +MONGREL2_VERSION = 1.12.2 MONGREL2_SOURCE = mongrel2-v$(MONGREL2_VERSION).tar.bz2 # Do not use the github helper here, the generated tarball is *NOT* the same # as the one uploaded by upstream for the release. -MONGREL2_SITE = https://github.com/mongrel2/mongrel2/releases/download/$(MONGREL2_VERSION) +MONGREL2_SITE = https://github.com/mongrel2/mongrel2/releases/download/v$(MONGREL2_VERSION) MONGREL2_LICENSE = BSD-3-Clause MONGREL2_LICENSE_FILES = LICENSE -MONGREL2_DEPENDENCIES = sqlite zeromq - -define MONGREL2_POLARSSL_DISABLE_ASM - $(SED) '/^#define POLARSSL_HAVE_ASM/d' $(@D)/src/polarssl/include/polarssl/config.h -endef - -# ARM in thumb mode breaks debugging with asm optimizations -# Microblaze asm optimizations are broken in general -# MIPS R6 asm is not yet supported -ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) -MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM -else ifeq ($(BR2_microblaze),y) -MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM -else ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM -endif +MONGREL2_DEPENDENCIES = mbedtls sqlite zeromq define MONGREL2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ PREFIX=/usr all endef define MONGREL2_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ PREFIX=/usr DESTDIR=$(TARGET_DIR) install endef diff --git a/package/monit/monit.mk b/package/monit/monit.mk index 93e310ff78..6d5d475813 100644 --- a/package/monit/monit.mk +++ b/package/monit/monit.mk @@ -8,6 +8,8 @@ MONIT_VERSION = 5.26.0 MONIT_SITE = http://mmonit.com/monit/dist MONIT_LICENSE = AGPL-3.0 with OpenSSL exception MONIT_LICENSE_FILES = COPYING +MONIT_CPE_ID_VENDOR = mmonit +MONIT_SELINUX_MODULES = monit # # Touching Makefile.am: MONIT_AUTORECONF = YES diff --git a/package/mono/Config.in b/package/mono/Config.in index 0d555bfa82..44b8cf8581 100644 --- a/package/mono/Config.in +++ b/package/mono/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_MONO_ARCH_SUPPORTS default y if (BR2_arm || BR2_armeb || BR2_i386 || \ BR2_powerpc || BR2_x86_64) depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS config BR2_PACKAGE_MONO bool "mono" @@ -15,6 +16,7 @@ config BR2_PACKAGE_MONO depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBATOMIC_OPS help An open source, cross-platform, implementation of C# and the CLR that is binary compatible with Microsoft.NET. diff --git a/package/mono/mono.hash b/package/mono/mono.hash index fa5333867c..2477e9231c 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 ed5df4ec663a4e228e89e910e954fa18d33f72e790c11174e1b62fc8cca90ba0 mono-6.8.0.96.tar.xz +sha256 51de5c02ad511333f93ff585bca54c8784de35af4ff27b759d16b46c4402cdac mono-6.12.0.90.tar.xz sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 274d9817e5..27f7886224 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,12 +4,13 @@ # ################################################################################ -MONO_VERSION = 6.8.0.96 +MONO_VERSION = 6.12.0.90 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.xz MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial MONO_LICENSE_FILES = LICENSE mcs/COPYING \ external/Newtonsoft.Json/Tools/7-zip/copying.txt +MONO_CPE_ID_VENDOR = mono-project MONO_INSTALL_STAGING = YES ## Mono native @@ -42,7 +43,8 @@ endif MONO_DEPENDENCIES += \ host-mono \ - $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) + $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \ + libatomic_ops ## Mono managed @@ -51,7 +53,7 @@ HOST_MONO_CONF_OPTS = $(MONO_COMMON_CONF_OPTS) --disable-libraries # ensure monolite is used HOST_MONO_MAKE_OPTS += EXTERNAL_MCS=false -HOST_MONO_DEPENDENCIES = host-monolite host-gettext +HOST_MONO_DEPENDENCIES = host-monolite host-gettext host-python3 define HOST_MONO_SETUP_MONOLITE rm -rf $(@D)/mcs/class/lib/monolite diff --git a/package/monolite/monolite.hash b/package/monolite/monolite.hash index bd953591b4..b008d42ebb 100644 --- a/package/monolite/monolite.hash +++ b/package/monolite/monolite.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 4b75a73bb4a99b8e3b51837afb72192cce27b482cb5ec70cc136b293071f902e monolite-linux-ABB721D6-116A-4555-B4FD-9248146D2051-latest.tar.gz +sha256 0ac314f75ca2bc4455785f12ceb50da89b6dac90162f9f46afbbb988a8752d4b monolite-linux-1A5E0066-58DC-428A-B21C-0AD6CDAE2789-latest.tar.gz diff --git a/package/monolite/monolite.mk b/package/monolite/monolite.mk index b9e3990c42..b0042aabf7 100644 --- a/package/monolite/monolite.mk +++ b/package/monolite/monolite.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONOLITE_VERSION = ABB721D6-116A-4555-B4FD-9248146D2051 +MONOLITE_VERSION = 1A5E0066-58DC-428A-B21C-0AD6CDAE2789 MONOLITE_SITE = http://download.mono-project.com/monolite MONOLITE_SOURCE = monolite-linux-$(MONOLITE_VERSION)-latest.tar.gz MONOLITE_LICENSE = LGPL-2.0 or commercial diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index ab3f7aeb26..2692aa1a9b 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,8 +1,8 @@ # Locally calculated after checking gpg signature -# from https://mosquitto.org/files/source/mosquitto-1.6.9.tar.gz.asc -sha256 412979b2db0a0020bd02fa64f0a0de9e7000b84462586e32b67f29bb1f6c1685 mosquitto-1.6.9.tar.gz +# from https://mosquitto.org/files/source/mosquitto-2.0.12.tar.gz.asc +sha256 31cf0065cb431d6f4e57a5f4d56663e839c9d177362eff89582d7cfde191c933 mosquitto-2.0.12.tar.gz # License files -sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt -sha256 3b9be6b894d0769de796e653571ff6cef494913c0ce78c35a97db939e7d9087c epl-v10 +sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt +sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20 sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index ea57d76933..06b963a994 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,13 +4,15 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.6.9 +MOSQUITTO_VERSION = 2.0.12 MOSQUITTO_SITE = https://mosquitto.org/files/source -MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0 -MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 +MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0 +MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 +MOSQUITTO_CPE_ID_VENDOR = eclipse MOSQUITTO_INSTALL_STAGING = YES MOSQUITTO_MAKE_OPTS = \ + CLIENT_STATIC_LDADD="$(MOSQUITTO_STATIC_LIBS)" \ UNAME=Linux \ STRIP=true \ prefix=/usr \ @@ -41,21 +43,29 @@ else MOSQUITTO_MAKE_OPTS += WITH_ADNS=no endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +# threaded API uses pthread_setname_np +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) MOSQUITTO_MAKE_OPTS += WITH_THREADING=yes else MOSQUITTO_MAKE_OPTS += WITH_THREADING=no endif -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -MOSQUITTO_DEPENDENCIES += host-pkgconf libopenssl -MOSQUITTO_MAKE_OPTS += \ - WITH_TLS=yes \ - CLIENT_STATIC_LDADD="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`" +ifeq ($(BR2_PACKAGE_OPENSSL),y) +MOSQUITTO_DEPENDENCIES += host-pkgconf openssl +MOSQUITTO_MAKE_OPTS += WITH_TLS=yes +MOSQUITTO_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl` else MOSQUITTO_MAKE_OPTS += WITH_TLS=no endif +ifeq ($(BR2_PACKAGE_CJSON),y) +MOSQUITTO_DEPENDENCIES += cjson +MOSQUITTO_MAKE_OPTS += WITH_CJSON=yes +MOSQUITTO_STATIC_LIBS += -lcjson +else +MOSQUITTO_MAKE_OPTS += WITH_CJSON=no +endif + ifeq ($(BR2_PACKAGE_C_ARES),y) MOSQUITTO_DEPENDENCIES += c-ares MOSQUITTO_MAKE_OPTS += WITH_SRV=yes @@ -114,7 +124,7 @@ define MOSQUITTO_INSTALL_INIT_SYSTEMD endef define MOSQUITTO_USERS - mosquitto -1 nogroup -1 * - - - Mosquitto user + mosquitto -1 nobody -1 * - - - Mosquitto user endef endif diff --git a/package/motion/motion.hash b/package/motion/motion.hash index 2b25d0a52c..96ab1c4338 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c8d40976b41da8eb9f9f7128599403a312fc26b7226bf3787d75f78cb5a6cc6e motion-4.2.2.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 dafa4264b2d8e4778f8be5871f09b6c0ec710d5a836182c583469c18db944d70 motion-4.3.2.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad doc/COPYING diff --git a/package/motion/motion.mk b/package/motion/motion.mk index ae58c54935..29b70fd85f 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,13 +4,14 @@ # ################################################################################ -MOTION_VERSION = 4.2.2 +MOTION_VERSION = 4.3.2 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 -MOTION_LICENSE_FILES = COPYING +MOTION_LICENSE_FILES = doc/COPYING MOTION_DEPENDENCIES = host-pkgconf jpeg libmicrohttpd $(TARGET_NLS_DEPENDENCIES) # From git MOTION_AUTORECONF = YES +MOTION_GETTEXTIZE = YES MOTION_CONF_OPTS += --without-optimizecpu @@ -23,20 +24,14 @@ endif ifeq ($(BR2_PACKAGE_MYSQL),y) MOTION_DEPENDENCIES += mysql -MOTION_CONF_OPTS += \ - --with-mysql \ - --with-mysql-include=$(STAGING_DIR)/usr/include/mysql \ - --with-mysql-lib=$(STAGING_DIR)/usr/lib +MOTION_CONF_OPTS += --with-mysql else MOTION_CONF_OPTS += --without-mysql endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) MOTION_DEPENDENCIES += postgresql -MOTION_CONF_OPTS += \ - --with-pgsql \ - --with-pgsql-include=$(STAGING_DIR)/usr/include \ - --with-pgsql-lib=$(STAGING_DIR)/usr/lib +MOTION_CONF_OPTS += --with-pgsql else MOTION_CONF_OPTS += --without-pgsql endif @@ -58,9 +53,9 @@ endif # Do not use default install target as it installs many unneeded files and # directories: docs, examples and init scripts define MOTION_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/motion-dist.conf \ + $(INSTALL) -D -m 0644 $(@D)/data/motion-dist.conf \ $(TARGET_DIR)/etc/motion/motion.conf - $(INSTALL) -D -m 0755 $(@D)/motion $(TARGET_DIR)/usr/bin/motion + $(INSTALL) -D -m 0755 $(@D)/src/motion $(TARGET_DIR)/usr/bin/motion endef define MOTION_INSTALL_INIT_SYSV diff --git a/package/mp4v2/0001-Fix-GCC7-build.patch b/package/mp4v2/0001-Fix-GCC7-build.patch index 90222c10ae..4e39be4a79 100644 --- a/package/mp4v2/0001-Fix-GCC7-build.patch +++ b/package/mp4v2/0001-Fix-GCC7-build.patch @@ -10,6 +10,7 @@ no encoding parameters ppEncodingParams will be returned as a pointer to an empty string rather than as a null pointer Signed-off-by: Peter Korsgaard +[Upstream status: https://github.com/TechSmith/mp4v2/pull/36] --- src/rtphint.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in index 490ebac9fd..172d1baabe 100644 --- a/package/mp4v2/Config.in +++ b/package/mp4v2/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_MP4V2 The MP4v2 library provides functions to read, create, and modify mp4 files. - https://code.google.com/archive/p/mp4v2/ + https://github.com/TechSmith/mp4v2/ if BR2_PACKAGE_MP4V2 diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index d75c1994d9..85fce49384 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,4 +1,3 @@ -# From https://code.google.com/p/mp4v2/downloads/detail?name=mp4v2-2.0.0.tar.bz2 -sha1 193260cfb7201e6ec250137bcca1468d4d20e2f0 mp4v2-2.0.0.tar.bz2 # Locally computed +sha256 e3ad6c2dc451b0875dbe34bfe7f51f4fe278b391434c886083e6d3ecd5fa08c2 mp4v2-4.1.3.tar.gz sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index b6b7d9ae5e..478d10d472 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,9 +4,9 @@ # ################################################################################ -MP4V2_VERSION = 2.0.0 -MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 -MP4V2_SITE = https://mp4v2.googlecode.com/files +MP4V2_VERSION = 4.1.3 +MP4V2_SITE = \ + $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) MP4V2_INSTALL_STAGING = YES MP4V2_LICENSE = MPL-1.1 MP4V2_LICENSE_FILES = COPYING diff --git a/package/mpc/mpc.hash b/package/mpc/mpc.hash index fa98f673d5..0520a7b9b4 100644 --- a/package/mpc/mpc.hash +++ b/package/mpc/mpc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e mpc-1.1.0.tar.gz -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER +sha256 17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459 mpc-1.2.1.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk index 0e84bc2770..364e4c3c85 100644 --- a/package/mpc/mpc.mk +++ b/package/mpc/mpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPC_VERSION = 1.1.0 +MPC_VERSION = 1.2.1 MPC_SITE = $(BR2_GNU_MIRROR)/mpc MPC_LICENSE = LGPL-3.0+ MPC_LICENSE_FILES = COPYING.LESSER diff --git a/package/mpd/Config.in b/package/mpd/Config.in index e9e7b83cbd..7a2597558b 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -5,8 +5,8 @@ menuconfig BR2_PACKAGE_MPD depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14 - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 + depends on BR2_HOST_GCC_AT_LEAST_8 # C++17 select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help @@ -34,6 +34,12 @@ config BR2_PACKAGE_MPD_SQLITE Enable sqlite database support. If you don't use sqlite it will use an ASCII database. +config BR2_PACKAGE_MPD_ZZIP + bool "zzip" + select BR2_PACKAGE_ZZIPLIB + help + Enable ZIP archive support. + comment "Commercial services" config BR2_PACKAGE_MPD_QOBUZ @@ -78,13 +84,6 @@ config BR2_PACKAGE_MPD_LIBSOXR comment "Decoder plugins" -config BR2_PACKAGE_MPD_AUDIOFILE - bool "audiofile" - select BR2_PACKAGE_AUDIOFILE - help - Enable audiofile input/streaming support. - Select this if you want to play back WAV files. - config BR2_PACKAGE_MPD_DSD bool "dsd" help @@ -114,6 +113,16 @@ config BR2_PACKAGE_MPD_FLAC Enable flac input/streaming support. Select this if you want to play back FLAC files. +config BR2_PACKAGE_MPD_FLUIDSYNTH + bool "fluidsynth" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_FLUIDSYNTH + help + Enable fluidsynth MIDI decoder support. + +comment "fluidsynth support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_MPD_LIBSNDFILE bool "libsndfile" select BR2_PACKAGE_LIBSNDFILE @@ -130,6 +139,12 @@ config BR2_PACKAGE_MPD_MAD Enable mad input support. Select this if you want to play back MP3 files. +config BR2_PACKAGE_MPD_MODPLUG + bool "modplug" + select BR2_PACKAGE_LIBMODPLUG + help + Enable Modplug decoder support. + config BR2_PACKAGE_MPD_MPG123 bool "mpg123" select BR2_PACKAGE_LIBID3TAG @@ -155,6 +170,12 @@ config BR2_PACKAGE_MPD_OPUS Enable opus input support. Select this if you want to play back OPUS encoded files. +config BR2_PACKAGE_MPD_SIDPLAY + bool "sidplay" + select BR2_PACKAGE_LIBSIDPLAY2 + help + Enable C64 SID support. + config BR2_PACKAGE_MPD_TREMOR bool "tremor" depends on !BR2_PACKAGE_MPD_VORBIS @@ -276,6 +297,18 @@ comment "jack support needs a toolchain w/ dynamic library" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS +config BR2_PACKAGE_MPD_OPENAL + bool "openal" + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_PACKAGE_OPENAL + help + Enable OpenAL output support. + +comment "openal support needs a toolchain w/ NPTL" + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + config BR2_PACKAGE_MPD_OSS bool "oss" help @@ -350,18 +383,25 @@ config BR2_PACKAGE_MPD_TCP config BR2_PACKAGE_MPD_UPNP bool "UPnP" select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP + select BR2_PACKAGE_LIBUPNP select BR2_PACKAGE_MPD_CURL help Enable MPD UPnP client support. +comment "Tag plugins" + +config BR2_PACKAGE_MPD_ID3TAG + bool "id3tag" + select BR2_PACKAGE_LIBID3TAG + help + Enable ID3 support. + endif -comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 6" +comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 7, host gcc >= 7" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 - -comment "mpd needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ + !BR2_HOST_GCC_AT_LEAST_8 diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 70ca9df582..1079ccf367 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 422ef0a996d961f3ebc6856395f3a855b45fa0059910e878fb98281007e510e1 mpd-0.21.20.tar.xz +sha256 9617ed08c9ffafcf5f925819251f6b90df3f4f73cf2838c41033e1962104286d mpd-0.22.8.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index a879a33d33..e5e5097048 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -4,13 +4,17 @@ # ################################################################################ -MPD_VERSION_MAJOR = 0.21 -MPD_VERSION = $(MPD_VERSION_MAJOR).20 +MPD_VERSION_MAJOR = 0.22 +MPD_VERSION = $(MPD_VERSION_MAJOR).8 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING +MPD_SELINUX_MODULES = mpd +MPD_CONF_OPTS = \ + -Daudiofile=disabled \ + -Ddocumentation=disabled # Zeroconf support depends on libdns_sd from avahi. ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y) @@ -42,13 +46,6 @@ else MPD_CONF_OPTS += -Dao=disabled endif -ifeq ($(BR2_PACKAGE_MPD_AUDIOFILE),y) -MPD_DEPENDENCIES += audiofile -MPD_CONF_OPTS += -Daudiofile=enabled -else -MPD_CONF_OPTS += -Daudiofile=disabled -endif - ifeq ($(BR2_PACKAGE_MPD_BZIP2),y) MPD_DEPENDENCIES += bzip2 MPD_CONF_OPTS += -Dbzip2=enabled @@ -97,12 +94,26 @@ else MPD_CONF_OPTS += -Dflac=disabled endif +ifeq ($(BR2_PACKAGE_MPD_FLUIDSYNTH),y) +MPD_DEPENDENCIES += fluidsynth +MPD_CONF_OPTS += -Dfluidsynth=enabled +else +MPD_CONF_OPTS += -Dfluidsynth=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_HTTPD_OUTPUT),y) MPD_CONF_OPTS += -Dhttpd=true else MPD_CONF_OPTS += -Dhttpd=false endif +ifeq ($(BR2_PACKAGE_MPD_ID3TAG),y) +MPD_DEPENDENCIES += libid3tag +MPD_CONF_OPTS += -Did3tag=enabled +else +MPD_CONF_OPTS += -Did3tag=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_JACK2),y) MPD_DEPENDENCIES += jack2 MPD_CONF_OPTS += -Djack=enabled @@ -173,6 +184,13 @@ else MPD_CONF_OPTS += -Dmad=disabled endif +ifeq ($(BR2_PACKAGE_MPD_MODPLUG),y) +MPD_DEPENDENCIES += libmodplug +MPD_CONF_OPTS += -Dmodplug=enabled +else +MPD_CONF_OPTS += -Dmodplug=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_MPG123),y) MPD_DEPENDENCIES += libid3tag mpg123 MPD_CONF_OPTS += -Dmpg123=enabled @@ -193,6 +211,13 @@ else MPD_CONF_OPTS += -Dneighbor=false endif +ifeq ($(BR2_PACKAGE_MPD_OPENAL),y) +MPD_DEPENDENCIES += openal +MPD_CONF_OPTS += -Dopenal=enabled +else +MPD_CONF_OPTS += -Dopenal=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_OPUS),y) MPD_DEPENDENCIES += opus libogg MPD_CONF_OPTS += -Dopus=enabled @@ -227,6 +252,13 @@ else MPD_CONF_OPTS += -Dshout=disabled endif +ifeq ($(BR2_PACKAGE_MPD_SIDPLAY),y) +MPD_DEPENDENCIES += libsidplay2 +MPD_CONF_OPTS += -Dsidplay=enabled +else +MPD_CONF_OPTS += -Dsidplay=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y) MPD_DEPENDENCIES += yajl MPD_CONF_OPTS += -Dsoundcloud=enabled @@ -269,7 +301,7 @@ endif ifeq ($(BR2_PACKAGE_MPD_UPNP),y) MPD_DEPENDENCIES += \ expat \ - $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18) + libupnp MPD_CONF_OPTS += -Dupnp=enabled else MPD_CONF_OPTS += -Dupnp=disabled @@ -289,8 +321,17 @@ else MPD_CONF_OPTS += -Dwavpack=disabled endif +ifeq ($(BR2_PACKAGE_MPD_ZZIP),y) +MPD_DEPENDENCIES += zziplib +MPD_CONF_OPTS += -Dzzip=enabled +else +MPD_CONF_OPTS += -Dzzip=disabled +endif + define MPD_INSTALL_EXTRA_FILES $(INSTALL) -m 0644 -D package/mpd/mpd.conf $(TARGET_DIR)/etc/mpd.conf + mkdir -p $(TARGET_DIR)/var/lib/mpd/music + mkdir -p $(TARGET_DIR)/var/lib/mpd/playlists endef MPD_POST_INSTALL_TARGET_HOOKS += MPD_INSTALL_EXTRA_FILES diff --git a/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch b/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch index 630bbd6642..60d6b4bb02 100644 --- a/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch +++ b/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch @@ -9,6 +9,8 @@ that building the shared library can be disabled in pure static library contexts. Signed-off-by: Thomas Petazzoni +[Fabrice: update for 2.5.0 (add libmpdec++)] +Signed-off-by: Fabrice Fontaine --- Makefile.in | 6 ++++++ configure.ac | 13 +++++++++++++ @@ -37,11 +39,25 @@ index 2c91891..0c44f36 100644 +endif +ifeq ($(BUILD_SHARED),yes) $(INSTALL) -m 755 libmpdec/$(LIBSHARED) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED) $(LIBSONAME) && ln -sf $(LIBSHARED) libmpdec.so + cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED) $(LIBSONAME) && ln -sf $(LIBSHARED) $(LIBNAME) +endif $(INSTALL) -d -m 755 $(DESTDIR)$(docdir) cp -R doc/* $(DESTDIR)$(docdir) +@@ -74,9 +80,13 @@ install_libcxx: install_lib + $(INSTALL) -d -m 755 $(DESTDIR)$(includedir) + $(INSTALL) -m 644 libmpdec++/decimal.hh $(DESTDIR)$(includedir) + $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) ++ifeq ($(BUILD_STATIC),yes) + $(INSTALL) -m 644 libmpdec++/$(LIBSTATIC_CXX) $(DESTDIR)$(libdir) ++endif ++ifeq ($(BUILD_SHARED),yes) + $(INSTALL) -m 755 libmpdec++/$(LIBSHARED_CXX) $(DESTDIR)$(libdir) + cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED_CXX) $(LIBSONAME_CXX) && ln -sf $(LIBSHARED_CXX) $(LIBNAME_CXX) ++endif + cp -R doc/libmpdec++ $(DESTDIR)$(docdir) + + diff --git a/configure.ac b/configure.ac index 7ee8f86..2b3e505 100644 --- a/configure.ac @@ -96,6 +112,36 @@ index d9619a3..985c73c 100644 OBJS := basearith.o context.o constants.o convolute.o crt.o mpdecimal.o \ +diff --git a/libmpdec/Makefile.in b/libmpdec/Makefile.in +index d9619a3..985c73c 100644 +--- a/libmpdec++/Makefile.in ++++ b/libmpdec++/Makefile.in +@@ -13,6 +13,8 @@ LIBSTATIC_CXX = @LIBSTATIC_CXX@ + LIBNAME_CXX = @LIBNAME_CXX@ + LIBSONAME_CXX = @LIBSONAME_CXX@ + LIBSHARED_CXX = @LIBSHARED_CXX@ ++BUILD_SHARED = @BUILD_SHARED@ ++BUILD_STATIC = @BUILD_STATIC@ + + CXX = @CXX@ + LDXX = @LDXX@ +@@ -39,8 +41,15 @@ ifeq ($(MAKECMDGOALS), profile_use) + MPD_LDXXFLAGS += $(MPD_PUSE) + endif + ++ifeq ($(BUILD_SHARED),yes) ++TARGETS += $(LIBSHARED_CXX) ++endif ++ ++ifeq ($(BUILD_STATIC),yes) ++TARGETS += $(LIBSTATIC_CXX) ++endif + +-default: $(LIBSTATIC_CXX) $(LIBSHARED_CXX) ++default: $(TARGETS) + + + OBJS := decimal.o -- 2.1.0 diff --git a/package/mpdecimal/mpdecimal.hash b/package/mpdecimal/mpdecimal.hash index e152243230..c931ee4a6d 100644 --- a/package/mpdecimal/mpdecimal.hash +++ b/package/mpdecimal/mpdecimal.hash @@ -1,4 +1,4 @@ # From http://www.bytereef.org/mpdecimal/download.html -sha256 83c628b90f009470981cf084c5418329c88b19835d8af3691b930afccb7d79c7 mpdecimal-2.4.2.tar.gz +sha256 15417edc8e12a57d1d9d75fa7e3f22b158a3b98f44db9d694cfd2acde8dfa0ca mpdecimal-2.5.0.tar.gz # Locally computed -sha256 e384413a13f061a50f6fadceefc0f326c22d83c13ae94978e1f86d0468332c19 LICENSE.txt +sha256 b07528d8b1dbf1e2d2741052996f0876e23342ce2d30d0effa39c5457716c25a LICENSE.txt diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk index 2d06d0f6b4..fa310a2274 100644 --- a/package/mpdecimal/mpdecimal.mk +++ b/package/mpdecimal/mpdecimal.mk @@ -5,7 +5,7 @@ ################################################################################ MPDECIMAL_SITE = http://www.bytereef.org/software/mpdecimal/releases -MPDECIMAL_VERSION = 2.4.2 +MPDECIMAL_VERSION = 2.5.0 MPDECIMAL_INSTALL_STAGING = YES MPDECIMAL_LICENSE = BSD-2-Clause MPDECIMAL_LICENSE_FILES = LICENSE.txt @@ -22,4 +22,10 @@ MPDECIMAL_CONF_ENV += MACHINE=ansi32 endif endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +MPDECIMAL_CONF_OPTS += --enable-cxx +else +MPDECIMAL_CONF_OPTS += --disable-cxx +endif + $(eval $(autotools-package)) diff --git a/package/mpfr/mpfr.hash b/package/mpfr/mpfr.hash index ea44b8c20a..35056f626a 100644 --- a/package/mpfr/mpfr.hash +++ b/package/mpfr/mpfr.hash @@ -1,5 +1,5 @@ -# From http://lists.gnu.org/archive/html/info-gnu/2019-01/msg00019.html -sha256 1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a mpfr-4.0.2.tar.xz +# Locally calculated +sha256 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f mpfr-4.1.0.tar.xz # Hash for license file -sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER +sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index ef2999eb16..cd558dae0e 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -4,11 +4,12 @@ # ################################################################################ -MPFR_VERSION = 4.0.2 +MPFR_VERSION = 4.1.0 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ MPFR_LICENSE_FILES = COPYING.LESSER +MPFR_CPE_ID_VENDOR = gnu MPFR_INSTALL_STAGING = YES MPFR_DEPENDENCIES = gmp HOST_MPFR_DEPENDENCIES = host-gmp diff --git a/package/mpg123/mpg123.hash b/package/mpg123/mpg123.hash index 02c40ad086..e5fb09b46a 100644 --- a/package/mpg123/mpg123.hash +++ b/package/mpg123/mpg123.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/mpg123/files/mpg123/1.25.13/ -sha1 2b6428dc563c56fb1374191d1244c8ac928e4d89 mpg123-1.25.13.tar.bz2 -md5 294a6c30546504ec3d0deac2b2ea22be mpg123-1.25.13.tar.bz2 +# From https://sourceforge.net/projects/mpg123/files/mpg123/1.25.15/ +sha1 286fcb83afad3ecbfea60434d3ee1b6d7f41bb7c mpg123-1.25.15.tar.bz2 +md5 9a050d4b3573661c606f8095a3f34ca3 mpg123-1.25.15.tar.bz2 # Locally calculated -sha256 90306848359c793fd43b9906e52201df18775742dc3c81c06ab67a806509890a mpg123-1.25.13.tar.bz2 +sha256 503a76d82d97f1a6513bbeb284e460a99fb17ef80f23a661d8fc026ce6adcbbc mpg123-1.25.15.tar.bz2 # License file sha256 f40e0dd86b27b52e429b693a87b3ca63ae0a98a4d142e77207aa6bdf1db7a295 COPYING diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index 5e3b7fd94e..fbb011c2c2 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -4,13 +4,13 @@ # ################################################################################ -MPG123_VERSION = 1.25.13 +MPG123_VERSION = 1.25.15 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) -MPG123_CONF_OPTS = --disable-lfs-alias MPG123_INSTALL_STAGING = YES MPG123_LICENSE = LGPL-2.1 MPG123_LICENSE_FILES = COPYING +MPG123_CPE_ID_VENDOR = mpg123 MPG123_DEPENDENCIES = host-pkgconf MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu) diff --git a/package/mpv/Config.in b/package/mpv/Config.in index 32910f2245..81b1e24b5f 100644 --- a/package/mpv/Config.in +++ b/package/mpv/Config.in @@ -1,12 +1,21 @@ +config BR2_PACKAGE_MPV_SUPPORTS_VAAPI + bool + default y if BR2_PACKAGE_LIBDRM && BR2_PACKAGE_MESA3D_OPENGL_EGL + default y if BR2_PACKAGE_WAYLAND + default y if BR2_PACKAGE_XORG7 + config BR2_PACKAGE_MPV bool "mpv" + depends on BR2_INSTALL_LIBSTDCPP # libass + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h + depends on BR2_TOOLCHAIN_HAS_ATOMIC select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE + select BR2_PACKAGE_LIBASS select BR2_PACKAGE_ZLIB select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND # Select xkbcommon for wayland to avoid being mysterious @@ -23,8 +32,10 @@ config BR2_PACKAGE_MPV https://mpv.io/ -comment "mpv needs a toolchain w/ threads, gcc >= 4.5" +comment "mpv needs a toolchain w/ C++, threads, gcc >= 4.9" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash index 734b6a3663..0c7eb5f8a5 100644 --- a/package/mpv/mpv.hash +++ b/package/mpv/mpv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623 v0.29.1.tar.gz -sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL +sha256 100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9 mpv-0.33.1.tar.gz +sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index 8619de5a8e..f8ecaeb78a 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -4,14 +4,14 @@ # ################################################################################ -MPV_VERSION = 0.29.1 -MPV_SITE = https://github.com/mpv-player/mpv/archive -MPV_SOURCE = v$(MPV_VERSION).tar.gz +MPV_VERSION = 0.33.1 +MPV_SITE = $(call github,mpv-player,mpv,v$(MPV_VERSION)) MPV_DEPENDENCIES = \ - host-pkgconf ffmpeg zlib \ + host-pkgconf ffmpeg libass zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) MPV_LICENSE = GPL-2.0+ MPV_LICENSE_FILES = LICENSE.GPL +MPV_CPE_ID_VENDOR = mpv MPV_NEEDS_EXTERNAL_WAF = YES @@ -24,12 +24,19 @@ MPV_CONF_OPTS = \ --disable-coreaudio \ --disable-cuda-hwaccel \ --disable-opensles \ - --disable-rsound \ --disable-rubberband \ --disable-uchardet \ - --disable-vapoursynth \ - --disable-vapoursynth-lazy \ - --disable-mali-fbdev + --disable-vapoursynth + +ifeq ($(BR2_REPRODUCIBLE),y) +MPV_CONF_OPTS += --disable-build-date +endif + +ifeq ($(BR2_STATIC_LIBS),y) +MPV_CONF_OPTS += --disable-libmpv-shared --enable-libmpv-static +else +MPV_CONF_OPTS += --enable-libmpv-shared --disable-libmpv-static +endif # ALSA support requires pcm+mixer ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) @@ -43,8 +50,13 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) MPV_CONF_OPTS += --enable-gbm MPV_DEPENDENCIES += mesa3d +ifeq ($(BR2_PACKAGE_LIBDRM),y) +MPV_CONF_OPTS += --enable-egl-drm else -MPV_CONF_OPTS += --disable-gbm +MPV_CONF_OPTS += --disable-egl-drm +endif +else +MPV_CONF_OPTS += --disable-gbm --disable-egl-drm endif # jack support @@ -80,14 +92,6 @@ else MPV_CONF_OPTS += --disable-libarchive endif -# libass subtitle support -ifeq ($(BR2_PACKAGE_LIBASS),y) -MPV_CONF_OPTS += --enable-libass -MPV_DEPENDENCIES += libass -else -MPV_CONF_OPTS += --disable-libass -endif - # bluray support ifeq ($(BR2_PACKAGE_LIBBLURAY),y) MPV_CONF_OPTS += --enable-libbluray @@ -112,14 +116,6 @@ else MPV_CONF_OPTS += --disable-dvdnav endif -# libdvdread -ifeq ($(BR2_PACKAGE_LIBDVDREAD),y) -MPV_CONF_OPTS += --enable-dvdread -MPV_DEPENDENCIES += libdvdread -else -MPV_CONF_OPTS += --disable-dvdread -endif - # libdrm ifeq ($(BR2_PACKAGE_LIBDRM),y) MPV_CONF_OPTS += --enable-drm @@ -128,16 +124,6 @@ else MPV_CONF_OPTS += --disable-drm endif -# libv4l -ifeq ($(BR2_PACKAGE_LIBV4L),y) -MPV_CONF_OPTS += \ - --enable-libv4l2 \ - --enable-tv -MPV_DEPENDENCIES += libv4l -else -MPV_CONF_OPTS += --disable-libv4l2 -endif - # libvdpau ifeq ($(BR2_PACKAGE_LIBVDPAU),y) MPV_CONF_OPTS += --enable-vdpau @@ -159,6 +145,12 @@ endif ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) MPV_CONF_OPTS += --enable-gl MPV_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +MPV_CONF_OPTS += --enable-gl +MPV_DEPENDENCIES += libgles +else ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +MPV_CONF_OPTS += --enable-gl +MPV_DEPENDENCIES += libegl else MPV_CONF_OPTS += --disable-gl endif @@ -171,14 +163,6 @@ else MPV_CONF_OPTS += --disable-pulse endif -# samba support -ifeq ($(BR2_PACKAGE_SAMBA4),y) -MPV_CONF_OPTS += --enable-libsmbclient -MPV_DEPENDENCIES += samba4 -else -MPV_CONF_OPTS += --disable-libsmbclient -endif - # SDL support # Sdl2 requires 64-bit sync intrinsics ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL2),yy) @@ -197,17 +181,16 @@ MPV_CONF_OPTS += --disable-rpi endif # va-api support -# This requires one or more of the egl-drm, wayland, x11 backends -# For now we support wayland and x11 -ifeq ($(BR2_PACKAGE_LIBVA),y) -ifneq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_XORG7),) +ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_MPV_SUPPORTS_VAAPI),yy) MPV_CONF_OPTS += --enable-vaapi MPV_DEPENDENCIES += libva +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy) +MPV_CONF_OPTS += --enable-vaapi-drm else -MPV_CONF_OPTS += --disable-vaapi +MPV_CONF_OPTS += --disable-vaapi-drm endif else -MPV_CONF_OPTS += --disable-vaapi +MPV_CONF_OPTS += --disable-vaapi --disable-vaapi-drm endif # wayland support @@ -235,4 +218,8 @@ else MPV_CONF_OPTS += --disable-x11 endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +MPV_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic" +endif + $(eval $(waf-package)) diff --git a/package/mraa/Config.in b/package/mraa/Config.in index cdd7b9e8f1..c845fe9f99 100644 --- a/package/mraa/Config.in +++ b/package/mraa/Config.in @@ -1,7 +1,15 @@ +config BR2_PACKAGE_MRAA_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + config BR2_PACKAGE_MRAA bool "mraa" + depends on BR2_PACKAGE_MRAA_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_arm || BR2_i386 || BR2_x86_64 help mraa is a C/C++ library with bindings to javascript & python to interface with the IO on Galileo, Edison & other @@ -10,5 +18,6 @@ config BR2_PACKAGE_MRAA http://iotdk.intel.com/docs/master/mraa -comment "mraa needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "mraa needs a toolchain w/ threads, dynamic library" + depends on BR2_PACKAGE_MRAA_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/mraa/mraa.hash b/package/mraa/mraa.hash index f2eb73ca74..f29a5ce838 100644 --- a/package/mraa/mraa.hash +++ b/package/mraa/mraa.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e4501e6936afb426c75b7d406c1a7a27b514297f640e887de4d88a2d9687f37b mraa-0.9.1.tar.gz -sha256 04f8503394c6d01c86538a693f6990fc1debd94119954ff4eae4407fe7c60a8e COPYING +sha256 5351ce9eb654014d8ea7f43bdb2d17e6d1955536938a2ea0d467f4008e614345 mraa-2.1.0.tar.gz +sha256 fac52622ed3badd86b34857b21777ab90296d6ccbc2ac0fd457c09fdeefa9ef1 COPYING diff --git a/package/mraa/mraa.mk b/package/mraa/mraa.mk index 5077859fa5..910339b386 100644 --- a/package/mraa/mraa.mk +++ b/package/mraa/mraa.mk @@ -4,22 +4,41 @@ # ################################################################################ -MRAA_VERSION = 0.9.1 -MRAA_SITE = $(call github,intel-iot-devkit,mraa,v$(MRAA_VERSION)) +MRAA_VERSION = 2.1.0 +MRAA_SITE = $(call github,eclipse,mraa,v$(MRAA_VERSION)) MRAA_LICENSE = MIT MRAA_LICENSE_FILES = COPYING MRAA_INSTALL_STAGING = YES +ifeq ($(BR2_i386),y) +MRAA_ARCH = i386 +else ifeq ($(BR2_x86_64),y) +MRAA_ARCH = x86_64 +else ifeq ($(BR2_arm)$(BR2_armeb),y) +MRAA_ARCH = arm +else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) +MRAA_ARCH = aarch64 +else ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y) +MRAA_ARCH = mips +endif + # USBPLAT only makes sense with FTDI4222, which requires the ftd2xx library, # which doesn't exist in buildroot - +# Disable C++ as it is used only by FTDI4222 and tests MRAA_CONF_OPTS += \ + -DBUILDARCH=$(MRAA_ARCH) \ + -DBUILDCPP=OFF \ -DBUILDSWIG=OFF \ -DUSBPLAT=OFF \ -DFTDI4222=OFF \ - -DIPK=OFF \ - -DRPM=OFF \ -DENABLEEXAMPLES=OFF \ -DBUILDTESTS=OFF +ifeq ($(BR2_PACKAGE_JSON_C),y) +MRAA_CONF_OPTS += -DJSONPLAT=ON +MRAA_DEPENDENCIES += json-c +else +MRAA_CONF_OPTS += -DJSONPLAT=OFF +endif + $(eval $(cmake-package)) diff --git a/package/mrouted/Config.in b/package/mrouted/Config.in index e5d9348d1b..f8dd173c4a 100644 --- a/package/mrouted/Config.in +++ b/package/mrouted/Config.in @@ -3,5 +3,24 @@ config BR2_PACKAGE_MROUTED depends on BR2_USE_MMU # fork() help An implementation of the DVMRP multicast routing protocol. + Unlike PIM a DVMRP router has a distance vector protocol (like + RIP) built-in to figure out the reverse-path to the multicast + source. This package comes with mrouted and mroutectl. Where + the latter is used to query status and control operation. + + Note: at least two interfaces with MULTICAST flag is requried. http://github.com/troglobit/mrouted + +if BR2_PACKAGE_MROUTED + +config BR2_PACKAGE_MROUTED_RSRR + bool "enable RSRR for RSVP" + help + Routing Support for Resource Reservation, currently used by + RSVP. This is an EXPERIMENTAL feature. + + For details, see: + http://tools.ietf.org/html/draft-ietf-rsvp-routing-02 + +endif diff --git a/package/mrouted/mrouted.hash b/package/mrouted/mrouted.hash index 8f10e014e3..188293025f 100644 --- a/package/mrouted/mrouted.hash +++ b/package/mrouted/mrouted.hash @@ -1,3 +1,6 @@ +# From https://github.com/troglobit/mrouted/releases/download/4.2/mrouted-4.2.tar.gz.md5 +md5 b921f9e152e039efdac745438ef8362c mrouted-4.2.tar.gz + # Locally calculated -sha256 179636d211a82d0140a3488c6b65e634b4838da23e50d8cdee15ef03fe9b46af mrouted-3.9.8.tar.gz -sha256 2e6c7d9e92afc391f584290c3817f2cdec1501621cf820abbd4bc4adc2e5b2ef LICENSE +sha256 689541334ea951286054b771640e9d0f26b6a3242ff7f3894a3ef1b680811b34 mrouted-4.2.tar.gz +sha256 834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29 LICENSE diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index b9a4eaba45..95da0c622c 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -4,24 +4,35 @@ # ################################################################################ -MROUTED_VERSION = 3.9.8 -MROUTED_SITE = $(call github,troglobit,mrouted,$(MROUTED_VERSION)) +MROUTED_VERSION = 4.2 +MROUTED_SITE = \ + https://github.com/troglobit/mrouted/releases/download/$(MROUTED_VERSION) MROUTED_DEPENDENCIES = host-bison MROUTED_LICENSE = BSD-3-Clause MROUTED_LICENSE_FILES = LICENSE +MROUTED_CPE_ID_VENDOR = troglobit -define MROUTED_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_MAKE_ENV) $(@D)/configure --enable-rsrr \ - ) +ifeq ($(BR2_PACKAGE_MROUTED_RSRR),y) +MROUTED_CONF_OPTS += --enable-rsrr +else +MROUTED_CONF_OPTS += --disable-rsrr +endif + +define MROUTED_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D package/mrouted/S41mrouted \ + $(TARGET_DIR)/etc/init.d/S41mrouted endef -define MROUTED_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) +define MROUTED_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/mrouted.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mrouted.service endef -define MROUTED_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) prefix=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install +# We will asume that CONFIG_NET and CONFIG_INET are already +# set in the kernel configuration provided by the user. +define MROUTED_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_MULTICAST) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_MROUTE) endef -$(eval $(generic-package)) +$(eval $(autotools-package)) diff --git a/package/msgpack/msgpack.hash b/package/msgpack/msgpack.hash index 6b3a7ef134..5d432ba0ec 100644 --- a/package/msgpack/msgpack.hash +++ b/package/msgpack/msgpack.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ff865a36bad5c72b8e7ebc4b7cf5f27a820fce4faff9c571c1791e3728355a39 msgpack-3.2.0.tar.gz +sha256 6e114d12a5ddb8cb11f669f83f32246e484a8addd0ce93f274996f1941c1f07b msgpack-3.3.0.tar.gz sha256 664550b43996452a5a2c7471bb0ff77185a58c69ccafa60f983dc4c162e1ee22 COPYING sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/msgpack/msgpack.mk b/package/msgpack/msgpack.mk index 1e13464ca1..996b5a2f7c 100644 --- a/package/msgpack/msgpack.mk +++ b/package/msgpack/msgpack.mk @@ -4,8 +4,8 @@ # ################################################################################ -MSGPACK_VERSION = 3.2.0 -MSGPACK_SITE = $(call github,msgpack,msgpack-c,cpp-$(MSGPACK_VERSION)) +MSGPACK_VERSION = 3.3.0 +MSGPACK_SITE = https://github.com/msgpack/msgpack-c/releases/download/cpp-$(MSGPACK_VERSION) MSGPACK_LICENSE = BSL-1.0 MSGPACK_LICENSE_FILES = COPYING LICENSE_1_0.txt MSGPACK_INSTALL_STAGING = YES diff --git a/package/msmtp/msmtp.hash b/package/msmtp/msmtp.hash index 9849c547c2..1e73d92470 100644 --- a/package/msmtp/msmtp.hash +++ b/package/msmtp/msmtp.hash @@ -1,6 +1,7 @@ # Locally calculated after checking signature -# https://marlam.de/msmtp/releases/msmtp-1.8.6.tar.xz.sig -sha256 6625f147430c65ba8527f52c4fe5d4d33552d3c0fb6d793ba7df819a3b3042e1 msmtp-1.8.6.tar.xz +# https://marlam.de/msmtp/releases/msmtp-1.8.14.tar.xz.sig +# with key 2F61B4828BBA779AECB3F32703A2A4AB1E32FD34 +sha256 d56f065d711486e9c234618515a02a48a48dab4051b34f3e108fbecb6fb773b4 msmtp-1.8.14.tar.xz # Hash for license file: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk index 1518aa10e4..3db36f4cd0 100644 --- a/package/msmtp/msmtp.mk +++ b/package/msmtp/msmtp.mk @@ -4,13 +4,14 @@ # ################################################################################ -MSMTP_VERSION = 1.8.6 +MSMTP_VERSION = 1.8.14 MSMTP_SITE = https://marlam.de/msmtp/releases MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf MSMTP_CONF_OPTS = --disable-gai-idn MSMTP_LICENSE = GPL-3.0+ MSMTP_LICENSE_FILES = COPYING +MSMTP_CPE_ID_VENDOR = marlam # msmtpd needs fork ifeq ($(BR2_USE_MMU),y) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 590ca7f5ef..c45dd1e2b7 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -54,6 +54,9 @@ config BR2_PACKAGE_MTD_FLASH_OTP_LOCK config BR2_PACKAGE_MTD_FLASH_OTP_WRITE bool "flash_otp_write" +config BR2_PACKAGE_MTD_FLASH_OTP_ERASE + bool "flash_otp_erase" + config BR2_PACKAGE_MTD_FLASH_UNLOCK bool "flash_unlock" default y @@ -95,6 +98,9 @@ config BR2_PACKAGE_MTD_NANDWRITE bool "nandwrite" default y +config BR2_PACKAGE_MTD_NANDFLIPBITS + bool "nandflipbits" + config BR2_PACKAGE_MTD_NFTLDUMP bool "nftldump" @@ -137,6 +143,14 @@ config BR2_PACKAGE_MTD_UBIFORMAT bool "ubiformat" default y +config BR2_PACKAGE_MTD_UBIHEALTHD + bool "ubihealthd" + default y + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # getrandom() + +comment "ubihealthd needs a toolchain w/ headers >= 3.17" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 + config BR2_PACKAGE_MTD_UBIMKVOL bool "ubimkvol" default y diff --git a/package/mtd/mtd.hash b/package/mtd/mtd.hash index 2e23fbb819..481788f844 100644 --- a/package/mtd/mtd.hash +++ b/package/mtd/mtd.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.1.tar.bz2.asc -sha256 8d15e8b70f036d6af1a66011f8ca0e048e9675fa7983d33bea92c24313a232d2 mtd-utils-2.1.1.tar.bz2 -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.3.tar.bz2.asc +sha256 11305a5daf6fc6ed85120695c8593290b577effb039adbfa63d35b4418ff5630 mtd-utils-2.1.3.tar.bz2 +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 3477460200..6385b9ee0a 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -4,11 +4,13 @@ # ################################################################################ -MTD_VERSION = 2.1.1 +MTD_VERSION = 2.1.3 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils MTD_LICENSE = GPL-2.0 MTD_LICENSE_FILES = COPYING +MTD_CPE_ID_VENDOR = mtd-utils_project +MTD_CPE_ID_PRODUCT = mtd-utils MTD_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y) @@ -21,7 +23,8 @@ endif ifeq ($(BR2_PACKAGE_MTD_UBIFS_UTILS),y) MTD_DEPENDENCIES += util-linux zlib lzo host-pkgconf MTD_CONF_OPTS += --with-ubifs -ifeq ($(BR2_PACKAGE_OPENSSL),y) +# crypto needs linux/hash_info.h +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12)$(BR2_PACKAGE_OPENSSL),yy) MTD_DEPENDENCIES += openssl MTD_CONF_OPTS += --with-crypto else @@ -37,6 +40,12 @@ else MTD_CONF_OPTS += --without-ubifs endif +ifeq ($(BR2_PACKAGE_MTD_UBIHEALTHD),y) +MTD_CONF_OPTS += --enable-ubihealthd +else +MTD_CONF_OPTS += --disable-ubihealthd +endif + ifeq ($(BR2_PACKAGE_MTD_TESTS),y) MTD_CONF_OPTS += --enable-tests --enable-install-tests else @@ -52,10 +61,11 @@ else MTD_CONF_OPTS += --without-xattr endif -HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-util-linux host-zstd +HOST_MTD_DEPENDENCIES = host-acl host-zlib host-lzo host-util-linux host-zstd HOST_MTD_CONF_OPTS = \ --with-jffs \ --with-ubifs \ + --without-crypto \ --disable-tests MKFS_JFFS2 = $(HOST_DIR)/sbin/mkfs.jffs2 @@ -70,6 +80,7 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP) += flash_otp_dump MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO) += flash_otp_info MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_LOCK) += flash_otp_lock MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_WRITE) += flash_otp_write +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_ERASE) += flash_otp_erase MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format @@ -92,6 +103,7 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIATTACH) += ubiattach MTD_TARGETS_$(BR2_PACKAGE_MTD_UBICRC32) += ubicrc32 MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIDETACH) += ubidetach MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIFORMAT) += ubiformat +MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIHEALTHD) += ubihealthd MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIMKVOL) += ubimkvol MTD_TARGETS_$(BR2_PACKAGE_MTD_UBINFO) += ubinfo MTD_TARGETS_$(BR2_PACKAGE_MTD_UBINIZE) += ubinize @@ -109,6 +121,7 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_INTEGCK) += integck MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDBITERRS) += nandbiterrs MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDPAGETEST) += nandpagetest MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDSUBPAGETEST) += nandsubpagetest +MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDFLIPBITS) += nandflipbits define MTD_INSTALL_TARGET_CMDS $(foreach f,$(MTD_TARGETS_y), \ @@ -119,8 +132,8 @@ endef # Those libraries are not installed by "make install", but are needed # by other packages, such as swupdate. define MTD_INSTALL_LIBS - $(INSTALL) -D -m 0755 $(@D)/include/libmtd.h $(STAGING_DIR)/usr/include/mtd/libmtd.h - $(INSTALL) -D -m 0755 $(@D)/include/libubi.h $(STAGING_DIR)/usr/include/mtd/libubi.h + $(INSTALL) -D -m 0755 $(@D)/include/libmtd.h $(STAGING_DIR)/usr/include/libmtd.h + $(INSTALL) -D -m 0755 $(@D)/include/libubi.h $(STAGING_DIR)/usr/include/libubi.h $(INSTALL) -D -m 0755 $(@D)/include/mtd/ubi-media.h $(STAGING_DIR)/usr/include/mtd/ubi-media.h $(INSTALL) -D -m 0755 $(@D)/libmtd.a $(STAGING_DIR)/usr/lib/libmtd.a $(INSTALL) -D -m 0755 $(@D)/libubi.a $(STAGING_DIR)/usr/lib/libubi.a diff --git a/package/mtdev/mtdev.hash b/package/mtdev/mtdev.hash index 7ead723ef4..355e50ff6f 100644 --- a/package/mtdev/mtdev.hash +++ b/package/mtdev/mtdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f mtdev-1.1.5.tar.bz2 -sha256 795bfe74daae59a97d3a0c8ec0ba0f08c243adf94a3aa7981a4136fce31d55b4 COPYING +sha256 15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0 mtdev-1.1.6.tar.bz2 +sha256 795bfe74daae59a97d3a0c8ec0ba0f08c243adf94a3aa7981a4136fce31d55b4 COPYING diff --git a/package/mtdev/mtdev.mk b/package/mtdev/mtdev.mk index f4c38d5c41..7191858187 100644 --- a/package/mtdev/mtdev.mk +++ b/package/mtdev/mtdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTDEV_VERSION = 1.1.5 +MTDEV_VERSION = 1.1.6 MTDEV_SOURCE = mtdev-$(MTDEV_VERSION).tar.bz2 MTDEV_SITE = http://bitmath.org/code/mtdev diff --git a/package/mtools/Config.in b/package/mtools/Config.in index 99a073ca83..43e14e2c0c 100644 --- a/package/mtools/Config.in +++ b/package/mtools/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_MTOOLS bool "mtools" depends on BR2_USE_WCHAR depends on BR2_USE_MMU # fork() + # runtime UTF conversion support + select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC help Mtools is a collection of utilities to access MS-DOS disks from Unix without mounting them. It supports Win'95 style diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 1efc99a6b2..86cfe693d9 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 c708ff513fada78060a9e55db7c8d169d82d0e3d4afbd7c2744dce6ae0bfdb6d mtools-4.0.23.tar.lz +sha256 d09cff66d7277ad36a7573fc3e9803bfa558cdda83baabaafbf7761317462283 mtools-4.0.26.tar.lz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index bd3444022f..6d63a565bd 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.23 +MTOOLS_VERSION = 4.0.26 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ diff --git a/package/mtr/mtr.mk b/package/mtr/mtr.mk index 7a4b140267..0400a12021 100644 --- a/package/mtr/mtr.mk +++ b/package/mtr/mtr.mk @@ -8,8 +8,18 @@ MTR_VERSION = 0.93 MTR_SITE = $(call github,traviscross,mtr,v$(MTR_VERSION)) MTR_AUTORECONF = YES MTR_CONF_OPTS = --without-gtk -MTR_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_NCURSES),ncurses) +MTR_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_LIBCAP),libcap) MTR_LICENSE = GPL-2.0 MTR_LICENSE_FILES = COPYING +MTR_SELINUX_MODULES = netutils + +ifeq ($(BR2_PACKAGE_NCURSES),y) +MTR_CONF_OPTS += --with-ncurses +MTR_DEPENDENCIES += ncurses +else +MTR_CONF_OPTS += --without-ncurses +endif $(eval $(autotools-package)) diff --git a/package/musl/musl.hash b/package/musl/musl.hash index 9d8b61e165..4ab18cebd8 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://musl.libc.org/releases/musl-1.2.0.tar.gz.asc -sha256 c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8 musl-1.2.0.tar.gz -sha256 afe1df384787fce3577f3356b8b0d417381483f7c704eacb63f8050349fac77a COPYRIGHT +# https://musl.libc.org/releases/musl-1.2.2.tar.gz.asc +sha256 9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd musl-1.2.2.tar.gz +sha256 f9bc4423732350eb0b3f7ed7e91d530298476f8fec0c6c427a1c04ade22655af COPYRIGHT diff --git a/package/musl/musl.mk b/package/musl/musl.mk index 9482c0b246..d4f26b50a7 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,10 +4,11 @@ # ################################################################################ -MUSL_VERSION = 1.2.0 +MUSL_VERSION = 1.2.2 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT +MUSL_CPE_ID_VENDOR = musl-libc # Before musl is configured, we must have the first stage # cross-compiler and the kernel headers diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index f0b0153221..1b58c50065 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 78423016b5f2fcb31bfd156999ff6638177be4459230d2ee61a81e5641d07378 mutt-1.13.3.tar.gz -sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL +sha256 4ae6d60f7f19854c375cc1c27b5768b71e9f450c2adc10c22e45de8a27de524a mutt-2.1.1.tar.gz +sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 9cf8304bfe..66616f032c 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,14 +4,17 @@ # ################################################################################ -MUTT_VERSION = 1.13.3 +MUTT_VERSION = 2.1.1 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL +MUTT_CPE_ID_VENDOR = mutt MUTT_DEPENDENCIES = ncurses MUTT_CONF_OPTS = --disable-doc --disable-smtp -# We're patching configure.ac -MUTT_AUTORECONF = YES + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +MUTT_CONF_ENV += LIBS=-latomic +endif ifeq ($(BR2_PACKAGE_LIBICONV),y) MUTT_DEPENDENCIES += libiconv @@ -29,6 +32,15 @@ else MUTT_CONF_OPTS += --without-idn --without-idn2 endif +ifeq ($(BR2_PACKAGE_LIBGPGME),y) +MUTT_DEPENDENCIES += libgpgme +MUTT_CONF_OPTS += \ + --enable-gpgme \ + --with-gpgme-prefix=$(STAGING_DIR)/usr +else +MUTT_CONF_OPTS += --disable-gpgme +endif + ifeq ($(BR2_PACKAGE_MUTT_IMAP),y) MUTT_CONF_OPTS += --enable-imap else @@ -42,15 +54,26 @@ MUTT_CONF_OPTS += --disable-pop endif # SSL support is only used by imap or pop3 module -ifneq ($(BR2_PACKAGET_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) +ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) ifeq ($(BR2_PACKAGE_OPENSSL),y) MUTT_DEPENDENCIES += openssl -MUTT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr +MUTT_CONF_OPTS += \ + --without-gnutls \ + --with-ssl=$(STAGING_DIR)/usr +else ifeq ($(BR2_PACKAGE_GNUTLS),y) +MUTT_DEPENDENCIES += gnutls +MUTT_CONF_OPTS += \ + --with-gnutls=$(STAGING_DIR)/usr \ + --without-ssl else -MUTT_CONF_OPTS += --without-ssl +MUTT_CONF_OPTS += \ + --without-gnutls \ + --without-ssl endif else -MUTT_CONF_OPTS += --without-ssl +MUTT_CONF_OPTS += \ + --without-gnutls \ + --without-ssl endif ifeq ($(BR2_PACKAGE_SQLITE),y) @@ -60,6 +83,13 @@ else MUTT_CONF_OPTS += --without-sqlite3 endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +MUTT_DEPENDENCIES += zlib +MUTT_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr +else +MUTT_CONF_OPTS += --without-zlib +endif + # Avoid running tests to check for: # - target system is *BSD # - C99 conformance (snprintf, vsnprintf) diff --git a/package/mxml/mxml.hash b/package/mxml/mxml.hash index 811064c315..70f82cada8 100644 --- a/package/mxml/mxml.hash +++ b/package/mxml/mxml.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 1ac8d252f62f9dc2b2004518c70d2da313bdfcd92b8350e215f46064a34b52fc mxml-3.1.tar.gz -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE -sha256 63cc06ba05adecb1fdf2c94460a98291fd71614865456e52a19a1e7cc674250f NOTICE +sha256 b894f6c64964f2e77902564c17ba00f5d077a7a24054e7c1937903b0bd42c974 mxml-3.2.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE +sha256 ed63aec4c75b9c21a5156b40052138032269bd27fd6f4bc0c51389807cdc7db9 NOTICE diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk index 8ca83e1118..85930ab388 100644 --- a/package/mxml/mxml.mk +++ b/package/mxml/mxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -MXML_VERSION = 3.1 +MXML_VERSION = 3.2 MXML_SITE = https://github.com/michaelrsweet/mxml/releases/download/v$(MXML_VERSION) MXML_LICENSE = Apache-2.0 with exceptions MXML_LICENSE_FILES = LICENSE NOTICE diff --git a/package/mxsldr/Config.in.host b/package/mxsldr/Config.in.host index 0a02877c8b..7c49f02012 100644 --- a/package/mxsldr/Config.in.host +++ b/package/mxsldr/Config.in.host @@ -1,9 +1,14 @@ config BR2_PACKAGE_HOST_MXSLDR bool "host mxsldr" depends on BR2_arm || BR2_armeb + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help This package contains tools to download and execute code on Freescale i.MX23 and i.MX28 SoC's through the Serial Download Protocol. https://gitlab.denx.de/denx/mxsldr + +comment "host mxsldr needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm || BR2_armeb + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/nano/Config.in b/package/nano/Config.in index 4b340ff5b8..b0b7a3e7a3 100644 --- a/package/nano/Config.in +++ b/package/nano/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_NANO A nice ncurses-based editor. Started out as a clone of pico. Great editor for new users. - http://www.nano-editor.org/ + https://www.nano-editor.org/ if BR2_PACKAGE_NANO diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 9193a8af32..277f224014 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v4/nano-4.9.2.tar.xz.asc +# https://www.nano-editor.org/dist/v5/nano-5.8.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 d8a25eea942ecee2d57b8e037eb4b28f030f818b78773b8fcb994ed5835d2ef6 nano-4.9.2.tar.xz +sha256 e43b63db2f78336e2aa123e8d015dbabc1720a15361714bfd4b1bb4e5e87768c nano-5.8.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 3b7ccf1129..2a20eca210 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -4,15 +4,12 @@ # ################################################################################ -NANO_VERSION_MAJOR = 4 -NANO_VERSION = $(NANO_VERSION_MAJOR).9.2 +NANO_VERSION_MAJOR = 5 +NANO_VERSION = $(NANO_VERSION_MAJOR).8 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ NANO_LICENSE_FILES = COPYING -NANO_CONF_OPTS = \ - --without-slang \ - --with-wordbounds NANO_DEPENDENCIES = ncurses ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) @@ -22,18 +19,23 @@ NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false NANO_MAKE_ENV += CURSES_LIB="-lncurses" endif -ifeq ($(BR2_PACKAGE_FILE),y) -NANO_DEPENDENCIES += file -NANO_CONF_OPTS += --enable-libmagic -else -NANO_CONF_OPTS += --disable-libmagic -endif - ifeq ($(BR2_PACKAGE_NANO_TINY),y) -NANO_CONF_OPTS += --enable-tiny +NANO_CONF_OPTS += \ + --enable-tiny \ + --disable-libmagic \ + --disable-color \ + --disable-nanorc define NANO_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/src/nano $(TARGET_DIR)/usr/bin/nano endef -endif +else +NANO_CONF_OPTS += --disable-tiny +ifeq ($(BR2_PACKAGE_FILE),y) +NANO_DEPENDENCIES += file +NANO_CONF_OPTS += --enable-libmagic --enable-color --enable-nanorc +else +NANO_CONF_OPTS += --disable-libmagic --disable-libmagic --disable-color +endif # BR2_PACKAGE_FILE +endif # BR2_PACKAGE_NANO_TINY $(eval $(autotools-package)) diff --git a/package/nasm/nasm.hash b/package/nasm/nasm.hash index d824f22b86..86c67d6ba5 100644 --- a/package/nasm/nasm.hash +++ b/package/nasm/nasm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5 nasm-2.14.02.tar.xz -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE +sha256 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f nasm-2.15.05.tar.xz +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk index 5a46fd0a4b..ecb0889363 100644 --- a/package/nasm/nasm.mk +++ b/package/nasm/nasm.mk @@ -4,10 +4,12 @@ # ################################################################################ -NASM_VERSION = 2.14.02 +NASM_VERSION = 2.15.05 NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz NASM_SITE = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) NASM_LICENSE = BSD-2-Clause NASM_LICENSE_FILES = LICENSE +NASM_CPE_ID_VENDOR = nasm +NASM_CPE_ID_PRODUCT = netwide_assembler $(eval $(host-autotools-package)) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index d856953c22..f0df35bc27 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.20/ -md5 910fe6c152f8c30ad8608388e6a4ce89 nbd-3.20.tar.xz -sha1 9240430266ff4bfb2316ef6d880056a9974a59fd nbd-3.20.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ +md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz +sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz # Locally calculated -sha256 e0e1b3538ab7ae5accf56180afd1a9887d415b98d21223b8ad42592b4af7d6cd nbd-3.20.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 5fd5555510..0a7f08b2cf 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,13 +4,15 @@ # ################################################################################ -NBD_VERSION = 3.20 +NBD_VERSION = 3.21 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs NBD_DEPENDENCIES = host-pkgconf libglib2 NBD_LICENSE = GPL-2.0 NBD_LICENSE_FILES = COPYING +NBD_CPE_ID_VENDOR = network_block_device_project +NBD_CPE_ID_PRODUCT = network_block_device ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) # We have linux/falloc.h diff --git a/package/ncdu/ncdu.hash b/package/ncdu/ncdu.hash index 285dc9bfa4..be2b6e0788 100644 --- a/package/ncdu/ncdu.hash +++ b/package/ncdu/ncdu.hash @@ -1,5 +1,5 @@ -# From https://dev.yorhel.nl/download/ncdu-1.14.2.tar.gz.sha256 -sha256 947a7f5c1d0cd4e338e72b4f5bc5e2873651442cec3cb012e04ad2c37152c6b1 ncdu-1.14.2.tar.gz +# From https://dev.yorhel.nl/ncdu +sha256 b02ddc4dbf1db139cc6fbbe2f54a282770380f0ca5c17089855eab52a9ea3fb0 ncdu-1.15.1.tar.gz # computed locally -sha256 978f49428f21714c973706030c0ef09983cc1e2889a1b7b521dbf8860870cf05 COPYING +sha256 978f49428f21714c973706030c0ef09983cc1e2889a1b7b521dbf8860870cf05 COPYING diff --git a/package/ncdu/ncdu.mk b/package/ncdu/ncdu.mk index 681c8bd87a..532f145b20 100644 --- a/package/ncdu/ncdu.mk +++ b/package/ncdu/ncdu.mk @@ -4,7 +4,7 @@ # ################################################################################ -NCDU_VERSION = 1.14.2 +NCDU_VERSION = 1.15.1 NCDU_SITE = http://dev.yorhel.nl/download NCDU_DEPENDENCIES = ncurses diff --git a/package/ncmpc/ncmpc.hash b/package/ncmpc/ncmpc.hash index 963c6d2601..b8f79a70b5 100644 --- a/package/ncmpc/ncmpc.hash +++ b/package/ncmpc/ncmpc.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 7c8eb727f6e12d8f97a53915b1b5632898b4afb335a1121c5e01c81df695615c ncmpc-0.37.tar.xz +sha256 17ff446447e002f2ed4342b7324263a830df7d76bcf177dce928f7d3a6f1f785 ncmpc-0.45.tar.xz # Hash for license file: -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index 29675f2256..9a394ba356 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -5,7 +5,7 @@ ################################################################################ NCMPC_VERSION_MAJOR = 0 -NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).37 +NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).45 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR) NCMPC_DEPENDENCIES = \ @@ -16,6 +16,7 @@ NCMPC_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) NCMPC_LICENSE = GPL-2.0+ NCMPC_LICENSE_FILES = COPYING +NCMPC_CPE_ID_VENDOR = ncmpc_project NCMPC_CONF_OPTS = \ -Dcurses=ncurses \ diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index c11650c766..5d9c6bb0dd 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -10,6 +10,13 @@ NCURSES_INSTALL_STAGING = YES NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING +NCURSES_CPE_ID_VENDOR = gnu +# Commit 4b21273d71d09 added upstream (security) patches up to 20200118 +NCURSES_IGNORE_CVES += CVE-2018-10754 +NCURSES_IGNORE_CVES += CVE-2018-19211 +NCURSES_IGNORE_CVES += CVE-2018-19217 +NCURSES_IGNORE_CVES += CVE-2019-17594 +NCURSES_IGNORE_CVES += CVE-2019-17595 NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config NCURSES_PATCH = \ $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ @@ -50,6 +57,9 @@ NCURSES_PATCH = \ ncurses-6.1-20200118.patch.gz \ ) +# ncurses-6.1-20191012.patch.gz +NCURSES_IGNORE_CVES += CVE-2019-17594 CVE-2019-17595 + NCURSES_CONF_OPTS = \ --without-cxx \ --without-cxx-binding \ @@ -184,6 +194,9 @@ define HOST_NCURSES_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/progs tic endef +HOST_NCURSES_CONF_ENV = \ + ac_cv_path_LDCONFIG="" + HOST_NCURSES_CONF_OPTS = \ --with-shared \ --without-gpm \ diff --git a/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch b/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch index f140a60441..0aa6fd2ba1 100644 --- a/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch +++ b/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch @@ -1,29 +1,30 @@ -From 9ff39800cec5f1dabba246b253794582d611bc6d Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 20 Feb 2015 10:44:15 -0600 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cody Guldner +Date: Tue, 14 Apr 2020 09:12:01 -0500 Subject: [PATCH] CMakeLists: don't hard code thumb code generation -Migrating to version 1.2.0 +Migrating to version 1.2.1 Signed-off-by: Baruch Siach Signed-off-by: Clayton Shotwell +Signed-off-by: Cody Guldner --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fdf01ec..34ae26e 100644 +index fc2a5e3..25da215 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -84,7 +84,7 @@ if(ANDROID_PLATFORM) - ${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ar - ${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ranlib") +@@ -135,7 +135,7 @@ if(ANDROID_PLATFORM) + ${CMAKE_C_FLAGS}") elseif(GNULINUX_PLATFORM) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -march=armv7-a -mfpu=vfp3") - set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon") - elseif(IOS_PLATFORM) - #set minimal target ios version.If not provided this option, Xcode + if(${NE10_TARGET_ARCH} STREQUAL "armv7") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3 -funsafe-math-optimizations") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -march=armv7-a -mfpu=vfp3 -funsafe-math-optimizations") + set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon") + # Turn on asm optimization for Linux on ARM v7. + set(NE10_ASM_OPTIMIZATION on) -- -1.9.1 +2.23.0 diff --git a/package/ne10/Config.in b/package/ne10/Config.in index 8d375793db..a84ac18c92 100644 --- a/package/ne10/Config.in +++ b/package/ne10/Config.in @@ -1,17 +1,17 @@ +config BR2_PACKAGE_NE10_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm && (BR2_ARM_FPU_NEON || BR2_ARM_FPU_NEON_VFPV4) + config BR2_PACKAGE_NE10 bool "ne10" - depends on BR2_arm - depends on BR2_ARM_FPU_NEON || BR2_ARM_FPU_NEON_VFPV4 + depends on BR2_PACKAGE_NE10_ARCH_SUPPORTS help The Ne10 project has been set up to provide a set of common, useful functions which have been heavily optimized for the - ARM Architecture and provide consistent well tested behavior - that can be easily incorporated into applications. C - interfaces to the functions are provided for both assembler - and NEON implementations. + ARM and AArch64 Architecture and provide consistent well + tested behavior that can be easily incorporated into + applications. C interfaces to the functions are provided for + both assembler and NEON implementations. http://projectne10.github.io/Ne10/ - -comment "ne10 needs a toolchain w/ neon" - depends on BR2_arm - depends on !(BR2_ARM_FPU_NEON || BR2_ARM_FPU_NEON_VFPV4) diff --git a/package/ne10/ne10.hash b/package/ne10/ne10.hash index 2c56215c1c..cdb6e013a1 100644 --- a/package/ne10/ne10.hash +++ b/package/ne10/ne10.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 450dac5bb3a2351019ae23792e97c3bf965d16a21c0598b73cea9fbc3b3a56af ne10-1.2.0.tar.gz +sha256 dd1a96610c0692cc80154ae123edd5d25e6e0a3f81d0c16a96425f3ef57b9929 ne10-1.2.1.tar.gz sha256 eb48041c8e0ad556cf72f2a6eff89c893aa5702bba4e163ca7798cce07e6c55e doc/LICENSE diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk index 2af664be39..e529caf2af 100644 --- a/package/ne10/ne10.mk +++ b/package/ne10/ne10.mk @@ -4,13 +4,17 @@ # ################################################################################ -NE10_VERSION = 1.2.0 +NE10_VERSION = 1.2.1 NE10_SITE = $(call github,projectNe10,Ne10,v$(NE10_VERSION)) NE10_LICENSE = BSD-3-Clause or Apache-2.0 NE10_LICENSE_FILES = doc/LICENSE NE10_INSTALL_STAGING = YES -NE10_CONF_OPTS = -DGNULINUX_PLATFORM=ON +NE10_CONF_OPTS = \ + -DGNULINUX_PLATFORM=ON \ + -DNE10_BUILD_EXAMPLES=OFF \ + -DNE10_BUILD_UNIT_TEST=OFF \ + -DNE10_LINUX_TARGET_ARCH=$(if $(BR2_aarch64),aarch64,armv7) ifeq ($(BR2_STATIC_LIBS),) NE10_CONF_OPTS += \ diff --git a/package/neard/Config.in b/package/neard/Config.in index 277e467ced..a60fb3f8f6 100644 --- a/package/neard/Config.in +++ b/package/neard/Config.in @@ -13,9 +13,7 @@ config BR2_PACKAGE_NEARD daemon is a part of the NFC stack provided by the Linux NFC project. - http://git.kernel.org/?p=network/nfc/neard.git;a=summary - - https://01.org/linux-nfc/ + https://git.kernel.org/pub/scm/network/nfc/neard.git if BR2_PACKAGE_NEARD diff --git a/package/neon/Config.in b/package/neon/Config.in index 983134339b..d055b37607 100644 --- a/package/neon/Config.in +++ b/package/neon/Config.in @@ -16,6 +16,8 @@ config BR2_PACKAGE_NEON_ZLIB config BR2_PACKAGE_NEON_SSL bool "SSL support" select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL help build with SSL support diff --git a/package/neon/neon.mk b/package/neon/neon.mk index 2c00e6a8b4..da53735d0e 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -8,6 +8,7 @@ NEON_VERSION = 0.30.2 NEON_SITE = http://www.webdav.org/neon NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README +NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES NEON_CONF_OPTS = --without-gssapi --disable-rpath NEON_CONFIG_SCRIPTS = neon-config diff --git a/package/net-tools/net-tools.hash b/package/net-tools/net-tools.hash index 510cac3659..e29415b8ff 100644 --- a/package/net-tools/net-tools.hash +++ b/package/net-tools/net-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f7cfe9e73825bac9ab1a6f99d1fc7f54bfd9d33a6f62ba58d28a566905c4e86c net-tools-479bb4a7e11a4084e2935c0a576388f92469225b.tar.gz +sha256 4c68ef33d97cc807fe437fa64a801355c36d638774c0c8a4342742f6bdceea78 net-tools-479bb4a7e11a4084e2935c0a576388f92469225b-br1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk index 985fe2e35e..eb268a6e14 100644 --- a/package/net-tools/net-tools.mk +++ b/package/net-tools/net-tools.mk @@ -9,6 +9,7 @@ NET_TOOLS_SITE = git://git.code.sf.net/p/net-tools/code NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) NET_TOOLS_LICENSE = GPL-2.0+ NET_TOOLS_LICENSE_FILES = COPYING +NET_TOOLS_CPE_ID_VENDOR = net-tools_project define NET_TOOLS_CONFIGURE_CMDS (cd $(@D); yes "" | ./configure.sh config.in ) diff --git a/package/netatalk/Config.in b/package/netatalk/Config.in index 1560a18747..225d5891c7 100644 --- a/package/netatalk/Config.in +++ b/package/netatalk/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_NETATALK depends on !BR2_STATIC_LIBS select BR2_PACKAGE_BERKELEYDB select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGPG_ERROR diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 1214fc3bf5..0c219a2316 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -14,6 +14,7 @@ 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 # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ diff --git a/package/netcat-openbsd/Config.in b/package/netcat-openbsd/Config.in index 4734ff9901..beaa8ed451 100644 --- a/package/netcat-openbsd/Config.in +++ b/package/netcat-openbsd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_NETCAT_OPENBSD bool "netcat-openbsd" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS # libbsd depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS @@ -21,8 +22,9 @@ config BR2_PACKAGE_NETCAT_OPENBSD https://packages.debian.org/sid/netcat-openbsd -comment "netcat-openbsd needs a glibc toolchain w/ threads, headers >= 3.12" +comment "netcat-openbsd needs a glibc toolchain w/ dynamic library, threads, headers >= 3.12" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package/netcat-openbsd/netcat-openbsd.hash b/package/netcat-openbsd/netcat-openbsd.hash index cfa65ee24b..b70cae8860 100644 --- a/package/netcat-openbsd/netcat-openbsd.hash +++ b/package/netcat-openbsd/netcat-openbsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b46c11f83f66c41ad8f413e842c51a9fb2c495e9a2ed836e6ee75bc314545c30 netcat-openbsd-debian_1.195-2.tar.gz -sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright +sha256 55e578f652cbf6ffc95f75ea3e2645ab335fab63649568bd7cdb0a6331ca87de netcat-openbsd-debian_1.195-2-br1.tar.gz +sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index eb7ddcac27..939c9fa9fb 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -8,5 +8,6 @@ NETCAT_VERSION = 0.7.1 NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION) NETCAT_LICENSE = GPL-2.0+ NETCAT_LICENSE_FILES = COPYING +NETCAT_CPE_ID_VENDOR = netcat_project $(eval $(autotools-package)) diff --git a/package/netdata/netdata.hash b/package/netdata/netdata.hash index 2d6bd2a9a8..8d5ce51fca 100644 --- a/package/netdata/netdata.hash +++ b/package/netdata/netdata.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b6a80ac1e86d8a8d6fa16bba2ad15e8a8e5a89e3437cb7f30c538d11b95b5325 netdata-1.21.0.tar.gz +sha256 60cdde3f1f8bd9035fef6a566053c0a7195d1714b5da6814473263e85382b4a8 netdata-1.21.1.tar.gz sha256 0e5fd9d833efe9b79f784d1903281554af82d1b4261af67d35455728e5572aa6 LICENSE diff --git a/package/netdata/netdata.mk b/package/netdata/netdata.mk index 34d6d53d0f..34365cbf56 100644 --- a/package/netdata/netdata.mk +++ b/package/netdata/netdata.mk @@ -4,13 +4,15 @@ # ################################################################################ -NETDATA_VERSION = 1.21.0 +NETDATA_VERSION = 1.21.1 NETDATA_SITE = $(call github,netdata,netdata,v$(NETDATA_VERSION)) NETDATA_LICENSE = GPL-3.0+ NETDATA_LICENSE_FILES = LICENSE # netdata's source code is released without a generated configure script NETDATA_AUTORECONF = YES -NETDATA_CONF_OPTS = --disable-dbengine +NETDATA_CONF_OPTS = \ + --disable-dbengine \ + --disable-unit-tests NETDATA_DEPENDENCIES = libuv util-linux zlib ifeq ($(BR2_GCC_ENABLE_LTO),y) @@ -33,6 +35,13 @@ else NETDATA_CONF_OPTS += --disable-jsonc endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +NETDATA_CONF_OPTS += --with-libcap +NETDATA_DEPENDENCIES += libcap +else +NETDATA_CONF_OPTS += --without-libcap +endif + ifeq ($(BR2_PACKAGE_NFACCT),y) NETDATA_CONF_OPTS += --enable-plugin-nfacct NETDATA_DEPENDENCIES += nfacct diff --git a/package/netperf/netperf.mk b/package/netperf/netperf.mk index 8b2280830f..85f6bce033 100644 --- a/package/netperf/netperf.mk +++ b/package/netperf/netperf.mk @@ -5,7 +5,7 @@ ################################################################################ NETPERF_VERSION = 2.7.0 -NETPERF_SITE = ftp://ftp.netperf.org/netperf +NETPERF_SITE = http://sources.buildroot.org/netperf NETPERF_SOURCE = netperf-$(NETPERF_VERSION).tar.bz2 # gcc 5+ defaults to gnu99 which breaks netperf NETPERF_CONF_ENV = \ diff --git a/package/netsniff-ng/netsniff-ng.hash b/package/netsniff-ng/netsniff-ng.hash index c9408ccbdb..40b015cb0d 100644 --- a/package/netsniff-ng/netsniff-ng.hash +++ b/package/netsniff-ng/netsniff-ng.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -sha256 7949d38eb5b507700ea0f3c87e9f804d87b43f86ea5de0e961451044c2d3dba2 netsniff-ng-0.6.6.tar.xz +sha256 77d17d4158faf1d93c7d922a1bd7f093a8b437bd658292c830708540e10894ba netsniff-ng-0.6.8.tar.xz # Locally computed sha256 b353349ba51e0d4b59cf2f188f0c285296e154ce8c58954bc5e0dc0282a4db2d README sha256 8f6d85366f3763557d6ddd0637988b9ba11edef354e3c9302fff4262a235c387 COPYING diff --git a/package/netsniff-ng/netsniff-ng.mk b/package/netsniff-ng/netsniff-ng.mk index 283ecaf245..27bd707c84 100644 --- a/package/netsniff-ng/netsniff-ng.mk +++ b/package/netsniff-ng/netsniff-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETSNIFF_NG_VERSION = 0.6.6 +NETSNIFF_NG_VERSION = 0.6.8 NETSNIFF_NG_SITE = http://pub.netsniff-ng.org/netsniff-ng NETSNIFF_NG_SOURCE = netsniff-ng-$(NETSNIFF_NG_VERSION).tar.xz NETSNIFF_NG_LICENSE = GPL-2.0 @@ -13,7 +13,7 @@ NETSNIFF_NG_LICENSE_FILES = README COPYING NETSNIFF_NG_CONF_ENV = \ NACL_INC_DIR=/dev/null \ NACL_LIB_DIR=/dev/null -NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu +NETSNIFF_NG_DEPENDENCIES = host-pkgconf libnl libpcap libnetfilter_conntrack liburcu ifeq ($(BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN),y) NETSNIFF_NG_DEPENDENCIES += libcli libnet diff --git a/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch b/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch index 8431d46868..bf61fdfe7a 100644 --- a/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch +++ b/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch @@ -1,7 +1,7 @@ From bd59be8e4e339870a1400f6866a7b73ca11f6460 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 12 Sep 2018 20:16:39 +0200 -Subject: [PATCH 1/3] configure, static linking: Fix SSL checks +Subject: [PATCH] configure, static linking: Fix SSL checks During checking of DTLS_method, the stub program is linked only with -ssl libssl.a lacks some function from -lcrypto: @@ -19,13 +19,17 @@ See also https://sourceforge.net/p/net-snmp/patches/1374/. Signed-off-by: Giulio Benetti [bvanassche: Edited subject / rewrote this patch] +[yann.morin.1998@free.fr: + - use an actual backport of bd59be8e4e339870a1400f6866a7b73ca11f6460 +] +Signed-off-by: Yann E. MORIN --- configure | 52 ++++++++++++++++++++++++++++++++++--- configure.d/config_os_libs2 | 14 +++++++--- 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index 6504a8e58..1116cecaa 100755 +index 6504a8e58a..1116cecaad 100755 --- a/configure +++ b/configure @@ -23228,16 +23228,60 @@ fi @@ -74,12 +78,12 @@ index 6504a8e58..1116cecaa 100755 +$as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } +if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : + CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz" ++fi ++ ++ fi - fi -+ -+fi -+ + else + LIBCRYPTO="-l${CRYPTO}" + fi @@ -98,11 +102,11 @@ index 6504a8e58..1116cecaa 100755 netsnmp_save_LIBS="$LIBS" - LIBS="-lssl" + LIBS="-lssl $LIBCRYPTO" - for ac_func in TLS_method TLSv1_method DTLS_method DTLSv1_method SSL_library_init SSL_load_error_strings + for ac_func in TLS_method TLSv1_method DTLS_method DTLSv1_method SSL_library_init SSL_load_error_strings ERR_get_error_all do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 4a1ad1551..75214cfff 100644 +index 4a1ad1551f..75214cfff3 100644 --- a/configure.d/config_os_libs2 +++ b/configure.d/config_os_libs2 @@ -306,13 +306,19 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then @@ -138,5 +142,5 @@ index 4a1ad1551..75214cfff 100644 [SSL_library_init SSL_load_error_strings]) LIBS="$netsnmp_save_LIBS" -- -2.17.1 +2.25.1 diff --git a/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch b/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch index 3ec0c2278f..50387c8390 100644 --- a/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch +++ b/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch @@ -1,19 +1,22 @@ -From d8694929b12b47febb0f7f43f46041387874fe52 Mon Sep 17 00:00:00 2001 +From 13da2bcde8e22dd0127a668374fdf79bed04d353 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 17 Sep 2018 07:33:34 -0700 -Subject: [PATCH 2/3] configure: Fix -lcrypto -lz test +Subject: [PATCH] configure: Fix -lcrypto -lz test Avoid that the second crypto library test uses the cached result from the first test by explicitly clearing the cached test result. -Signed-off-by: Giulio Benetti +[yann.morin.1998@free.fr: + - use an actual backport of 13da2bcde8e22dd0127a668374fdf79bed04d353 +] +Signed-off-by: Yann E. MORIN --- configure | 1 + configure.d/config_os_libs2 | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure -index 1116cecaa..33b8c93e5 100755 +index 1116cecaad..33b8c93e57 100755 --- a/configure +++ b/configure @@ -23231,6 +23231,7 @@ if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : @@ -25,7 +28,7 @@ index 1116cecaa..33b8c93e5 100755 $as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } if ${ac_cv_lib_crypto_EVP_md5+:} false; then : diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 75214cfff..81788a209 100644 +index 75214cfff3..81788a2096 100644 --- a/configure.d/config_os_libs2 +++ b/configure.d/config_os_libs2 @@ -308,6 +308,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then @@ -37,5 +40,5 @@ index 75214cfff..81788a209 100644 [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], [-lz]) -- -2.17.1 +2.25.1 diff --git a/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch b/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch index a731f25761..2618cbee74 100644 --- a/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch +++ b/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch @@ -32,8 +32,8 @@ index 93044000b..c811c63ec 100644 - LIBS="-lssl $LIBCRYPTO" + LIBS="-lssl $LIBCRYPTO $LIBS" AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl - [SSL_library_init SSL_load_error_strings]) - LIBS="$netsnmp_save_LIBS" + [SSL_library_init SSL_load_error_strings]dnl + [ERR_get_error_all]) -- 2.17.1 diff --git a/package/netsnmp/Config.in b/package/netsnmp/Config.in index f22e38b335..dff0f18bee 100644 --- a/package/netsnmp/Config.in +++ b/package/netsnmp/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_NETSNMP bool "netsnmp" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help Suite of applications used to implement SNMP v1, SNMP v2c, and SNMP v3 using both IPv4 and IPv6. diff --git a/package/netsnmp/netsnmp.hash b/package/netsnmp/netsnmp.hash index d05a7de9da..9d196c8bee 100644 --- a/package/netsnmp/netsnmp.hash +++ b/package/netsnmp/netsnmp.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/net-snmp/files/net-snmp/5.8/ -md5 63bfc65fbb86cdb616598df1aff6458a net-snmp-5.8.tar.gz -sha1 78f70731df9dcdb13fe8f60eb7d80d7583da4d2c net-snmp-5.8.tar.gz -# Locally computed -sha256 b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf net-snmp-5.8.tar.gz -sha256 ed869ea395a1f125819a56676385ab0557a21507764bf56f2943302011381e59 COPYING +# Locally calculated after checking pgp signature at +# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9/net-snmp-5.9.tar.gz.asc +# using key D0F8F495DA6160C44EFFBF10F07B9D2DACB19FD6 +sha256 04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071 net-snmp-5.9.tar.gz + +# Hash for license file +sha256 ed869ea395a1f125819a56676385ab0557a21507764bf56f2943302011381e59 COPYING diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index ed573c51e3..1a9a776033 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -4,13 +4,17 @@ # ################################################################################ -NETSNMP_VERSION = 5.8 +NETSNMP_VERSION = 5.9 NETSNMP_SITE = https://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION) NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz NETSNMP_LICENSE = Various BSD-like NETSNMP_LICENSE_FILES = COPYING +NETSNMP_CPE_ID_VENDOR = net-snmp +NETSNMP_CPE_ID_PRODUCT = $(NETSNMP_CPE_ID_VENDOR) NETSNMP_INSTALL_STAGING = YES -NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=no +NETSNMP_CONF_ENV = \ + ac_cv_NETSNMP_CAN_USE_SYSCTL=no \ + ac_cv_path_PSPROG=/bin/ps NETSNMP_CONF_OPTS = \ --with-persistent-directory=/var/lib/snmp \ --with-defaults \ @@ -30,7 +34,6 @@ NETSNMP_CONF_OPTS = \ --with-sys-location="Unknown" \ --with-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES))" \ --with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \ - --with-out-transports="Unix" \ --disable-manuals NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install diff --git a/package/netsurf-buildsystem/netsurf-buildsystem.hash b/package/netsurf-buildsystem/netsurf-buildsystem.hash index 8e3bbabf05..dfdc999829 100644 --- a/package/netsurf-buildsystem/netsurf-buildsystem.hash +++ b/package/netsurf-buildsystem/netsurf-buildsystem.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2e2d93e25623761c5de39c8c94750c982335acc1c2da4439b1a2088ecd4455c9 netsurf-buildsystem-7574b41345968b5f7e9ca5875faccb1478ce0555.tar.gz +sha256 150a3a45c3f433a35451506b316a35c14630112fc557f9e1f02c9e08b50e0cce netsurf-buildsystem-7574b41345968b5f7e9ca5875faccb1478ce0555-br1.tar.gz sha256 b2ddc1d607332423f6cf415b2ac619a1c03dd565facdc39a571282a520929a65 llvm/LICENSE.TXT diff --git a/package/netsurf/netsurf.hash b/package/netsurf/netsurf.hash index 0f38ea2080..77de5c6de4 100644 --- a/package/netsurf/netsurf.hash +++ b/package/netsurf/netsurf.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11e384eaf47e65c186da5001f1055a02f2d72ff17b50f403b8392546a2cf65ff netsurf-all-3.9.tar.gz -sha256 55c4a7ae3953d720a462e69d1f128a20004933d12538be5314a33f8821675378 netsurf/COPYING +sha256 495adf6b6614ce36fca6c605f7c321f9cb4a3df838043158122678ce2b3325b7 netsurf-all-3.10.tar.gz +sha256 55c4a7ae3953d720a462e69d1f128a20004933d12538be5314a33f8821675378 netsurf/COPYING diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk index 0077adde28..1064698c12 100644 --- a/package/netsurf/netsurf.mk +++ b/package/netsurf/netsurf.mk @@ -4,18 +4,19 @@ # ################################################################################ -NETSURF_VERSION = 3.9 +NETSURF_VERSION = 3.10 NETSURF_SOURCE = netsurf-all-$(NETSURF_VERSION).tar.gz NETSURF_SITE = http://download.netsurf-browser.org/netsurf/releases/source-full NETSURF_LICENSE = GPL-2.0 NETSURF_LICENSE_FILES = netsurf/COPYING +NETSURF_CPE_ID_VENDOR = netsurf-browser # host-vim needed for the xxd utility NETSURF_DEPENDENCIES = expat jpeg libpng \ host-bison host-flex host-gperf host-pkgconf host-vim ifeq ($(BR2_PACKAGE_NETSURF_GTK),y) NETSURF_DEPENDENCIES += libgtk2 -NETSURF_FRONTEND = gtk +NETSURF_FRONTEND = gtk2 endif ifeq ($(BR2_PACKAGE_NETSURF_GTK3),y) diff --git a/package/nettle/0001-disable-testsuite-examples.patch b/package/nettle/0001-disable-testsuite-examples.patch index 82d97d5d21..aa37bcf8f3 100644 --- a/package/nettle/0001-disable-testsuite-examples.patch +++ b/package/nettle/0001-disable-testsuite-examples.patch @@ -9,9 +9,9 @@ Signed-off-by: "Yann E. MORIN" diff -durN nettle-2.7.1.orig/Makefile.in nettle-2.7.1/Makefile.in --- nettle-2.7.1.orig/Makefile.in 2013-05-28 16:21:54.000000000 +0200 +++ nettle-2.7.1/Makefile.in 2014-12-12 19:57:12.499805574 +0100 -@@ -16,7 +16,7 @@ +@@ -19,7 +19,7 @@ - OPT_ASM_SOURCES = @OPT_ASM_SOURCES@ + FAT_TEST_LIST = @FAT_TEST_LIST@ -SUBDIRS = tools testsuite examples +SUBDIRS = tools diff --git a/package/nettle/Config.in b/package/nettle/Config.in index 4890970120..cf4803c7bb 100644 --- a/package/nettle/Config.in +++ b/package/nettle/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_NETTLE object-oriented languages, in applications like LSH or GNUPG, or even in kernel space - http://www.lysator.liu.se/~nisse/nettle/ + https://www.lysator.liu.se/~nisse/nettle/ diff --git a/package/nettle/nettle.hash b/package/nettle/nettle.hash index 1e13aab411..cd32ad442e 100644 --- a/package/nettle/nettle.hash +++ b/package/nettle/nettle.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/nettle/nettle-3.5.1.tar.gz.sig -sha256 75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419 nettle-3.5.1.tar.gz +# https://ftp.gnu.org/gnu/nettle/nettle-3.7.3.tar.gz.sig +sha256 661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0 nettle-3.7.3.tar.gz # Locally calculated -sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk index 380d167521..3dbd0cb94b 100644 --- a/package/nettle/nettle.mk +++ b/package/nettle/nettle.mk @@ -4,12 +4,13 @@ # ################################################################################ -NETTLE_VERSION = 3.5.1 +NETTLE_VERSION = 3.7.3 NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive NETTLE_DEPENDENCIES = gmp NETTLE_INSTALL_STAGING = YES NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+ NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 +NETTLE_CPE_ID_VENDOR = nettle_project # don't include openssl support for (unused) examples as it has problems # with static linking NETTLE_CONF_OPTS = --disable-openssl diff --git a/package/network-manager-openvpn/network-manager-openvpn.hash b/package/network-manager-openvpn/network-manager-openvpn.hash index 0c52fb8d13..d0cbc7ca87 100644 --- a/package/network-manager-openvpn/network-manager-openvpn.hash +++ b/package/network-manager-openvpn/network-manager-openvpn.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.sha256sum -sha256 af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef NetworkManager-openvpn-1.8.10.tar.xz +# From https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.14.sha256sum +sha256 e7419053fc3b5a7e25f1a7517c313ad4531b6ea280255524ebb85a70c76fdbeb NetworkManager-openvpn-1.8.14.tar.xz # Locally computed -sha256 c39e345d992dfba62db265f8c6d6ff1d90c61d92876635ae05adbfa2f45fff46 COPYING +sha256 c39e345d992dfba62db265f8c6d6ff1d90c61d92876635ae05adbfa2f45fff46 COPYING diff --git a/package/network-manager-openvpn/network-manager-openvpn.mk b/package/network-manager-openvpn/network-manager-openvpn.mk index 1a872dc127..d5d4c5da42 100644 --- a/package/network-manager-openvpn/network-manager-openvpn.mk +++ b/package/network-manager-openvpn/network-manager-openvpn.mk @@ -5,7 +5,7 @@ ################################################################################ NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.8 -NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).10 +NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).14 NETWORK_MANAGER_OPENVPN_SOURCE = NetworkManager-openvpn-$(NETWORK_MANAGER_OPENVPN_VERSION).tar.xz NETWORK_MANAGER_OPENVPN_SITE = https://download.gnome.org/sources/NetworkManager-openvpn/$(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR) NETWORK_MANAGER_OPENVPN_DEPENDENCIES = network-manager openvpn diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index e6a3f5f04f..43987451b6 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -4,8 +4,9 @@ config BR2_PACKAGE_NETWORK_MANAGER depends on !BR2_STATIC_LIBS # gnutls 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_3_2 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_* depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 @@ -40,8 +41,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER - select BR2_PACKAGE_MODEM_MANAGER_LIBMBIM - select BR2_PACKAGE_MODEM_MANAGER_LIBQMI help This option enables support for ModemManager @@ -63,9 +62,10 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS endif -comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.2, dynamic library, wchar, threads" +comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 || \ !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 93a9b5017e..c9d4826a0b 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,6 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.20/NetworkManager-1.22.10.sha256sum -sha256 2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77 NetworkManager-1.22.10.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.32/NetworkManager-1.32.2.sha256sum +sha256 701d511067f757d0f92f412c98cdb49a74a6ba69448aabb1beadacbc171e3873 NetworkManager-1.32.2.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 f0543c137bc0eece552d42642d1bab31707ca3b3663d9c7a81ac3b270a4780e7 CONTRIBUTING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 e70c2d84a038b972beff16d8662f35567709dff2d552220bd1af6014f6d2215d CONTRIBUTING.md diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index c5749c857c..fbd5b1c85c 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,15 +4,18 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.22 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 +NETWORK_MANAGER_VERSION_MAJOR = 1.32 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ libgcrypt wireless_tools util-linux host-intltool readline libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) -NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING +NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md +NETWORK_MANAGER_CPE_ID_VENDOR = gnome +NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager +NETWORK_MANAGER_SELINUX_MODULES = networkmanager NETWORK_MANAGER_CONF_ENV = \ ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ @@ -23,6 +26,7 @@ NETWORK_MANAGER_CONF_ENV = \ ac_cv_file__etc_SuSE_release=no NETWORK_MANAGER_CONF_OPTS = \ + --disable-introspection \ --disable-tests \ --disable-qt \ --disable-more-warnings \ diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index cfca034019..df9c12ca44 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -7,7 +7,8 @@ config BR2_PACKAGE_NFS_UTILS depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc, rpcbind depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBTIRPC # IPv6 requires libtirpc - select BR2_PACKAGE_RPCBIND # runtime + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help The NFS Linux kernel server. @@ -15,6 +16,26 @@ config BR2_PACKAGE_NFS_UTILS if BR2_PACKAGE_NFS_UTILS +config BR2_PACKAGE_NFS_UTILS_NFSV4 + bool "NFSv4/NFSv4.1" + depends on !BR2_STATIC_LIBS # keyutils, lvm2 + select BR2_PACKAGE_KEYUTILS + select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_SQLITE + help + Enable NFSv4/NFSv4.1 support + +comment "NFSv4/NFSv4.1 support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + +config BR2_PACKAGE_NFS_UTILS_GSS + bool "gss" + depends on BR2_PACKAGE_NFS_UTILS_NFSV4 + select BR2_PACKAGE_LIBTIRPC_GSS + help + Enable GSS support + config BR2_PACKAGE_NFS_UTILS_RPCDEBUG bool "rpcdebug" help @@ -28,6 +49,7 @@ config BR2_PACKAGE_NFS_UTILS_RPC_LOCKD config BR2_PACKAGE_NFS_UTILS_RPC_NFSD bool "rpc.nfsd" default y + select BR2_PACKAGE_RPCBIND # runtime help NFS server diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index a30013af93..2073bebd8a 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.4.3/sha256sums.asc -sha256 af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599 nfs-utils-2.4.3.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc +sha256 51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd nfs-utils-2.5.4.tar.xz # Locally computed -sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING +sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 7af229a57e..763dd57ace 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,27 +4,28 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.4.3 +NFS_UTILS_VERSION = 2.5.4 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ NFS_UTILS_LICENSE_FILES = COPYING -NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libtirpc +NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libtirpc util-linux +NFS_UTILS_CPE_ID_VENDOR = linux-nfs +NFS_UTILS_AUTORECONF = YES NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no NFS_UTILS_CONF_OPTS = \ - --disable-nfsv4 \ - --disable-nfsv41 \ - --disable-gss \ - --disable-uuid \ --enable-tirpc \ --enable-ipv6 \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --with-rpcgen=$(HOST_DIR)/bin/rpcgen +HOST_NFS_UTILS_DEPENDENCIES = host-pkgconf host-libtirpc + HOST_NFS_UTILS_CONF_OPTS = \ + --enable-tirpc \ --disable-nfsv4 \ --disable-nfsv41 \ --disable-gss \ @@ -33,10 +34,9 @@ HOST_NFS_UTILS_CONF_OPTS = \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --disable-caps \ - --disable-tirpc \ --without-systemd \ - --with-rpcgen=internal -HOST_NFS_UTILS_DEPENDENCIES = host-pkgconf host-libtirpc + --with-rpcgen=internal \ + --with-tirpcinclude=$(HOST_DIR)/include/tirpc NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd @@ -44,6 +44,23 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \ usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service +ifeq ($(BR2_PACKAGE_NFS_UTILS_NFSV4),y) +NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-nfsv41 +NFS_UTILS_DEPENDENCIES += keyutils libevent lvm2 sqlite +else +NFS_UTILS_CONF_OPTS += --disable-nfsv4 --disable-nfsv41 +endif + +ifeq ($(BR2_PACKAGE_NFS_UTILS_GSS),y) +NFS_UTILS_CONF_OPTS += \ + --enable-gss \ + --enable-svcgss \ + --with-krb5=$(STAGING_DIR)/usr +NFS_UTILS_DEPENDENCIES += libkrb5 +else +NFS_UTILS_CONF_OPTS += --disable-gss --disable-svcgss +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) NFS_UTILS_CONF_OPTS += --enable-caps NFS_UTILS_DEPENDENCIES += libcap @@ -51,6 +68,12 @@ else NFS_UTILS_CONF_OPTS += --disable-caps endif +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) +NFS_UTILS_CONF_OPTS += --enable-uuid +else +NFS_UTILS_CONF_OPTS += --disable-uuid +endif + define NFS_UTILS_INSTALL_FIXUP cd $(TARGET_DIR) && rm -f $(NFS_UTILS_TARGETS_) touch $(TARGET_DIR)/etc/exports diff --git a/package/nftables/Config.in b/package/nftables/Config.in index 6452ab4f52..8d172b7256 100644 --- a/package/nftables/Config.in +++ b/package/nftables/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_NFTABLES bool "nftables" depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - select BR2_PACKAGE_GMP select BR2_PACKAGE_LIBMNL select BR2_PACKAGE_LIBNFTNL help diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index 93c816edc7..1112b7a8ad 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,3 +1,3 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78 nftables-0.9.3.tar.bz2 -sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING +sha256 68d6fdfe8ab02303e6b1f13968a4022da5b0120110eaee3233d806857937b66e nftables-0.9.6.tar.bz2 +sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 210e950c11..f9468c5250 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,14 +4,21 @@ # ################################################################################ -NFTABLES_VERSION = 0.9.3 +NFTABLES_VERSION = 0.9.6 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files -NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \ - host-pkgconf $(TARGET_NLS_DEPENDENCIES) +NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) NFTABLES_LICENSE = GPL-2.0 NFTABLES_LICENSE_FILES = COPYING NFTABLES_CONF_OPTS = --disable-man-doc --disable-pdf-doc +NFTABLES_SELINUX_MODULES = iptables + +ifeq ($(BR2_PACKAGE_GMP),y) +NFTABLES_DEPENDENCIES += gmp +NFTABLES_CONF_OPTS += --without-mini-gmp +else +NFTABLES_CONF_OPTS += --with-mini-gmp +endif ifeq ($(BR2_PACKAGE_READLINE),y) NFTABLES_DEPENDENCIES += readline @@ -40,4 +47,10 @@ endif NFTABLES_CONF_ENV = LIBS="$(NFTABLES_LIBS)" +define NFTABLES_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES_INET) +endef + $(eval $(autotools-package)) diff --git a/package/nghttp2/nghttp2.hash b/package/nghttp2/nghttp2.hash index e0512e891b..3702a91b5e 100644 --- a/package/nghttp2/nghttp2.hash +++ b/package/nghttp2/nghttp2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fc820a305e2f410fade1a3260f09229f15c0494fc089b0100312cd64a33a38c0 nghttp2-1.39.2.tar.gz -sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING +sha256 eacc6f0f8543583ecd659faf0a3f906ed03826f1d4157b536b4b385fe47c5bb8 nghttp2-1.41.0.tar.gz +sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING diff --git a/package/nghttp2/nghttp2.mk b/package/nghttp2/nghttp2.mk index 6a5ec72847..9190fa30d6 100644 --- a/package/nghttp2/nghttp2.mk +++ b/package/nghttp2/nghttp2.mk @@ -4,11 +4,12 @@ # ################################################################################ -NGHTTP2_VERSION = 1.39.2 +NGHTTP2_VERSION = 1.41.0 NGHTTP2_SITE = https://github.com/nghttp2/nghttp2/releases/download/v$(NGHTTP2_VERSION) NGHTTP2_LICENSE = MIT NGHTTP2_LICENSE_FILES = COPYING NGHTTP2_INSTALL_STAGING = YES +NGHTTP2_CPE_ID_VENDOR = nghttp2 NGHTTP2_DEPENDENCIES = host-pkgconf NGHTTP2_CONF_OPTS = --enable-lib-only diff --git a/package/nginx-dav-ext/Config.in b/package/nginx-dav-ext/Config.in index 1e60321fe3..9e3a0faf28 100644 --- a/package/nginx-dav-ext/Config.in +++ b/package/nginx-dav-ext/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_NGINX_DAV_EXT bool "nginx-dav-ext" depends on BR2_PACKAGE_NGINX_HTTP_DAV_MODULE - select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBXSLT help NGINX WebDAV missing commands support (PROPFIND & OPTIONS). diff --git a/package/nginx-dav-ext/nginx-dav-ext.hash b/package/nginx-dav-ext/nginx-dav-ext.hash index fbed87f0c0..07deab08db 100644 --- a/package/nginx-dav-ext/nginx-dav-ext.hash +++ b/package/nginx-dav-ext/nginx-dav-ext.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6b004eed8ea16ad8de4d304027bf0413cc323a95914e58625a7dc066481aae3a nginx-dav-ext-0.1.0.tar.gz -sha256 40581cf424621965adaf1461e97129520ff4fcfb62ed9965ec6fd50b7f4ddfca LICENSE +sha256 d2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859 nginx-dav-ext-3.0.0.tar.gz +sha256 e377bb81e5024682a66438306e8ff9541d843d3831e480aec2f58eb8d83e48de LICENSE diff --git a/package/nginx-dav-ext/nginx-dav-ext.mk b/package/nginx-dav-ext/nginx-dav-ext.mk index 695287ee2c..cce527e179 100644 --- a/package/nginx-dav-ext/nginx-dav-ext.mk +++ b/package/nginx-dav-ext/nginx-dav-ext.mk @@ -4,10 +4,10 @@ # ################################################################################ -NGINX_DAV_EXT_VERSION = 0.1.0 +NGINX_DAV_EXT_VERSION = 3.0.0 NGINX_DAV_EXT_SITE = $(call github,arut,nginx-dav-ext-module,v$(NGINX_DAV_EXT_VERSION)) NGINX_DAV_EXT_LICENSE = BSD-2-Clause NGINX_DAV_EXT_LICENSE_FILES = LICENSE -NGINX_DAV_EXT_DEPENDENCIES = expat +NGINX_DAV_EXT_DEPENDENCIES = libxslt $(eval $(generic-package)) diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index 2af11eeee2..b1fcbadd7a 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -2,9 +2,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY bool "nginx-modsecurity" depends on BR2_PACKAGE_NGINX_HTTP depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity - depends on !BR2_STATIC_LIBS # libmodsecurity depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity - select BR2_PACKAGE_PCRE # libmodsecurity select BR2_PACKAGE_LIBMODSECURITY help The ModSecurity-nginx connector is the connection @@ -13,7 +11,6 @@ config BR2_PACKAGE_NGINX_MODSECURITY https://github.com/SpiderLabs/ModSecurity-nginx -comment "nginx-modsecurity needs a toolchain w/ C++, dynamic library, threads" +comment "nginx-modsecurity needs a toolchain w/ C++, threads" depends on BR2_PACKAGE_NGINX_HTTP - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/nginx-modsecurity/nginx-modsecurity.hash b/package/nginx-modsecurity/nginx-modsecurity.hash index d2dd266ac1..fbaf1ca239 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.hash +++ b/package/nginx-modsecurity/nginx-modsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.1/modsecurity-nginx-v1.0.1.tar.gz.sha256 -sha256 def45a8db5bc9da14765eda75363457209a86c89538ccf5bfbd3aa02fa10833c modsecurity-nginx-v1.0.1.tar.gz +# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.2/modsecurity-nginx-v1.0.2.tar.gz.sha256 +sha256 41a6660c50508c60df59f8f09c444d18ef8112a4c118cdc791a3992390b78c32 modsecurity-nginx-v1.0.2.tar.gz # Localy calculated -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/nginx-modsecurity/nginx-modsecurity.mk b/package/nginx-modsecurity/nginx-modsecurity.mk index 6d33403d66..90ef8ecd51 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.mk +++ b/package/nginx-modsecurity/nginx-modsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_MODSECURITY_VERSION = 1.0.1 +NGINX_MODSECURITY_VERSION = 1.0.2 NGINX_MODSECURITY_SOURCE = modsecurity-nginx-v$(NGINX_MODSECURITY_VERSION).tar.gz NGINX_MODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v$(NGINX_MODSECURITY_VERSION) NGINX_MODSECURITY_LICENSE = Apache-2.0 diff --git a/package/nginx-naxsi/nginx-naxsi.hash b/package/nginx-naxsi/nginx-naxsi.hash index 1f289c56cd..4712ede2af 100644 --- a/package/nginx-naxsi/nginx-naxsi.hash +++ b/package/nginx-naxsi/nginx-naxsi.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4 nginx-naxsi-0.56.tar.gz -sha256 046812ddc8f250f85b5d6e04218c185849c618b309271ef9d8b01e92c6f7a6ac naxsi_src/naxsi_json.c +sha256 439c8677372d2597b4360bbcc10bc86490de1fc75695b193ad5df154a214d628 nginx-naxsi-1.3.tar.gz +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE +sha256 d0732bc23658db5b9749e3f9cd4fe0f9b3e132b5955adccb08821845fe2a21c8 naxsi_src/ext/libinjection/COPYING diff --git a/package/nginx-naxsi/nginx-naxsi.mk b/package/nginx-naxsi/nginx-naxsi.mk index 7cfa94a5d4..2dba8ad589 100644 --- a/package/nginx-naxsi/nginx-naxsi.mk +++ b/package/nginx-naxsi/nginx-naxsi.mk @@ -4,9 +4,9 @@ # ################################################################################ -NGINX_NAXSI_VERSION = 0.56 +NGINX_NAXSI_VERSION = 1.3 NGINX_NAXSI_SITE = $(call github,nbs-system,naxsi,$(NGINX_NAXSI_VERSION)) -NGINX_NAXSI_LICENSE = GPL-2.0+ with OpenSSL exception -NGINX_NAXSI_LICENSE_FILES = naxsi_src/naxsi_json.c +NGINX_NAXSI_LICENSE = GPL-3.0, BSD-3-Clause (libinjection) +NGINX_NAXSI_LICENSE_FILES = LICENSE naxsi_src/ext/libinjection/COPYING $(eval $(generic-package)) diff --git a/package/nginx-upload/nginx-upload.hash b/package/nginx-upload/nginx-upload.hash index ac04626eb0..b1d380eb1d 100644 --- a/package/nginx-upload/nginx-upload.hash +++ b/package/nginx-upload/nginx-upload.hash @@ -1,3 +1,3 @@ #Locally Computed: -sha256 5f1c3c2b9858b9cacd877a0f2df9b9263734e9cef8d837b73f0e659c0f7fde2d nginx-upload-70bee48f1811eecd255ed094ce9f0fb560c390c3.tar.gz +sha256 61ad5bcb67c8f688a4c7a5611311a351049361840b8dfe78be542066f475166e nginx-upload-4423994c7d8fb491d95867f6af968585d949e7a9.tar.gz sha256 825f9684c427e29fd1ab085d5c421a4cbf96a460f3c58884a42c28bfbac5e544 LICENCE diff --git a/package/nginx-upload/nginx-upload.mk b/package/nginx-upload/nginx-upload.mk index 738542571e..253ebeb34b 100644 --- a/package/nginx-upload/nginx-upload.mk +++ b/package/nginx-upload/nginx-upload.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_UPLOAD_VERSION = 70bee48f1811eecd255ed094ce9f0fb560c390c3 +NGINX_UPLOAD_VERSION = 4423994c7d8fb491d95867f6af968585d949e7a9 NGINX_UPLOAD_SITE = $(call github,vkholodkov,nginx-upload-module,$(NGINX_UPLOAD_VERSION)) NGINX_UPLOAD_LICENSE = BSD-3-Clause NGINX_UPLOAD_LICENSE_FILES = LICENCE diff --git a/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch b/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch index f186becdf8..ee7f3e9290 100644 --- a/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch +++ b/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch @@ -15,14 +15,16 @@ Signed-off-by: Samuel Martin Refresh for 1.8.0. Signed-off-by: Danomi Manchego +[rebased against v1.20.1] +Signed-off-by: Adam Duskett --- auto/cc/conf | 3 +++ auto/cc/name | 1 + auto/lib/libatomic/conf | 1 + auto/os/darwin | 3 +++ auto/os/linux | 4 ++++ - auto/unix | 8 ++++++++ - 6 files changed, 20 insertions(+) + auto/unix | 7 +++++++ + 6 files changed, 19 insertions(+) diff --git a/auto/cc/conf b/auto/cc/conf index afbca62b..ad42c800 100644 @@ -116,7 +118,7 @@ index 2c8a9bb8..eb4513ee 100644 ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs= -@@ -111,6 +112,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE" +@@ -136,6 +137,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE" ngx_feature="sendfile()" ngx_feature_name="NGX_HAVE_SENDFILE" ngx_feature_run=yes @@ -124,7 +126,7 @@ index 2c8a9bb8..eb4513ee 100644 ngx_feature_incs="#include #include " ngx_feature_path= -@@ -132,6 +134,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" +@@ -157,6 +159,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" ngx_feature="sendfile64()" ngx_feature_name="NGX_HAVE_SENDFILE64" ngx_feature_run=yes @@ -132,7 +134,7 @@ index 2c8a9bb8..eb4513ee 100644 ngx_feature_incs="#include #include " ngx_feature_path= -@@ -150,6 +153,7 @@ ngx_include="sys/prctl.h"; . auto/include +@@ -175,6 +178,7 @@ ngx_include="sys/prctl.h"; . auto/include ngx_feature="prctl(PR_SET_DUMPABLE)" ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE" ngx_feature_run=yes @@ -152,15 +154,15 @@ index 43d3b25a..3da00537 100644 ngx_feature_incs="#include #include " ngx_feature_path= -@@ -730,6 +731,7 @@ ngx_feature_test="char buf[1]; struct iovec vec[1]; ssize_t n; - ngx_feature="sys_nerr" - ngx_feature_name="NGX_SYS_NERR" - ngx_feature_run=value -+ngx_feature_run_force_result="$ngx_force_sys_nerr" - ngx_feature_incs='#include - #include ' - ngx_feature_path= -@@ -744,6 +746,7 @@ if [ $ngx_found = no ]; then +@@ -722,6 +723,7 @@ if [ $ngx_found = no ]; then + ngx_feature="sys_nerr" + ngx_feature_name="NGX_SYS_NERR" + ngx_feature_run=value ++ ngx_feature_run_force_result="$ngx_force_sys_nerr" + ngx_feature_incs='#include + #include ' + ngx_feature_path= +@@ -737,6 +739,7 @@ if [ $ngx_found = no ]; then ngx_feature="_sys_nerr" ngx_feature_name="NGX_SYS_NERR" ngx_feature_run=value @@ -168,15 +170,7 @@ index 43d3b25a..3da00537 100644 ngx_feature_incs='#include #include ' ngx_feature_path= -@@ -759,6 +762,7 @@ if [ $ngx_found = no ]; then - ngx_feature='maximum errno' - ngx_feature_name=NGX_SYS_NERR - ngx_feature_run=value -+ ngx_feature_run_force_result="$ngx_force_sys_nerr" - ngx_feature_incs='#include - #include - #include ' -@@ -841,6 +845,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096); +@@ -806,6 +809,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096); ngx_feature="mmap(MAP_ANON|MAP_SHARED)" ngx_feature_name="NGX_HAVE_MAP_ANON" ngx_feature_run=yes @@ -184,7 +178,7 @@ index 43d3b25a..3da00537 100644 ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs= -@@ -854,6 +859,7 @@ ngx_feature_test="void *p; +@@ -819,6 +823,7 @@ ngx_feature_test="void *p; ngx_feature='mmap("/dev/zero", MAP_SHARED)' ngx_feature_name="NGX_HAVE_MAP_DEVZERO" ngx_feature_run=yes @@ -192,7 +186,7 @@ index 43d3b25a..3da00537 100644 ngx_feature_incs="#include #include #include " -@@ -869,6 +875,7 @@ ngx_feature_test='void *p; int fd; +@@ -834,6 +839,7 @@ ngx_feature_test='void *p; int fd; ngx_feature="System V shared memory" ngx_feature_name="NGX_HAVE_SYSVSHM" ngx_feature_run=yes @@ -200,7 +194,7 @@ index 43d3b25a..3da00537 100644 ngx_feature_incs="#include #include " ngx_feature_path= -@@ -883,6 +890,7 @@ ngx_feature_test="int id; +@@ -848,6 +854,7 @@ ngx_feature_test="int id; ngx_feature="POSIX semaphores" ngx_feature_name="NGX_HAVE_POSIX_SEM" ngx_feature_run=yes diff --git a/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch b/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch index 747a034aee..79fa4970cb 100644 --- a/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch +++ b/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch @@ -15,10 +15,12 @@ Signed-off-by: Samuel Martin Refresh for 1.8.0. Signed-off-by: Danomi Manchego +[rebased against v1.20.1] +Signed-off-by: Adam Duskett --- - auto/os/sys_nerr | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - auto/unix | 10 ++++++++ - 2 files changed, 88 insertions(+) + auto/os/sys_nerr | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ + auto/unix | 8 +++++ + 2 files changed, 86 insertions(+) create mode 100644 auto/os/sys_nerr diff --git a/auto/os/sys_nerr b/auto/os/sys_nerr @@ -109,18 +111,13 @@ diff --git a/auto/unix b/auto/unix index 7dbf9d1..00a7370 100755 --- a/auto/unix +++ b/auto/unix -@@ -736,6 +736,10 @@ ngx_feature_incs='#include - #include ' - ngx_feature_path= - ngx_feature_libs= -+ -+if false ; then -+# Disabled because only valid for native build. -+ - ngx_feature_test='printf("%d", sys_nerr);' - . auto/feature - -@@ -784,6 +788,12 @@ if [ $ngx_found = no ]; then +@@ -744,10 +744,18 @@ if [ $ngx_found = no ]; then + #include ' + ngx_feature_path= + ngx_feature_libs= ++ if false ; then ++ # Disabled because only valid for native build. + ngx_feature_test='printf("%d", _sys_nerr);' . auto/feature fi diff --git a/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch b/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch index cea68035e1..31ccf88fff 100644 --- a/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch +++ b/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch @@ -9,6 +9,8 @@ dependencies. Signed-off-by: Martin Bark [Peter: updated for 1.15.6] Signed-off-by: Peter Korsgaard +[Fabrice: use pkg-config instead of gdlib-config] +Signed-off-by: Fabrice Fontaine --- auto/lib/libgd/conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -17,14 +19,15 @@ diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf index 67863976..1a4379a5 100644 --- a/auto/lib/libgd/conf +++ b/auto/lib/libgd/conf -@@ -7,8 +7,8 @@ +@@ -7,8 +7,9 @@ ngx_feature_name= ngx_feature_run=no ngx_feature_incs="#include " - ngx_feature_path= - ngx_feature_libs="-lgd" -+ ngx_feature_path="$(${GDLIB_CONFIG:=gdlib-config} --includedir)" -+ ngx_feature_libs="$(${GDLIB_CONFIG:=gdlib-config} --libs)" ++ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I gdlib| ++ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" ++ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs gdlib)" ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL); (void) img" . auto/feature diff --git a/package/nginx/Config.in b/package/nginx/Config.in index 5c34f11edd..1200b2bf4c 100644 --- a/package/nginx/Config.in +++ b/package/nginx/Config.in @@ -75,6 +75,12 @@ config BR2_PACKAGE_NGINX_HTTP_IMAGE_FILTER_MODULE help Enable ngx_http_image_filter_module +config BR2_PACKAGE_NGINX_HTTP_GEOIP_MODULE + bool "ngx_http_geoip_module" + select BR2_PACKAGE_GEOIP + help + Enable ngx_http_geoip_module + config BR2_PACKAGE_NGINX_HTTP_SUB_MODULE bool "ngx_http_sub_module" help @@ -128,6 +134,11 @@ config BR2_PACKAGE_NGINX_HTTP_DEGRADATION_MODULE help Enable ngx_http_degradation_module +config BR2_PACKAGE_NGINX_HTTP_SLICE_MODULE + bool "ngx_http_slice_module" + help + Enable ngx_http_slice_module + config BR2_PACKAGE_NGINX_HTTP_STUB_STATUS_MODULE bool "ngx_http_stub_status_module" help @@ -279,6 +290,12 @@ config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE help Enable ngx_http_upstream_keepalive_module +config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE + bool "ngx_http_upstream_random_module" + default y + help + Enable ngx_http_upstream_random_module + endif #BR2_PACKAGE_NGINX_HTTP config BR2_PACKAGE_NGINX_MAIL @@ -317,12 +334,34 @@ config BR2_PACKAGE_NGINX_STREAM if BR2_PACKAGE_NGINX_STREAM +config BR2_PACKAGE_NGINX_STREAM_REALIP_MODULE + bool "ngx_stream_realip_module" + help + Enable ngx_stream_realip_module + +config BR2_PACKAGE_NGINX_STREAM_SET_MODULE + bool "ngx_stream_set_module" + default y + help + Enable ngx_stream_set_module + config BR2_PACKAGE_NGINX_STREAM_SSL_MODULE bool "ngx_stream_ssl_module" select BR2_PACKAGE_OPENSSL help Enable ngx_stream_ssl_module +config BR2_PACKAGE_NGINX_STREAM_GEOIP_MODULE + bool "ngx_stream_geoip_module" + select BR2_PACKAGE_GEOIP + help + Enable ngx_stream_geoip_module + +config BR2_PACKAGE_NGINX_STREAM_SSL_PREREAD_MODULE + bool "ngx_stream_ssl_preread_module" + help + Enable ngx_stream_ssl_preread_module + config BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE bool "ngx_stream_limit_conn_module" default y @@ -335,6 +374,30 @@ config BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE help Enable ngx_stream_access_module +config BR2_PACKAGE_NGINX_STREAM_GEO_MODULE + bool "ngx_stream_geo_module" + default y + help + Enable ngx_stream_geo_module + +config BR2_PACKAGE_NGINX_STREAM_MAP_MODULE + bool "ngx_stream_map_module" + default y + help + Enable ngx_stream_map_module + +config BR2_PACKAGE_NGINX_STREAM_SPLIT_CLIENTS_MODULE + bool "ngx_stream_split_clients_module" + default y + help + Enable ngx_stream_split_clients_module + +config BR2_PACKAGE_NGINX_STREAM_RETURN_MODULE + bool "ngx_stream_return_module" + default y + help + Enable ngx_stream_return_module + config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE bool "ngx_stream_upstream_hash_module" default y @@ -347,6 +410,12 @@ config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE help Enable ngx_stream_upstream_least_conn_module +config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_RANDOM_MODULE + bool "ngx_stream_upstream_random_module" + default y + help + Enable ngx_stream_upstream_random_module + config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE bool "ngx_stream_upstream_zone_module" default y diff --git a/package/nginx/S50nginx b/package/nginx/S50nginx index 964652b922..6c243f40b3 100644 --- a/package/nginx/S50nginx +++ b/package/nginx/S50nginx @@ -9,7 +9,7 @@ PIDFILE=/var/run/nginx.pid case "$1" in start) echo "Starting nginx..." - mkdir -p /var/log/nginx /var/tmp/nginx + mkdir -p /var/log/nginx /var/cache/nginx start-stop-daemon -S -x "$NGINX" -p "$PIDFILE" ;; stop) diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 8c5b80f80e..06d3392a2e 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 b62756842807e5693b794e5d0ae289bd8ae5b098e66538b2a91eb80f25c591ff nginx-1.17.7.tar.gz +sha256 e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49 nginx-1.20.1.tar.gz # License files, locally calculated -sha256 28ad30e2f64bd89ac1287b4606906bb99ed04d9f4e13fb6564a0be9c8a23f509 LICENSE +sha256 b57270c1f73eb6624b38b2d0a1affcec56b21fab39efbf8c837428f05cef1d73 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 5c828d3bb0..31b6e276b7 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,18 +4,20 @@ # ################################################################################ -NGINX_VERSION = 1.17.7 +NGINX_VERSION = 1.20.1 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE -NGINX_DEPENDENCIES = host-pkgconf +NGINX_CPE_ID_VENDOR = nginx +NGINX_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) NGINX_CONF_OPTS = \ --crossbuild=Linux::$(BR2_ARCH) \ --with-cc="$(TARGET_CC)" \ --with-cpp="$(TARGET_CC)" \ - --with-ld-opt="$(TARGET_LDFLAGS)" \ - --with-ipv6 + --with-ld-opt="$(TARGET_LDFLAGS)" # www-data user and group are used for nginx. Because these user and group # are already set by buildroot, it is not necessary to redefine them. @@ -47,20 +49,21 @@ NGINX_CONF_ENV += \ # prefix: nginx root configuration location NGINX_CONF_OPTS += \ + --force-endianness=$(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) \ --prefix=/usr \ --conf-path=/etc/nginx/nginx.conf \ --sbin-path=/usr/sbin/nginx \ - --pid-path=/var/run/nginx.pid \ - --lock-path=/var/run/lock/nginx.lock \ + --pid-path=/run/nginx.pid \ + --lock-path=/run/lock/nginx.lock \ --user=www-data \ --group=www-data \ --error-log-path=/var/log/nginx/error.log \ --http-log-path=/var/log/nginx/access.log \ - --http-client-body-temp-path=/var/tmp/nginx/client-body \ - --http-proxy-temp-path=/var/tmp/nginx/proxy \ - --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi \ - --http-scgi-temp-path=/var/tmp/nginx/scgi \ - --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi + --http-client-body-temp-path=/var/cache/nginx/client-body \ + --http-proxy-temp-path=/var/cache/nginx/proxy \ + --http-fastcgi-temp-path=/var/cache/nginx/fastcgi \ + --http-scgi-temp-path=/var/cache/nginx/scgi \ + --http-uwsgi-temp-path=/var/cache/nginx/uwsgi NGINX_CONF_OPTS += \ $(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio) \ @@ -86,7 +89,6 @@ endif # modules disabled or not activated because of missing dependencies: # - google_perftools (googleperftools) -# - http_geoip_module (geoip) # - http_perl_module (host-perl) # - pcre-jit (want to rebuild pcre) @@ -135,6 +137,11 @@ NGINX_DEPENDENCIES += gd jpeg libpng NGINX_CONF_OPTS += --with-http_image_filter_module endif +ifeq ($(BR2_PACKAGE_NGINX_HTTP_GEOIP_MODULE),y) +NGINX_DEPENDENCIES += geoip +NGINX_CONF_OPTS += --with-http_geoip_module +endif + ifeq ($(BR2_PACKAGE_NGINX_HTTP_GUNZIP_MODULE),y) NGINX_DEPENDENCIES += zlib NGINX_CONF_OPTS += --with-http_gunzip_module @@ -172,6 +179,7 @@ NGINX_CONF_OPTS += \ $(if $(BR2_PACKAGE_NGINX_HTTP_AUTH_REQUEST_MODULE),--with-http_auth_request_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_RANDOM_INDEX_MODULE),--with-http_random_index_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_DEGRADATION_MODULE),--with-http_degradation_module) \ + $(if $(BR2_PACKAGE_NGINX_HTTP_SLICE_MODULE),--with-http_slice_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_STUB_STATUS_MODULE),--with-http_stub_status_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_CHARSET_MODULE),,--without-http_charset_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_SSI_MODULE),,--without-http_ssi_module) \ @@ -194,6 +202,7 @@ NGINX_CONF_OPTS += \ $(if $(BR2_PACKAGE_NGINX_HTTP_BROWSER_MODULE),,--without-http_browser_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_IP_HASH_MODULE),,--without-http_upstream_ip_hash_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_LEAST_CONN_MODULE),,--without-http_upstream_least_conn_module) \ + $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE),,--without-http_upstream_random_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE),,--without-http_upstream_keepalive_module) else # !BR2_PACKAGE_NGINX_HTTP @@ -220,16 +229,38 @@ endif # BR2_PACKAGE_NGINX_MAIL ifeq ($(BR2_PACKAGE_NGINX_STREAM),y) NGINX_CONF_OPTS += --with-stream +ifeq ($(BR2_PACKAGE_NGINX_STREAM_REALIP_MODULE),y) +NGINX_CONF_OPTS += --with-stream_realip_module +endif + +ifeq ($(BR2_PACKAGE_NGINX_STREAM_SET_MODULE),) +NGINX_CONF_OPTS += --without-stream_set_module +endif + ifeq ($(BR2_PACKAGE_NGINX_STREAM_SSL_MODULE),y) NGINX_DEPENDENCIES += openssl NGINX_CONF_OPTS += --with-stream_ssl_module endif +ifeq ($(BR2_PACKAGE_NGINX_STREAM_GEOIP_MODULE),y) +NGINX_DEPENDENCIES += geoip +NGINX_CONF_OPTS += --with-stream_geoip_module +endif + +ifeq ($(BR2_PACKAGE_NGINX_STREAM_SSL_PREREAD_MODULE),y) +NGINX_CONF_OPTS += --with-stream_ssl_preread_module +endif + NGINX_CONF_OPTS += \ $(if $(BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE),,--without-stream_limit_conn_module) \ $(if $(BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE),,--without-stream_access_module) \ + $(if $(BR2_PACKAGE_NGINX_STREAM_GEO_MODULE),,--without-stream_geo_module) \ + $(if $(BR2_PACKAGE_NGINX_STREAM_MAP_MODULE),,--without-stream_map_module) \ + $(if $(BR2_PACKAGE_NGINX_STREAM_SPLIT_CLIENTS_MODULE),,--without-stream_split_clients_module) \ + $(if $(BR2_PACKAGE_NGINX_STREAM_RETURN_MODULE),,--without-stream_return_module) \ $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE),,--without-stream_upstream_hash_module) \ $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE),,--without-stream_upstream_least_conn_module) \ + $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_RANDOM_MODULE),,--without-stream_upstream_random_module) \ $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE),,--without-stream_upstream_zone_module) endif # BR2_PACKAGE_NGINX_STREAM @@ -267,7 +298,6 @@ NGINX_PRE_CONFIGURE_HOOKS += NGINX_DISABLE_WERROR define NGINX_CONFIGURE_CMDS cd $(@D) ; $(NGINX_CONF_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config \ ./configure $(NGINX_CONF_OPTS) \ --with-cc-opt="$(TARGET_CFLAGS) $(NGINX_CFLAGS)" endef diff --git a/package/nginx/nginx.service b/package/nginx/nginx.service index 320df9a80e..11ccd62237 100644 --- a/package/nginx/nginx.service +++ b/package/nginx/nginx.service @@ -4,12 +4,13 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=/var/run/nginx.pid -ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx -ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecReload=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -s reload -ExecStop=/usr/sbin/nginx -g 'pid /var/run/nginx.pid;' -s quit +LogsDirectory=nginx +CacheDirectory=nginx +PIDFile=/run/nginx.pid +ExecStartPre=/usr/sbin/nginx -t -q -g 'daemon on; master_process on;' +ExecStart=/usr/sbin/nginx -g 'daemon on; master_process on;' +ExecReload=/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload +ExecStop=/usr/sbin/nginx -s quit PrivateDevices=yes [Install] diff --git a/package/ngircd/ngircd.hash b/package/ngircd/ngircd.hash index 3772bd6c16..e46e8e6669 100644 --- a/package/ngircd/ngircd.hash +++ b/package/ngircd/ngircd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 c4997cae3e3dd6ff6a605ca274268f2b8c9ba0b1a96792c7402e5594222eee4e ngircd-25.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 55c16fd26009f6fc6a007df4efac87a02e122f680612cda1ce26e17a18d86254 ngircd-26.1.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk index 5fa86afdd5..47d8ef2265 100644 --- a/package/ngircd/ngircd.mk +++ b/package/ngircd/ngircd.mk @@ -4,11 +4,12 @@ # ################################################################################ -NGIRCD_VERSION = 25 +NGIRCD_VERSION = 26.1 NGIRCD_SOURCE = ngircd-$(NGIRCD_VERSION).tar.xz NGIRCD_SITE = https://arthur.barton.de/pub/ngircd NGIRCD_LICENSE = GPL-2.0+ NGIRCD_LICENSE_FILES = COPYING +NGIRCD_CPE_ID_VENDOR = barton ifeq ($(BR2_PACKAGE_LINUX_PAM),y) NGIRCD_CONF_OPTS += --with-pam=$(STAGING_DIR)/usr @@ -18,8 +19,8 @@ NGIRCD_CONF_OPTS += --without-pam endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -NGIRCD_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr -NGIRCD_DEPENDENCIES += openssl +NGIRCD_CONF_OPTS += --with-openssl +NGIRCD_DEPENDENCIES += host-pkgconf openssl else NGIRCD_CONF_OPTS += --without-openssl ifeq ($(BR2_PACKAGE_GNUTLS),y) diff --git a/package/ninja/ninja.hash b/package/ninja/ninja.hash index cd9bb08832..fd2c594a77 100644 --- a/package/ninja/ninja.hash +++ b/package/ninja/ninja.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f ninja-1.10.0.tar.gz -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING +sha256 ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed ninja-1.10.2.tar.gz +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index 060893d85f..ab1941023e 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -4,7 +4,7 @@ # ################################################################################ -NINJA_VERSION = 1.10.0 +NINJA_VERSION = 1.10.2 NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index d7446f1ead..8f69bbf613 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,5 +1,5 @@ -# From https://nmap.org/dist/sigs/nmap-7.80.tar.bz2.digest.txt (lowercase) -sha256 fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa nmap-7.80.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.91.tar.bz2.digest.txt (lowercase) +sha256 18cc4b5070511c51eb243cdd2b0b30ff9b2c4dc4544c6312f75ce3a67a593300 nmap-7.91.tar.bz2 # Locally calculated -sha256 a6afaad36c803dc602734451d9421ed363b48d1ca0faadf0907fc2d91a000284 COPYING +sha256 8254a9bc733f3312c6dcfe0d5a129c29e96ecb8b33408c652a8c7beb2e25b471 LICENSE diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 5da1ce925f..34cf61ff0b 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,14 +4,16 @@ # ################################################################################ -NMAP_VERSION = 7.80 +NMAP_VERSION = 7.91 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = liblinear libpcap NMAP_CONF_OPTS = --without-liblua --without-zenmap \ --with-libdnet=included NMAP_LICENSE = nmap license -NMAP_LICENSE_FILES = COPYING +NMAP_LICENSE_FILES = LICENSE +NMAP_CPE_ID_VENDOR = nmap +NMAP_SELINUX_MODULES = netutils # needed by libpcap NMAP_LIBS_FOR_STATIC_LINK += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` @@ -42,6 +44,13 @@ else NMAP_CONF_OPTS += --without-openssl endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +NMAP_CONF_OPTS += --with-libz="$(STAGING_DIR)/usr" +NMAP_DEPENDENCIES += zlib +else +NMAP_CONF_OPTS += --without-libz +endif + NMAP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) ifeq ($(BR2_PACKAGE_NMAP_NCAT),y) diff --git a/package/nmon/nmon.hash b/package/nmon/nmon.hash index 432f71d846..fd3f09c63a 100644 --- a/package/nmon/nmon.hash +++ b/package/nmon/nmon.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/nmon/files/ -md5 246ccfc74d5af55d992601fc4d3d4a72 lmon16g.c -sha1 926217a98f78dd398d4d5690d7b10b8b2b620168 lmon16g.c +md5 df67f07ea4006c6204acff586beada81 lmon16m.c +sha1 68cd02be19036a287fe352823db93223e73a9411 lmon16m.c # Locally computed -sha256 da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688 lmon16g.c +sha256 2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1 lmon16m.c diff --git a/package/nmon/nmon.mk b/package/nmon/nmon.mk index f7edd66a26..8b39748cce 100644 --- a/package/nmon/nmon.mk +++ b/package/nmon/nmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMON_VERSION = 16g +NMON_VERSION = 16m NMON_SITE = https://sourceforge.net/projects/nmon/files NMON_SOURCE = lmon$(NMON_VERSION).c NMON_LICENSE = GPL-3.0+ diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 992040d391..f31c7d5d69 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v12.16.1/SHASUMS256.txt -sha256 0a95845ba02c46102b5671d0c5732460073f2d397488337e18d1fc30146d412d node-v12.16.1.tar.xz +# From https://nodejs.org/dist/v12.22.7/SHASUMS256.txt +sha256 cc6a23b44870679a94bd8f3c8d4e1f4b77bb2712a36888ab87463459e6785f6b node-v12.22.7.tar.xz # Hash for license file -sha256 3f5749f7a58edaadd77843057a90063a18067f472d8b26c0a76905cafa1063e3 LICENSE +sha256 221417a7ca275112a5ac54639b36ee3c5184e74631ea1e1b01b701293b655190 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 7f875058b3..c8c5223a0b 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,15 +4,18 @@ # ################################################################################ -NODEJS_VERSION = 12.16.1 +NODEJS_VERSION = 12.22.7 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) -HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib +HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-python host-zlib +NODEJS_INSTALL_STAGING = YES NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE +NODEJS_CPE_ID_VENDOR = nodejs +NODEJS_CPE_ID_PRODUCT = node.js NODEJS_CONF_OPTS = \ --without-snapshot \ @@ -65,7 +68,7 @@ define HOST_NODEJS_CONFIGURE_CMDS --shared-openssl-libpath=$(HOST_DIR)/lib \ --shared-zlib \ --no-cross-compiling \ - --with-intl=small-icu \ + --with-intl=system-icu \ ) endef @@ -76,10 +79,13 @@ NODEJS_HOST_TOOLS_V8 = \ NODEJS_HOST_TOOLS_NODE = mkcodecache NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) +HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 + define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) @@ -89,6 +95,7 @@ define HOST_NODEJS_INSTALL_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) install \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) @@ -215,6 +222,17 @@ define NODEJS_INSTALL_MODULES endef endif +define NODEJS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ + $(MAKE) -C $(@D) install \ + DESTDIR=$(STAGING_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + NO_LOAD=cctest.target.mk \ + PATH=$(@D)/bin:$(BR_PATH) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ + LD="$(TARGET_CXX)" +endef + define NODEJS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) install \ diff --git a/package/nodm/Config.in b/package/nodm/Config.in index 38171e8dcf..2dd6f1e1cf 100644 --- a/package/nodm/Config.in +++ b/package/nodm/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_NODM depends on BR2_PACKAGE_XORG7 depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam depends on !BR2_STATIC_LIBS # linux-pam - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # linux-pam select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_LINUX_PAM @@ -18,7 +17,7 @@ config BR2_PACKAGE_NODM https://github.com/spanezz/nodm/ -comment "nodm needs a glibc or uClibc toolchain w/ wchar, locale, dynamic library" +comment "nodm needs a toolchain w/ wchar, locale, dynamic library" depends on BR2_PACKAGE_XORG7 depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS diff --git a/package/nss-pam-ldapd/nslcd.service b/package/nss-pam-ldapd/nslcd.service index 6c0d71b241..5a000a8e4c 100644 --- a/package/nss-pam-ldapd/nslcd.service +++ b/package/nss-pam-ldapd/nslcd.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=/var/run/nslcd/nslcd.pid +PIDFile=/run/nslcd/nslcd.pid ExecStart=/usr/sbin/nslcd [Install] diff --git a/package/ntfs-3g/ntfs-3g.hash b/package/ntfs-3g/ntfs-3g.hash index 63c999f253..668e11a800 100644 --- a/package/ntfs-3g/ntfs-3g.hash +++ b/package/ntfs-3g/ntfs-3g.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5 ntfs-3g_ntfsprogs-2017.3.23.tgz +sha256 55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb ntfs-3g_ntfsprogs-2021.8.22.tgz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk index cbb356195c..21f7cfc46d 100644 --- a/package/ntfs-3g/ntfs-3g.mk +++ b/package/ntfs-3g/ntfs-3g.mk @@ -4,7 +4,7 @@ # ################################################################################ -NTFS_3G_VERSION = 2017.3.23 +NTFS_3G_VERSION = 2021.8.22 NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz NTFS_3G_SITE = http://tuxera.com/opensource NTFS_3G_CONF_OPTS = --disable-ldconfig @@ -12,9 +12,7 @@ NTFS_3G_INSTALL_STAGING = YES NTFS_3G_DEPENDENCIES = host-pkgconf NTFS_3G_LICENSE = GPL-2.0+, LGPL-2.0+ NTFS_3G_LICENSE_FILES = COPYING COPYING.LIB - -# 0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch -NTFS_3G_IGNORE_CVES += CVE-2019-9755 +NTFS_3G_CPE_ID_VENDOR = tuxera ifeq ($(BR2_PACKAGE_LIBFUSE),y) NTFS_3G_CONF_OPTS += --with-fuse=external diff --git a/package/ntp/S49ntp b/package/ntp/S49ntp index 35e58746b4..66c5f70a5f 100644 --- a/package/ntp/S49ntp +++ b/package/ntp/S49ntp @@ -1,34 +1,56 @@ -#! /bin/sh +#!/bin/sh +# +# Starts Network Time Protocol daemon +# -NAME=ntpd +DAEMON="ntpd" +PIDFILE="/var/run/$DAEMON.pid" -# Read config file if it is present. -if [ -r /etc/default/$NAME ] -then - . /etc/default/$NAME -fi +NTPD_ARGS="-g" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $NTPD_ARGS -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} case "$1" in - start) - printf "Starting $NAME: " - start-stop-daemon -S -q -x /usr/sbin/ntpd -- -g - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping $NAME: " - start-stop-daemon -K -q -n $NAME - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - echo "Restarting $NAME: " - $0 stop - sleep 1 - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" >&2 - exit 1 - ;; + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac - -exit 0 diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash index fdb5bacade..3c2f6a95a7 100644 --- a/package/ntp/ntp.hash +++ b/package/ntp/ntp.hash @@ -1,5 +1,5 @@ -# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p14.tar.gz.md5 -md5 783edaf1d68ddf651bde64eda54a579d ntp-4.2.8p14.tar.gz +# From http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p15.tar.gz.md5 +md5 e1e6b23d2fc75cced41801dbcd6c2561 ntp-4.2.8p15.tar.gz # Calculated based on the hash above -sha256 1960e4f081f6aafd108d721bc3ab15f9e8dfd08dc08339aa95bca9d2545e4eb7 ntp-4.2.8p14.tar.gz +sha256 f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19 ntp-4.2.8p15.tar.gz sha256 957e6a13445cc61ab1ca3dc80d8c269cf9b0a6d9eaec20f9f39639b0b3e66ee8 COPYRIGHT diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 3af3e01a52..ff23cdc2b6 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -5,11 +5,17 @@ ################################################################################ NTP_VERSION_MAJOR = 4.2 -NTP_VERSION = $(NTP_VERSION_MAJOR).8p14 +NTP_VERSION_MINOR = 8 +NTP_VERSION_POINT = 15 +NTP_VERSION = $(NTP_VERSION_MAJOR).$(NTP_VERSION_MINOR)p$(NTP_VERSION_POINT) NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent NTP_LICENSE = NTP NTP_LICENSE_FILES = COPYRIGHT +NTP_CPE_ID_VENDOR = ntp +NTP_CPE_ID_VERSION = $(NTP_VERSION_MAJOR).$(NTP_VERSION_MINOR) +NTP_CPE_ID_UPDATE = p$(NTP_VERSION_POINT) +NTP_SELINUX_MODULES = ntp NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no POSIX_SHELL=/bin/sh NTP_CONF_OPTS = \ --with-shared \ diff --git a/package/ntp/ntpd.service b/package/ntp/ntpd.service index 7964c5389b..9a0f4c6dbf 100644 --- a/package/ntp/ntpd.service +++ b/package/ntp/ntpd.service @@ -5,6 +5,10 @@ After=network.target [Service] Type=forking PIDFile=/run/ntpd.pid +# Turn off DNSSEC validation for hostname look-ups, since those need the +# correct time to work, but we likely won't acquire that without NTP. Let's +# break this chicken-and-egg cycle here. +Environment=SYSTEMD_NSS_RESOLVE_VALIDATE=0 ExecStart=/usr/sbin/ntpd -g -p /run/ntpd.pid [Install] diff --git a/package/numactl/Config.in b/package/numactl/Config.in index 8ea07bb856..23cf7facb0 100644 --- a/package/numactl/Config.in +++ b/package/numactl/Config.in @@ -1,9 +1,6 @@ config BR2_PACKAGE_NUMACTL bool "numactl" - # numactl uses some system calls that are not available on all - # architectures. - depends on BR2_aarch64 || BR2_i386 || BR2_mips || BR2_mipsel || \ - BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64 + depends on BR2_USE_MMU # madvise() help numactl allows you to run your application on specific cpus and memory nodes. It does this by supplying a NUMA memory diff --git a/package/numactl/numactl.hash b/package/numactl/numactl.hash index 61cb94b3b3..802175d360 100644 --- a/package/numactl/numactl.hash +++ b/package/numactl/numactl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 97ee012b2f294903530424b4ff7f28bcaad6a356897ce8777383f87e5c2e325d numactl-2.0.13.tar.gz -sha256 e2b738b1303c088421b09933a78c1326fe43692e2c05a7c510a2eb7e7a8eb575 README.md +sha256 1ee27abd07ff6ba140aaf9bc6379b37825e54496e01d6f7343330cf1a4487035 numactl-2.0.14.tar.gz +sha256 e2b738b1303c088421b09933a78c1326fe43692e2c05a7c510a2eb7e7a8eb575 README.md diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk index 4d3ceeb6c7..cf9c759693 100644 --- a/package/numactl/numactl.mk +++ b/package/numactl/numactl.mk @@ -4,11 +4,12 @@ # ################################################################################ -NUMACTL_VERSION = 2.0.13 +NUMACTL_VERSION = 2.0.14 NUMACTL_SITE = $(call github,numactl,numactl,v$(NUMACTL_VERSION)) NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs) NUMACTL_LICENSE_FILES = README.md NUMACTL_INSTALL_STAGING = YES NUMACTL_AUTORECONF = YES +NUMACTL_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -fPIC" $(eval $(autotools-package)) diff --git a/package/nut/nut.hash b/package/nut/nut.hash index 0a677bc058..a4e84244b5 100644 --- a/package/nut/nut.hash +++ b/package/nut/nut.hash @@ -1,6 +1,5 @@ -# From http://www.networkupstools.org/source/2.7/nut-2.7.2.tar.gz.sha256 -sha256 980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7 nut-2.7.4.tar.gz # Locally computed +sha256 7129b2df45f9a9df3943f4d09f2b95b5a63d66ca4913431352570206968ca97b nut-03c3bbe8df9a2caf3c09c120ae7045d35af99b76.tar.gz sha256 9f562d0e6be5108a06684dd249686d378abe1653df14b1944e971e084f6751f0 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE-GPL2 sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 LICENSE-GPL3 diff --git a/package/nut/nut.mk b/package/nut/nut.mk index 4ea9947128..db0247dc2c 100644 --- a/package/nut/nut.mk +++ b/package/nut/nut.mk @@ -4,16 +4,26 @@ # ################################################################################ -NUT_VERSION_MAJOR = 2.7 -NUT_VERSION = $(NUT_VERSION_MAJOR).4 -NUT_SITE = http://www.networkupstools.org/source/$(NUT_VERSION_MAJOR) +NUT_VERSION = 03c3bbe8df9a2caf3c09c120ae7045d35af99b76 +NUT_SITE = $(call github,networkupstools,nut,$(NUT_VERSION)) NUT_LICENSE = GPL-2.0+, GPL-3.0+ (python scripts), GPL/Artistic (perl client) NUT_LICENSE_FILES = COPYING LICENSE-GPL2 LICENSE-GPL3 -NUT_DEPENDENCIES = host-pkgconf +NUT_SELINUX_MODULES = apache nut +NUT_INSTALL_STAGING = YES +NUT_DEPENDENCIES = host-pkgconf host-perl -# Our patch changes m4 macros, so we need to autoreconf +# From git: NUT_AUTORECONF = YES +# Generate files otherwise generated by autogen.sh +# buildroot does not support augeas, creating an empty file prevents +# us from adding a dependency to host-python +define NUT_PREGEN + touch $(@D)/scripts/augeas/nutupsconf.aug.in + cd $(@D)/tools && PATH=$(BR_PATH) ./nut-usbinfo.pl +endef +NUT_PRE_CONFIGURE_HOOKS += NUT_PREGEN + # Race condition in tools generation NUT_MAKE = $(MAKE1) @@ -21,7 +31,9 @@ NUT_MAKE = $(MAKE1) # since the default location (/var/state/ups) maybe readonly. NUT_CONF_OPTS = \ --with-altpidpath=/var/run/upsd \ - --without-hal + --with-dev + +NUT_CONF_ENV = ax_cv__printf_string_null=yes # For uClibc-based toolchains, nut forgets to link with -lm ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) @@ -44,9 +56,7 @@ endif # gd with support for png is required for the CGI ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) NUT_DEPENDENCIES += gd libpng -NUT_CONF_OPTS += \ - --with-cgi \ - --with-gdlib-config=$(STAGING_DIR)/usr/bin/gdlib-config +NUT_CONF_OPTS += --with-cgi else NUT_CONF_OPTS += --without-cgi endif diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash index 79ac052610..7f2248d0f9 100644 --- a/package/nvidia-driver/nvidia-driver.hash +++ b/package/nvidia-driver/nvidia-driver.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 6f4af70ee3d03ed31c497a5d555164c56057b53ecedfc0d2c8de4b0b90728805 NVIDIA-Linux-x86-390.67.run -sha256 6df2ca1a7420b6751bcaf257d321b14f4e5f7ca54d77a43514912a3792ece65a NVIDIA-Linux-x86_64-390.67.run +sha256 51adb28f0ed4548f35a88a93ad6767ebd807fa14f418bf5e51a6d63a3ff7f275 NVIDIA-Linux-x86-390.132.run +sha256 b6b4b8af37e78e026c9ebdf4a5c64ea412dfcb710931dd028c22dac228de659d NVIDIA-Linux-x86_64-390.132-no-compat32.run sha256 bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526 LICENSE diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index baf2ba2be5..54c2aa46d8 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -4,10 +4,10 @@ # ################################################################################ -NVIDIA_DRIVER_VERSION = 390.67 +NVIDIA_DRIVER_VERSION = 390.132 NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64) NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) -NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run +NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION)$(if $(BR2_x86_64),-no-compat32).run NVIDIA_DRIVER_LICENSE = NVIDIA Software License NVIDIA_DRIVER_LICENSE_FILES = LICENSE NVIDIA_DRIVER_REDISTRIBUTE = NO @@ -35,7 +35,7 @@ NVIDIA_DRIVER_PROVIDES += libgl libegl libgles # NVidia extensions (which is deemed bad now), while the former follows # the newly-introduced vendor-neutral "dispatching" API/ABI: # https://github.com/aritger/linux-opengl-abi-proposal/blob/master/linux-opengl-abi-proposal.txt -# However, this is not very usefull to us, as we don't support multiple +# However, this is not very useful to us, as we don't support multiple # GL providers at the same time on the system, which this proposal is # aimed at supporting. # @@ -62,7 +62,7 @@ NVIDIA_DRIVER_LIBS_MISC = \ libnvidia-glcore.so.$(NVIDIA_DRIVER_VERSION) \ libnvidia-glsi.so.$(NVIDIA_DRIVER_VERSION) \ tls/libnvidia-tls.so.$(NVIDIA_DRIVER_VERSION) \ - libvdpau_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ + libvdpau_nvidia.so.$(NVIDIA_DRIVER_VERSION):vdpau/ \ libnvidia-ml.so.$(NVIDIA_DRIVER_VERSION) NVIDIA_DRIVER_LIBS += \ @@ -84,7 +84,7 @@ endef # Those libraries are 'private' libraries requiring an agreement with # NVidia to develop code for those libs. There seems to be no restriction # on using those libraries (e.g. if the user has such an agreement, or -# wants to run a third-party program developped under such an agreement). +# wants to run a third-party program developed under such an agreement). ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_PRIVATE_LIBS),y) NVIDIA_DRIVER_LIBS += \ libnvidia-ifr.so.$(NVIDIA_DRIVER_VERSION) \ @@ -92,10 +92,15 @@ NVIDIA_DRIVER_LIBS += \ endif # We refer to the destination path; the origin file has no directory component -NVIDIA_DRIVER_X_MODS = \ - drivers/nvidia_drv.so \ - extensions/libglx.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-wfb.so.$(NVIDIA_DRIVER_VERSION) +NVIDIA_DRIVER_LIBS += \ + nvidia_drv.so:xorg/modules/drivers/ \ + libglx.so.$(NVIDIA_DRIVER_VERSION):xorg/modules/extensions/ + +# libglx needs a symlink according to the driver README. It has no SONAME +define NVIDIA_DRIVER_SYMLINK_LIBGLX + ln -sf libglx.so.$(NVIDIA_DRIVER_VERSION) \ + $(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so +endef endif # X drivers @@ -154,24 +159,31 @@ define NVIDIA_DRIVER_EXTRACT_CMDS endef # Helper to install libraries -# $1: destination directory (target or staging) +# $1: library name +# $2: target directory # # For all libraries, we install them and create a symlink using # their SONAME, so we can link to them at runtime; we also create # the no-version symlink, so we can link to them at build time. +define NVIDIA_DRIVER_INSTALL_LIB + $(INSTALL) -D -m 0644 $(@D)/$(1) $(2)$(notdir $(1)) + libsoname="$$( $(TARGET_READELF) -d "$(@D)/$(1)" \ + |sed -r -e '/.*\(SONAME\).*\[(.*)\]$$/!d; s//\1/;' )"; \ + if [ -n "$${libsoname}" -a "$${libsoname}" != "$(notdir $(1))" ]; then \ + ln -sf $(notdir $(1)) $(2)$${libsoname}; \ + fi + baseso=$(firstword $(subst .,$(space),$(notdir $(1)))).so; \ + if [ -n "$${baseso}" -a "$${baseso}" != "$(notdir $(1))" ]; then \ + ln -sf $(notdir $(1)) $(2)$${baseso}; \ + fi +endef + +# Helper to install libraries +# $1: destination directory (target or staging) define NVIDIA_DRIVER_INSTALL_LIBS - $(foreach lib,$(NVIDIA_DRIVER_LIBS),\ - $(INSTALL) -D -m 0644 $(@D)/$(lib) $(1)/usr/lib/$(notdir $(lib)) - libsoname="$$( $(TARGET_READELF) -d "$(@D)/$(lib)" \ - |sed -r -e '/.*\(SONAME\).*\[(.*)\]$$/!d; s//\1/;' )"; \ - if [ -n "$${libsoname}" -a "$${libsoname}" != "$(notdir $(lib))" ]; then \ - ln -sf $(notdir $(lib)) \ - $(1)/usr/lib/$${libsoname}; \ - fi - baseso=$(firstword $(subst .,$(space),$(notdir $(lib)))).so; \ - if [ -n "$${baseso}" -a "$${baseso}" != "$(notdir $(lib))" ]; then \ - ln -sf $(notdir $(lib)) $(1)/usr/lib/$${baseso}; \ - fi + $(foreach lib,$(NVIDIA_DRIVER_LIBS), + $(call NVIDIA_DRIVER_INSTALL_LIB,$(word 1,$(subst :, ,$(lib))), \ + $(1)/usr/lib/$(word 2,$(subst :, ,$(lib)))) ) endef @@ -184,15 +196,16 @@ endef # For target, install libraries and X.org modules define NVIDIA_DRIVER_INSTALL_TARGET_CMDS $(call NVIDIA_DRIVER_INSTALL_LIBS,$(TARGET_DIR)) - $(foreach m,$(NVIDIA_DRIVER_X_MODS), \ - $(INSTALL) -D -m 0644 $(@D)/$(notdir $(m)) \ - $(TARGET_DIR)/usr/lib/xorg/modules/$(m) - ) $(foreach p,$(NVIDIA_DRIVER_PROGS), \ $(INSTALL) -D -m 0755 $(@D)/$(p) \ $(TARGET_DIR)/usr/bin/$(p) ) + $(NVIDIA_DRIVER_SYMLINK_LIBGLX) $(NVIDIA_DRIVER_INSTALL_KERNEL_MODULE) endef +# Due to a conflict with xserver_xorg-server, this needs to be performed when +# finalizing the target filesystem to make sure this version is used. +NVIDIA_DRIVER_TARGET_FINALIZE_HOOKS += NVIDIA_DRIVER_SYMLINK_LIBGLX + $(eval $(generic-package)) diff --git a/package/nvme/nvme.hash b/package/nvme/nvme.hash index 94aefb2ff9..a7ce51ca74 100644 --- a/package/nvme/nvme.hash +++ b/package/nvme/nvme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d7c3d56f36f81c0933f7b7c3f90c4196be0fec758affc8062c525b6bc5ea65f5 nvme-1.9.tar.gz -sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE +sha256 a75270e65a4a7a6add48f748ba216d8f68d78f90f8cb77e88e9753b74d527991 nvme-1.12.tar.gz +sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE diff --git a/package/nvme/nvme.mk b/package/nvme/nvme.mk index 5a7c634e3c..53f9dff753 100644 --- a/package/nvme/nvme.mk +++ b/package/nvme/nvme.mk @@ -4,7 +4,7 @@ # ################################################################################ -NVME_VERSION = 1.9 +NVME_VERSION = 1.12 NVME_SITE = $(call github,linux-nvme,nvme-cli,v$(NVME_VERSION)) NVME_LICENSE = GPL-2.0+ NVME_LICENSE_FILES = LICENSE @@ -18,6 +18,15 @@ else NVME_MAKE_OPTS += LIBUUID=1 endif +# Yes, HAVE_SYSTEMD=0 means systemd support enabled. +# HAVE_SYSTEMD=1 means systemd support disabled. +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +NVME_DEPENDENCIES += systemd +NVME_MAKE_OPTS += HAVE_SYSTEMD=0 +else +NVME_MAKE_OPTS += HAVE_SYSTEMD=1 +endif + define NVME_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ $(NVME_MAKE_OPTS) -C $(@D) diff --git a/package/odhcp6c/Config.in b/package/odhcp6c/Config.in index 97ea4b44ef..ca3a2f6424 100644 --- a/package/odhcp6c/Config.in +++ b/package/odhcp6c/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_ODHCP6C odhcp6c is a minimal DHCPv6 and RA-client for use in embedded Linux systems, especially routers. - https://github.com/sbyx/odhcp6c + https://git.openwrt.org/project/odhcp6c.git diff --git a/package/odhcp6c/odhcp6c.hash b/package/odhcp6c/odhcp6c.hash index 8b16fa98bb..84d1fc4527 100644 --- a/package/odhcp6c/odhcp6c.hash +++ b/package/odhcp6c/odhcp6c.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6d472320ccfa2e57197596869507f2a4bf9900a502939404bf0c033dceeadf5f odhcp6c-d2e247d8d87ecf8c60fcf0acdad05667bd379521.tar.gz -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 7274a304016838483e2da48193309e5f84ca0a8a407647033283d1249eebe986 odhcp6c-53f07e90b7f1da6977143a488dd5cb73a33b233b-br1.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/odhcp6c/odhcp6c.mk b/package/odhcp6c/odhcp6c.mk index 3b4e7580a2..dd3a9d3e28 100644 --- a/package/odhcp6c/odhcp6c.mk +++ b/package/odhcp6c/odhcp6c.mk @@ -4,8 +4,9 @@ # ################################################################################ -ODHCP6C_VERSION = d2e247d8d87ecf8c60fcf0acdad05667bd379521 -ODHCP6C_SITE = $(call github,sbyx,odhcp6c,$(ODHCP6C_VERSION)) +ODHCP6C_VERSION = 53f07e90b7f1da6977143a488dd5cb73a33b233b +ODHCP6C_SITE = https://git.openwrt.org/project/odhcp6c.git +ODHCP6C_SITE_METHOD = git ODHCP6C_LICENSE = GPL-2.0 ODHCP6C_LICENSE_FILES = COPYING diff --git a/package/ofono/Config.in b/package/ofono/Config.in index 57ee4bc536..c1d0cae4ef 100644 --- a/package/ofono/Config.in +++ b/package/ofono/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_OFONO depends on BR2_USE_MMU # dbus, libglib2 depends on !BR2_STATIC_LIBS # dlopen(), ell depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell select BR2_PACKAGE_DBUS select BR2_PACKAGE_ELL select BR2_PACKAGE_LIBCAP_NG @@ -17,7 +18,9 @@ config BR2_PACKAGE_OFONO http://ofono.org/ -comment "ofono needs a toolchain w/ dynamic library, wchar, threads" +comment "ofono needs a toolchain w/ dynamic library, wchar, threads, headers >= 4.12" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 diff --git a/package/ogre/Config.in b/package/ogre/Config.in index b5475a7cb6..1d7784714d 100644 --- a/package/ogre/Config.in +++ b/package/ogre/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_OGRE depends on BR2_USE_WCHAR # use wchar_t select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_LIBFREEIMAGE - select BR2_PACKAGE_LIBGLU # GL/glu.h select BR2_PACKAGE_SDL2 select BR2_PACKAGE_SDL2_OPENGL select BR2_PACKAGE_SDL2_X11 # use wmInfo.info.x11 diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk index 253e022a73..2df685a23a 100644 --- a/package/ogre/ogre.mk +++ b/package/ogre/ogre.mk @@ -15,7 +15,6 @@ OGRE_DEPENDENCIES = host-pkgconf \ freetype \ libfreeimage \ libgl \ - libglu \ sdl2 \ xlib_libX11 \ xlib_libXaw \ @@ -23,12 +22,17 @@ OGRE_DEPENDENCIES = host-pkgconf \ xlib_libXrandr \ zziplib +OGRE_CFLAGS = $(TARGET_CFLAGS) -DGLEW_NO_GLU +OGRE_CXXFLAGS = $(TARGET_CXXFLAGS) -DGLEW_NO_GLU + # Unbundle freetype and zziplib. # Disable java and nvidia cg support. OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ -DOGRE_BUILD_COMPONENT_JAVA=OFF \ -DOGRE_BUILD_PLUGIN_CG=OFF \ - -DOGRE_INSTALL_DOCS=OFF + -DOGRE_INSTALL_DOCS=OFF \ + -DCMAKE_C_FLAGS="$(OGRE_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)" # Enable optional python component if python interpreter is present on the target. ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) @@ -41,7 +45,7 @@ endif # Uses __atomic_fetch_add_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -OGRE_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +OGRE_CXXFLAGS += -latomic endif $(eval $(cmake-package)) diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk index f930b3cacf..b2c8e7e001 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -10,8 +10,8 @@ OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \ mdns nameservice netjson poprouting p2pd pgraph secure txtinfo watchdog # Doesn't really need quagga but not very useful without it OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga) -OLSR_LICENSE = BSD-3-Clause, LGPL-2.1+ -OLSR_LICENSE_FILES = license.txt lib/pud/nmealib/LICENSE +OLSR_LICENSE = BSD-3-Clause +OLSR_LICENSE_FILES = license.txt OLSR_DEPENDENCIES = host-flex host-bison OLSR_CFLAGS = $(TARGET_CFLAGS) @@ -19,6 +19,13 @@ OLSR_CFLAGS = $(TARGET_CFLAGS) # it needs -fPIC to link on lot of architectures OLSR_CFLAGS += -fPIC +ifeq ($(BR2_PACKAGE_GPSD),y) +OLSR_LICENSE += , LGPL-2.1+ (nmealib) +OLSR_LICENSE_FILES += lib/pud/nmealib/LICENSE +OLSR_DEPENDENCIES += gpsd +OLSR_PLUGINS += pud +endif + define OLSR_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ CFLAGS="$(OLSR_CFLAGS)" -C $(@D) olsrd diff --git a/package/omniorb/omniorb.hash b/package/omniorb/omniorb.hash index 9911c4d6af..5ac8614689 100644 --- a/package/omniorb/omniorb.hash +++ b/package/omniorb/omniorb.hash @@ -1,7 +1,8 @@ -# From http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.3/ -sha1 0af1b8c181088c096de237315cce7b52fc457c78 omniORB-4.2.3.tar.bz2 +# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.4/ +sha1 a6f3c8e96fc09c4ef8d75bd495bbc5256a4773ee omniORB-4.2.4.tar.bz2 +md5 de961e8aa29f3eed95ea40a94c1cccdf omniORB-4.2.4.tar.bz2 # Locally generated -sha256 26412ac08ab495ce5a6a8e40961fa20b7c43f623c6c26b616d210ca32f078bca omniORB-4.2.3.tar.bz2 +sha256 28c01cd0df76c1e81524ca369dc9e6e75f57dc70f30688c99c67926e4bdc7a6f omniORB-4.2.4.tar.bz2 sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index b5caf6ff8b..4ecbb9d2c9 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -OMNIORB_VERSION = 4.2.3 +OMNIORB_VERSION = 4.2.4 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 OMNIORB_INSTALL_STAGING = YES diff --git a/package/omxplayer/Config.in b/package/omxplayer/Config.in index 80e48d09c8..d2e4b5ace0 100644 --- a/package/omxplayer/Config.in +++ b/package/omxplayer/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_OMXPLAYER depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS # ffmpeg depends on BR2_INSTALL_LIBSTDCPP # boost depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, boost, libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_WCHAR # boost depends on BR2_PACKAGE_RPI_USERLAND select BR2_PACKAGE_ALSA_LIB @@ -25,10 +26,11 @@ config BR2_PACKAGE_OMXPLAYER https://github.com/popcornmix/omxplayer -comment "omxplayer needs rpi-userland and a toolchain w/ C++, threads, wchar, dynamic library" +comment "omxplayer needs rpi-userland and a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.9" depends on BR2_arm depends on BR2_USE_MMU depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on !BR2_PACKAGE_RPI_USERLAND depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_USE_WCHAR || BR2_STATIC_LIBS + || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/oniguruma/oniguruma.hash b/package/oniguruma/oniguruma.hash index b0764ab1fc..3a6112e832 100644 --- a/package/oniguruma/oniguruma.hash +++ b/package/oniguruma/oniguruma.hash @@ -1,3 +1,4 @@ -# Locally calculated -sha256 4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53 onig-6.9.4.tar.gz -sha256 ae266a1ad1c2ef50baf14a1a2993e926cd46d09c6cc8b0b3a8498e44da2746b8 COPYING +# From https://github.com/kkos/oniguruma/releases/download/v6.9.7/onig-6.9.7.1.tar.gz.sha256 +sha256 6444204b9c34e6eb6c0b23021ce89a0370dad2b2f5c00cd44c342753e0b204d9 onig-6.9.7.1.tar.gz +# Hash for license file +sha256 70ba5469ea0bab6e18a32d7009068f996503168d27be57747e08da34337ff26f COPYING diff --git a/package/oniguruma/oniguruma.mk b/package/oniguruma/oniguruma.mk index 2126ff9120..31c8d8e512 100644 --- a/package/oniguruma/oniguruma.mk +++ b/package/oniguruma/oniguruma.mk @@ -4,12 +4,13 @@ # ################################################################################ -ONIGURUMA_VERSION = 6.9.4 +ONIGURUMA_VERSION = 6.9.7.1 ONIGURUMA_SITE = \ https://github.com/kkos/oniguruma/releases/download/v$(ONIGURUMA_VERSION) ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz ONIGURUMA_LICENSE = BSD-2-Clause ONIGURUMA_LICENSE_FILES = COPYING +ONIGURUMA_CPE_ID_VENDOR = oniguruma_project ONIGURUMA_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/package/open-lldp/Config.in b/package/open-lldp/Config.in index b40bff8996..5bf363ef15 100644 --- a/package/open-lldp/Config.in +++ b/package/open-lldp/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_OPEN_LLDP configuration tool for Intel LLDP Agent with Enhanced Ethernet support for the Data Center. - http://open-lldp.org/ + https://github.com/intel/openlldp/ comment "open-lldp needs a toolchain w/ dynamic library, threads" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/open-lldp/open-lldp.hash b/package/open-lldp/open-lldp.hash index fdd85fed4f..1fbd8dd0ca 100644 --- a/package/open-lldp/open-lldp.hash +++ b/package/open-lldp/open-lldp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f2c8a3307970374b01ad832ea18cf6d9abce6f00b3d8aed9305aa1428ad8252d open-lldp-036e314bd93602f7388262cc37faf8b626980af1.tar.gz -sha256 67af5abeb092213cd9c53781503320f635ba28b641e0c3f24d367e8e93a9839b COPYING +sha256 13e0890527192a6289e6dac82056c447a1e2624ff93b0b6bbd8a42d15b2cbc8c open-lldp-1.1.tar.gz +sha256 67af5abeb092213cd9c53781503320f635ba28b641e0c3f24d367e8e93a9839b COPYING diff --git a/package/open-lldp/open-lldp.mk b/package/open-lldp/open-lldp.mk index c9fd958a4f..d42dbcc5c3 100644 --- a/package/open-lldp/open-lldp.mk +++ b/package/open-lldp/open-lldp.mk @@ -4,13 +4,18 @@ # ################################################################################ -OPEN_LLDP_VERSION = 036e314bd93602f7388262cc37faf8b626980af1 -OPEN_LLDP_SITE = git://open-lldp.org/open-lldp.git +OPEN_LLDP_VERSION = 1.1 +OPEN_LLDP_SITE = $(call github,intel,openlldp,v$(OPEN_LLDP_VERSION)) OPEN_LLDP_DEPENDENCIES = readline libnl libconfig host-pkgconf OPEN_LLDP_LICENSE = GPL-2.0 OPEN_LLDP_LICENSE_FILES = COPYING -# Fetching from git, need to generate configure/Makefile.in +# Fetching from git OPEN_LLDP_AUTORECONF = YES +ifeq ($(BR2_INIT_SYSTEMD),y) +OPEN_LLDP_DEPENDENCIES += systemd +OPEN_LLDP_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system +endif + $(eval $(autotools-package)) diff --git a/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch b/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch index 9fc30a969f..d3364440e4 100644 --- a/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch +++ b/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch @@ -1,4 +1,4 @@ -From fdfeac7e77382ddd0e3fb4f2abeae84f0a31584f Mon Sep 17 00:00:00 2001 +From 1fe7b756365254f7175558e7a89c1d89f95c5e2e Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Tue, 30 Sep 2014 13:46:59 +0200 Subject: [PATCH] Remove OWNER and GROUPS parameters to install @@ -8,25 +8,25 @@ Buildroot we don't want that, since fakeroot will do its job when we finalize the rootfs. Signed-off-by: Maxime Hadjinlian +[aduskett@gmail.com: Updated for 32408520fcebe785983a68e39ec83830a3005779] +Signed-off-by: Adam Duskett --- - docbook/Makefile | 4 ++-- - ether/Makefile | 8 ++++---- - iso15118/Makefile | 8 ++++---- - key/Makefile | 8 ++++---- - mdio/Makefile | 8 ++++---- - mme/Makefile | 8 ++++---- - nvm/Makefile | 8 ++++---- - pib/Makefile | 8 ++++---- - plc/Makefile | 8 ++++---- - ram/Makefile | 8 ++++---- - scripts/Makefile | 4 ++-- - serial/Makefile | 8 ++++---- - slac/Makefile | 8 ++++---- - tools/Makefile | 2 +- - 14 files changed, 49 insertions(+), 49 deletions(-) + docbook/Makefile | 4 ++-- + ether/Makefile | 8 ++++---- + key/Makefile | 8 ++++---- + mdio/Makefile | 8 ++++---- + mme/Makefile | 8 ++++---- + nvm/Makefile | 8 ++++---- + pib/Makefile | 8 ++++---- + plc/Makefile | 8 ++++---- + ram/Makefile | 8 ++++---- + serial/Makefile | 8 ++++---- + slac/Makefile | 8 ++++---- + tools/Makefile | 2 +- + 12 files changed, 43 insertions(+), 43 deletions(-) diff --git a/docbook/Makefile b/docbook/Makefile -index d630822..23a9b5a 100755 +index d630822..039d62a 100755 --- a/docbook/Makefile +++ b/docbook/Makefile @@ -32,9 +32,9 @@ manuals: @@ -42,7 +42,7 @@ index d630822..23a9b5a 100755 rm -f ${LIBRARY}/*.c.html ${LIBRARY}/*.h.html ${LIBRARY}/*.1.html setup: diff --git a/ether/Makefile b/ether/Makefile -index 807cbcb..574050a 100755 +index 89174cb..8256d50 100755 --- a/ether/Makefile +++ b/ether/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -62,31 +62,9 @@ index 807cbcb..574050a 100755 + install -m ${SUID_PERM} ${TOOLS} ${BIN} uninstall: cd ${BIN}; rm -f ${TOOLS} - check: -diff --git a/iso15118/Makefile b/iso15118/Makefile -index 72afdc4..da11a1c 100755 ---- a/iso15118/Makefile -+++ b/iso15118/Makefile -@@ -27,13 +27,13 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: -- if [ ! -d ${MAN} ]; then install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}; fi -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ if [ ! -d ${MAN} ]; then install -m ${DIR_PERM} -d ${MAN}; fi -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - install: compile library -- install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${SUID_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f plc ${TOOLS} - cd ${MAN}; rm -f plc ${PAGES} + cd ${MAN}; rm -f ${PAGES} diff --git a/key/Makefile b/key/Makefile -index 7de75ff..ee8968c 100755 +index de62a49..78fa200 100755 --- a/key/Makefile +++ b/key/Makefile @@ -28,13 +28,13 @@ compact: compile @@ -108,7 +86,7 @@ index 7de75ff..ee8968c 100755 cd ${BIN}; rm -f ${TOOLS} cd ${MAN}; rm -f ${PAGES} diff --git a/mdio/Makefile b/mdio/Makefile -index 60a75a9..062d858 100755 +index 049b08e..3ff4c26 100755 --- a/mdio/Makefile +++ b/mdio/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -130,7 +108,7 @@ index 60a75a9..062d858 100755 cd ${BIN}; rm -f int6k ${TOOLS} cd ${MAN}; rm -f int6k ${PAGES} diff --git a/mme/Makefile b/mme/Makefile -index d6a9132..23f4775 100755 +index 0313aea..77a6b96 100755 --- a/mme/Makefile +++ b/mme/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -150,9 +128,9 @@ index d6a9132..23f4775 100755 + install -m ${BIN_PERM} ${TOOLS} ${BIN} uninstall: cd ${BIN}; rm -f ${TOOLS} - check: + cd ${MAN}; rm -f ${PAGES} diff --git a/nvm/Makefile b/nvm/Makefile -index 5ae47d2..d7f4037 100755 +index 9aa05ec..b468e70 100755 --- a/nvm/Makefile +++ b/nvm/Makefile @@ -28,12 +28,12 @@ compact: compile @@ -171,9 +149,9 @@ index 5ae47d2..d7f4037 100755 + install -m ${BIN_PERM} ${TOOLS} ${BIN} uninstall: cd ${BIN}; rm -f ${TOOLS} - check: + cd ${MAN}; rm -f ${PAGES} diff --git a/pib/Makefile b/pib/Makefile -index 3af94c8..908b03a 100644 +index 93f0c3b..23195b4 100644 --- a/pib/Makefile +++ b/pib/Makefile @@ -30,12 +30,12 @@ compact: compile @@ -192,9 +170,9 @@ index 3af94c8..908b03a 100644 + install -m ${BIN_PERM} ${TOOLS} ${BIN} uninstall: cd ${BIN}; rm -f ${TOOLS} - check: + cd ${MAN}; rm -f ${PAGES} diff --git a/plc/Makefile b/plc/Makefile -index bd8b806..5b41c0b 100644 +index 43d6bd5..9fd4e0a 100644 --- a/plc/Makefile +++ b/plc/Makefile @@ -32,13 +32,13 @@ compact: compile @@ -213,10 +191,10 @@ index bd8b806..5b41c0b 100644 - install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} + install -m ${SUID_PERM} ${TOOLS} ${BIN} uninstall: - cd ${BIN}; rm -f int6k ${TOOLS} - cd ${MAN}; rm -f int6k ${PAGES} + cd ${BIN}; rm -f ${TOOLS} + cd ${MAN}; rm -f ${PAGES} diff --git a/ram/Makefile b/ram/Makefile -index 60b9bb3..c951218 100755 +index 60b9bb3..c34ddd0 100755 --- a/ram/Makefile +++ b/ram/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -238,7 +216,7 @@ index 60b9bb3..c951218 100755 cd ${BIN}; rm -f ${TOOLS} cd ${MAN}; rm -f ${PAGES} diff --git a/serial/Makefile b/serial/Makefile -index c25f1a6..6420d4a 100755 +index c25f1a6..aebbac9 100755 --- a/serial/Makefile +++ b/serial/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -260,7 +238,7 @@ index c25f1a6..6420d4a 100755 cd ${BIN}; rm -f int6k ${TOOLS} cd ${MAN}; rm -f int6k ${PAGES} diff --git a/slac/Makefile b/slac/Makefile -index d69da17..449f20a 100755 +index bd12db9..1f0b65d 100755 --- a/slac/Makefile +++ b/slac/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -279,10 +257,10 @@ index d69da17..449f20a 100755 - install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} + install -m ${SUID_PERM} ${TOOLS} ${BIN} uninstall: - cd ${BIN}; rm -f plc ${TOOLS} - cd ${MAN}; rm -f plc ${PAGES} + cd ${BIN}; rm -f ${TOOLS} + cd ${MAN}; rm -f ${PAGES} diff --git a/tools/Makefile b/tools/Makefile -index 1d992cf..f17db3d 100755 +index 1d992cf..a74fd24 100755 --- a/tools/Makefile +++ b/tools/Makefile @@ -27,7 +27,7 @@ compact: compile @@ -294,5 +272,6 @@ index 1d992cf..f17db3d 100755 scripts: manuals: # install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} --- -2.1.0 +-- +2.26.2 + diff --git a/package/open-plc-utils/open-plc-utils.hash b/package/open-plc-utils/open-plc-utils.hash index 0c3b64b7e7..1788b42fc0 100644 --- a/package/open-plc-utils/open-plc-utils.hash +++ b/package/open-plc-utils/open-plc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 00cd7f71e03849b1d6a96ec040351b819481e2f420cfb246f0b0f02cde73e098 open-plc-utils-1be781d1ea81827e5f6c1a35961c65dd4d15472c.tar.gz +sha256 b0156567a71c608cc1a0b18bbb1c5a97dd0ad9180097435f7e99119712bb299b open-plc-utils-32408520fcebe785983a68e39ec83830a3005779.tar.gz sha256 3137c632bbcec5e88b72dc13f4fe06ee184eea364fec8f7494bdfa57672ef921 LICENSE diff --git a/package/open-plc-utils/open-plc-utils.mk b/package/open-plc-utils/open-plc-utils.mk index e1e66bf7e0..d2ac39aca4 100644 --- a/package/open-plc-utils/open-plc-utils.mk +++ b/package/open-plc-utils/open-plc-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN_PLC_UTILS_VERSION = 1be781d1ea81827e5f6c1a35961c65dd4d15472c +OPEN_PLC_UTILS_VERSION = 32408520fcebe785983a68e39ec83830a3005779 OPEN_PLC_UTILS_SITE = $(call github,qca,open-plc-utils,$(OPEN_PLC_UTILS_VERSION)) OPEN_PLC_UTILS_LICENSE = BSD-3-Clause OPEN_PLC_UTILS_LICENSE_FILES = LICENSE @@ -26,7 +26,8 @@ define OPEN_PLC_UTILS_BUILD_CMDS endef define OPEN_PLC_UTILS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) ROOTFS=$(TARGET_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) ROOTFS=$(TARGET_DIR) \ + BIN="$(TARGET_DIR)/usr/bin" -C $(@D) install endef $(eval $(generic-package)) diff --git a/package/open2300/open2300.hash b/package/open2300/open2300.hash index 414041b923..f8b1150694 100644 --- a/package/open2300/open2300.hash +++ b/package/open2300/open2300.hash @@ -1,6 +1,4 @@ # Localy computed -# Note: open2300's upstream svn tree is off-line, so this tarball is -# served from s.b.o. instead, which actually makes it stable. -sha256 f4239d2f16d52156586d06be38f06a3eb58168377e243a8de8720b66e33ddb8f open2300-12.tar.gz +sha256 ffa7f8d35b16abfbf5e52285cb21f2a7fc6afb901abb40c0c80eef9d23d08aab open2300-f21982e0b1f8321561e5ad1668307fde97700e1b.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk index 589d344b97..9fb7dbc2fd 100644 --- a/package/open2300/open2300.mk +++ b/package/open2300/open2300.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPEN2300_SITE = http://www.lavrsen.dk/svn/open2300/trunk -OPEN2300_SITE_METHOD = svn -OPEN2300_VERSION = 12 +OPEN2300_VERSION = f21982e0b1f8321561e5ad1668307fde97700e1b +OPEN2300_SITE = $(call github,wezm,open2300,$(OPEN2300_VERSION)) OPEN2300_LICENSE = GPL-2.0 OPEN2300_LICENSE_FILES = COPYING @@ -19,12 +18,8 @@ OPEN2300_LDFLAGS = $(TARGET_LDFLAGS) ifeq ($(BR2_PACKAGE_MYSQL),y) OPEN2300_DEPENDENCIES += mysql OPEN2300_BINS += mysql2300 mysqlhistlog2300 -OPEN2300_CFLAGS += -I$(STAGING_DIR)/usr/include/mysql -OPEN2300_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -ifeq ($(BR2_STATIC_LIBS),y) -# mysql needs -lz, so we need to specify it for static builds -OPEN2300_LDFLAGS += -lz -endif +OPEN2300_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/mysql_config --cflags) +OPEN2300_LDFLAGS += $(shell $(STAGING_DIR)/usr/bin/mysql_config --libs) endif define OPEN2300_BUILD_CMDS diff --git a/package/openal/Config.in b/package/openal/Config.in index a564156555..6b0e9973db 100644 --- a/package/openal/Config.in +++ b/package/openal/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_OPENAL_ARCH_SUPPORTS config BR2_PACKAGE_OPENAL bool "openal" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 PR56019 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS help @@ -26,7 +27,8 @@ config BR2_PACKAGE_OPENAL http://kcat.strangesoft.net/openal.html -comment "openal needs a toolchain w/ NPTL, C++" +comment "openal needs a toolchain w/ NPTL, C++, gcc >= 4.9" depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_INSTALL_LIBSTDCPP + || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/openal/openal.hash b/package/openal/openal.hash index a133808cae..3f1a574e3e 100644 --- a/package/openal/openal.hash +++ b/package/openal/openal.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9f3536ab2bb7781dbafabc6a61e0b34b17edd16bd6c2eaf2ae71bc63078f98c7 openal-1.19.1.tar.gz -sha256 d808ce217e5b611854da622b57ec29fe545584c48bc5352fae72a4b6e5074a15 COPYING +sha256 8ac17e4e3b32c1af3d5508acfffb838640669b4274606b7892aa796ca9d7467f openal-1.21.1.tar.gz +sha256 d808ce217e5b611854da622b57ec29fe545584c48bc5352fae72a4b6e5074a15 COPYING diff --git a/package/openal/openal.mk b/package/openal/openal.mk index 8e761a8d9b..a878e4847f 100644 --- a/package/openal/openal.mk +++ b/package/openal/openal.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENAL_VERSION = 1.19.1 -OPENAL_SITE = $(call github,kcat,openal-soft,openal-soft-$(OPENAL_VERSION)) +OPENAL_VERSION = 1.21.1 +OPENAL_SITE = $(call github,kcat,openal-soft,$(OPENAL_VERSION)) OPENAL_LICENSE = LGPL-2.0+ OPENAL_LICENSE_FILES = COPYING OPENAL_INSTALL_STAGING = YES diff --git a/package/openblas/Config.in b/package/openblas/Config.in index 3f658c862a..0144e93a3f 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -73,4 +73,25 @@ config BR2_PACKAGE_OPENBLAS_TARGET string "OpenBLAS target CPU" default BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET +config BR2_PACKAGE_OPENBLAS_USE_THREAD + bool "use multithreading" + default y + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + help + Tell OpenBLAS to use multithreading, by passing USE_THREAD=1. + +config BR2_PACKAGE_OPENBLAS_USE_LOCKING + bool "use locking" + default y + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_PACKAGE_OPENBLAS_USE_THREAD + help + Tell OpenBLAS to use locking, by passing USE_LOCKING=1. + Locking is implicitly enabled when USE_THREAD=1. + However, if USE_THREAD=0 (i.e. OpenBLAS itself will run in + single-threaded mode) but an application makes OpenBLAS + function calls from multiple threads, then locking is + mandatory for correct operation. + endif diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index 0683d2a646..c58def9d5d 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8f86ade36f0dbed9ac90eb62575137388359d97d8f93093b38abe166ad7ef3a8 openblas-0.3.8.tar.gz +sha256 17d4677264dfbc4433e97076220adc79b050e4f8a083ea3f853a53af253bc380 openblas-0.3.9.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 105c03713b..60b9d9b15b 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.8 +OPENBLAS_VERSION = 0.3.9 OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,v$(OPENBLAS_VERSION)) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE @@ -25,20 +25,27 @@ OPENBLAS_MAKE_OPTS += ONLY_CBLAS=1 endif # Enable/Disable multi-threading (not for static-only since it uses dlfcn.h) -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS):$(BR2_STATIC_LIBS),y:) +ifeq ($(BR2_PACKAGE_OPENBLAS_USE_THREAD),y) OPENBLAS_MAKE_OPTS += USE_THREAD=1 else OPENBLAS_MAKE_OPTS += USE_THREAD=0 endif +ifeq ($(BR2_PACKAGE_OPENBLAS_USE_LOCKING),y) +OPENBLAS_MAKE_OPTS += USE_LOCKING=1 +else +# not passing USE_LOCKING=0 as this could be confusing: its effect is implicit +# in case of USE_THREAD=1. +endif + # We don't know if OpenMP is available or not, so disable OPENBLAS_MAKE_OPTS += USE_OPENMP=0 # Static-only/Shared-only toggle +# Note: static library is always generated so that applications can link +# statically for size reduction, even if BR2_STATIC_LIBS is not set. ifeq ($(BR2_STATIC_LIBS),y) OPENBLAS_MAKE_OPTS += NO_SHARED=1 -else ifeq ($(BR2_SHARED_LIBS),y) -OPENBLAS_MAKE_OPTS += NO_STATIC=1 endif # binutils version <= 2.23.2 has a bug diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in index d4b17b6acf..b9ea033f13 100644 --- a/package/opencv3/Config.in +++ b/package/opencv3/Config.in @@ -5,7 +5,6 @@ menuconfig BR2_PACKAGE_OPENCV3 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS # include dlfcn.h - depends on !BR2_PACKAGE_OPENCV select BR2_PACKAGE_ZLIB help OpenCV (Open Source Computer Vision) is a library of @@ -85,7 +84,6 @@ comment "gtk3 support needs libgtk3" config BR2_PACKAGE_OPENCV3_WITH_QT5 bool "qt5" depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS @@ -156,7 +154,7 @@ config BR2_PACKAGE_OPENCV3_LIB_PHOTO config BR2_PACKAGE_OPENCV3_LIB_PYTHON bool "python" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_PYTHON_NUMPY @@ -165,6 +163,8 @@ config BR2_PACKAGE_OPENCV3_LIB_PYTHON python example is installed. comment "python support needs glibc or musl" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) config BR2_PACKAGE_OPENCV3_LIB_SHAPE @@ -312,6 +312,14 @@ config BR2_PACKAGE_OPENCV3_WITH_V4L If the package libv4l is enabled, its support is automatically enabled. +config BR2_PACKAGE_OPENCV3_WITH_WEBP + bool "webp support" + select BR2_PACKAGE_WEBP + help + Enable WebP support. + + Use shared libwebp from the target system. + comment "Install options" config BR2_PACKAGE_OPENCV3_INSTALL_DATA diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash index 4953d01a1c..59af557198 100644 --- a/package/opencv3/opencv3.hash +++ b/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b7ea364de7273cfb3b771a0d9c111b8b8dfb42ff2bcd2d84681902fb8f49892a opencv3-3.4.9.tar.gz -sha256 c3596f2f886631ac49af2c9a201ca559f850bb5726bdc25eacbe2369a70caad9 LICENSE +sha256 b1e8470b18e9e793bf70b4ae051bbc9bf81fa45f8cbfee1e6c88858c90be8ff7 opencv3-3.4.15.tar.gz +sha256 9076d3d934839a2f8e7bfe549abda6faea4751f1edd6e9460ff703559890ad5f LICENSE diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index fab6716340..f3511bbcb9 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -4,15 +4,22 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.9 +OPENCV3_VERSION = 3.4.15 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause OPENCV3_LICENSE_FILES = LICENSE +OPENCV3_CPE_ID_VENDOR = opencv +OPENCV3_CPE_ID_PRODUCT = opencv OPENCV3_SUPPORTS_IN_SOURCE_BUILD = NO OPENCV3_CXXFLAGS = $(TARGET_CXXFLAGS) +# Uses __atomic_fetch_add_4 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +OPENCV3_CXXFLAGS += -latomic +endif + # Fix c++11 build with missing std::exception_ptr ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_64735),y) OPENCV3_CXXFLAGS += -DCV__EXCEPTION_PTR=0 @@ -41,6 +48,7 @@ endif # OpenCV build options OPENCV3_CONF_OPTS += \ -DBUILD_WITH_STATIC_CRT=OFF \ + -DENABLE_CCACHE=OFF \ -DENABLE_COVERAGE=OFF \ -DENABLE_FAST_MATH=ON \ -DENABLE_IMPL_COLLECTION=OFF \ @@ -48,7 +56,7 @@ OPENCV3_CONF_OPTS += \ -DENABLE_OMIT_FRAME_POINTER=ON \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DENABLE_PROFILING=OFF \ - -DOPENCV3_WARNINGS_ARE_ERRORS=OFF + -DOPENCV_WARNINGS_ARE_ERRORS=OFF # OpenCV link options OPENCV3_CONF_OPTS += \ @@ -218,7 +226,6 @@ OPENCV3_CONF_OPTS += \ -DWITH_VA=OFF \ -DWITH_VA_INTEL=OFF \ -DWITH_VTK=OFF \ - -DWITH_WEBP=OFF \ -DWITH_XINE=OFF OPENCV3_DEPENDENCIES += host-pkgconf zlib @@ -282,7 +289,9 @@ OPENCV3_CONF_OPTS += -DWITH_PNG=OFF endif ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PROTOBUF),y) +# protobuf needs c++11 (since 3.6.0) OPENCV3_CONF_OPTS += \ + -DENABLE_CXX11=ON \ -DPROTOBUF_UPDATE_FILES=ON \ -DWITH_PROTOBUF=ON OPENCV3_DEPENDENCIES += protobuf @@ -313,20 +322,14 @@ else OPENCV3_CONF_OPTS += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF endif -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_PYTHON),y) -ifeq ($(BR2_PACKAGE_PYTHON),y) -OPENCV3_CONF_OPTS += \ - -DBUILD_opencv_python2=ON \ - -DBUILD_opencv_python3=OFF \ - -DPYTHON2_EXECUTABLE=$(HOST_DIR)/bin/python2 \ - -DPYTHON2_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) \ - -DPYTHON2_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so \ - -DPYTHON2_NUMPY_INCLUDE_DIRS=$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/numpy/core/include \ - -DPYTHON2_PACKAGES_PATH=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - -DPYTHON2_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) -OPENCV3_DEPENDENCIES += python -OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/cv2/config*.py +ifeq ($(BR2_PACKAGE_OPENCV3_WITH_WEBP),y) +OPENCV3_CONF_OPTS += -DWITH_WEBP=ON +OPENCV3_DEPENDENCIES += webp else +OPENCV3_CONF_OPTS += -DWITH_WEBP=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_PYTHON),y) OPENCV3_CONF_OPTS += \ -DBUILD_opencv_python2=OFF \ -DBUILD_opencv_python3=ON \ @@ -338,7 +341,6 @@ OPENCV3_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV3_DEPENDENCIES += python3 OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -endif OPENCV3_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) OPENCV3_DEPENDENCIES += python-numpy else @@ -348,16 +350,21 @@ OPENCV3_CONF_OPTS += \ endif # Installation hooks: -define OPENCV3_CLEAN_INSTALL_DOC - $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/doc +define OPENCV3_CLEAN_INSTALL_LICENSE + $(RM) -fr $(TARGET_DIR)/usr/share/licenses/opencv3 endef -OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_DOC +OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_LICENSE define OPENCV3_CLEAN_INSTALL_CMAKE - $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCVConfig*.cmake + $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCV*.cmake endef OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_CMAKE +define OPENCV3_CLEAN_INSTALL_VALGRIND + $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/valgrind* +endef +OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_VALGRIND + ifneq ($(BR2_PACKAGE_OPENCV3_INSTALL_DATA),y) define OPENCV3_CLEAN_INSTALL_DATA $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/haarcascades \ diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index 9835b84b64..f1b34ef5dd 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -1,18 +1,15 @@ config BR2_PACKAGE_OPENFPGALOADER bool "openfpgaloader" depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi1 - depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_INSTALL_LIBSTDCPP # libftdipp1 - depends on BR2_USE_WCHAR # libftdipp1 - select BR2_PACKAGE_ARGP_STANDALONE \ - if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL # argp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi1 -> libusb + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBFTDI1 - select BR2_PACKAGE_LIBFTDI1_LIBFTDIPP1 help Universal utility for programming FPGA https://github.com/trabucayre/openFPGALoader/ -comment "openfpgaloader needs udev, a toolchain w/ threads, wchar, C++" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_UDEV +comment "openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash index a084e938b0..990149cded 100644 --- a/package/openfpgaloader/openfpgaloader.hash +++ b/package/openfpgaloader/openfpgaloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fcff4999164ee2d3734f16b7f1d2063b3a68e237921e8d63c2afe75e16cdc7ce openfpgaloader-849e5751e06d4d00f323205d5f02ee01f9f59a61.tar.gz +sha256 ef3ed60297ab560f15cd4362d61b7da86c44b84e18937e0411023f8d1cf6a606 openfpgaloader-381c67de00a3102cf6e9bb20ca84030a71c7a0f2.tar.gz sha256 8486a10c4393cee1c25392769ddd3b2d6c242d6ec7928e1414efff7dfb2f07ef LICENSE diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index f806fd68f9..1bb3de37fb 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -4,15 +4,17 @@ # ################################################################################ -OPENFPGALOADER_VERSION = 849e5751e06d4d00f323205d5f02ee01f9f59a61 +OPENFPGALOADER_VERSION = 381c67de00a3102cf6e9bb20ca84030a71c7a0f2 OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,$(OPENFPGALOADER_VERSION)) OPENFPGALOADER_LICENSE = AGPL-3.0 OPENFPGALOADER_LICENSE_FILES = LICENSE -OPENFPGALOADER_DEPENDENCIES = libftdi1 udev +OPENFPGALOADER_DEPENDENCIES = libftdi1 -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -OPENFPGALOADER_DEPENDENCIES += argp-standalone -OPENFPGALOADER_CONF_OPTS += -DCMAKE_CXX_STANDARD_LIBRARIES="-largp" +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +OPENFPGALOADER_DEPENDENCIES += udev +OPENFPGALOADER_CONF_OPTS += -DENABLE_UDEV=ON +else +OPENFPGALOADER_CONF_OPTS += -DENABLE_UDEV=OFF endif $(eval $(cmake-package)) diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index 756ea539f1..2ec9dd31af 100644 --- a/package/openipmi/openipmi.hash +++ b/package/openipmi/openipmi.hash @@ -1,7 +1,8 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 043738af9e1aaa6ae4f372d4af7870683e68faf8 OpenIPMI-2.0.27.tar.gz +sha1 be0c87743a38e2fa00586df931f021c0b480385b OpenIPMI-2.0.28.tar.gz +md5 ba37f08e306062ec73c7ed2a2bd4d5f4 OpenIPMI-2.0.28.tar.gz # Locally computed -sha256 f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b OpenIPMI-2.0.27.tar.gz +sha256 8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996 OpenIPMI-2.0.28.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index ca8fa77342..3240b89894 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.27 -OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library +OPENIPMI_VERSION = 2.0.28 +OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 98e039c17e..bbc939d4e8 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,6 +1,9 @@ -# From https://github.com/AdoptOpenJDK/openjdk12-binaries/releases -sha256 6c06853332585ab58834d9e8a02774b388e6e062ef6c4084b4f058c67f2e81b5 OpenJDK14U-jdk_x64_linux_hotspot_14_36.tar.gz +# https://github.com/adoptium/temurin17-binaries/releases +sha256 6ea18c276dcbb8522feeebcfc3a4b5cb7c7e7368ba8590d3326c6c3efc5448b6 OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz + +# From https://github.com/adoptium/temurin11-binaries/releases +sha256 3b1c0c34be4c894e64135a454f2d5aaa4bd10aea04ec2fa0c0efe6bb26528e30 OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz # Locally calculated -sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE -sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE +sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 31dc4a4666..266c93d363 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -4,25 +4,34 @@ # ################################################################################ -HOST_OPENJDK_BIN_VERSION_MAJOR = 14 -HOST_OPENJDK_BIN_VERSION_MINOR = 36 -HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) -HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz -HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) +HOST_OPENJDK_BIN_VERSION_MAJOR = 17 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.1_12 +else +HOST_OPENJDK_BIN_VERSION_MAJOR = 11 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.13_8 +endif +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR).$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE = OpenJDK$(HOST_OPENJDK_BIN_VERSION_MAJOR)U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/adoptium/temurin$(HOST_OPENJDK_BIN_VERSION_MAJOR)-binaries/releases/download/jdk-$(subst _,%2B,$(HOST_OPENJDK_BIN_VERSION)) + HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION +HOST_OPENJDK_BIN_ROOT_DIR = $(HOST_DIR)/usr/lib/jvm + # unpack200 has an invalid RPATH and relies on libzlib. When # host-libzlib is installed on the system, the error "ERROR: package # host-libzlib installs executables without proper RPATH: will occur. # Because unpack200 is a deprecated tool, removing it to fix this # issue is safe. define HOST_OPENJDK_BIN_INSTALL_CMDS - mkdir -p $(HOST_DIR)/bin - cp -dpfr $(@D)/bin/* $(HOST_DIR)/bin/ - mkdir -p $(HOST_DIR)/lib - cp -dpfr $(@D)/lib/* $(HOST_DIR)/lib/ - $(RM) -f $(HOST_DIR)/bin/unpack200 + mkdir -p $(HOST_OPENJDK_BIN_ROOT_DIR) + cp -dpfr $(@D)/* $(HOST_OPENJDK_BIN_ROOT_DIR) + $(RM) -f $(HOST_OPENJDK_BIN_ROOT_DIR)/bin/unpack200 endef $(eval $(host-generic-package)) + +# variables used by other packages +JAVAC = $(HOST_OPENJDK_BIN_ROOT_DIR)/bin/javac diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 61294ec49f..2aad1dcea3 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -11,7 +11,6 @@ config BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS default y if BR2_m68k default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le default y if BR2_sh - default y if BR2_sparc || BR2_sparc64 config BR2_PACKAGE_OPENJDK bool "openjdk" @@ -21,6 +20,7 @@ config BR2_PACKAGE_OPENJDK depends on !BR2_STATIC_LIBS # glibc depends on BR2_INSTALL_LIBSTDCPP # cups depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, cups, libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb, C++14 for OpenJDK17 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_USE_MMU # cups depends on BR2_PACKAGE_XORG7 @@ -49,6 +49,78 @@ config BR2_PACKAGE_OPENJDK if BR2_PACKAGE_OPENJDK +choice + prompt "openjdk version" + default BR2_PACKAGE_OPENJDK_VERSION_17 + help + Select the version of OpenJDK you wish to use. + +config BR2_PACKAGE_OPENJDK_VERSION_11 + bool "OpenJDK 11" + +config BR2_PACKAGE_OPENJDK_VERSION_17 + bool "OpenJDK 17" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++14 + +comment "OpenJDK 17 needs a host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 # C++14 + +endchoice + +config BR2_PACKAGE_OPENJDK_FULL_JDK + bool "Build the full JDK" + help + Install the full JDK instead of just the run time. + The full JDK includes several packages used for debugging and + development. Some useful tools included with the JDK are: + - javaws + Command line tool for launching Java Web Start and setting + various options. + + - jcmd: + JVM Diagnostic Commands tool: Sends diagnostic command + requests to a running Java Virtual Machine. + + - jinfo + Configuration Info for Java: Prints configuration + information for a given process or core file or a remote + debug server. + + - jmap + Memory Map for Java: Prints shared object memory maps or + heap memory details of a given process or core file or a + remote debug server. + + - jsadebugd + Serviceability Agent Debug Daemon for Java: Attaches to a + process or core file and acts as a debug server. + + - jstack + Stack Trace for Java - Prints a stack trace of threads for + a given process or core file or remote debug server. + + - jstat + JVM Statistics Monitoring Tool: Attaches to an + instrumented HotSpot Java virtual machine and collects and + logs performance statistics as specified by the command + line options. + + - jstatd + JVM jstat Daemon - Launches an RMI server application that + monitors for the creation and termination of instrumented + HotSpot Java virtual machines and provides an interface to + allow remote monitoring tools to attach to Java virtual + machines running on the local system. + + Note: + While the JDK also comes with several tools which can be used + for developing java applications on a target, Buildroot does + not support development on a target. Building the full JDK is + supported for debugging purposes only. + + Selecting this option increases the file system by + approximately 110M. + choice prompt "openjdk variant" default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpc @@ -84,12 +156,14 @@ comment "openjdk needs X.Org" depends on BR2_USE_MMU depends on !BR2_PACKAGE_XORG7 -comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++" +comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 comment "openjdk does not support soft float configurations" depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index d5be642052..2f46b044ad 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 6815dbac7dd0f86291254e84ed17565c89477eeb6b0847a9648b00ecb4f07634 jdk-14+36.tar.gz -sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE +sha256 8c076203a6f85ab916b3e54de1992bcbcc5ffe580c52b1ac8d52ca7afb9f02d1 openjdk-17.0.1+12.tar.gz +sha256 119c6233fe7ff5670c590e2f9d6686ac4d80c97b17065506998b75c547b54f2c openjdk-11.0.13+8.tar.gz +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index edc86c6fbe..5fccdaa7ac 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -4,13 +4,19 @@ # ################################################################################ -OPENJDK_VERSION_MAJOR = 14 -OPENJDK_VERSION_MINOR = 36 -OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) -OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz -OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive +ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) +OPENJDK_VERSION_MAJOR = 17 +OPENJDK_VERSION_MINOR = 0.1+12 +else +OPENJDK_VERSION_MAJOR = 11 +OPENJDK_VERSION_MINOR = 0.13+8 +endif +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) +OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) + OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE +OPENJDK_INSTALL_STAGING = YES # OpenJDK requires Alsa, cups, and X11 even for a headless build. # host-zip is needed for the zip executable. @@ -46,6 +52,21 @@ OPENJDK_JVM_VARIANT = zero OPENJDK_DEPENDENCIES += libffi endif +ifeq ($(BR2_PACKAGE_OPENJDK_FULL_JDK),y) +OPENJDK_VARIANT = jdk +OPENJDK_MAKE_TARGET = jdk-image +else +OPENJDK_VARIANT = jre +OPENJDK_MAKE_TARGET = legacy-jre-image +endif + +# OpenJDK installs a file named 'modules' in jre/lib, which gets installed as +# /usr/lib/modules. However, with a merged /usr, this conflicts with the +# directory named 'modules' installed by the kernel. If OpenJDK gets built +# after the kernel, this manifests itself with: "cp: cannot overwrite +# directory '/usr/lib/modules with non-directory." +OPENJDK_INSTALL_BASE = /usr/lib/jvm + # OpenJDK ignores some variables unless passed via the environment. # These variables are PATH, LD, CC, CXX, and CPP. # OpenJDK defaults ld to the ld binary but passes -Xlinker and -z as @@ -69,12 +90,13 @@ OPENJDK_CONF_OPTS = \ --enable-openjdk-only \ --enable-unlimited-crypto \ --openjdk-target=$(GNU_TARGET_NAME) \ - --with-boot-jdk=$(HOST_DIR) \ + --with-boot-jdk=$(HOST_OPENJDK_BIN_ROOT_DIR) \ --with-stdc++lib=dynamic \ --with-debug-level=release \ --with-devkit=$(HOST_DIR) \ --with-extra-cflags="$(TARGET_CFLAGS)" \ --with-extra-cxxflags="$(TARGET_CXXFLAGS)" \ + --with-extra-ldflags="-Wl,-rpath,$(OPENJDK_INSTALL_BASE)/lib,-rpath,$(OPENJDK_INSTALL_BASE)/lib/$(OPENJDK_JVM_VARIANT)" \ --with-giflib=system \ --with-jobs=$(PARALLEL_JOBS) \ --with-jvm-variants=$(OPENJDK_JVM_VARIANT) \ @@ -108,14 +130,31 @@ endef # Make -jn is unsupported. Instead, set the "--with-jobs=" configure option, # and use $(MAKE1). define OPENJDK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) legacy-jre-image + $(TARGET_MAKE_ENV) $(OPENJDK_CONF_ENV) $(MAKE1) -C $(@D) $(OPENJDK_MAKE_TARGET) endef # Calling make install always builds and installs the JDK instead of the JRE, # which makes manual installation necessary. define OPENJDK_INSTALL_TARGET_CMDS - cp -dpfr $(@D)/build/linux-*-release/images/jre/bin/* $(TARGET_DIR)/usr/bin/ - cp -dpfr $(@D)/build/linux-*-release/images/jre/lib/* $(TARGET_DIR)/usr/lib/ + mkdir -p $(TARGET_DIR)$(OPENJDK_INSTALL_BASE) + cp -dpfr $(@D)/build/linux-*-release/images/$(OPENJDK_VARIANT)/* \ + $(TARGET_DIR)$(OPENJDK_INSTALL_BASE)/ + cd $(TARGET_DIR)/usr/bin && ln -snf ../..$(OPENJDK_INSTALL_BASE)/bin/* . endef +define OPENJDK_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/jvm + cp -dpfr $(@D)/build/linux-*-release/jdk/include/* \ + $(STAGING_DIR)/usr/include/jvm +endef + +# Demos and includes are not needed on the target +ifeq ($(BR2_PACKAGE_OPENJDK_FULL_JDK),y) +define OPENJDK_REMOVE_UNEEDED_JDK_DIRECTORIES + $(RM) -r $(TARGET_DIR)$(OPENJDK_INSTALL_BASE)/include/ + $(RM) -r $(TARGET_DIR)$(OPENJDK_INSTALL_BASE)/demo/ +endef +OPENJDK_TARGET_FINALIZE_HOOKS += OPENJDK_REMOVE_UNEEDED_JDK_DIRECTORIES +endif + $(eval $(generic-package)) diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash index 31c5b50409..8798245256 100644 --- a/package/openjpeg/openjpeg.hash +++ b/package/openjpeg/openjpeg.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9 openjpeg-2.3.1.tar.gz -sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6 LICENSE +sha256 8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d openjpeg-2.4.0.tar.gz +sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6 LICENSE diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk index 1ff3111d64..7f2a2c439c 100644 --- a/package/openjpeg/openjpeg.mk +++ b/package/openjpeg/openjpeg.mk @@ -4,22 +4,13 @@ # ################################################################################ -OPENJPEG_VERSION = 2.3.1 +OPENJPEG_VERSION = 2.4.0 OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2-Clause OPENJPEG_LICENSE_FILES = LICENSE +OPENJPEG_CPE_ID_VENDOR = uclouvain OPENJPEG_INSTALL_STAGING = YES -# 0004-convertbmp-detect-invalid-file-dimensions-early.patch -# 0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch -OPENJPEG_IGNORE_CVES += CVE-2019-12973 - -# 0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch -OPENJPEG_IGNORE_CVES += CVE-2020-6851 - -# 0007-opj_tcd_init_tile-avoid-integer-overflow.patch -OPENJPEG_IGNORE_CVES += CVE-2020-8112 - OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng) OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index f1678507d7..23683bd6e9 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 e133a2ad952f4a31002b1a3217f6b4b68bc9f02bcf6c0b9970638a2627887101 v6.2.1-dist.zip +sha256 ab80014b15963404ec269a71f563fd3568581c55de160d5663600ea0787cf568 v6.5.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 65a1fe00fa..db464ef8a6 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.2.1 +OPENLAYERS_VERSION = 6.5.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause diff --git a/package/openldap/0001-fix_cross_strip.patch b/package/openldap/0001-fix_cross_strip.patch index ed4964e44b..d9d6f9d505 100644 --- a/package/openldap/0001-fix_cross_strip.patch +++ b/package/openldap/0001-fix_cross_strip.patch @@ -44,7 +44,7 @@ diff -rupN openldap-2.4.40/clients/tools/Makefile.in openldap-2.4.40-br/clients/ diff -rupN openldap-2.4.40/configure.in openldap-2.4.40-br/configure.in --- openldap-2.4.40/configure.in 2014-09-18 21:48:49.000000000 -0400 +++ openldap-2.4.40-br/configure.in 2015-01-16 15:50:48.874816786 -0500 -@@ -669,6 +669,15 @@ if test -z "${AR}"; then +@@ -668,6 +668,15 @@ if test -z "${AR}"; then fi fi diff --git a/package/openldap/0002-fix-bignum.patch b/package/openldap/0002-fix-bignum.patch index d3dc88fc37..159ea8e228 100644 --- a/package/openldap/0002-fix-bignum.patch +++ b/package/openldap/0002-fix-bignum.patch @@ -15,7 +15,7 @@ Signed-off-by: "Yann E. MORIN" diff -durN openldap-2.4.40.orig/configure openldap-2.4.40/configure --- openldap-2.4.40.orig/configure 2014-09-19 03:48:49.000000000 +0200 +++ openldap-2.4.40/configure 2015-01-25 18:44:54.216879362 +0100 -@@ -23478,7 +23478,7 @@ +@@ -23431,7 +23431,7 @@ if test "$ac_cv_header_openssl_bn_h" = "yes" && test "$ac_cv_header_openssl_crypto_h" = "yes" && @@ -27,7 +27,7 @@ diff -durN openldap-2.4.40.orig/configure openldap-2.4.40/configure diff -durN openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in --- openldap-2.4.40.orig/configure.in 2014-09-19 03:48:49.000000000 +0200 +++ openldap-2.4.40/configure.in 2015-01-25 18:44:37.628676446 +0100 -@@ -2367,7 +2367,7 @@ +@@ -2383,7 +2383,7 @@ AC_CHECK_HEADERS(openssl/crypto.h) if test "$ac_cv_header_openssl_bn_h" = "yes" && test "$ac_cv_header_openssl_crypto_h" = "yes" && diff --git a/package/openldap/Config.in b/package/openldap/Config.in index bd39d0d022..7a0b2f4b87 100644 --- a/package/openldap/Config.in +++ b/package/openldap/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_OPENLDAP This only installs client-side support. - http://www.openldap.org/ + https://www.openldap.org/ if BR2_PACKAGE_OPENLDAP diff --git a/package/openldap/openldap.hash b/package/openldap/openldap.hash index 9ea1e7a55d..71092c93d0 100644 --- a/package/openldap/openldap.hash +++ b/package/openldap/openldap.hash @@ -1,7 +1,7 @@ -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.48.md5 -md5 0729a0711fe096831dedc159e0bbe73f openldap-2.4.48.tgz -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.48.sha1 -sha1 c1984e80f6db038b317bf931866adb38e5537dcd openldap-2.4.48.tgz +# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.59.md5 +md5 6036a03b3a67b4a1fe1246e0a2c7265a openldap-2.4.59.tgz +# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.59.sha1 +sha1 b154d06bbf40fafafb34fffc4b116946d931efef openldap-2.4.59.tgz # Locally computed -sha256 d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d openldap-2.4.48.tgz -sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE +sha256 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 openldap-2.4.59.tgz +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 4417bb659b..b5373544ab 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -4,11 +4,13 @@ # ################################################################################ -OPENLDAP_VERSION = 2.4.48 +OPENLDAP_VERSION = 2.4.59 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz -OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release +OPENLDAP_SITE = https://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License OPENLDAP_LICENSE_FILES = LICENSE +OPENLDAP_CPE_ID_VENDOR = openldap +OPENLDAP_SELINUX_MODULES = ldap OPENLDAP_INSTALL_STAGING = YES OPENLDAP_DEPENDENCIES = host-pkgconf diff --git a/package/openmpi/openmpi-mips32-fortran.cache b/package/openmpi/openmpi-mips32-fortran.cache index 473f73a22e..36f9f02bb8 100644 --- a/package/openmpi/openmpi-mips32-fortran.cache +++ b/package/openmpi/openmpi-mips32-fortran.cache @@ -49,3 +49,4 @@ ompi_cv_fortran_kind_value_C_DOUBLE=8 ompi_cv_fortran_kind_value_C_DOUBLE_COMPLEX=8 ompi_cv_fortran_true_value=1 ompi_cv_fortran_sizeof_type_test_mpi_handle_=4 +ompi_cv_fortran_alignment_type_test_mpi_handle_=4 diff --git a/package/openmpi/openmpi-mips64-fortran.cache b/package/openmpi/openmpi-mips64-fortran.cache index 7f0209971a..dea2ce9cda 100644 --- a/package/openmpi/openmpi-mips64-fortran.cache +++ b/package/openmpi/openmpi-mips64-fortran.cache @@ -58,3 +58,4 @@ ompi_cv_fortran_kind_value_0=0 ompi_cv_real16_c_equiv=yes ompi_cv_fortran_true_value=1 ompi_cv_fortran_sizeof_type_test_mpi_handle_=4 +ompi_cv_fortran_alignment_type_test_mpi_handle_=4 diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index b682e6e74e..8bdc3fa188 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -11,7 +11,6 @@ OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause OPENMPI_LICENSE_FILES = LICENSE OPENMPI_INSTALL_STAGING = YES -OPENMPI_CONF_OPTS = --disable-vt # Enabling Fortran support requires pre-seeding the configure script # with various values that cannot be guessed, so we provide cache diff --git a/package/openntpd/ntpd.service b/package/openntpd/ntpd.service index a4ffa7318c..c2924b0c5c 100644 --- a/package/openntpd/ntpd.service +++ b/package/openntpd/ntpd.service @@ -5,6 +5,10 @@ Conflicts=systemd-timesyncd.service [Service] Type=simple +# Turn off DNSSEC validation for hostname look-ups, since those need the +# correct time to work, but we likely won't acquire that without NTP. Let's +# break this chicken-and-egg cycle here. +Environment=SYSTEMD_NSS_RESOLVE_VALIDATE=0 ExecStart=/usr/sbin/ntpd -s -d [Install] diff --git a/package/openntpd/openntpd.hash b/package/openntpd/openntpd.hash index 4d00b7bb9d..2ef8a619eb 100644 --- a/package/openntpd/openntpd.hash +++ b/package/openntpd/openntpd.hash @@ -1,5 +1,5 @@ # from http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/SHA256 -sha256 7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a openntpd-6.2p3.tar.gz +sha256 8582db838a399153d4a17f2a76518b638cc3020f58028575bf54127518f55a46 openntpd-6.8p1.tar.gz # Locally computed -sha256 6c1822ee950652c12bb3773849db18794f62c63452a70d018edf23e8cba71839 COPYING +sha256 6c1822ee950652c12bb3773849db18794f62c63452a70d018edf23e8cba71839 COPYING diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index f2eaee7efd..f9409cd90c 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -4,10 +4,12 @@ # ################################################################################ -OPENNTPD_VERSION = 6.2p3 +OPENNTPD_VERSION = 6.8p1 OPENNTPD_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD OPENNTPD_LICENSE = MIT-like, BSD-2-Clause, BSD-3-Clause OPENNTPD_LICENSE_FILES = COPYING +OPENNTPD_CPE_ID_VENDOR = openntpd +OPENNTPD_DEPENDENCIES = host-bison # Need to autoreconf for our libtool patch to apply properly OPENNTPD_AUTORECONF = YES diff --git a/package/openocd/Config.in b/package/openocd/Config.in index 448872061b..b14f940b27 100644 --- a/package/openocd/Config.in +++ b/package/openocd/Config.in @@ -13,6 +13,7 @@ comment "Adapters" config BR2_PACKAGE_OPENOCD_CMSIS_DAP bool "CMSIS-DAP compliant debuggers" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_PACKAGE_HAS_UDEV # hidapi depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # hidapi select BR2_PACKAGE_LIBUSB @@ -24,6 +25,7 @@ config BR2_PACKAGE_OPENOCD_CMSIS_DAP config BR2_PACKAGE_OPENOCD_FTDI bool "MPSSE mode of FTDI based devices" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the MPSSE mode of FTDI @@ -32,6 +34,7 @@ config BR2_PACKAGE_OPENOCD_FTDI config BR2_PACKAGE_OPENOCD_STLINK bool "ST-Link JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the ST-Link JTAG @@ -40,6 +43,7 @@ config BR2_PACKAGE_OPENOCD_STLINK config BR2_PACKAGE_OPENOCD_TI_ICDI bool "TI ICDI JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the TI ICDI JTAG @@ -48,6 +52,7 @@ config BR2_PACKAGE_OPENOCD_TI_ICDI config BR2_PACKAGE_OPENOCD_ULINK bool "Keil ULINK JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the Keil ULINK JTAG @@ -56,6 +61,7 @@ config BR2_PACKAGE_OPENOCD_ULINK config BR2_PACKAGE_OPENOCD_UBLASTER2 bool "Altera USB-Blaster II Compatible" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the Altera USB-Blaster @@ -64,6 +70,7 @@ config BR2_PACKAGE_OPENOCD_UBLASTER2 config BR2_PACKAGE_OPENOCD_JLINK bool "Segger J-Link JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Segger J-Link JTAG Programmer and clone such as Atmel @@ -72,6 +79,7 @@ config BR2_PACKAGE_OPENOCD_JLINK config BR2_PACKAGE_OPENOCD_OSDBM bool "OSDBM JTAG (only) Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the OSBDM (JTAG only) @@ -80,6 +88,7 @@ config BR2_PACKAGE_OPENOCD_OSDBM config BR2_PACKAGE_OPENOCD_OPENDOUS bool "eStick/opendous JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the eStick/opendous JTAG @@ -89,6 +98,7 @@ config BR2_PACKAGE_OPENOCD_AICE bool "Andes JTAG Programmer" depends on BR2_USE_MMU # use fork() depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the Andes JTAG @@ -97,6 +107,7 @@ config BR2_PACKAGE_OPENOCD_AICE config BR2_PACKAGE_OPENOCD_VSLLINK bool "Versaloon-Link JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb-compat -> libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -106,6 +117,7 @@ config BR2_PACKAGE_OPENOCD_VSLLINK config BR2_PACKAGE_OPENOCD_USBPROG bool "USBProg JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb-compat -> libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -115,6 +127,7 @@ config BR2_PACKAGE_OPENOCD_USBPROG config BR2_PACKAGE_OPENOCD_RLINK bool "Raisonance RLink JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb-compat -> libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -124,12 +137,22 @@ config BR2_PACKAGE_OPENOCD_RLINK config BR2_PACKAGE_OPENOCD_ARMEW bool "Olimex ARM-JTAG-EW Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb-compat -> libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help Enable building support for the Olimex ARM-JTAG-EW Programmer (default is auto) +config BR2_PACKAGE_OPENOCD_XDS110 + bool "TI XDS110 Debug Probe" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb + select BR2_PACKAGE_LIBUSB + help + Enable building support for the TI XDS110 Debug Probe. + config BR2_PACKAGE_OPENOCD_PARPORT bool "pc parallel port driver" help @@ -143,6 +166,7 @@ config BR2_PACKAGE_OPENOCD_VPI config BR2_PACKAGE_OPENOCD_UBLASTER bool "Altera USB-Blaster" depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi -> libusb select BR2_PACKAGE_LIBFTDI1 help Enable building support for the Altera USB-Blaster @@ -183,6 +207,7 @@ config BR2_PACKAGE_OPENOCD_GW16012 config BR2_PACKAGE_OPENOCD_PRESTO bool "ASIX Presto Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi -> libusb select BR2_PACKAGE_LIBFTDI1 help Enable building support for ASIX Presto Programmer @@ -191,6 +216,7 @@ config BR2_PACKAGE_OPENOCD_PRESTO config BR2_PACKAGE_OPENOCD_OPENJTAG bool "OpenJTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi -> libusb select BR2_PACKAGE_LIBFTDI1 select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT # needs usb.h @@ -209,10 +235,15 @@ config BR2_PACKAGE_OPENOCD_SYSFS Enable building support for programming driven via sysfs gpios. -# Many adapters need libusb or libusb-compat, which require threads, -# but we don't want to duplicate this comment for all adapters that -# select libusb or libusb-compat. -comment "many openocd adapters needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +# Many adapters need libusb or libusb-compat, which require threads and +# gcc >= 4.9 but we don't want to duplicate this comment for all +# adapters that select libusb or libusb-compat. +comment "many openocd adapters needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + +comment "xds110 adapter support needs toolchain w/ wchar" + depends on !BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 endif # BR2_PACKAGE_OPENOCD diff --git a/package/openocd/Config.in.host b/package/openocd/Config.in.host index e1d0e63308..8ff37379a1 100644 --- a/package/openocd/Config.in.host +++ b/package/openocd/Config.in.host @@ -1,6 +1,10 @@ config BR2_PACKAGE_HOST_OPENOCD bool "host openocd" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help OpenOCD - Open On-Chip Debugger http://openocd.org/ + +comment "host openocd needs a toolchain w/ host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash index 3fb817b4a2..91eb56d930 100644 --- a/package/openocd/openocd.hash +++ b/package/openocd/openocd.hash @@ -1,4 +1,3 @@ -# From http://sourceforge.net/projects/openocd/files/openocd/0.10.0/ -sha1 3245d43d60a1a93f8b0f6b1ce20b53e38cab7a4a openocd-0.10.0.tar.bz2 -md5 b412bdef0481a3859c6585eb69f6f6ba openocd-0.10.0.tar.bz2 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/ +sha256 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d openocd-0.11.0.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 7887f3a6dc..9f53ae3ee3 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENOCD_VERSION = 0.10.0 +OPENOCD_VERSION = 0.11.0 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION) OPENOCD_LICENSE = GPL-2.0+ @@ -32,7 +32,8 @@ OPENOCD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBUSB),libusb) \ $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \ $(if $(BR2_PACKAGE_LIBHID),libhid) \ - $(if $(BR2_PACKAGE_HIDAPI),hidapi) + $(if $(BR2_PACKAGE_HIDAPI),hidapi) \ + $(if $(BR2_PACKAGE_LIBGPIOD),libgpiod) # Adapters OPENOCD_CONF_OPTS += \ @@ -48,6 +49,7 @@ OPENOCD_CONF_OPTS += \ $(if $(BR2_PACKAGE_OPENOCD_VSLLINK),--enable-vsllink,--disable-vsllink) \ $(if $(BR2_PACKAGE_OPENOCD_USBPROG),--enable-usbprog,--disable-usbprog) \ $(if $(BR2_PACKAGE_OPENOCD_RLINK),--enable-rlink,--disable-rlink) \ + $(if $(BR2_PACKAGE_OPENOCD_XDS110),--enable-xds110,--disable-xds110) \ $(if $(BR2_PACKAGE_OPENOCD_ARMEW),--enable-armjtagew,--disable-armjtagew) \ $(if $(BR2_PACKAGE_OPENOCD_CMSIS_DAP),--enable-cmsis-dap,--disable-cmsis-dap) \ $(if $(BR2_PACKAGE_OPENOCD_PARPORT),--enable-parport,--disable-parport) \ diff --git a/package/openpgm/openpgm.hash b/package/openpgm/openpgm.hash index 472053173c..9d61bcdc96 100644 --- a/package/openpgm/openpgm.hash +++ b/package/openpgm/openpgm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 acc1545fd8060aa66b17327110e2859e451cfc685ebd3b2211619728e3471b66 openpgm-5-2-122.tar.gz +sha256 8d707ef8dda45f4a7bc91016d7f2fed6a418637185d76c7ab30b306499c6d393 openpgm-5-3-128.tar.gz sha256 4a7d4ec71fa60969399fd4caad64d5a3003fee2775445f271a5a36a8ae743a29 openpgm/pgm/LICENSE diff --git a/package/openpgm/openpgm.mk b/package/openpgm/openpgm.mk index ec293b42df..ded06f3d9a 100644 --- a/package/openpgm/openpgm.mk +++ b/package/openpgm/openpgm.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENPGM_VERSION = 5-2-122 +OPENPGM_VERSION = 5-3-128 OPENPGM_SITE = $(call github,steve-o,openpgm,release-$(OPENPGM_VERSION)) OPENPGM_LICENSE = LGPL-2.1+ OPENPGM_LICENSE_FILES = openpgm/pgm/LICENSE diff --git a/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch b/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch index 66bbba42ba..457fbacb5b 100644 --- a/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch +++ b/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch @@ -12,6 +12,8 @@ reasons. However uucp does not exist on buildroot by default, and it makes more sense that 'daemon' group should own this directory. Signed-off-by: Michał Łyszczek +[Fabrice: update for 0.43.3] +Signed-off-by: Fabrice Fontaine --- sh/init.sh.Linux.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -21,9 +23,9 @@ index 222bbd3b..7f1a88db 100644 --- a/sh/init.sh.Linux.in +++ b/sh/init.sh.Linux.in @@ -85,7 +85,7 @@ fi + fi - [ -x /sbin/restorecon ] && /sbin/restorecon -rF /run - checkpath -d $RC_SVCDIR + checkpath -d "$RC_SVCDIR" -checkpath -d -m 0775 -o root:uucp /run/lock +checkpath -d -m 0775 -o root:daemon /run/lock diff --git a/package/openrc/openrc.hash b/package/openrc/openrc.hash index bb5880806d..4fcfa9132f 100644 --- a/package/openrc/openrc.hash +++ b/package/openrc/openrc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 91a01ca6d930a0688fb91338209985de57cac7aa2d37feddacb78fd3d95308e2 openrc-0.42.1.tar.gz -sha256 96862463f4e77e2508e4fc2c83773fd24807cb699368b63fd93a5e2b466dd624 LICENSE +sha256 968e81743a1de7a2348590b3b3286d6af5baf96da28fa1e6364e24f8203fc3b6 openrc-0.43.3.tar.gz +sha256 96862463f4e77e2508e4fc2c83773fd24807cb699368b63fd93a5e2b466dd624 LICENSE diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk index 6057451bfe..1d4e70f712 100644 --- a/package/openrc/openrc.mk +++ b/package/openrc/openrc.mk @@ -4,10 +4,11 @@ # ################################################################################ -OPENRC_VERSION = 0.42.1 +OPENRC_VERSION = 0.43.3 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION)) OPENRC_LICENSE = BSD-2-Clause OPENRC_LICENSE_FILES = LICENSE +OPENRC_CPE_ID_VENDOR = openrc_project OPENRC_DEPENDENCIES = ncurses @@ -18,7 +19,6 @@ OPENRC_MAKE_OPTS = \ LIBNAME=lib \ LIBEXECDIR=/usr/libexec/rc \ MKPKGCONFIG=no \ - MKSELINUX=no \ MKSYSVINIT=yes \ BRANDING="Buildroot $(BR2_VERSION_FULL)" \ CC=$(TARGET_CC) @@ -29,6 +29,13 @@ else OPENRC_MAKE_OPTS += MKSTATICLIBS=yes endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +OPENRC_MAKE_OPTS += MKSELINUX=yes +OPENRC_DEPENDENCIES += libselinux +else +OPENRC_MAKE_OPTS += MKSELINUX=no +endif + define OPENRC_BUILD_CMDS $(MAKE) $(OPENRC_MAKE_OPTS) -C $(@D) endef diff --git a/package/openresolv/openresolv.hash b/package/openresolv/openresolv.hash index b8eb4346b8..f2a101df39 100644 --- a/package/openresolv/openresolv.hash +++ b/package/openresolv/openresolv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0024df7c4568a157db1c3511a55d37d442629d586c575d9e0f9c2004df8297bd openresolv-3.9.2.tar.gz -sha256 f78b2c2bfb333e66e935c81510580d002b6e2009a5b8132b3b5be8ed8f8f3fa7 LICENSE +sha256 7d74c669849183ecefdfcec30d25664b1ca24ba1ca8c2ad5de50fcaeef3b4810 openresolv-3.10.0.tar.gz +sha256 384740bf5e19e7628d20f4dcc22925062fdc6020e9a6f074e567d4d797be57a0 LICENSE diff --git a/package/openresolv/openresolv.mk b/package/openresolv/openresolv.mk index 3a64446698..55ec7fd8f9 100644 --- a/package/openresolv/openresolv.mk +++ b/package/openresolv/openresolv.mk @@ -4,10 +4,11 @@ # ################################################################################ -OPENRESOLV_VERSION = 3.9.2 +OPENRESOLV_VERSION = 3.10.0 OPENRESOLV_SITE = $(call github,rsmarples,openresolv,openresolv-$(OPENRESOLV_VERSION)) OPENRESOLV_LICENSE = BSD-2-Clause OPENRESOLV_LICENSE_FILES = LICENSE +OPENRESOLV_CPE_ID_VENDOR = openresolv_project define OPENRESOLV_CONFIGURE_CMDS cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure --sysconfdir=/etc diff --git a/package/openssh/Config.in b/package/openssh/Config.in index 683a9c0e51..cc5998742e 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -9,3 +9,26 @@ config BR2_PACKAGE_OPENSSH friends. http://www.openssh.com/ + +if BR2_PACKAGE_OPENSSH + +config BR2_PACKAGE_OPENSSH_CLIENT + bool "client" + default y + help + Client programs: ssh, scp, sftp, ssh-agent, ssh-add, + ssh-copy-id. + +config BR2_PACKAGE_OPENSSH_SERVER + bool "server" + default y + help + Server programs: sshd, sftp-server + +config BR2_PACKAGE_OPENSSH_KEY_UTILS + bool "key utilities" + default y + help + Key utilities: ssh-keygen, ssh-keyscan. + +endif diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 2f962d4337..aab3dba09c 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-8.2 (base64 encoded) -sha256 43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671 openssh-8.2p1.tar.gz +# From https://www.openssh.com/txt/release-8.8 (base64 encoded) +sha256 4590890ea9bb9ace4f71ae331785a3a5823232435161960ed5fc86588f331fe9 openssh-8.8p1.tar.gz # Locally calculated -sha256 73d0db766229670c7b4e1ec5e6baed54977a0694a565e7cc878c45ee834045d7 LICENCE +sha256 432abf7480fb31473a6706627212913fc70032e3fb71b90fecb28ae26a2d741d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index d50572128a..75c4a0128b 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,14 +4,19 @@ # ################################################################################ -OPENSSH_VERSION = 8.2p1 +OPENSSH_VERSION_MAJOR = 8.8 +OPENSSH_VERSION_MINOR = p1 +OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) +OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) +OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable -OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain +OPENSSH_LICENSE = BSD-4-Clause, BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` +OPENSSH_CPE_ID_VENDOR = openbsd OPENSSH_CONF_OPTS = \ --sysconfdir=/etc/ssh \ --with-default-path=$(BR2_SYSTEM_DEFAULT_PATH) \ @@ -39,6 +44,13 @@ else OPENSSH_CONF_OPTS += --without-ssl-engine endif +ifeq ($(BR2_PACKAGE_AUDIT),y) +OPENSSH_DEPENDENCIES += audit +OPENSSH_CONF_OPTS += --with-audit=linux +else +OPENSSH_CONF_OPTS += --without-audit +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) define OPENSSH_INSTALL_PAM_CONF $(INSTALL) -D -m 644 $(@D)/contrib/sshd.pam.generic $(TARGET_DIR)/etc/pam.d/sshd @@ -71,6 +83,31 @@ define OPENSSH_USERS endef endif +# Let the default install rule only install the configuration file. +# The programs will be installed based on the config options selected. +OPENSSH_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-sysconf + +ifeq ($(BR2_PACKAGE_OPENSSH_CLIENT),y) +define OPENSSH_INSTALL_CLIENT_PROGRAMS + $(INSTALL) -D -m 0755 $(@D)/ssh $(TARGET_DIR)/usr/bin/ssh + $(INSTALL) -D -m 0755 $(@D)/scp $(TARGET_DIR)/usr/bin/scp + $(INSTALL) -D -m 0755 $(@D)/sftp $(TARGET_DIR)/usr/bin/sftp + $(INSTALL) -D -m 0755 $(@D)/ssh-agent $(TARGET_DIR)/usr/bin/ssh-agent + $(INSTALL) -D -m 0755 $(@D)/ssh-add $(TARGET_DIR)/usr/bin/ssh-add + $(INSTALL) -D -m 4711 $(@D)/ssh-keysign $(TARGET_DIR)/usr/libexec/ssh-keysign + $(INSTALL) -D -m 0755 $(@D)/ssh-pkcs11-helper $(TARGET_DIR)/usr/libexec/ssh-pkcs11-helper + $(INSTALL) -D -m 0755 $(@D)/contrib/ssh-copy-id $(TARGET_DIR)/usr/bin/ssh-copy-id +endef +OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_CLIENT_PROGRAMS +endif + +ifeq ($(BR2_PACKAGE_OPENSSH_SERVER),y) +define OPENSSH_INSTALL_SERVER_PROGRAMS + $(INSTALL) -D -m 0755 $(@D)/sshd $(TARGET_DIR)/usr/sbin/sshd + $(INSTALL) -D -m 0755 $(@D)/sftp-server $(TARGET_DIR)/usr/libexec/sftp-server +endef +OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SERVER_PROGRAMS + define OPENSSH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/openssh/sshd.service \ $(TARGET_DIR)/usr/lib/systemd/system/sshd.service @@ -81,11 +118,14 @@ define OPENSSH_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/openssh/S50sshd \ $(TARGET_DIR)/etc/init.d/S50sshd endef +endif -define OPENSSH_INSTALL_SSH_COPY_ID - $(INSTALL) -D -m 755 $(@D)/contrib/ssh-copy-id $(TARGET_DIR)/usr/bin/ssh-copy-id +ifeq ($(BR2_PACKAGE_OPENSSH_KEY_UTILS),y) +define OPENSSH_INSTALL_KEY_UTILS + $(INSTALL) -D -m 0755 $(@D)/ssh-keygen $(TARGET_DIR)/usr/bin/ssh-keygen + $(INSTALL) -D -m 0755 $(@D)/ssh-keyscan $(TARGET_DIR)/usr/bin/ssh-keyscan endef - -OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SSH_COPY_ID +OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_KEY_UTILS +endif $(eval $(autotools-package)) diff --git a/package/openssl/Config.in b/package/openssl/Config.in index 5ce91cb80f..7bf49b05f6 100644 --- a/package/openssl/Config.in +++ b/package/openssl/Config.in @@ -11,7 +11,6 @@ if BR2_PACKAGE_OPENSSL choice prompt "ssl library" - default BR2_PACKAGE_LIBOPENSSL help Select OpenSSL or LibreSSL. @@ -34,6 +33,7 @@ source "package/libopenssl/Config.in" config BR2_PACKAGE_LIBRESSL bool "libressl" depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + depends on BR2_TOOLCHAIN_HAS_THREADS # uClibc on noMMU doesn't provide __register_atfork() depends on !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) help @@ -56,8 +56,8 @@ config BR2_PACKAGE_HAS_OPENSSL config BR2_PACKAGE_PROVIDES_OPENSSL string - default "libopenssl" if BR2_PACKAGE_LIBOPENSSL - default "libressl" if BR2_PACKAGE_LIBRESSL + default "libopenssl" if BR2_PACKAGE_LIBOPENSSL + default "libressl" if BR2_PACKAGE_LIBRESSL endif diff --git a/package/openswan/Config.in b/package/openswan/Config.in index 340686cc50..c71d064daf 100644 --- a/package/openswan/Config.in +++ b/package/openswan/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_OPENSWAN bool "openswan" depends on BR2_USE_MMU # iproute2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 - depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE + depends on !BR2_TOOLCHAIN_USES_UCLIBC # ns_t_tkey select BR2_PACKAGE_GMP select BR2_PACKAGE_IPROUTE2 help @@ -10,7 +10,7 @@ config BR2_PACKAGE_OPENSWAN http://www.openswan.org -comment "openswan needs a uClibc or glibc toolchain w/ headers >= 3.4" +comment "openswan needs a glibc or musl toolchain w/ headers >= 3.4" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || \ - BR2_TOOLCHAIN_USES_MUSL + BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/openswan/openswan.hash b/package/openswan/openswan.hash index a9b54dbaf6..574009ebfb 100644 --- a/package/openswan/openswan.hash +++ b/package/openswan/openswan.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 4124f4ce970089f301c34b9c48f54b021cf6b2b8813877942337f8022104f70d openswan-2.6.51.5.tar.gz -sha256 1c36ae1e7b0f6cce4b4ffe969b71f83635734804acdd38544443564b00f8783a COPYING -sha256 d7d012ef3be47faffba4d97a83d4986c9f4a63ac997ebf5961d33852e5f1801a LICENSE +sha256 69fe7a71e54aaf0ea93b874db4963057c1ff4904b3617b36f2c9be2010c23331 openswan-3.0.0.tar.gz +sha256 1c36ae1e7b0f6cce4b4ffe969b71f83635734804acdd38544443564b00f8783a COPYING +sha256 d7d012ef3be47faffba4d97a83d4986c9f4a63ac997ebf5961d33852e5f1801a LICENSE diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index aabf7d98c7..bb56e4516c 100644 --- a/package/openswan/openswan.mk +++ b/package/openswan/openswan.mk @@ -4,16 +4,18 @@ # ################################################################################ -OPENSWAN_VERSION = 2.6.51.5 -OPENSWAN_SITE = https://download.openswan.org/openswan +OPENSWAN_VERSION = 3.0.0 +OPENSWAN_SITE = $(call github,xelerance,Openswan,v$(OPENSWAN_VERSION)) OPENSWAN_LICENSE = GPL-2.0+, BSD-3-Clause OPENSWAN_LICENSE_FILES = COPYING LICENSE +OPENSWAN_CPE_ID_VENDOR = xelerance OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2 OPENSWAN_MAKE_OPTS = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" POD2MAN="" XMLTO="" \ USERCOMPILE="$(TARGET_CFLAGS) $(if $(BR2_TOOLCHAIN_SUPPORTS_PIE),-fPIE)" \ USERLINK="$(TARGET_LDFLAGS) $(if $(BR2_TOOLCHAIN_SUPPORTS_PIE),-fPIE)" \ - INC_USRLOCAL=/usr USE_KLIPS=false USE_MAST=false USE_NM=false + INC_USRLOCAL=/usr USE_KLIPS=false USE_MAST=false USE_NM=false \ + USE_NOMANINSTALL=true WERROR="" ifeq ($(BR2_PACKAGE_LIBCURL),y) OPENSWAN_DEPENDENCIES += libcurl diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk index d466a80237..0605cd5d96 100644 --- a/package/opentracing-cpp/opentracing-cpp.mk +++ b/package/opentracing-cpp/opentracing-cpp.mk @@ -22,4 +22,6 @@ else ifeq ($(BR2_SHARED_LIBS),y) OPENTRACING_CPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF endif +OPENTRACING_CPP_CONF_OPTS += -DENABLE_LINTING=OFF + $(eval $(cmake-package)) diff --git a/package/opentyrian/opentyrian.mk b/package/opentyrian/opentyrian.mk index 12e41ad998..690323334e 100644 --- a/package/opentyrian/opentyrian.mk +++ b/package/opentyrian/opentyrian.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENTYRIAN_VERSION = 9c9f0ec3532b -OPENTYRIAN_SITE = https://bitbucket.org/opentyrian/opentyrian -OPENTYRIAN_SITE_METHOD = hg +OPENTYRIAN_VERSION = cf5dbeb69eebd9ef9afc4473088d9469b79589eb +OPENTYRIAN_SITE = $(call github,opentyrian,opentyrian,$(OPENTYRIAN_VERSION)) OPENTYRIAN_LICENSE = GPL-2.0+ OPENTYRIAN_LICENSE_FILES = COPYING diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in index 1a077a2a47..a50b6b9b3e 100644 --- a/package/openvmtools/Config.in +++ b/package/openvmtools/Config.in @@ -27,13 +27,12 @@ config BR2_PACKAGE_OPENVMTOOLS_PAM # linux-pam needs locale and wchar, but we already have this # dependency on the main symbol, above. depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam select BR2_PACKAGE_LINUX_PAM help Support for PAM in openvmtools -comment "PAM support needs a glibc toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL +comment "PAM support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS config BR2_PACKAGE_OPENVMTOOLS_RESOLUTIONKMS bool "resolutionkms support" diff --git a/package/openvmtools/vmtoolsd.service b/package/openvmtools/vmtoolsd.service index cb97357ec2..1d2a3566cf 100644 --- a/package/openvmtools/vmtoolsd.service +++ b/package/openvmtools/vmtoolsd.service @@ -5,8 +5,8 @@ ConditionVirtualization=vmware [Service] Type=forking -PIDFile=/var/run/vmtoolsd.pid -ExecStart=/usr/bin/vmtoolsd -b /var/run/vmtoolsd.pid +PIDFile=/run/vmtoolsd.pid +ExecStart=/usr/bin/vmtoolsd -b /run/vmtoolsd.pid Restart=on-failure KillMode=process KillSignal=SIGKILL diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in index 0a1675573a..cd8b1db996 100644 --- a/package/openvpn/Config.in +++ b/package/openvpn/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_OPENVPN bool "openvpn" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help OpenVPN is a full-featured SSL VPN solution which can accomodate a wide range of configurations, including road diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index bc1ab01c1a..f097cf11ec 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -11,13 +11,15 @@ CONFIG_DIR=/etc/openvpn test -d $CONFIG_DIR || exit 0 start_vpn () { - /usr/sbin/openvpn --daemon --writepid /var/run/openvpn.$NAME.pid \ - --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || printf " FAILED->" - printf " $NAME" + printf " $NAME " + start-stop-daemon -S -p /var/run/openvpn.$NAME.pid -x /usr/sbin/openvpn -- \ + --daemon --writepid /var/run/openvpn.$NAME.pid \ + --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR + [ $? = 0 ] && echo "OK" || echo "FAIL" } stop_vpn () { - kill `cat $PIDFILE` || true - rm $PIDFILE + printf " $NAME " + start-stop-daemon -K -p /var/run/openvpn.$NAME.pid -x /usr/sbin/openvpn } case "$1" in @@ -48,7 +50,6 @@ stop) NAME=`echo $PIDFILE | cut -c18-` NAME=${NAME%%.pid} stop_vpn - printf " $NAME" done else if test -e /var/run/openvpn.$2.pid ; then @@ -56,7 +57,6 @@ stop) NAME=`echo $PIDFILE | cut -c18-` NAME=${NAME%%.pid} stop_vpn - printf " $NAME" else printf " No such VPN: $2" fi diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index d219c0f18d..1d365eeab4 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 fb8ca66bb7807fff595fbdf2a0afd085c02a6aa47715c9aa3171002f9f1a3f91 openvpn-2.4.8.tar.xz -sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL +sha256 fb6a9943c603a1951ca13e9267653f8dd650c02f84bccd2b9d20f06a4c9c9a7e openvpn-2.5.3.tar.xz +sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 64f459eee3..749a567e16 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,20 +4,18 @@ # ################################################################################ -OPENVPN_VERSION = 2.4.8 +OPENVPN_VERSION = 2.5.3 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases -OPENVPN_DEPENDENCIES = host-pkgconf openssl +OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL +OPENVPN_CPE_ID_VENDOR = openvpn +OPENVPN_SELINUX_MODULES = openvpn OPENVPN_CONF_OPTS = \ - --enable-iproute2 \ - --with-crypto-library=openssl \ + --disable-unit-tests \ $(if $(BR2_STATIC_LIBS),--disable-plugins) -OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \ - NETSTAT=/bin/netstat \ - ROUTE=/sbin/route \ - IPROUTE=/sbin/ip +OPENVPN_CONF_ENV = NETSTAT=/bin/netstat ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y) OPENVPN_CONF_OPTS += \ @@ -51,6 +49,21 @@ else OPENVPN_CONF_OPTS += --disable-plugin-auth-pam endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +OPENVPN_DEPENDENCIES += openssl +OPENVPN_CONF_OPTS += --with-crypto-library=openssl +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +OPENVPN_DEPENDENCIES += mbedtls +OPENVPN_CONF_OPTS += --with-crypto-library=mbedtls +endif + +ifeq ($(BR2_PACKAGE_PKCS11_HELPER),y) +OPENVPN_DEPENDENCIES += pkcs11-helper +OPENVPN_CONF_OPTS += --enable-pkcs11 +else +OPENVPN_CONF_OPTS += --disable-pkcs11 +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) OPENVPN_DEPENDENCIES += systemd OPENVPN_CONF_OPTS += --enable-systemd @@ -58,11 +71,6 @@ else OPENVPN_CONF_OPTS += --disable-systemd endif -define OPENVPN_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 $(@D)/src/openvpn/openvpn \ - $(TARGET_DIR)/usr/sbin/openvpn -endef - define OPENVPN_INSTALL_INIT_SYSV $(INSTALL) -m 755 -D package/openvpn/S60openvpn \ $(TARGET_DIR)/etc/init.d/S60openvpn diff --git a/package/openzwave/openzwave.mk b/package/openzwave/openzwave.mk index 357d19f32e..17da3b9b87 100644 --- a/package/openzwave/openzwave.mk +++ b/package/openzwave/openzwave.mk @@ -23,6 +23,7 @@ OPENZWAVE_INSTALL_STAGING = YES # the correct directory otherwise openzwave will install configuration files in # $(PREFIX)/etc/openzwave. # Disable doxygen documentation. +# Set {DEBUG,RELEASE}_CFLAGS to remove -Werror. OPENZWAVE_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ PREFIX=/usr \ @@ -30,6 +31,8 @@ OPENZWAVE_MAKE_OPTS = \ pkgconfigdir=/usr/lib/pkgconfig \ sysconfdir=/etc/openzwave \ DOXYGEN= \ + DEBUG_CFLAGS="-fPIC -std=c++11" \ + RELEASE_CFLAGS="-fPIC -std=c++11" \ USE_BI_TXML=0 ifeq ($(BR2_PACKAGE_HAS_UDEV),y) diff --git a/package/opkg-utils/opkg-utils.hash b/package/opkg-utils/opkg-utils.hash index d95286abc8..29671f9609 100644 --- a/package/opkg-utils/opkg-utils.hash +++ b/package/opkg-utils/opkg-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5a3071019715cf3066946ac9a57fcb51117c611a3114efc56894afc8b3b51b4c opkg-utils-0.4.2.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 e0fcaab51bff2149bd6560fb4238319d502dd99b581f66763d702e75c224736d opkg-utils-0.4.5-br1.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/opkg-utils/opkg-utils.mk b/package/opkg-utils/opkg-utils.mk index 38137bc67b..369a4586e8 100644 --- a/package/opkg-utils/opkg-utils.mk +++ b/package/opkg-utils/opkg-utils.mk @@ -4,18 +4,27 @@ # ################################################################################ -OPKG_UTILS_VERSION = 0.4.2 -OPKG_UTILS_SITE = http://git.yoctoproject.org/git/opkg-utils +OPKG_UTILS_VERSION = 0.4.5 +OPKG_UTILS_SITE = https://git.yoctoproject.org/git/opkg-utils OPKG_UTILS_SITE_METHOD = git OPKG_UTILS_LICENSE = GPL-2.0+ OPKG_UTILS_LICENSE_FILES = COPYING -define HOST_OPKG_UTILS_BUILD_CMDS - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) +HOST_OPKG_UTILS_DEPENDENCIES = \ + $(BR2_PYTHON3_HOST_DEPENDENCY) \ + host-diffutils \ + host-lz4 \ + host-xz + +# Nothing to build; only scripts to install. +define OPKG_UTILS_INSTALL_CMDS + $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install-utils endef +# Nothing to build; only scripts to install. define HOST_OPKG_UTILS_INSTALL_CMDS - $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install + $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-utils endef +$(eval $(generic-package)) $(eval $(host-generic-package)) diff --git a/package/opkg/opkg.hash b/package/opkg/opkg.hash index b1ead67a11..b0c0ba6574 100644 --- a/package/opkg/opkg.hash +++ b/package/opkg/opkg.hash @@ -1,4 +1,4 @@ # From http://downloads.yoctoproject.org/releases/opkg/SHA256SUMS -sha256 86887852c43457edfff9d8b6d9520f3f1cdd55f25eb600a6eb31e1c4e151e106 opkg-0.4.2.tar.gz +sha256 a1214a75fa34fb9228db8da47308e0e711b1c93fd8938cf164c10fd28eb50f1e opkg-0.4.5.tar.gz # Locally calculated -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk index e25e51b9e6..501edcf8af 100644 --- a/package/opkg/opkg.mk +++ b/package/opkg/opkg.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPKG_VERSION = 0.4.2 -OPKG_SITE = http://downloads.yoctoproject.org/releases/opkg +OPKG_VERSION = 0.4.5 +OPKG_SITE = https://downloads.yoctoproject.org/releases/opkg OPKG_DEPENDENCIES = host-pkgconf libarchive OPKG_LICENSE = GPL-2.0+ OPKG_LICENSE_FILES = COPYING diff --git a/package/oprofile/oprofile.hash b/package/oprofile/oprofile.hash index d1d96c6232..7d005aa747 100644 --- a/package/oprofile/oprofile.hash +++ b/package/oprofile/oprofile.hash @@ -1,6 +1,6 @@ -# From http://sourceforge.net/projects/oprofile/files/oprofile/oprofile-1.3.0/ -sha1 7daa0cca8587e399cb3df9eb817c6a39ffea2082 oprofile-1.3.0.tar.gz -md5 bd998df5521ebedae31e71cd3fb6200b oprofile-1.3.0.tar.gz +# From http://sourceforge.net/projects/oprofile/files/oprofile/oprofile-1.4.0/ +sha1 d4d7634372d18de821b33650ad0ff7392e94c6e3 oprofile-1.4.0.tar.gz +md5 ac0ff685ec9735e30d6a4d19de0efed7 oprofile-1.4.0.tar.gz # Hash for license file: -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index b9d7d9e608..85bc4efa9b 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -4,13 +4,11 @@ # ################################################################################ -OPROFILE_VERSION = 1.3.0 +OPROFILE_VERSION = 1.4.0 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION) OPROFILE_LICENSE = GPL-2.0+ OPROFILE_LICENSE_FILES = COPYING -# 0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch -# 0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch -OPROFILE_AUTORECONF = YES +OPROFILE_CPE_ID_VENDOR = maynard_johnson OPROFILE_CONF_OPTS = \ --disable-account-check \ --enable-gui=no \ diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in index 5fd365a9e3..2070582fbb 100644 --- a/package/optee-benchmark/Config.in +++ b/package/optee-benchmark/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_OPTEE_BENCHMARK bool "optee-benchmark" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client + depends on !BR2_STATIC_LIBS # optee-client + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_PACKAGE_LIBYAML help @@ -12,6 +14,7 @@ config BR2_PACKAGE_OPTEE_BENCHMARK http://github.com/linaro-swg/optee_benchmark -comment "optee-benchmark needs a toolchain w/ threads" +comment "optee-benchmark needs a toolchain w/ threads, dynamic library, headers >= 4.3" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3f5195db62..51f248462b 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.7.0.tar.gz -sha256 c2bbeb188e3ebe06c62b1a7d6483d023737695c36d4752402fae33bd8f487c40 optee-benchmark-3.7.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.13.0/optee-benchmark-3.13.0.tar.gz +sha256 58431b0d48c634dcb86d5e307df157a99256d4328a77a5099e0b1b3cd79e2968 optee-benchmark-3.13.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 9d67f9d262..ce168def81 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.7.0 +OPTEE_BENCHMARK_VERSION = 3.13.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in index 1ef0a1401e..2765f49308 100644 --- a/package/optee-client/Config.in +++ b/package/optee-client/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_OPTEE_CLIENT bool "optee-client" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # MMC_IOC_MULTI_CMD help Enable the OP-TEE client package that brings non-secure client application resources for OP-TEE support. OP-TEE @@ -25,5 +27,6 @@ config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH endif -comment "optee-client needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "optee-client needs a toolchain w/ threads, dynamic library, headers >= 4.3" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3fae359f3a..5d14f1023c 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.7.0.tar.gz -sha256 7a31076a3a77398c6db2b5d3e0a6ac297923bee126ff83430e8f1ebc2a060faa optee-client-3.7.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.13.0/optee-client-3.13.0.tar.gz +sha256 2ec6f05f833dce458f0358104e83e28e9a7643b81cfd96db32a7a1fadcc1e3af optee-client-3.13.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 64235b41e4..b73e76775e 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,14 +4,15 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.7.0 +OPTEE_CLIENT_VERSION = 3.13.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE OPTEE_CLIENT_INSTALL_STAGING = YES OPTEE_CLIENT_CONF_OPTS = \ - -DCFG_TEE_FS_PARENT_PATH=$(BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH) + -DCFG_TEE_FS_PARENT_PATH=$(BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH) \ + -DCFG_WERROR=OFF define OPTEE_CLIENT_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30optee \ diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in index c0fecfdf50..843981a458 100644 --- a/package/optee-examples/Config.in +++ b/package/optee-examples/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_OPTEE_EXAMPLES bool "optee-examples" depends on BR2_TARGET_OPTEE_OS depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client + depends on !BR2_STATIC_LIBS # optee-client + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK help @@ -18,6 +20,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES https://github.com/linaro-swg/optee_examples -comment "optee-examples needs a toolchain w/ threads" +comment "optee-examples needs a toolchain w/ threads, dynamic library, headers >= 4.3" depends on BR2_TARGET_OPTEE_OS - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index 8b14e43ad4..5e1839f43f 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.7.0.tar.gz -sha256 6c5600871edc64dbdca08dfe40b3161bfb55a11e6004699957c6da8f67b2a475 optee-examples-3.7.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.13.0/optee-examples-3.13.0.tar.gz +sha256 2e97252a57a5d84fa5f33adec976cea2dbfb0e17f60b1ee912041be74f6b14f8 optee-examples-3.13.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 093b8600c1..484245c951 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.7.0 +OPTEE_EXAMPLES_VERSION = 3.13.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in index a40f1e9069..cf36d19fab 100644 --- a/package/optee-test/Config.in +++ b/package/optee-test/Config.in @@ -2,6 +2,9 @@ config BR2_PACKAGE_OPTEE_TEST bool "optee-test" depends on BR2_TARGET_OPTEE_OS depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS # optee-client + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK help @@ -22,6 +25,7 @@ config BR2_PACKAGE_OPTEE_TEST http://github.com/OP-TEE/optee_test -comment "optee-test needs a toolchain w/ threads" +comment "optee-test needs a toolchain w/ threads, C++, dynamic library, headers >= 4.3" depends on BR2_TARGET_OPTEE_OS - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 17f73e26d7..39bd68532d 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.7.0.tar.gz -sha256 6486ba7eba8ea8b43278032c9d6ea1d6b35340a7f76ef4c6f34efbca3d80265d optee-test-3.7.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.13.0/optee-test-3.13.0.tar.gz +sha256 4dda2a6b2f7667664cc3bc2578a90c1e60fef7e1c296b8fa8f317ba93302a652 optee-test-3.13.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index 4cf2f95305..ed6ec3fb39 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,13 +4,17 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.7.0 +OPTEE_TEST_VERSION = 3.13.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md OPTEE_TEST_DEPENDENCIES = optee-client optee-os +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +OPTEE_TEST_DEPENDENCIES += libopenssl +endif + OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_OS_SDK) # Trusted Application are not built from CMake due to ta_dev_kit diff --git a/package/opusfile/opusfile.hash b/package/opusfile/opusfile.hash index e9ecf83feb..30bf9b36df 100644 --- a/package/opusfile/opusfile.hash +++ b/package/opusfile/opusfile.hash @@ -1,5 +1,5 @@ # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt -sha256 74ce9b6cf4da103133e7b5c95df810ceb7195471e1162ed57af415fabf5603bf opusfile-0.11.tar.gz +sha256 118d8601c12dd6a44f52423e68ca9083cc9f2bfe72da7a8c1acb22a80ae3550b opusfile-0.12.tar.gz # Hash for license file -sha256 0267ae795ab744c4e0f9c45e249440fdf2e75dac8c804f36066b28649bf74aaf COPYING +sha256 0267ae795ab744c4e0f9c45e249440fdf2e75dac8c804f36066b28649bf74aaf COPYING diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 49a53b3958..72ae82e801 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPUSFILE_VERSION = 0.11 +OPUSFILE_VERSION = 0.12 OPUSFILE_SITE = https://downloads.xiph.org/releases/opus OPUSFILE_DEPENDENCIES = host-pkgconf libogg opus OPUSFILE_LICENSE = BSD-3-Clause diff --git a/package/oracle-mysql/oracle-mysql.mk b/package/oracle-mysql/oracle-mysql.mk index 8a8613a3d1..6607486d4d 100644 --- a/package/oracle-mysql/oracle-mysql.mk +++ b/package/oracle-mysql/oracle-mysql.mk @@ -13,6 +13,7 @@ ORACLE_MYSQL_DEPENDENCIES = ncurses ORACLE_MYSQL_AUTORECONF = YES ORACLE_MYSQL_LICENSE = GPL-2.0 ORACLE_MYSQL_LICENSE_FILES = README COPYING +ORACLE_MYSQL_SELINUX_MODULES = mysql ORACLE_MYSQL_PROVIDES = mysql # Unix socket. This variable can also be consulted by other buildroot packages @@ -68,6 +69,9 @@ endif ifeq ($(BR2_PACKAGE_ZLIB),y) ORACLE_MYSQL_DEPENDENCIES += zlib +ORACLE_MYSQL_CONF_OPTS += --with-zlib-dir=$(STAGING_DIR)/usr +else +ORACLE_MYSQL_CONF_OPTS += --without-zlib-dir endif ifeq ($(BR2_PACKAGE_ORACLE_MYSQL_SERVER),y) @@ -92,14 +96,14 @@ ORACLE_MYSQL_CONF_OPTS += \ # Debugging is only available for the server, so no need for # this if-block outside of the server if-block -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) ORACLE_MYSQL_CONF_OPTS += --with-debug=full else ORACLE_MYSQL_CONF_OPTS += --without-debug endif define ORACLE_MYSQL_USERS - mysql -1 nogroup -1 * /var/mysql - - MySQL daemon + mysql -1 nobody -1 * /var/mysql - - MySQL daemon endef define ORACLE_MYSQL_ADD_FOLDER diff --git a/package/orc/orc.hash b/package/orc/orc.hash index c30a50112c..f48c2932ab 100644 --- a/package/orc/orc.hash +++ b/package/orc/orc.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/orc/orc-0.4.31.tar.xz.sha256sum -sha256 a0ab5f10a6a9ae7c3a6b4218246564c3bf00d657cbdf587e6d34ec3ef0616075 orc-0.4.31.tar.xz +# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.32.tar.xz.sha256sum +sha256 a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0 orc-0.4.32.tar.xz # Locally calculated -sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING +sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING diff --git a/package/orc/orc.mk b/package/orc/orc.mk index 51a9b78482..a93a4f875a 100644 --- a/package/orc/orc.mk +++ b/package/orc/orc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ORC_VERSION = 0.4.31 +ORC_VERSION = 0.4.32 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/ortp/ortp.hash b/package/ortp/ortp.hash index 65a5141609..7853c63143 100644 --- a/package/ortp/ortp.hash +++ b/package/ortp/ortp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55d12b71ed7c3958abb8d892105e616499d66c88200c46e3ec3cfbbe79771b2e ortp-4.3.1.tar.gz +sha256 9b1d43f676a35920e2837abc0eb4d600d4d3e47d2621fa3b0897777cf587ee8d ortp-4.4.8.tar.gz sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk index 436e04c14d..67bef9aebb 100644 --- a/package/ortp/ortp.mk +++ b/package/ortp/ortp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ORTP_VERSION = 4.3.1 +ORTP_VERSION = 4.4.8 ORTP_SITE = https://gitlab.linphone.org/BC/public/ortp/-/archive/$(ORTP_VERSION) ORTP_LICENSE = GPL-3.0+ ORTP_LICENSE_FILES = LICENSE.txt diff --git a/package/p11-kit/Config.in b/package/p11-kit/Config.in index a6b7261886..9be76c2f41 100644 --- a/package/p11-kit/Config.in +++ b/package/p11-kit/Config.in @@ -3,8 +3,6 @@ config BR2_PACKAGE_P11_KIT depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBFFI - select BR2_PACKAGE_LIBTASN1 help Provides a way to load and enumerate PKCS#11 modules. Provides a standard configuration setup for installing PKCS#11 diff --git a/package/p11-kit/p11-kit.hash b/package/p11-kit/p11-kit.hash index 45f0f1d64e..3481a40b00 100644 --- a/package/p11-kit/p11-kit.hash +++ b/package/p11-kit/p11-kit.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 4b34e92ae36fa493e0d94366c767f06d5f9951e3d8581d10fd935d738db1574d p11-kit-0.23.16.1.tar.gz +sha256 8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6 p11-kit-0.23.22.tar.xz # Locally computed -sha256 2e1ba993904df807a10c3eda1e5c272338edc35674b679773a8b3ad460731054 COPYING +sha256 2e1ba993904df807a10c3eda1e5c272338edc35674b679773a8b3ad460731054 COPYING diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk index 1f72e0515b..284eb0fa35 100644 --- a/package/p11-kit/p11-kit.mk +++ b/package/p11-kit/p11-kit.mk @@ -4,20 +4,38 @@ # ################################################################################ -P11_KIT_VERSION = 0.23.16.1 +P11_KIT_VERSION = 0.23.22 +P11_KIT_SOURCE = p11-kit-$(P11_KIT_VERSION).tar.xz P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION) -P11_KIT_DEPENDENCIES = host-pkgconf libffi libtasn1 P11_KIT_INSTALL_STAGING = YES P11_KIT_CONF_OPTS = --disable-static P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \ ac_cv_have_decl___progname=no P11_KIT_LICENSE = BSD-3-Clause P11_KIT_LICENSE_FILES = COPYING +P11_KIT_CPE_ID_VENDOR = p11-kit_project +ifeq ($(BR2_PACKAGE_LIBFFI),y) +P11_KIT_DEPENDENCIES += host-pkgconf libffi +P11_KIT_CONF_OPTS += --with-libffi +else +P11_KIT_CONF_OPTS += --without-libffi +endif + +ifeq ($(BR2_PACKAGE_LIBTASN1),y) +P11_KIT_DEPENDENCIES += host-pkgconf libtasn1 +P11_KIT_CONF_OPTS += \ + --enable-trust-module \ + --with-libtasn1 ifeq ($(BR2_PACKAGE_CA_CERTIFICATES),y) P11_KIT_CONF_OPTS += --with-trust-paths=/etc/ssl/certs/ca-certificates.crt else P11_KIT_CONF_OPTS += --without-trust-paths endif +else +P11_KIT_CONF_OPTS += \ + --disable-trust-module \ + --without-libtasn1 +endif $(eval $(autotools-package)) diff --git a/package/p7zip/Config.in b/package/p7zip/Config.in index a3adab5b3d..badfb9b9e8 100644 --- a/package/p7zip/Config.in +++ b/package/p7zip/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_P7ZIP bool "p7zip" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR @@ -12,4 +13,5 @@ config BR2_PACKAGE_P7ZIP http://sourceforge.net/projects/p7zip comment "p7zip needs a toolchain w/ threads, wchar, C++" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP diff --git a/package/p7zip/p7zip.hash b/package/p7zip/p7zip.hash index a63a0b4a97..0048777d89 100644 --- a/package/p7zip/p7zip.hash +++ b/package/p7zip/p7zip.hash @@ -1,6 +1,3 @@ -# From https://sourceforge.net/projects/p7zip/files/p7zip/16.02/ -md5 a0128d661cfe7cc8c121e73519c54fbf p7zip_16.02_src_all.tar.bz2 -sha1 e8819907132811aa1afe5ef296181d3a15cc8f22 p7zip_16.02_src_all.tar.bz2 -# Locally computed -sha256 5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f p7zip_16.02_src_all.tar.bz2 +# Locally calculated +sha256 ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef p7zip-17.04.tar.gz sha256 555806657dcf0f1e720b581c52643c195ec86ae3f00bd18cc66d2e0f88ffa210 DOC/License.txt diff --git a/package/p7zip/p7zip.mk b/package/p7zip/p7zip.mk index ff0dd01e02..f94b55ecd2 100644 --- a/package/p7zip/p7zip.mk +++ b/package/p7zip/p7zip.mk @@ -4,11 +4,11 @@ # ################################################################################ -P7ZIP_VERSION = 16.02 -P7ZIP_SOURCE = p7zip_$(P7ZIP_VERSION)_src_all.tar.bz2 -P7ZIP_SITE = http://downloads.sourceforge.net/project/p7zip/p7zip/$(P7ZIP_VERSION) +P7ZIP_VERSION = 17.04 +P7ZIP_SITE = $(call github,jinfeihan57,p7zip,v$(P7ZIP_VERSION)) P7ZIP_LICENSE = LGPL-2.1+ with unRAR restriction P7ZIP_LICENSE_FILES = DOC/License.txt +P7ZIP_CPE_ID_VENDOR = 7-zip # p7zip buildsystem is a mess: it plays dirty tricks with CFLAGS and # CXXFLAGS, so we can't pass them. Instead, it accepts ALLFLAGS_C diff --git a/package/paho-mqtt-c/Config.in b/package/paho-mqtt-c/Config.in index 3560d8c08c..0f4b2a29b2 100644 --- a/package/paho-mqtt-c/Config.in +++ b/package/paho-mqtt-c/Config.in @@ -1,11 +1,10 @@ config BR2_PACKAGE_PAHO_MQTT_C bool "paho-mqtt-c" - depends on !BR2_STATIC_LIBS # dlopen() depends on BR2_TOOLCHAIN_HAS_THREADS help MQTT client C library https://eclipse.org/paho/clients/c/ -comment "paho-mqtt-c needs a toolchain w/ threads and dynamic library support" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS +comment "paho-mqtt-c needs a toolchain w/ threads" + depends on !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 97b15d1320..4cdedfbf9a 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,4 +1,5 @@ # Locally computed: -sha256 7b4eed66ae3df3613629139c0df28b16abfa4e0927bd17360027d936784aa55e paho-mqtt-c-1.3.1.tar.gz +sha256 386c9b5fa1cf6d0d516db12d57fd8f6a410dd0fdc5e9a2da870aae437a2535ed paho-mqtt-c-1.3.9.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 -sha256 44277b2bec6093e4ac313afec251a4de599d24c4e768f8574d95b13a9d2d97b5 epl-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 8772d73be0..68b58f2e02 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,12 +4,17 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.1 +PAHO_MQTT_C_VERSION = 1.3.9 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION)) -PAHO_MQTT_C_LICENSE = EPL-1.0 or BSD-3-Clause -PAHO_MQTT_C_LICENSE_FILES = epl-v10 edl-v10 +PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause +PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE PAHO_MQTT_C_INSTALL_STAGING = YES +PAHO_MQTT_C_CONF_OPTS = \ + -DPAHO_ENABLE_TESTING=FALSE \ + -DPAHO_ENABLE_CPACK=FALSE \ + -DPAHO_HIGH_PERFORMANCE=TRUE + ifeq ($(BR2_PACKAGE_OPENSSL),y) PAHO_MQTT_C_DEPENDENCIES += openssl PAHO_MQTT_C_CONF_OPTS += -DPAHO_WITH_SSL=TRUE @@ -17,4 +22,18 @@ else PAHO_MQTT_C_CONF_OPTS += -DPAHO_WITH_SSL=FALSE endif +ifeq ($(BR2_SHARED_LIBS),y) +PAHO_MQTT_C_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=TRUE \ + -DPAHO_BUILD_STATIC=FALSE +else ifeq ($(BR2_STATIC_LIBS),y) +PAHO_MQTT_C_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=FALSE \ + -DPAHO_BUILD_STATIC=TRUE +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +PAHO_MQTT_C_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=TRUE \ + -DPAHO_BUILD_STATIC=TRUE +endif + $(eval $(cmake-package)) diff --git a/package/paho-mqtt-cpp/Config.in b/package/paho-mqtt-cpp/Config.in index dfeb5545f0..a46c1256e8 100644 --- a/package/paho-mqtt-cpp/Config.in +++ b/package/paho-mqtt-cpp/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PAHO_MQTT_CPP bool "paho-mqtt-cpp" - depends on !BR2_STATIC_LIBS # dlopen() depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future depends on BR2_INSTALL_LIBSTDCPP @@ -10,9 +9,8 @@ config BR2_PACKAGE_PAHO_MQTT_CPP https://eclipse.org/paho/clients/cpp/ -comment "paho-mqtt-cpp needs a toolchain w/ threads, C++, dynamic library support" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP +comment "paho-mqtt-cpp needs a toolchain w/ threads, C++" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 comment "paho-mqtt-cpp needs a toolchain not affected by GCC bug 64735" diff --git a/package/paho-mqtt-cpp/paho-mqtt-cpp.mk b/package/paho-mqtt-cpp/paho-mqtt-cpp.mk index 2cb65d9840..161e53d484 100644 --- a/package/paho-mqtt-cpp/paho-mqtt-cpp.mk +++ b/package/paho-mqtt-cpp/paho-mqtt-cpp.mk @@ -11,10 +11,6 @@ PAHO_MQTT_CPP_LICENSE_FILES = epl-v10 edl-v10 PAHO_MQTT_CPP_INSTALL_STAGING = YES PAHO_MQTT_CPP_DEPENDENCIES = paho-mqtt-c -# The following CMake variable disables a TRY_RUN call in the -pthread -# test which is not allowed when cross-compiling (for cmake < 3.10) -PAHO_MQTT_CPP_CONF_OPTS = -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_PACKAGE_OPENSSL),y) PAHO_MQTT_CPP_DEPENDENCIES += openssl PAHO_MQTT_CPP_CONF_OPTS += -DPAHO_WITH_SSL=TRUE @@ -22,4 +18,18 @@ else PAHO_MQTT_CPP_CONF_OPTS += -DPAHO_WITH_SSL=FALSE endif +ifeq ($(BR2_SHARED_LIBS),y) +PAHO_MQTT_CPP_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=TRUE \ + -DPAHO_BUILD_STATIC=FALSE +else ifeq ($(BR2_STATIC_LIBS),y) +PAHO_MQTT_CPP_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=FALSE \ + -DPAHO_BUILD_STATIC=TRUE +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +PAHO_MQTT_CPP_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=TRUE \ + -DPAHO_BUILD_STATIC=TRUE +endif + $(eval $(cmake-package)) diff --git a/package/pango/Config.in b/package/pango/Config.in index e810598eef..cf5170c8f3 100644 --- a/package/pango/Config.in +++ b/package/pango/Config.in @@ -22,7 +22,7 @@ config BR2_PACKAGE_PANGO widget toolkit. Pango forms the core of text and font handling for GTK+-2.x. - http://www.pango.org/ + https://pango.gnome.org/ comment "pango needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_USE_MMU diff --git a/package/pango/pango.hash b/package/pango/pango.hash index 1cd19d3cf9..8208155610 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,3 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.44/pango-1.44.6.sha256sum -sha256 3e1e41ba838737e200611ff001e3b304c2ca4cdbba63d200a20db0b0ddc0f86c pango-1.44.6.tar.xz -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.48/pango-1.48.10.sha256sum +sha256 21e1f5798bcdfda75eabc4280514b0896ab56f656d4e7e66030b9a2535ecdc98 pango-1.48.10.tar.xz + +# Locally computed +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 48edd18b05..7d3d6626d9 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -4,16 +4,17 @@ # ################################################################################ -PANGO_VERSION_MAJOR = 1.44 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).6 +PANGO_VERSION_MAJOR = 1.48 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).10 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES PANGO_LICENSE = LGPL-2.0+ PANGO_LICENSE_FILES = COPYING +PANGO_CPE_ID_VENDOR = pango -PANGO_CONF_OPTS = -Duse_fontconfig=true -Dintrospection=false -HOST_PANGO_CONF_OPTS = -Duse_fontconfig=true -Dintrospection=false +PANGO_CONF_OPTS = -Dfontconfig=enabled +HOST_PANGO_CONF_OPTS = -Dfontconfig=enabled -Dintrospection=disabled PANGO_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ @@ -33,6 +34,13 @@ HOST_PANGO_DEPENDENCIES = \ host-fontconfig \ host-freetype +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +PANGO_CONF_OPTS += -Dintrospection=enabled +PANGO_DEPENDENCIES += gobject-introspection +else +PANGO_CONF_OPTS += -Dintrospection=disabled +endif + ifeq ($(BR2_PACKAGE_XORG7),y) PANGO_DEPENDENCIES += xlib_libX11 endif diff --git a/package/parted/Config.in b/package/parted/Config.in index a35b30662f..f48b365a2d 100644 --- a/package/parted/Config.in +++ b/package/parted/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PARTED bool "parted" depends on BR2_ENABLE_LOCALE depends on BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_USES_UCLIBC select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID help @@ -10,6 +9,5 @@ config BR2_PACKAGE_PARTED http://www.gnu.org/software/parted/ -comment "parted needs a glibc or musl toolchain w/ locale, wchar" - depends on BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR +comment "parted needs a toolchain w/ locale, wchar" + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR diff --git a/package/parted/parted.mk b/package/parted/parted.mk index c3ab3ceb4b..66940fc516 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -11,6 +11,7 @@ PARTED_DEPENDENCIES = host-pkgconf util-linux PARTED_INSTALL_STAGING = YES PARTED_LICENSE = GPL-3.0+ PARTED_LICENSE_FILES = COPYING +PARTED_CPE_ID_VENDOR = parted_project ifeq ($(BR2_PACKAGE_READLINE),y) PARTED_DEPENDENCIES += readline diff --git a/package/patch/patch.mk b/package/patch/patch.mk index b7f5bac05a..6f83d2418c 100644 --- a/package/patch/patch.mk +++ b/package/patch/patch.mk @@ -9,6 +9,7 @@ PATCH_SOURCE = patch-$(PATCH_VERSION).tar.xz PATCH_SITE = $(BR2_GNU_MIRROR)/patch PATCH_LICENSE = GPL-3.0+ PATCH_LICENSE_FILES = COPYING +PATCH_CPE_ID_VENDOR = gnu # 0001-Fix-segfault-with-mangled-rename-patch.patch PATCH_IGNORE_CVES += CVE-2018-6951 diff --git a/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch b/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch index feec627680..f9f2537a6c 100644 --- a/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch +++ b/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch @@ -167,7 +167,7 @@ index 1d9a772..35b4a33 100644 if (op == rpShrink && !rpath) { debug("no RPATH to shrink\n"); return; -@@ -1120,26 +1196,86 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) +@@ -1120,26 +1196,80 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) continue; } @@ -250,12 +250,6 @@ index 1d9a772..35b4a33 100644 + } + } + -+ if (!libFoundInRPath(canonicalPath, neededLibs, neededLibFound)) { -+ debug("removing directory '%s' from RPATH because it does not contain needed libs\n", -+ dirName.c_str()); -+ continue; -+ } -+ + /* Finally make "canonicalPath" relative to "filedir" in "rootDir" */ + if (relativeToFile) + concatToRPath(newRPath, makePathRelative(canonicalPath, fileDir)); @@ -268,7 +262,7 @@ index 1d9a772..35b4a33 100644 if (op == rpRemove) { if (!rpath) { debug("no RPATH to delete\n"); -@@ -1413,7 +1549,9 @@ static bool shrinkRPath = false; +@@ -1413,7 +1543,9 @@ static bool shrinkRPath = false; static bool removeRPath = false; static bool setRPath = false; static bool printRPath = false; @@ -278,7 +272,7 @@ index 1d9a772..35b4a33 100644 static set neededLibsToRemove; static map neededLibsToReplace; static set neededLibsToAdd; -@@ -1438,14 +1576,16 @@ static void patchElf2(ElfFile & elfFile) +@@ -1438,14 +1570,16 @@ static void patchElf2(ElfFile & elfFile) elfFile.setInterpreter(newInterpreter); if (printRPath) @@ -299,7 +293,7 @@ index 1d9a772..35b4a33 100644 if (printNeeded) elfFile.printNeededLibs(); -@@ -1508,6 +1648,9 @@ void showHelp(const string & progName) +@@ -1508,6 +1642,9 @@ void showHelp(const string & progName) [--set-rpath RPATH]\n\ [--remove-rpath]\n\ [--shrink-rpath]\n\ @@ -309,7 +303,7 @@ index 1d9a772..35b4a33 100644 [--print-rpath]\n\ [--force-rpath]\n\ [--add-needed LIBRARY]\n\ -@@ -1564,6 +1707,17 @@ int main(int argc, char * * argv) +@@ -1564,6 +1701,17 @@ int main(int argc, char * * argv) setRPath = true; newRPath = argv[i]; } diff --git a/package/pax-utils/Config.in b/package/pax-utils/Config.in index 58100e482a..ebcca98500 100644 --- a/package/pax-utils/Config.in +++ b/package/pax-utils/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_PAX_UTILS bool "pax-utils" + depends on BR2_USE_WCHAR help ELF related utils for ELF 32/64 binaries that can check files for security relevant properties. http://www.gentoo.org/proj/en/hardened/pax-utils.xml + +comment "pax-utils needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR diff --git a/package/pax-utils/pax-utils.hash b/package/pax-utils/pax-utils.hash index 1b4cee4fb8..0ef8fad643 100644 --- a/package/pax-utils/pax-utils.hash +++ b/package/pax-utils/pax-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9 pax-utils-1.2.2.tar.xz +sha256 9742d2a31d53a4e0f6df0d3721ab6f7cf8b0404c95fee3b00e678c1ff6db7f21 pax-utils-1.2.6.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/pax-utils/pax-utils.mk b/package/pax-utils/pax-utils.mk index b31468eca2..704e50e738 100644 --- a/package/pax-utils/pax-utils.mk +++ b/package/pax-utils/pax-utils.mk @@ -4,11 +4,12 @@ # ################################################################################ -PAX_UTILS_VERSION = 1.2.2 +PAX_UTILS_VERSION = 1.2.6 PAX_UTILS_SITE = http://distfiles.gentoo.org/distfiles PAX_UTILS_SOURCE = pax-utils-$(PAX_UTILS_VERSION).tar.xz PAX_UTILS_LICENSE = GPL-2.0 PAX_UTILS_LICENSE_FILES = COPYING +PAX_UTILS_CPE_ID_VENDOR = gentoo PAX_UTILS_DEPENDENCIES = host-pkgconf PAX_UTILS_CONF_OPTS = --without-python diff --git a/package/paxtest/paxtest.mk b/package/paxtest/paxtest.mk index e632e222c3..1b8d6699b6 100644 --- a/package/paxtest/paxtest.mk +++ b/package/paxtest/paxtest.mk @@ -8,6 +8,7 @@ PAXTEST_VERSION = 0.9.15 PAXTEST_SITE = https://www.grsecurity.net/~spender PAXTEST_LICENSE = GPL-2.0+ PAXTEST_LICENSE_FILES = README +PAXTEST_CPE_ID_VENDOR = grsecurity define PAXTEST_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ diff --git a/package/pciutils/pciutils.hash b/package/pciutils/pciutils.hash index da0358cacd..4b13c7484e 100644 --- a/package/pciutils/pciutils.hash +++ b/package/pciutils/pciutils.hash @@ -1,3 +1,3 @@ # From https://www.kernel.org/pub/software/utils/pciutils/sha256sums.asc -sha256 1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5 pciutils-3.5.5.tar.xz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 9d40b97be8b6a2cdf96aead5a61881d1f7e4e0da9544a9bac4fba1ae9dcd40eb pciutils-3.7.0.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 30d429e75a..9b83b62b55 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -4,20 +4,19 @@ # ################################################################################ -PCIUTILS_VERSION = 3.5.5 +PCIUTILS_VERSION = 3.7.0 PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz PCIUTILS_INSTALL_STAGING = YES PCIUTILS_LICENSE = GPL-2.0+ PCIUTILS_LICENSE_FILES = COPYING PCIUTILS_MAKE_OPTS = \ - CC="$(TARGET_CC)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ HOST="$(KERNEL_ARCH)-linux" \ OPT="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ - RANLIB=$(TARGET_RANLIB) \ - AR=$(TARGET_AR) \ - DNS=no + DNS=no \ + STRIP= ifeq ($(BR2_PACKAGE_HAS_UDEV),y) PCIUTILS_DEPENDENCIES += udev @@ -48,10 +47,6 @@ endif define PCIUTILS_CONFIGURE_CMDS $(SED) 's/wget --no-timestamping/wget/' $(PCIUTILS_DIR)/update-pciids.sh - $(SED) 's/uname -s/echo Linux/' \ - -e 's/uname -r/echo $(LINUX_HEADERS_VERSION)/' \ - $(PCIUTILS_DIR)/lib/configure - $(SED) 's/^STRIP/#STRIP/' $(PCIUTILS_DIR)/Makefile endef define PCIUTILS_BUILD_CMDS diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk index 6d5938f94e..6de11c0da2 100644 --- a/package/pcm-tools/pcm-tools.mk +++ b/package/pcm-tools/pcm-tools.mk @@ -33,4 +33,8 @@ define PCM_TOOLS_INSTALL_TARGET_CMDS $(PCM_TOOLS_INSTALL_PMU_QUERY) endef +define PCM_TOOLS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_X86_MSR) +endef + $(eval $(generic-package)) diff --git a/package/pcmanfm/pcmanfm.hash b/package/pcmanfm/pcmanfm.hash index b5574e39cd..1911de20b1 100644 --- a/package/pcmanfm/pcmanfm.hash +++ b/package/pcmanfm/pcmanfm.hash @@ -1,6 +1,7 @@ # From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/ -md5 d32ad2c9c7c52bff2004bbc120b53420 pcmanfm-1.3.1.tar.xz -sha1 4de1e5cb00fbf837c137f205e7e2327e3b49cb90 pcmanfm-1.3.1.tar.xz +md5 ef7c4417d2697ef138d175db7aeae15a pcmanfm-1.3.2.tar.xz +sha1 bc4e468b0ec3089aaf817eafed43ae06350961ee pcmanfm-1.3.2.tar.xz -# Hash for license file: -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +# Locally computed: +sha256 14cb7b247493c4cce65fbb5902611e3ad00a7a870fbc1e50adc50428c5140cf7 pcmanfm-1.3.2.tar.xz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk index 1d946ba521..1379b19f5d 100644 --- a/package/pcmanfm/pcmanfm.mk +++ b/package/pcmanfm/pcmanfm.mk @@ -4,12 +4,13 @@ # ################################################################################ -PCMANFM_VERSION = 1.3.1 +PCMANFM_VERSION = 1.3.2 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.xz PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm $(TARGET_NLS_DEPENDENCIES) PCMANFM_LICENSE = GPL-2.0+ PCMANFM_LICENSE_FILES = COPYING +PCMANFM_CPE_ID_VENDOR = pcmanfm_project PCMANFM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index 3c280e593f..c8498b7acf 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -9,6 +9,7 @@ PCRE_SITE = https://ftp.pcre.org/pub/pcre PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2 PCRE_LICENSE = BSD-3-Clause PCRE_LICENSE_FILES = LICENCE +PCRE_CPE_ID_VENDOR = pcre PCRE_INSTALL_STAGING = YES PCRE_CONFIG_SCRIPTS = pcre-config diff --git a/package/pcre2/Config.in b/package/pcre2/Config.in index f35877f376..f06f1914f3 100644 --- a/package/pcre2/Config.in +++ b/package/pcre2/Config.in @@ -1,4 +1,3 @@ - config BR2_PACKAGE_PCRE2 bool "pcre2" help diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index 9b83ccf135..130ce1f596 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,4 +1,5 @@ -# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.34.tar.bz2.sig -sha256 74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca pcre2-10.34.tar.bz2 +# Locally calculated after checking pgp signature +# https://ftp.pcre.org/pub/pcre/pcre2-10.37.tar.bz2.sig +sha256 4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270 pcre2-10.37.tar.bz2 # Locally computed -sha256 982293becea3f18eb4e3ce2145f66638e46d105a27b88418766caf321a684d03 LICENCE +sha256 9c9488256e3612ec5ea40fd12abe7ec55a58f23bd36e6f465116c2b3cbffba02 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index cedf4652a8..220eb8a99c 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,11 +4,12 @@ # ################################################################################ -PCRE2_VERSION = 10.34 +PCRE2_VERSION = 10.37 PCRE2_SITE = https://ftp.pcre.org/pub/pcre PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause PCRE2_LICENSE_FILES = LICENCE +PCRE2_CPE_ID_VENDOR = pcre PCRE2_INSTALL_STAGING = YES PCRE2_CONFIG_SCRIPTS = pcre2-config diff --git a/package/pcsc-lite/Config.in b/package/pcsc-lite/Config.in index 3250a463b4..1b4d0f7d18 100644 --- a/package/pcsc-lite/Config.in +++ b/package/pcsc-lite/Config.in @@ -13,10 +13,14 @@ if BR2_PACKAGE_PCSC_LITE config BR2_PACKAGE_PCSC_LITE_FORCE_LIBUSB bool "use libusb" depends on !BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Select Y if you want to support usb smart card readers. +comment "libusb support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + config BR2_PACKAGE_PCSC_LITE_DEBUGATR bool "enable ATR debug messages" help diff --git a/package/pcsc-lite/pcsc-lite.hash b/package/pcsc-lite/pcsc-lite.hash index 5df6a93582..4d31b25aaa 100644 --- a/package/pcsc-lite/pcsc-lite.hash +++ b/package/pcsc-lite/pcsc-lite.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 3eb7be7d6ef618c0a444316cf5c1f2f9d7227aedba7a192f389fe3e7c0dfbbd9 pcsc-lite-1.8.26.tar.bz2 -sha256 40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1 COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-3.0.txt +sha256 73c4789b7876a833a70f493cda21655dfe85689d9b7e29701c243276e55e683a pcsc-lite-1.9.1.tar.bz2 +sha256 40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-3.0.txt diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk index 96fa3f937a..3091da41a4 100644 --- a/package/pcsc-lite/pcsc-lite.mk +++ b/package/pcsc-lite/pcsc-lite.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCSC_LITE_VERSION = 1.8.26 +PCSC_LITE_VERSION = 1.9.1 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2 PCSC_LITE_SITE = https://pcsclite.apdu.fr/files PCSC_LITE_INSTALL_STAGING = YES diff --git a/package/pdbg/pdbg.hash b/package/pdbg/pdbg.hash index 486dff240d..9a58fa842c 100644 --- a/package/pdbg/pdbg.hash +++ b/package/pdbg/pdbg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 10f701c4bb8557a35de166c4322d77fa64ddbdd1146141a88a3d530144545820 pdbg-2.4.tar.gz +sha256 87fe68977f72885e46d321da806d30f33a901de817461eb44fa727cd81d1d109 pdbg-3.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/pdbg/pdbg.mk b/package/pdbg/pdbg.mk index 9977a126fb..7f6b48e6eb 100644 --- a/package/pdbg/pdbg.mk +++ b/package/pdbg/pdbg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PDBG_VERSION = 2.4 +PDBG_VERSION = 3.3 PDBG_SITE = $(call github,open-power,pdbg,v$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING diff --git a/package/pdmenu/pdmenu.hash b/package/pdmenu/pdmenu.hash index ab3a6660ac..00c2569adf 100644 --- a/package/pdmenu/pdmenu.hash +++ b/package/pdmenu/pdmenu.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 302aa81b8868133ff5a0f3e3e897f71d425bc628c0d7439addb623f12c277bea pdmenu_1.3.4.tar.gz +sha256 dedd2a4a5719278b5e49041161990c2f20b5909818837542aaca01819f2c14eb pdmenu-1.3.6.tar.gz # License file hash, locally calculated -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 doc/COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 doc/COPYING diff --git a/package/pdmenu/pdmenu.mk b/package/pdmenu/pdmenu.mk index 783509585c..2691a67ef6 100644 --- a/package/pdmenu/pdmenu.mk +++ b/package/pdmenu/pdmenu.mk @@ -4,9 +4,8 @@ # ################################################################################ -PDMENU_VERSION = 1.3.4 -PDMENU_SOURCE = pdmenu_$(PDMENU_VERSION).tar.gz -PDMENU_SITE = http://snapshot.debian.org/archive/debian/20170828T160058Z/pool/main/p/pdmenu +PDMENU_VERSION = 1.3.6 +PDMENU_SITE = https://git.joeyh.name/index.cgi/pdmenu.git/snapshot PDMENU_LICENSE = GPL-2.0 PDMENU_LICENSE_FILES = doc/COPYING PDMENU_DEPENDENCIES = slang $(TARGET_NLS_DEPENDENCIES) diff --git a/package/perl-convert-asn1/perl-convert-asn1.hash b/package/perl-convert-asn1/perl-convert-asn1.hash index 4fd7d3eb61..eb7973c313 100644 --- a/package/perl-convert-asn1/perl-convert-asn1.hash +++ b/package/perl-convert-asn1/perl-convert-asn1.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 68723e96be0b258a9e20480276e8a62c Convert-ASN1-0.27.tar.gz -sha256 74a4a78ae0c5e973100ac0a8f203a110f76fb047b79dae4fc1fd7d6814d3d58a Convert-ASN1-0.27.tar.gz +md5 1e12b263a5042804bb1c59ddce899876 Convert-ASN1-0.31.tar.gz +sha256 6fe4c1ba744c3a8212bf2c9b2703d93530acc153435cf2f93633540b439fbbeb Convert-ASN1-0.31.tar.gz # computed by scancpan -sha256 4ef46cc39d9e2b4c767503457a1f8fda5bcf9c0c164923e2a54a3863209cf237 LICENSE +sha256 db9e46a932b02253c8bddc05a44a0c1c6979627190afb2251dd76462dd370d79 LICENSE diff --git a/package/perl-convert-asn1/perl-convert-asn1.mk b/package/perl-convert-asn1/perl-convert-asn1.mk index b6ba76a7e8..c39fe3412f 100644 --- a/package/perl-convert-asn1/perl-convert-asn1.mk +++ b/package/perl-convert-asn1/perl-convert-asn1.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_CONVERT_ASN1_VERSION = 0.27 +PERL_CONVERT_ASN1_VERSION = 0.31 PERL_CONVERT_ASN1_SOURCE = Convert-ASN1-$(PERL_CONVERT_ASN1_VERSION).tar.gz -PERL_CONVERT_ASN1_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GB/GBARR +PERL_CONVERT_ASN1_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TI/TIMLEGGE PERL_CONVERT_ASN1_LICENSE = Artistic or GPL-1.0+ PERL_CONVERT_ASN1_LICENSE_FILES = LICENSE PERL_CONVERT_ASN1_DISTNAME = Convert-ASN1 diff --git a/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash index 327b06900a..e6d19cb681 100644 --- a/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash +++ b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e768fe2c07826b0ac9ea604c79f93032 Crypt-OpenSSL-Guess-0.11.tar.gz -sha256 aa6b18e38cb852cbad80a58cd90c395b40819d4d01e0ab37e7703149094d7167 Crypt-OpenSSL-Guess-0.11.tar.gz +md5 9e86baf96828a38c967003a5e66f0c39 Crypt-OpenSSL-Guess-0.12.tar.gz +sha256 0a18d18768cf42b49b15c9dea626199dc74346bbbc76acd3d817b9c1d2bd471d Crypt-OpenSSL-Guess-0.12.tar.gz # computed by scancpan -sha256 5c739f181ce7aa31d739277996ff230067dad39332e5597c0dffd36e5d784072 LICENSE +sha256 5c739f181ce7aa31d739277996ff230067dad39332e5597c0dffd36e5d784072 LICENSE diff --git a/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk index a53285165b..4f0898cf53 100644 --- a/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk +++ b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_CRYPT_OPENSSL_GUESS_VERSION = 0.11 +PERL_CRYPT_OPENSSL_GUESS_VERSION = 0.12 PERL_CRYPT_OPENSSL_GUESS_SOURCE = Crypt-OpenSSL-Guess-$(PERL_CRYPT_OPENSSL_GUESS_VERSION).tar.gz PERL_CRYPT_OPENSSL_GUESS_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AK/AKIYM PERL_CRYPT_OPENSSL_GUESS_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-crypt-openssl-rsa/Config.in b/package/perl-crypt-openssl-rsa/Config.in index e58a921bcb..b11d8a44c1 100644 --- a/package/perl-crypt-openssl-rsa/Config.in +++ b/package/perl-crypt-openssl-rsa/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_PERL_CRYPT_OPENSSL_RSA bool "perl-crypt-openssl-rsa" depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PERL_CRYPT_OPENSSL_RANDOM # runtime + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help RSA encoding and decoding, using the openSSL libraries. diff --git a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk index b161523421..23fd1ac381 100644 --- a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk +++ b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk @@ -9,7 +9,8 @@ PERL_CRYPT_OPENSSL_RSA_SOURCE = Crypt-OpenSSL-RSA-$(PERL_CRYPT_OPENSSL_RSA_VERSI PERL_CRYPT_OPENSSL_RSA_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR PERL_CRYPT_OPENSSL_RSA_DEPENDENCIES = \ host-perl-crypt-openssl-guess \ - perl-crypt-openssl-random + perl-crypt-openssl-random \ + openssl PERL_CRYPT_OPENSSL_RSA_LICENSE = Artistic or GPL-1.0+ PERL_CRYPT_OPENSSL_RSA_LICENSE_FILES = LICENSE PERL_CRYPT_OPENSSL_RSA_DISTNAME = Crypt-OpenSSL-RSA diff --git a/package/perl-data-dump/perl-data-dump.hash b/package/perl-data-dump/perl-data-dump.hash index 87850326de..cc1986e744 100644 --- a/package/perl-data-dump/perl-data-dump.hash +++ b/package/perl-data-dump/perl-data-dump.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 762c111e525c82ff23d62c90821b26e9 Data-Dump-1.23.tar.gz -sha256 af53b05ef1387b4cab4427e6789179283e4f0da8cf036e8db516ddb344512b65 Data-Dump-1.23.tar.gz +md5 9bd7131ef0441e1e0e001bf85e9fae31 Data-Dump-1.25.tar.gz +sha256 a4aa6e0ddbf39d5ad49bddfe0f89d9da864e3bc00f627125d1bc580472f53fbd Data-Dump-1.25.tar.gz # computed by scancpan -sha256 31d1b6482bcc3db87a38ad02065554f9d3bc13321d4ef8e96042464045e2abcf README +sha256 8bdd655ceab54bbeb1105a101f0412ec764098abf09b4e92bc430d56befa10cb README.md diff --git a/package/perl-data-dump/perl-data-dump.mk b/package/perl-data-dump/perl-data-dump.mk index 54d3a925fe..e70de2a211 100644 --- a/package/perl-data-dump/perl-data-dump.mk +++ b/package/perl-data-dump/perl-data-dump.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_DATA_DUMP_VERSION = 1.23 +PERL_DATA_DUMP_VERSION = 1.25 PERL_DATA_DUMP_SOURCE = Data-Dump-$(PERL_DATA_DUMP_VERSION).tar.gz -PERL_DATA_DUMP_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS +PERL_DATA_DUMP_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GARU PERL_DATA_DUMP_LICENSE = Artistic or GPL-1.0+ -PERL_DATA_DUMP_LICENSE_FILES = README +PERL_DATA_DUMP_LICENSE_FILES = README.md PERL_DATA_DUMP_DISTNAME = Data-Dump $(eval $(perl-package)) diff --git a/package/perl-data-optlist/perl-data-optlist.hash b/package/perl-data-optlist/perl-data-optlist.hash index 93df006486..1c805acef7 100644 --- a/package/perl-data-optlist/perl-data-optlist.hash +++ b/package/perl-data-optlist/perl-data-optlist.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 f9236c9ea5607134ad8a2b3dc901c4c5 Data-OptList-0.110.tar.gz -sha256 366117cb2966473f2559f2f4575ff6ae69e84c69a0f30a0773e1b51a457ef5c3 Data-OptList-0.110.tar.gz +md5 3b2cdb7846391f9acaf4e948a9a6b21b Data-OptList-0.112.tar.gz +sha256 62c60ccaae88d5339ae36bcc8940b03388cf84adbf27828b1f8b300307103bab Data-OptList-0.112.tar.gz # computed by scancpan -sha256 73c7bd4c8e4adc474f9dae32b9aa08f6ce27327940751dd6e8373404beabdffa LICENSE +sha256 712f3e40537810ba3046533fd71d877f69ab446d5e8e8a1135771804494b8b42 LICENSE diff --git a/package/perl-data-optlist/perl-data-optlist.mk b/package/perl-data-optlist/perl-data-optlist.mk index 49aeb820e2..8e089245f6 100644 --- a/package/perl-data-optlist/perl-data-optlist.mk +++ b/package/perl-data-optlist/perl-data-optlist.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATA_OPTLIST_VERSION = 0.110 +PERL_DATA_OPTLIST_VERSION = 0.112 PERL_DATA_OPTLIST_SOURCE = Data-OptList-$(PERL_DATA_OPTLIST_VERSION).tar.gz PERL_DATA_OPTLIST_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS PERL_DATA_OPTLIST_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-data-uuid/perl-data-uuid.hash b/package/perl-data-uuid/perl-data-uuid.hash index 280567177f..b2c8629605 100644 --- a/package/perl-data-uuid/perl-data-uuid.hash +++ b/package/perl-data-uuid/perl-data-uuid.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 71510bbcce760c394591fca83a9b5e6d Data-UUID-1.224.tar.gz -sha256 c958c17502bbef5eccf40c040874895747f7f9b9f9e5192c18688370981bf47c Data-UUID-1.224.tar.gz +md5 13468e0fb65a0b5ce27b8628cb2f0109 Data-UUID-1.226.tar.gz +sha256 093d57ffa0d411a94bafafae495697db26f5c9d0277198fe3f7cf2be22996453 Data-UUID-1.226.tar.gz # computed by scancpan -sha256 0560c8eea8e1fb8173faa6c2e9b7e9f8728b8ae8250a814709a53c30b778d5fb LICENSE +sha256 0560c8eea8e1fb8173faa6c2e9b7e9f8728b8ae8250a814709a53c30b778d5fb LICENSE diff --git a/package/perl-data-uuid/perl-data-uuid.mk b/package/perl-data-uuid/perl-data-uuid.mk index 00dccdb7e6..93060964bb 100644 --- a/package/perl-data-uuid/perl-data-uuid.mk +++ b/package/perl-data-uuid/perl-data-uuid.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATA_UUID_VERSION = 1.224 +PERL_DATA_UUID_VERSION = 1.226 PERL_DATA_UUID_SOURCE = Data-UUID-$(PERL_DATA_UUID_VERSION).tar.gz PERL_DATA_UUID_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS # The license is documented at diff --git a/package/perl-date-manip/perl-date-manip.hash b/package/perl-date-manip/perl-date-manip.hash index a35b514563..d40aa087b5 100644 --- a/package/perl-date-manip/perl-date-manip.hash +++ b/package/perl-date-manip/perl-date-manip.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 a9ff96f05675ac4cb7f19c4b03a7363b Date-Manip-6.81.tar.gz -sha256 044c319e2213dad73abd32b7f731bf4593d1e9fa96024bdc6b6475a2e768949b Date-Manip-6.81.tar.gz +md5 ce3447409d83d16e6dd7bea0a18f24b4 Date-Manip-6.85.tar.gz +sha256 1662393943b7c588478ea9d975200d825f500d26fe9996f2bf7f829cfaa5ccdc Date-Manip-6.85.tar.gz # computed by scancpan -sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE +sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE diff --git a/package/perl-date-manip/perl-date-manip.mk b/package/perl-date-manip/perl-date-manip.mk index 20dc722768..4ee81d340f 100644 --- a/package/perl-date-manip/perl-date-manip.mk +++ b/package/perl-date-manip/perl-date-manip.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATE_MANIP_VERSION = 6.81 +PERL_DATE_MANIP_VERSION = 6.85 PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-digest-hmac/Config.in b/package/perl-digest-hmac/Config.in index bb9b454174..e8bb880020 100644 --- a/package/perl-digest-hmac/Config.in +++ b/package/perl-digest-hmac/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_PERL_DIGEST_HMAC help Keyed-Hashing for Message Authentication. - https://metacpan.org/release/Digest-HMAC + http://metacpan.org/release/Digest-HMAC diff --git a/package/perl-digest-hmac/perl-digest-hmac.hash b/package/perl-digest-hmac/perl-digest-hmac.hash index 84bc86488a..5e7da14f3f 100644 --- a/package/perl-digest-hmac/perl-digest-hmac.hash +++ b/package/perl-digest-hmac/perl-digest-hmac.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e6a5d6f552da16eacb5157ea4369ff9d Digest-HMAC-1.03.tar.gz -sha256 3bc72c6d3ff144d73aefb90e9a78d33612d58cf1cd1631ecfb8985ba96da4a59 Digest-HMAC-1.03.tar.gz +md5 746a5edffd1485d7500e005730c271c8 Digest-HMAC-1.04.tar.gz +sha256 d6bc8156aa275c44d794b7c18f44cdac4a58140245c959e6b19b2c3838b08ed4 Digest-HMAC-1.04.tar.gz # computed by scancpan -sha256 56bf7cdaec5eebf74d58679638ebef5015883e65c1be7251a3ef8cce8bdd1ff5 README +sha256 cb9ff694d1769f450dd5c400204aa921d2fb3db90fcb21674a39f3725c4255c1 LICENSE diff --git a/package/perl-digest-hmac/perl-digest-hmac.mk b/package/perl-digest-hmac/perl-digest-hmac.mk index daacf7dab4..bc080703de 100644 --- a/package/perl-digest-hmac/perl-digest-hmac.mk +++ b/package/perl-digest-hmac/perl-digest-hmac.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_DIGEST_HMAC_VERSION = 1.03 +PERL_DIGEST_HMAC_VERSION = 1.04 PERL_DIGEST_HMAC_SOURCE = Digest-HMAC-$(PERL_DIGEST_HMAC_VERSION).tar.gz -PERL_DIGEST_HMAC_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS +PERL_DIGEST_HMAC_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AR/ARODLAND PERL_DIGEST_HMAC_LICENSE = Artistic or GPL-1.0+ -PERL_DIGEST_HMAC_LICENSE_FILES = README +PERL_DIGEST_HMAC_LICENSE_FILES = LICENSE PERL_DIGEST_HMAC_DISTNAME = Digest-HMAC $(eval $(perl-package)) diff --git a/package/perl-exporter-tiny/perl-exporter-tiny.hash b/package/perl-exporter-tiny/perl-exporter-tiny.hash index 1d36c63a10..c714ef902e 100644 --- a/package/perl-exporter-tiny/perl-exporter-tiny.hash +++ b/package/perl-exporter-tiny/perl-exporter-tiny.hash @@ -1,7 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e33f25f7556f5f5264a92cb9870d0eac Exporter-Tiny-1.002001.tar.gz -sha256 a82c334c02ce4b0f9ea77c67bf77738f76a9b8aa4bae5c7209d1c76453d3c48d Exporter-Tiny-1.002001.tar.gz +md5 485897322a2514b4d6ca90b2daacb7cd Exporter-Tiny-1.002002.tar.gz +sha256 00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101 Exporter-Tiny-1.002002.tar.gz # computed by scancpan -sha256 a109768ea1493cc7555d4381d6178d3cfc1fe52adc5d63d3831a2697d9fc90e6 COPYRIGHT -sha256 c614dadb36b02257ab492e3d4341e52f3f03fe8147cafd2b7da03b3b5c0361e9 LICENSE +sha256 f4cb223c8ac37d6ccd0e78b2892ca54a48a6adbe6a271c3c17c0226646297e66 COPYRIGHT +sha256 1fb7395e76eabf94c421912d7d0a4f7fa745d49e1acb76b222c21d605b66bd25 LICENSE diff --git a/package/perl-exporter-tiny/perl-exporter-tiny.mk b/package/perl-exporter-tiny/perl-exporter-tiny.mk index 1ba1a5ac70..c7abfbae2d 100644 --- a/package/perl-exporter-tiny/perl-exporter-tiny.mk +++ b/package/perl-exporter-tiny/perl-exporter-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_EXPORTER_TINY_VERSION = 1.002001 +PERL_EXPORTER_TINY_VERSION = 1.002002 PERL_EXPORTER_TINY_SOURCE = Exporter-Tiny-$(PERL_EXPORTER_TINY_VERSION).tar.gz PERL_EXPORTER_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOBYINK PERL_EXPORTER_TINY_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-file-listing/perl-file-listing.hash b/package/perl-file-listing/perl-file-listing.hash index 6189948a19..2358965714 100644 --- a/package/perl-file-listing/perl-file-listing.hash +++ b/package/perl-file-listing/perl-file-listing.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 83f636b477741f3a014585bb9cc079a6 File-Listing-6.04.tar.gz -sha256 1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5 File-Listing-6.04.tar.gz +md5 cf60a79563185391831613178a79b4cd File-Listing-6.14.tar.gz +sha256 15b3a4871e23164a36f226381b74d450af41f12cc94985f592a669fcac7b48ff File-Listing-6.14.tar.gz # computed by scancpan -sha256 9ee526d1593c48e65141aea5567f0cdf156eb57e68448cd91584c7aae92bd787 README +sha256 7f0ccec295e6d7d2be1439cedd7caf6cc6247191f4c10ac56d91ee9bc265ba02 LICENSE diff --git a/package/perl-file-listing/perl-file-listing.mk b/package/perl-file-listing/perl-file-listing.mk index 9f3ca95164..61bbc18eb8 100644 --- a/package/perl-file-listing/perl-file-listing.mk +++ b/package/perl-file-listing/perl-file-listing.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_FILE_LISTING_VERSION = 6.04 +PERL_FILE_LISTING_VERSION = 6.14 PERL_FILE_LISTING_SOURCE = File-Listing-$(PERL_FILE_LISTING_VERSION).tar.gz -PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS +PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PL/PLICEASE PERL_FILE_LISTING_LICENSE = Artistic or GPL-1.0+ -PERL_FILE_LISTING_LICENSE_FILES = README +PERL_FILE_LISTING_LICENSE_FILES = LICENSE PERL_FILE_LISTING_DISTNAME = File-Listing $(eval $(perl-package)) diff --git a/package/perl-file-sharedir/perl-file-sharedir.hash b/package/perl-file-sharedir/perl-file-sharedir.hash index e0a4966553..413678d6ae 100644 --- a/package/perl-file-sharedir/perl-file-sharedir.hash +++ b/package/perl-file-sharedir/perl-file-sharedir.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 f2a0eee9f04c93753dd56437175e5bda File-ShareDir-1.116.tar.gz -sha256 59d90bfdf98c4656ff4173e62954ea8cf0de66565e35d108ecd7050596cb8328 File-ShareDir-1.116.tar.gz +md5 0084f730f4e3d4d89703d92b3ea82f54 File-ShareDir-1.118.tar.gz +sha256 3bb2a20ba35df958dc0a4f2306fc05d903d8b8c4de3c8beefce17739d281c958 File-ShareDir-1.118.tar.gz # computed by scancpan -sha256 db57983ce0a3bce54900b5a3a3a69e9a593e7b07d0f58dd9f87ac9b016ff4a6b LICENSE +sha256 db57983ce0a3bce54900b5a3a3a69e9a593e7b07d0f58dd9f87ac9b016ff4a6b LICENSE diff --git a/package/perl-file-sharedir/perl-file-sharedir.mk b/package/perl-file-sharedir/perl-file-sharedir.mk index d907f3b066..0121b5634f 100644 --- a/package/perl-file-sharedir/perl-file-sharedir.mk +++ b/package/perl-file-sharedir/perl-file-sharedir.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_SHAREDIR_VERSION = 1.116 +PERL_FILE_SHAREDIR_VERSION = 1.118 PERL_FILE_SHAREDIR_SOURCE = File-ShareDir-$(PERL_FILE_SHAREDIR_VERSION).tar.gz PERL_FILE_SHAREDIR_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RE/REHSACK PERL_FILE_SHAREDIR_DEPENDENCIES = host-perl-file-sharedir-install diff --git a/package/perl-file-slurp/perl-file-slurp.hash b/package/perl-file-slurp/perl-file-slurp.hash index 5bf2713dc7..f3cc579f8a 100644 --- a/package/perl-file-slurp/perl-file-slurp.hash +++ b/package/perl-file-slurp/perl-file-slurp.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 a806ca5c769d811b0f32c6a773295408 File-Slurp-9999.30.tar.gz -sha256 2a37163db0b9454e48eb308dac1fc27571be086e0864c9083bed88d9c4e93747 File-Slurp-9999.30.tar.gz +md5 a10ddfcbe153fc8d0076936ee83b98ed File-Slurp-9999.32.tar.gz +sha256 4c3c21992a9d42be3a79dd74a3c83d27d38057269d65509a2f555ea0fb2bc5b0 File-Slurp-9999.32.tar.gz # computed by scancpan -sha256 2281c2e5a690ac7f227fd9934b3d0b9abc419fd514f001d421f2f854203d92b4 README.md +sha256 d1be945657536c93caf481b9f3c73fd1952ef66388c664e29021ab91d4fe47e8 README.md diff --git a/package/perl-file-slurp/perl-file-slurp.mk b/package/perl-file-slurp/perl-file-slurp.mk index 4174df4a2e..0d4ab94034 100644 --- a/package/perl-file-slurp/perl-file-slurp.mk +++ b/package/perl-file-slurp/perl-file-slurp.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_SLURP_VERSION = 9999.30 +PERL_FILE_SLURP_VERSION = 9999.32 PERL_FILE_SLURP_SOURCE = File-Slurp-$(PERL_FILE_SLURP_VERSION).tar.gz PERL_FILE_SLURP_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CA/CAPOEIRAB PERL_FILE_SLURP_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-file-util/perl-file-util.hash b/package/perl-file-util/perl-file-util.hash index 0915494f76..7e529e03ed 100644 --- a/package/perl-file-util/perl-file-util.hash +++ b/package/perl-file-util/perl-file-util.hash @@ -1,7 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 5706487ecf0daae885f709914915e832 File-Util-4.161950.tar.gz -sha256 88507b19da580d595b5c25fe6ba75bbd6096b4359e389ead067a216f766c20ee File-Util-4.161950.tar.gz +md5 093fe77c4658f98375c7f6cc68694948 File-Util-4.201720.tar.gz +sha256 d4491021850d5c5cbd702c7e4744858079841d2fa93f1c2d09ddc9a7863608df File-Util-4.201720.tar.gz # computed by scancpan -sha256 5f3732812570654ba911e45ec4e5f7353f4b63747ebfc506c543e8fb1ccf797f COPYING -sha256 48428fd07c402ea82d3556753ca936c7030f0d7a6a93c3ef09423c36820ffb91 LICENSE +sha256 5f3732812570654ba911e45ec4e5f7353f4b63747ebfc506c543e8fb1ccf797f COPYING +sha256 996b77ca668f16a443ed14758fce492bddd9f55fe831ee8353274c89191b8544 LICENSE diff --git a/package/perl-file-util/perl-file-util.mk b/package/perl-file-util/perl-file-util.mk index 5437bc11cf..4348b0e956 100644 --- a/package/perl-file-util/perl-file-util.mk +++ b/package/perl-file-util/perl-file-util.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_UTIL_VERSION = 4.161950 +PERL_FILE_UTIL_VERSION = 4.201720 PERL_FILE_UTIL_SOURCE = File-Util-$(PERL_FILE_UTIL_VERSION).tar.gz PERL_FILE_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOMMY PERL_FILE_UTIL_DEPENDENCIES = host-perl-module-build diff --git a/package/perl-gd/Config.in b/package/perl-gd/Config.in index ef28f7b971..044e601021 100644 --- a/package/perl-gd/Config.in +++ b/package/perl-gd/Config.in @@ -2,8 +2,6 @@ config BR2_PACKAGE_PERL_GD bool "perl-gd" depends on !BR2_STATIC_LIBS select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_GD help Perl interface to the gd2 graphics library. diff --git a/package/perl-gd/perl-gd.hash b/package/perl-gd/perl-gd.hash index 5895cc3458..780b1d1e27 100644 --- a/package/perl-gd/perl-gd.hash +++ b/package/perl-gd/perl-gd.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1e2534e1d0db57d6aad438f15ca63253 GD-2.71.tar.gz -sha256 451be4873b2ad7261cc5679698cd9d2e84dbdde4309971869fc7734b569b7ac7 GD-2.71.tar.gz +md5 c2bf1ca56d15e33d2432e4d8ba5aeadf GD-2.73.tar.gz +sha256 491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b GD-2.73.tar.gz # computed by scancpan -sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE +sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index d52ba1cce0..b402dfff49 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -4,19 +4,51 @@ # ################################################################################ -PERL_GD_VERSION = 2.71 +PERL_GD_VERSION = 2.73 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN -PERL_GD_DEPENDENCIES = zlib libpng freetype gd +PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd PERL_GD_LICENSE = Artistic or GPL-1.0+ PERL_GD_LICENSE_FILES = LICENSE PERL_GD_DISTNAME = GD -PERL_GD_CONF_OPTS = \ +PERL_GD_CONF_ENV = \ + PATH=$(BR_PATH) \ + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" + +ifeq ($(BR2_PACKAGE_FONTCONFIG),y) +PERL_GD_DEPENDENCIES += fontconfig +PERL_GD_OPTIONS += FONTCONFIG +PERL_GD_CONF_OPTS += -lib_fontconfig_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_FREETYPE),y) +PERL_GD_DEPENDENCIES += freetype +PERL_GD_OPTIONS += FT +PERL_GD_CONF_OPTS += -lib_ft_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +PERL_GD_DEPENDENCIES += jpeg +PERL_GD_OPTIONS += JPEG +PERL_GD_CONF_OPTS += -lib_jpeg_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +PERL_GD_DEPENDENCIES += libpng +PERL_GD_OPTIONS += PNG +PERL_GD_CONF_OPTS += -lib_png_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) +PERL_GD_DEPENDENCIES += xlib_libXpm +PERL_GD_OPTIONS += XPM +PERL_GD_CONF_OPTS += -lib_xpm_path=$(STAGING_DIR)/usr +endif + +PERL_GD_CONF_OPTS += \ -lib_gd_path=$(STAGING_DIR)/usr \ - -lib_ft_path=$(STAGING_DIR)/usr \ - -lib_png_path=$(STAGING_DIR)/usr \ -lib_zlib_path=$(STAGING_DIR)/usr \ - -gdlib_config_path=$(STAGING_DIR)/usr/bin + -options=$(subst $(space),$(comma),$(PERL_GD_OPTIONS)) $(eval $(perl-package)) diff --git a/package/perl-html-parser/Config.in b/package/perl-html-parser/Config.in index 10cd95e484..191d1b3b76 100644 --- a/package/perl-html-parser/Config.in +++ b/package/perl-html-parser/Config.in @@ -2,10 +2,12 @@ config BR2_PACKAGE_PERL_HTML_PARSER bool "perl-html-parser" depends on !BR2_STATIC_LIBS select BR2_PACKAGE_PERL_HTML_TAGSET # runtime + select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime + select BR2_PACKAGE_PERL_URI # runtime help HTML parser class. - https://metacpan.org/release/HTML-Parser + https://github.com/libwww-perl/HTML-Parser comment "perl-html-parser needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/perl-html-parser/perl-html-parser.hash b/package/perl-html-parser/perl-html-parser.hash index f06ec034b7..36b094a7cb 100644 --- a/package/perl-html-parser/perl-html-parser.hash +++ b/package/perl-html-parser/perl-html-parser.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 eb7505e5f626913350df9dd4a03d54a8 HTML-Parser-3.72.tar.gz -sha256 ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b HTML-Parser-3.72.tar.gz +md5 60e266d5a07fbea671a0383dd8af7b6c HTML-Parser-3.76.tar.gz +sha256 64d9e2eb2b420f1492da01ec0e6976363245b4be9290f03f10b7d2cb63fa2f61 HTML-Parser-3.76.tar.gz # computed by scancpan -sha256 663867028ae22c6f2fabab11238f65f1bf8dd789233b844bead5f6d22220d160 README +sha256 0e57338bc10d5fb8891012ebee65a7b504b247f5bb485e121b8b48d7a118a60b LICENSE diff --git a/package/perl-html-parser/perl-html-parser.mk b/package/perl-html-parser/perl-html-parser.mk index 6e5a81bb72..097564dbcb 100644 --- a/package/perl-html-parser/perl-html-parser.mk +++ b/package/perl-html-parser/perl-html-parser.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_HTML_PARSER_VERSION = 3.72 +PERL_HTML_PARSER_VERSION = 3.76 PERL_HTML_PARSER_SOURCE = HTML-Parser-$(PERL_HTML_PARSER_VERSION).tar.gz -PERL_HTML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS +PERL_HTML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTML_PARSER_LICENSE = Artistic or GPL-1.0+ -PERL_HTML_PARSER_LICENSE_FILES = README +PERL_HTML_PARSER_LICENSE_FILES = LICENSE PERL_HTML_PARSER_DISTNAME = HTML-Parser $(eval $(perl-package)) diff --git a/package/perl-http-cookies/perl-http-cookies.hash b/package/perl-http-cookies/perl-http-cookies.hash index 4099ce707f..15d9e7a86f 100644 --- a/package/perl-http-cookies/perl-http-cookies.hash +++ b/package/perl-http-cookies/perl-http-cookies.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 8c663710244e70c85775393a8f5be443 HTTP-Cookies-6.08.tar.gz -sha256 49ebb73576eb41063c04bc079477df094496deec805ae033f3be338c23c3af59 HTTP-Cookies-6.08.tar.gz +md5 b4d7804231b1dfd10999d42283e0cf06 HTTP-Cookies-6.10.tar.gz +sha256 e36f36633c5ce6b5e4b876ffcf74787cc5efe0736dd7f487bdd73c14f0bd7007 HTTP-Cookies-6.10.tar.gz # computed by scancpan -sha256 5204690d6efb272e6fde7c3e3b8aba5114e1458b706710eaf607041ac080344d LICENSE +sha256 82902ce20c8ed71d7f4e7a6a5b2b26e43a7e2e90c78098fb49aa49e03ac808e0 LICENSE diff --git a/package/perl-http-cookies/perl-http-cookies.mk b/package/perl-http-cookies/perl-http-cookies.mk index 6f802d6447..745fd10a7c 100644 --- a/package/perl-http-cookies/perl-http-cookies.mk +++ b/package/perl-http-cookies/perl-http-cookies.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_COOKIES_VERSION = 6.08 +PERL_HTTP_COOKIES_VERSION = 6.10 PERL_HTTP_COOKIES_SOURCE = HTTP-Cookies-$(PERL_HTTP_COOKIES_VERSION).tar.gz PERL_HTTP_COOKIES_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_COOKIES_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-http-daemon/perl-http-daemon.hash b/package/perl-http-daemon/perl-http-daemon.hash index b2e5dbceb3..f8272a4fce 100644 --- a/package/perl-http-daemon/perl-http-daemon.hash +++ b/package/perl-http-daemon/perl-http-daemon.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c5d6e1d84f7f09770d9ce52d4bddef59 HTTP-Daemon-6.06.tar.gz -sha256 fc03a161b54553f766457a4267e7066767f54ad01cacfe9a91d7caa2a0319bad HTTP-Daemon-6.06.tar.gz +md5 63674e3f81760a29075853413eb157d8 HTTP-Daemon-6.12.tar.gz +sha256 df47bed10c38670c780fd0116867d5fd4693604acde31ba63380dce04c4e1fa6 HTTP-Daemon-6.12.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENCE +sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENCE diff --git a/package/perl-http-daemon/perl-http-daemon.mk b/package/perl-http-daemon/perl-http-daemon.mk index 3fb89db924..e475072628 100644 --- a/package/perl-http-daemon/perl-http-daemon.mk +++ b/package/perl-http-daemon/perl-http-daemon.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_DAEMON_VERSION = 6.06 +PERL_HTTP_DAEMON_VERSION = 6.12 PERL_HTTP_DAEMON_SOURCE = HTTP-Daemon-$(PERL_HTTP_DAEMON_VERSION).tar.gz PERL_HTTP_DAEMON_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_DAEMON_DEPENDENCIES = host-perl-module-build-tiny diff --git a/package/perl-http-entity-parser/perl-http-entity-parser.hash b/package/perl-http-entity-parser/perl-http-entity-parser.hash index 6e0dccba93..69d5f6e978 100644 --- a/package/perl-http-entity-parser/perl-http-entity-parser.hash +++ b/package/perl-http-entity-parser/perl-http-entity-parser.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d8256c95119a3ddc6f4a88e59b67f0ec HTTP-Entity-Parser-0.22.tar.gz -sha256 93fe1cf2a2b4e6834bf0c1abd0d3bf28c614e8582ff10e6e0426f46a81eed6c8 HTTP-Entity-Parser-0.22.tar.gz +md5 09663f9577975587e832e28ba5f5f8af HTTP-Entity-Parser-0.25.tar.gz +sha256 3a8cd0d8cba3d17cd8c04ee82d7341dfaa247dbdd94a49eb94b53f69e483ec3a HTTP-Entity-Parser-0.25.tar.gz # computed by scancpan -sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE +sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE diff --git a/package/perl-http-entity-parser/perl-http-entity-parser.mk b/package/perl-http-entity-parser/perl-http-entity-parser.mk index 1638d5b1db..2304955bda 100644 --- a/package/perl-http-entity-parser/perl-http-entity-parser.mk +++ b/package/perl-http-entity-parser/perl-http-entity-parser.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_ENTITY_PARSER_VERSION = 0.22 +PERL_HTTP_ENTITY_PARSER_VERSION = 0.25 PERL_HTTP_ENTITY_PARSER_SOURCE = HTTP-Entity-Parser-$(PERL_HTTP_ENTITY_PARSER_VERSION).tar.gz PERL_HTTP_ENTITY_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/K/KA/KAZEBURO PERL_HTTP_ENTITY_PARSER_DEPENDENCIES = host-perl-module-build-tiny diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index 80e117cffe..62cf0588ad 100644 --- a/package/perl-http-message/perl-http-message.hash +++ b/package/perl-http-message/perl-http-message.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 3cfb96e96c1881afa72639a8f4282e86 HTTP-Message-6.22.tar.gz -sha256 970efd151b81c95831d2a5f9e117f8032b63a1768cd2cd3f092ad634c85175c3 HTTP-Message-6.22.tar.gz +md5 e291f19e9532ffb7d1c80eab786bf0f2 HTTP-Message-6.33.tar.gz +sha256 23b967f71b852cb209ec92a1af6bac89a141dff1650d69824d29a345c1eceef7 HTTP-Message-6.33.tar.gz # computed by scancpan -sha256 66f0d1e8593d5512d7a8cd90549a976aaae97e4fa9b6097249b3682f14747a6b LICENSE +sha256 1379396dcd2291f17a741d2d6bf14d379f5f2ab91b3c7e7b92c5f82856e2d7ac LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index c80d884054..18e673ae1c 100644 --- a/package/perl-http-message/perl-http-message.mk +++ b/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.22 +PERL_HTTP_MESSAGE_VERSION = 6.33 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-io-html/perl-io-html.hash b/package/perl-io-html/perl-io-html.hash index d8d865e8da..4067d2faa1 100644 --- a/package/perl-io-html/perl-io-html.hash +++ b/package/perl-io-html/perl-io-html.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 3f8958718844dc96b9f6946f21d70d22 IO-HTML-1.001.tar.gz -sha256 ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0 IO-HTML-1.001.tar.gz +md5 04bbe363686fd19bfb4cc0ed775e3d03 IO-HTML-1.004.tar.gz +sha256 c87b2df59463bbf2c39596773dfb5c03bde0f7e1051af339f963f58c1cbd8bf5 IO-HTML-1.004.tar.gz # computed by scancpan -sha256 b386f0545c17589141d98810dd46aa1c4a14d7028cae6bdd807969639ea7405e LICENSE +sha256 669fdd41b60ef6169a975b87a5fe35c50e81b9efc8f96b2459f4fbb238079d84 LICENSE diff --git a/package/perl-io-html/perl-io-html.mk b/package/perl-io-html/perl-io-html.mk index ae8c6405a3..934ac60cb6 100644 --- a/package/perl-io-html/perl-io-html.mk +++ b/package/perl-io-html/perl-io-html.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_HTML_VERSION = 1.001 +PERL_IO_HTML_VERSION = 1.004 PERL_IO_HTML_SOURCE = IO-HTML-$(PERL_IO_HTML_VERSION).tar.gz PERL_IO_HTML_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CJ/CJM PERL_IO_HTML_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-io-socket-ssl/Config.in b/package/perl-io-socket-ssl/Config.in index a7b94a3925..2797a11557 100644 --- a/package/perl-io-socket-ssl/Config.in +++ b/package/perl-io-socket-ssl/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PERL_IO_SOCKET_SSL bool "perl-io-socket-ssl" depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_PERL_MOZILLA_CA # runtime select BR2_PACKAGE_PERL_NET_SSLEAY # runtime help Nearly transparent SSL encapsulation for IO::Socket::INET. diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash index d849060f71..4f2a6811bd 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1d55e9f66ca442f4e0ae4d018e3067fc IO-Socket-SSL-2.067.tar.gz -sha256 ef8842806d047cf56e2af64add4ed30b24547bcbb50e8df33cee0c54609af1c1 IO-Socket-SSL-2.067.tar.gz +md5 3e33497ba43be5adce1f980437253172 IO-Socket-SSL-2.071.tar.gz +sha256 40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a IO-Socket-SSL-2.071.tar.gz # computed by scancpan -sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README +sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index 4ab1f1fbe1..45f7683058 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_SOCKET_SSL_VERSION = 2.067 +PERL_IO_SOCKET_SSL_VERSION = 2.071 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-json-maybexs/perl-json-maybexs.hash b/package/perl-json-maybexs/perl-json-maybexs.hash index c8bf172aaa..a53d4ec616 100644 --- a/package/perl-json-maybexs/perl-json-maybexs.hash +++ b/package/perl-json-maybexs/perl-json-maybexs.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 db61fb5515f8e2f19709a317e26dde42 JSON-MaybeXS-1.004000.tar.gz -sha256 59bda02e8f4474c73913723c608b539e2452e16c54ed7f0150c01aad06e0a126 JSON-MaybeXS-1.004000.tar.gz +md5 e46181e34588428d317932744597a7ab JSON-MaybeXS-1.004003.tar.gz +sha256 5bee3b17ff9dcffd6e99ab8cf7f35747650bfce1dc622e3ad10b85a194462fbf JSON-MaybeXS-1.004003.tar.gz # computed by scancpan -sha256 d972e00126c5337e88d81d64fc349a3f4c54841075f4180a1145441d30c86f83 README +sha256 0f2d6b537f7a735c981511875d832bc8ff767bf97d62848cf0bada964e40aadd LICENSE diff --git a/package/perl-json-maybexs/perl-json-maybexs.mk b/package/perl-json-maybexs/perl-json-maybexs.mk index cb6518b592..e6891f6808 100644 --- a/package/perl-json-maybexs/perl-json-maybexs.mk +++ b/package/perl-json-maybexs/perl-json-maybexs.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_JSON_MAYBEXS_VERSION = 1.004000 +PERL_JSON_MAYBEXS_VERSION = 1.004003 PERL_JSON_MAYBEXS_SOURCE = JSON-MaybeXS-$(PERL_JSON_MAYBEXS_VERSION).tar.gz -PERL_JSON_MAYBEXS_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG +PERL_JSON_MAYBEXS_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_JSON_MAYBEXS_LICENSE = Artistic or GPL-1.0+ -PERL_JSON_MAYBEXS_LICENSE_FILES = README +PERL_JSON_MAYBEXS_LICENSE_FILES = LICENSE PERL_JSON_MAYBEXS_DISTNAME = JSON-MaybeXS $(eval $(perl-package)) diff --git a/package/perl-libwww-perl/Config.in b/package/perl-libwww-perl/Config.in index 6e191dd529..3967d3570e 100644 --- a/package/perl-libwww-perl/Config.in +++ b/package/perl-libwww-perl/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PERL_LIBWWW_PERL select BR2_PACKAGE_PERL_FILE_LISTING # runtime select BR2_PACKAGE_PERL_HTML_PARSER # runtime select BR2_PACKAGE_PERL_HTTP_COOKIES # runtime - select BR2_PACKAGE_PERL_HTTP_DAEMON # runtime select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime select BR2_PACKAGE_PERL_HTTP_NEGOTIATE # runtime diff --git a/package/perl-libwww-perl/perl-libwww-perl.hash b/package/perl-libwww-perl/perl-libwww-perl.hash index bdd3df7db3..c419c1d7be 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e64d87052eb51bb55627c756ccdfe233 libwww-perl-6.43.tar.gz -sha256 e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d libwww-perl-6.43.tar.gz +md5 4df22c50511a3f01063d2ba4d91bfbec libwww-perl-6.55.tar.gz +sha256 c1d0d3a44a039b136ebac7336f576e3f5c232347e8221abd69ceb4108e85c920 libwww-perl-6.55.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE +sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk index dbc77db089..99adb56659 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.43 +PERL_LIBWWW_PERL_VERSION = 6.55 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-lwp-protocol-https/Config.in b/package/perl-lwp-protocol-https/Config.in index c4a7b306b3..9793b6f5d0 100644 --- a/package/perl-lwp-protocol-https/Config.in +++ b/package/perl-lwp-protocol-https/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_PERL_LWP_PROTOCOL_HTTPS help Provide https support for LWP::UserAgent. - https://metacpan.org/release/LWP-Protocol-https + https://github.com/libwww-perl/LWP-Protocol-https comment "perl-lwp-protocol-https needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash b/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash index 899cc22079..a3c011fe84 100644 --- a/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash +++ b/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b8943dfb7d187af63c36fc18ab15947d LWP-Protocol-https-6.07.tar.gz -sha256 522cc946cf84a1776304a5737a54b8822ec9e79b264d0ba0722a70473dbfb9e7 LWP-Protocol-https-6.07.tar.gz +md5 cf64e4bc57a9266ac4343cdf0808c5c8 LWP-Protocol-https-6.10.tar.gz +sha256 cecfc31fe2d4fc854cac47fce13d3a502e8fdfe60c5bc1c09535743185f2a86c LWP-Protocol-https-6.10.tar.gz # computed by scancpan -sha256 a93c39b0bce2bdff027b58d8a97f5116183b18b23da366fd7e1ec361d4603db2 README +sha256 294e73f9bd40ea600e9478cd57489a7da72558a83c6a66f37a82e4e0d5a706d9 LICENSE 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 00b93c74aa..0663820b2e 100644 --- a/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk +++ b/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_LWP_PROTOCOL_HTTPS_VERSION = 6.07 +PERL_LWP_PROTOCOL_HTTPS_VERSION = 6.10 PERL_LWP_PROTOCOL_HTTPS_SOURCE = LWP-Protocol-https-$(PERL_LWP_PROTOCOL_HTTPS_VERSION).tar.gz PERL_LWP_PROTOCOL_HTTPS_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LWP_PROTOCOL_HTTPS_LICENSE = Artistic or GPL-1.0+ -PERL_LWP_PROTOCOL_HTTPS_LICENSE_FILES = README +PERL_LWP_PROTOCOL_HTTPS_LICENSE_FILES = LICENSE PERL_LWP_PROTOCOL_HTTPS_DISTNAME = LWP-Protocol-https $(eval $(perl-package)) diff --git a/package/perl-mail-dkim/perl-mail-dkim.hash b/package/perl-mail-dkim/perl-mail-dkim.hash index 86a6384799..e94adfc6ed 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.hash +++ b/package/perl-mail-dkim/perl-mail-dkim.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9b03bcd334cbf22a93fd94af9935e11b Mail-DKIM-0.58.tar.gz -sha256 0a43a42b528a435f9e393171bf8ca1dc0cb54092f1d120d6299e615c0c55f331 Mail-DKIM-0.58.tar.gz +md5 9de35f8aa77a85dc17423cbcce2bf46d Mail-DKIM-1.20200824.tar.gz +sha256 871d329830acb4840423aa59036622fb2ee394efc1d09316dcc32ae94454e916 Mail-DKIM-1.20200824.tar.gz + +# computed by scancpan +sha256 ffaa40feb768566e52d93879fedd2c5483828b6de483874f30a0a4425351555f LICENSE diff --git a/package/perl-mail-dkim/perl-mail-dkim.mk b/package/perl-mail-dkim/perl-mail-dkim.mk index d331fe9d64..e67bf5ee18 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.mk +++ b/package/perl-mail-dkim/perl-mail-dkim.mk @@ -4,9 +4,11 @@ # ################################################################################ -PERL_MAIL_DKIM_VERSION = 0.58 +PERL_MAIL_DKIM_VERSION = 1.20200824 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MB/MBRADSHAW +PERL_MAIL_DKIM_LICENSE = Artistic or GPL-1.0+ +PERL_MAIL_DKIM_LICENSE_FILES = LICENSE PERL_MAIL_DKIM_DISTNAME = Mail-DKIM $(eval $(perl-package)) diff --git a/package/perl-mojolicious-plugin-authentication/Config.in b/package/perl-mojolicious-plugin-authentication/Config.in index 4fa01806fd..2f51989f2f 100644 --- a/package/perl-mojolicious-plugin-authentication/Config.in +++ b/package/perl-mojolicious-plugin-authentication/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION help A plugin to make authentication a bit easier. - https://metacpan.org/release/Mojolicious-Plugin-Authentication + https://github.com/benvanstaveren/Mojolicious-Plugin-Authentication diff --git a/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash b/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash index f225ff486b..34362f5d8d 100644 --- a/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash +++ b/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b318be1e1e50e7595baee639b2964565 Mojolicious-Plugin-Authentication-1.33.tar.gz -sha256 1c32dffc88a683ba3b2719f34bc52fb9c5c5fb2f1276bbd30136bfad0ac262bc Mojolicious-Plugin-Authentication-1.33.tar.gz +md5 c475f2d3962441698b178ad1bd7d2e29 Mojolicious-Plugin-Authentication-1.37.tar.gz +sha256 a7ed206725b7b395d4fca12e3f1d923da644d913333ff48ea231e064ecb1abb6 Mojolicious-Plugin-Authentication-1.37.tar.gz # computed by scancpan -sha256 59727ac57166e9891175d8247a8ea47d4aeb24a0dc1e24011b773d139481b135 LICENSE +sha256 37d219684a6c5f8754435fb0dd36a779121e416553fd6a75e22a7545039d1021 LICENSE diff --git a/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk b/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk index cce12314db..57c356eee5 100644 --- a/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk +++ b/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_VERSION = 1.33 +PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_VERSION = 1.37 PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_SOURCE = Mojolicious-Plugin-Authentication-$(PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_VERSION).tar.gz PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JJ/JJATRIA PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.hash b/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.hash index c55eefe2ff..30bf87bad0 100644 --- a/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.hash +++ b/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9c009599cf397e3eacf5d7cd0dec45b8 Mojolicious-Plugin-Authorization-1.05.tar.gz -sha256 87f84092d5698595ad0d01e745eca1d6affd1f3d662786f39f3583c54ffed0e3 Mojolicious-Plugin-Authorization-1.05.tar.gz +md5 7906886e2a66b84bb3c0edd7ea85c485 Mojolicious-Plugin-Authorization-1.06.tar.gz +sha256 d21ee5ab5fd8c630bc28ce001f9c91bba500370baf7cc8f6f60c9a4e051f9a6c Mojolicious-Plugin-Authorization-1.06.tar.gz # computed by scancpan -sha256 fd9632faca5a3d6af4cb9cf776514de87d2b34bff3a6cf06c23eea0f9cc3ab06 LICENSE +sha256 dfab85cd06e80a3493217a1dc741cf9065417d2e803d50756f013c0b6cb0cb3e LICENSE diff --git a/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.mk b/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.mk index 3fcee08a46..f136be3ba9 100644 --- a/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.mk +++ b/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_VERSION = 1.05 +PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_VERSION = 1.06 PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_SOURCE = Mojolicious-Plugin-Authorization-$(PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_VERSION).tar.gz PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_SITE = $(BR2_CPAN_MIRROR)/authors/id/B/BY/BYTEROCK PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_DEPENDENCIES = host-perl-module-build diff --git a/package/perl-mojolicious/perl-mojolicious.hash b/package/perl-mojolicious/perl-mojolicious.hash index f409e484dd..fbb1c7d991 100644 --- a/package/perl-mojolicious/perl-mojolicious.hash +++ b/package/perl-mojolicious/perl-mojolicious.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c714aae5e1c3914efc0352531718c473 Mojolicious-8.32.tar.gz -sha256 503450e76b5d114c79a01b76a3c661c8138c5729062582a88e307a4d46f9de85 Mojolicious-8.32.tar.gz +md5 ea3861504ab25b237f124842f8765b01 Mojolicious-9.19.tar.gz +sha256 45056d66b08e544fd77033fafe1730c1d45615e46a92892fc77fb241754a1a97 Mojolicious-9.19.tar.gz # computed by scancpan -sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE +sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE diff --git a/package/perl-mojolicious/perl-mojolicious.mk b/package/perl-mojolicious/perl-mojolicious.mk index 62281d7dea..8252dc7fd9 100644 --- a/package/perl-mojolicious/perl-mojolicious.mk +++ b/package/perl-mojolicious/perl-mojolicious.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_VERSION = 8.32 +PERL_MOJOLICIOUS_VERSION = 9.19 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI PERL_MOJOLICIOUS_LICENSE = Artistic-2.0 diff --git a/package/perl-moo/Config.in b/package/perl-moo/Config.in index e4a6db290b..9b2b4a8ca1 100644 --- a/package/perl-moo/Config.in +++ b/package/perl-moo/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PERL_MOO bool "perl-moo" select BR2_PACKAGE_PERL_CLASS_METHOD_MODIFIERS # runtime - select BR2_PACKAGE_PERL_MODULE_RUNTIME # runtime select BR2_PACKAGE_PERL_ROLE_TINY # runtime select BR2_PACKAGE_PERL_SUB_QUOTE # runtime help diff --git a/package/perl-moo/perl-moo.hash b/package/perl-moo/perl-moo.hash index 21bcc6cca5..9b67e7a65c 100644 --- a/package/perl-moo/perl-moo.hash +++ b/package/perl-moo/perl-moo.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 53af7e7849492a8e3994ee379d12e348 Moo-2.003006.tar.gz -sha256 bcb2092ab18a45005b5e2e84465ebf3a4999d8e82a43a09f5a94d859ae7f2472 Moo-2.003006.tar.gz +md5 49ecf491b49b9b200e8a5dfd1a42b480 Moo-2.005004.tar.gz +sha256 e3030b80bd554a66f6b3c27fd53b1b5909d12af05c4c11ece9a58f8d1e478928 Moo-2.005004.tar.gz # computed by scancpan -sha256 88f4a8719c584d756dcfeebc7f35643066354188bfb57c672fbafcd44e044e9c LICENSE +sha256 a8a1595c2347f7d10e896809d4f3dea85ccc10ac5644b8073111233cd120b14a LICENSE diff --git a/package/perl-moo/perl-moo.mk b/package/perl-moo/perl-moo.mk index 6913776401..6c484ba9e3 100644 --- a/package/perl-moo/perl-moo.mk +++ b/package/perl-moo/perl-moo.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOO_VERSION = 2.003006 +PERL_MOO_VERSION = 2.005004 PERL_MOO_SOURCE = Moo-$(PERL_MOO_VERSION).tar.gz PERL_MOO_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG PERL_MOO_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-mozilla-ca/perl-mozilla-ca.hash b/package/perl-mozilla-ca/perl-mozilla-ca.hash index 0d52d192e6..c577d4887e 100644 --- a/package/perl-mozilla-ca/perl-mozilla-ca.hash +++ b/package/perl-mozilla-ca/perl-mozilla-ca.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9c93333e1d9d3fad639e9d4082898de1 Mozilla-CA-20180117.tar.gz -sha256 f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406 Mozilla-CA-20180117.tar.gz +md5 8ac3fe1a83c45da3f468f78ab8133ea6 Mozilla-CA-20200520.tar.gz +sha256 b3ca0002310bf24a16c0d5920bdea97a2f46e77e7be3e7377e850d033387c726 Mozilla-CA-20200520.tar.gz # computed by scancpan -sha256 95cd63dae5c2bf6e7cf33435981614a36c85ef01fc7a02464e05e58a5355398e README +sha256 95cd63dae5c2bf6e7cf33435981614a36c85ef01fc7a02464e05e58a5355398e README diff --git a/package/perl-mozilla-ca/perl-mozilla-ca.mk b/package/perl-mozilla-ca/perl-mozilla-ca.mk index 9fca66d000..3bcb947f72 100644 --- a/package/perl-mozilla-ca/perl-mozilla-ca.mk +++ b/package/perl-mozilla-ca/perl-mozilla-ca.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOZILLA_CA_VERSION = 20180117 +PERL_MOZILLA_CA_VERSION = 20200520 PERL_MOZILLA_CA_SOURCE = Mozilla-CA-$(PERL_MOZILLA_CA_VERSION).tar.gz PERL_MOZILLA_CA_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AB/ABH PERL_MOZILLA_CA_LICENSE = MPL-2.0 diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index 8ef5d5c7d3..916603e715 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 f9b4f0b2613398d27434d94b456583ef Net-DNS-1.22.tar.gz -sha256 03cd6a733e1cab6f817b4c4dcb7b29575002f8c543fb85e94c6290bc224d4c12 Net-DNS-1.22.tar.gz +md5 e8ee02ec42dfeb10ae4a0d175d5fcafc Net-DNS-1.32.tar.gz +sha256 b890a7b44d573f27cc713caadf1e12eaaa4478a6504d1157194df614316b5b50 Net-DNS-1.32.tar.gz # computed by scancpan -sha256 afa7d288df3e3edbdb34790407ba4a9c7750c2746059d9355f4168bfb3212583 README +sha256 1e44fcf65509b47a251eda0ce1f8bd6aefa13517e38cb1e95b8d36120fb15452 LICENSE diff --git a/package/perl-net-dns/perl-net-dns.mk b/package/perl-net-dns/perl-net-dns.mk index 24a0eb339d..afba3e216a 100644 --- a/package/perl-net-dns/perl-net-dns.mk +++ b/package/perl-net-dns/perl-net-dns.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.22 +PERL_NET_DNS_VERSION = 1.32 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT -PERL_NET_DNS_LICENSE_FILES = README +PERL_NET_DNS_LICENSE_FILES = LICENSE PERL_NET_DNS_DISTNAME = Net-DNS $(eval $(perl-package)) diff --git a/package/perl-net-http/perl-net-http.hash b/package/perl-net-http/perl-net-http.hash index 5c93ad1176..85ddad6eea 100644 --- a/package/perl-net-http/perl-net-http.hash +++ b/package/perl-net-http/perl-net-http.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 6cbebcc76099ce822f0aa7764af11f73 Net-HTTP-6.19.tar.gz -sha256 52b76ec13959522cae64d965f15da3d99dcb445eddd85d2ce4e4f4df385b2fc4 Net-HTTP-6.19.tar.gz +md5 dbe27483034a79a7d43f61cc48540641 Net-HTTP-6.21.tar.gz +sha256 375aa35b76be99f06464089174d66ac76f78ce83a5c92a907bbfab18b099eec4 Net-HTTP-6.21.tar.gz # computed by scancpan -sha256 49fbcc80e17295888b909176a0029f275a8c17b6cbfaf8867fe571ebe9a9ca79 LICENSE +sha256 49fbcc80e17295888b909176a0029f275a8c17b6cbfaf8867fe571ebe9a9ca79 LICENSE diff --git a/package/perl-net-http/perl-net-http.mk b/package/perl-net-http/perl-net-http.mk index c7d0e3d0aa..de0809d0b6 100644 --- a/package/perl-net-http/perl-net-http.mk +++ b/package/perl-net-http/perl-net-http.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_HTTP_VERSION = 6.19 +PERL_NET_HTTP_VERSION = 6.21 PERL_NET_HTTP_SOURCE = Net-HTTP-$(PERL_NET_HTTP_VERSION).tar.gz PERL_NET_HTTP_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_NET_HTTP_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-net-ssh2/perl-net-ssh2.hash b/package/perl-net-ssh2/perl-net-ssh2.hash index 006f79477c..b2e8b2d48e 100644 --- a/package/perl-net-ssh2/perl-net-ssh2.hash +++ b/package/perl-net-ssh2/perl-net-ssh2.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ef8d282c410728aa452fb380a7d22b05 Net-SSH2-0.70.tar.gz -sha256 47236af8f4a5e4cfa3036f7969d940247349b65b032478a0c72ba0b2e398b000 Net-SSH2-0.70.tar.gz +md5 57aa0f6e2be4020f75888a7195ad5cba Net-SSH2-0.72.tar.gz +sha256 867d83070fac6436b9f0971918243002072fbf8d2724a87c254b34250dce0222 Net-SSH2-0.72.tar.gz # computed by scancpan -sha256 3e479d43f8316315caa30ba00b7a143175326a3be83fd4e03146c831afaa22bd README +sha256 268afaee7aa88a41959c93cd91853e8124bdbe64a74480d36ff1130e01a1c0ca README.pod diff --git a/package/perl-net-ssh2/perl-net-ssh2.mk b/package/perl-net-ssh2/perl-net-ssh2.mk index e75d01d9bd..20e45b6287 100644 --- a/package/perl-net-ssh2/perl-net-ssh2.mk +++ b/package/perl-net-ssh2/perl-net-ssh2.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_NET_SSH2_VERSION = 0.70 +PERL_NET_SSH2_VERSION = 0.72 PERL_NET_SSH2_SOURCE = Net-SSH2-$(PERL_NET_SSH2_VERSION).tar.gz PERL_NET_SSH2_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SA/SALVA PERL_NET_SSH2_LICENSE = Artistic or GPL-1.0+ -PERL_NET_SSH2_LICENSE_FILES = README +PERL_NET_SSH2_LICENSE_FILES = README.pod PERL_NET_SSH2_DEPENDENCIES = libssh2 zlib PERL_NET_SSH2_DISTNAME = Net-SSH2 @@ -18,7 +18,7 @@ PERL_NET_SSH2_CONF_OPTS += \ inc="$(STAGING_DIR)/usr/include" ifeq ($(BR2_PACKAGE_LIBSSH2_LIBGCRYPT),y) -PERL_NET_SSH2_CONF_OPTS += gcrypt +PERL_NET_SSH2_CONF_OPTS += crypto_backend=gcrypt endif $(eval $(perl-package)) diff --git a/package/perl-net-ssleay/Config.in b/package/perl-net-ssleay/Config.in index 6998553ef8..d699e6671d 100644 --- a/package/perl-net-ssleay/Config.in +++ b/package/perl-net-ssleay/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PERL_NET_SSLEAY bool "perl-net-ssleay" depends on !BR2_STATIC_LIBS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help Perl extension for using OpenSSL. diff --git a/package/perl-net-telnet/perl-net-telnet.hash b/package/perl-net-telnet/perl-net-telnet.hash index cf1def6a57..c6dc0ca600 100644 --- a/package/perl-net-telnet/perl-net-telnet.hash +++ b/package/perl-net-telnet/perl-net-telnet.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d2514080116c1b0fa5f96295c84538e3 Net-Telnet-3.04.tar.gz -sha256 e64d567a4e16295ecba949368e7a6b8b5ae2a16b3ad682121d9b007dc5d2a37a Net-Telnet-3.04.tar.gz +md5 c8573c57a2d9469f038c40ac284b1e5f Net-Telnet-3.05.tar.gz +sha256 677f68ba2cd2a824fae323fa82e183bf7e3d03c3c499c91d923bd6283796a743 Net-Telnet-3.05.tar.gz # computed by scancpan -sha256 05beca683093827706ef45a4958bf23bcd91990e0beeb0b098f97c661478c90d README +sha256 22d0a3343b46c7857cd7d06cb37fe437d467df71aa5854af515374e1e8bf6c53 README diff --git a/package/perl-net-telnet/perl-net-telnet.mk b/package/perl-net-telnet/perl-net-telnet.mk index 0b9cce0af8..ec3c022168 100644 --- a/package/perl-net-telnet/perl-net-telnet.mk +++ b/package/perl-net-telnet/perl-net-telnet.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_TELNET_VERSION = 3.04 +PERL_NET_TELNET_VERSION = 3.05 PERL_NET_TELNET_SOURCE = Net-Telnet-$(PERL_NET_TELNET_VERSION).tar.gz PERL_NET_TELNET_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JR/JROGERS PERL_NET_TELNET_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-package-stash/perl-package-stash.hash b/package/perl-package-stash/perl-package-stash.hash index be8760d2d9..0bbac515e2 100644 --- a/package/perl-package-stash/perl-package-stash.hash +++ b/package/perl-package-stash/perl-package-stash.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 dc2d802eea2cb0b52ed9c4dd178761dd Package-Stash-0.38.tar.gz -sha256 c58ee8844df2dda38e3bf66fdf443439aaefaef1a33940edf2055f0afd223a7f Package-Stash-0.38.tar.gz +md5 287d80c9115c9230912aca684f8ca92e Package-Stash-0.39.tar.gz +sha256 9165f555112e080493ce0e9129de0886da30b2593fb353a2abd1c76b2d2621b5 Package-Stash-0.39.tar.gz # computed by scancpan -sha256 13aab710649bae5a8bbb1ae725587ece773bf390537dba2da71247bd937d54b4 LICENSE +sha256 810b319a6f4a53c9cbbef513da17b2f0c872accd149bb889f153f4b78cf8cbb8 LICENSE diff --git a/package/perl-package-stash/perl-package-stash.mk b/package/perl-package-stash/perl-package-stash.mk index b1a83bd957..bc116abca3 100644 --- a/package/perl-package-stash/perl-package-stash.mk +++ b/package/perl-package-stash/perl-package-stash.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PACKAGE_STASH_VERSION = 0.38 +PERL_PACKAGE_STASH_VERSION = 0.39 PERL_PACKAGE_STASH_SOURCE = Package-Stash-$(PERL_PACKAGE_STASH_VERSION).tar.gz PERL_PACKAGE_STASH_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_PACKAGE_STASH_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-params-util/perl-params-util.hash b/package/perl-params-util/perl-params-util.hash index 0c247ebfe5..b0461372b1 100644 --- a/package/perl-params-util/perl-params-util.hash +++ b/package/perl-params-util/perl-params-util.hash @@ -1,6 +1,8 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 02db120c0eef87aae1830cc62bdec37b Params-Util-1.07.tar.gz -sha256 30f1ec3f2cf9ff66ae96f973333f23c5f558915bb6266881eac7423f52d7c76c Params-Util-1.07.tar.gz +md5 f1aa70ba570f03f14cd394096b9c6883 Params-Util-1.102.tar.gz +sha256 499bb1b482db24fda277a51525596ad092c2bd51dd508fa8fec2e9f849097402 Params-Util-1.102.tar.gz # computed by scancpan -sha256 71b5fb95de1ba013a517c926feaa2a7d0fb0e8f132818e8529e0da5ec01187cd LICENSE +sha256 08c2ed7589aff3b2076b48b792078d3479c2295559ee7bc4615e93abe0473939 ARTISTIC-1.0 +sha256 3d2fb9b42d1134f39c2e990d66b5e9b77005663fe956db526cc380eb3d9a77d8 GPL-1 +sha256 834c4ebff45be11f35f059b077fdd747dee4b8a747b95049d849fef1c0ccdc62 LICENSE diff --git a/package/perl-params-util/perl-params-util.mk b/package/perl-params-util/perl-params-util.mk index c33ea816eb..8c2a960c40 100644 --- a/package/perl-params-util/perl-params-util.mk +++ b/package/perl-params-util/perl-params-util.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_PARAMS_UTIL_VERSION = 1.07 +PERL_PARAMS_UTIL_VERSION = 1.102 PERL_PARAMS_UTIL_SOURCE = Params-Util-$(PERL_PARAMS_UTIL_VERSION).tar.gz -PERL_PARAMS_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AD/ADAMK +PERL_PARAMS_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RE/REHSACK PERL_PARAMS_UTIL_LICENSE = Artistic or GPL-1.0+ -PERL_PARAMS_UTIL_LICENSE_FILES = LICENSE +PERL_PARAMS_UTIL_LICENSE_FILES = ARTISTIC-1.0 GPL-1 LICENSE PERL_PARAMS_UTIL_DISTNAME = Params-Util $(eval $(perl-package)) diff --git a/package/perl-path-tiny/perl-path-tiny.hash b/package/perl-path-tiny/perl-path-tiny.hash index 17f7f42f8c..855af46e1a 100644 --- a/package/perl-path-tiny/perl-path-tiny.hash +++ b/package/perl-path-tiny/perl-path-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 bf2a021d653d7252a39c0d31b41a7c6e Path-Tiny-0.112.tar.gz -sha256 813df2d140c65f795daefd8eca18e61194ecac7050c5406a069db86dea31cc3a Path-Tiny-0.112.tar.gz +md5 cb34fd356725ec12b78e88ddac37db08 Path-Tiny-0.118.tar.gz +sha256 32138d8d0f4c9c1a84d2a8f91bc5e913d37d8a7edefbb15a10961bfed560b0fd Path-Tiny-0.118.tar.gz # computed by scancpan -sha256 a999b03d2b80e5c7f987289ac835fa2d88cafa9f0df24adf8a1fd21e175acd79 LICENSE +sha256 a999b03d2b80e5c7f987289ac835fa2d88cafa9f0df24adf8a1fd21e175acd79 LICENSE diff --git a/package/perl-path-tiny/perl-path-tiny.mk b/package/perl-path-tiny/perl-path-tiny.mk index 7e82af4c23..08cc66712e 100644 --- a/package/perl-path-tiny/perl-path-tiny.mk +++ b/package/perl-path-tiny/perl-path-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PATH_TINY_VERSION = 0.112 +PERL_PATH_TINY_VERSION = 0.118 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_PATH_TINY_LICENSE = Apache-2.0 diff --git a/package/perl-plack/perl-plack.hash b/package/perl-plack/perl-plack.hash index 7324b726ae..c763d2c173 100644 --- a/package/perl-plack/perl-plack.hash +++ b/package/perl-plack/perl-plack.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9d37086aec1b29bab52a9575687e3557 Plack-1.0047.tar.gz -sha256 322c93f5acc0a0f0e11fd4a76188f978bdc14338a9f1df3ae535227017046561 Plack-1.0047.tar.gz +md5 36282b473b4521219c44a9db437b650f Plack-1.0048.tar.gz +sha256 30f5f25e19b437859156a2526f61ca9ab708d50d5730c279189403aabfe542a6 Plack-1.0048.tar.gz # computed by scancpan -sha256 fb67655b5d1adedef83aed2c79bf4f89c68d8595a7060815520173f663a3631d LICENSE +sha256 fb67655b5d1adedef83aed2c79bf4f89c68d8595a7060815520173f663a3631d LICENSE diff --git a/package/perl-plack/perl-plack.mk b/package/perl-plack/perl-plack.mk index cccf5a6224..b95f204d23 100644 --- a/package/perl-plack/perl-plack.mk +++ b/package/perl-plack/perl-plack.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PLACK_VERSION = 1.0047 +PERL_PLACK_VERSION = 1.0048 PERL_PLACK_SOURCE = Plack-$(PERL_PLACK_VERSION).tar.gz PERL_PLACK_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIYAGAWA PERL_PLACK_DEPENDENCIES = host-perl-file-sharedir-install diff --git a/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash b/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash index e8c5219c48..bdc6fd45a0 100644 --- a/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash +++ b/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c0a5f76b1b0ce9cdb90d627b017e6cf5 POSIX-strftime-Compiler-0.42.tar.gz -sha256 26582bdd78b254bcc1c56d0b770fa280e8b8f70957c84dc44572ba4cacb0ac11 POSIX-strftime-Compiler-0.42.tar.gz +md5 3a5ae7d56a5917410c1b661e01ed1a68 POSIX-strftime-Compiler-0.44.tar.gz +sha256 dfd3c97398dcfe51c8236b85e3dc28035667b76531f7aa0a6535f3aa5405b35a POSIX-strftime-Compiler-0.44.tar.gz # computed by scancpan -sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE +sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE diff --git a/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk b/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk index d7e23d254f..c11ed58514 100644 --- a/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk +++ b/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk @@ -4,10 +4,10 @@ # ################################################################################ -PERL_POSIX_STRFTIME_COMPILER_VERSION = 0.42 +PERL_POSIX_STRFTIME_COMPILER_VERSION = 0.44 PERL_POSIX_STRFTIME_COMPILER_SOURCE = POSIX-strftime-Compiler-$(PERL_POSIX_STRFTIME_COMPILER_VERSION).tar.gz PERL_POSIX_STRFTIME_COMPILER_SITE = $(BR2_CPAN_MIRROR)/authors/id/K/KA/KAZEBURO -PERL_POSIX_STRFTIME_COMPILER_DEPENDENCIES = host-perl-module-build +PERL_POSIX_STRFTIME_COMPILER_DEPENDENCIES = host-perl-module-build-tiny PERL_POSIX_STRFTIME_COMPILER_LICENSE = Artistic or GPL-1.0+ PERL_POSIX_STRFTIME_COMPILER_LICENSE_FILES = LICENSE PERL_POSIX_STRFTIME_COMPILER_DISTNAME = POSIX-strftime-Compiler diff --git a/package/perl-role-tiny/perl-role-tiny.hash b/package/perl-role-tiny/perl-role-tiny.hash index c05873e653..33de6a53f8 100644 --- a/package/perl-role-tiny/perl-role-tiny.hash +++ b/package/perl-role-tiny/perl-role-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 98446826608b1e943e65c1f6e35942fe Role-Tiny-2.001004.tar.gz -sha256 92ba5712850a74102c93c942eb6e7f62f7a4f8f483734ed289d08b324c281687 Role-Tiny-2.001004.tar.gz +md5 9ee45591befa3d0b1094ac75d282b6ba Role-Tiny-2.002004.tar.gz +sha256 d7bdee9e138a4f83aa52d0a981625644bda87ff16642dfa845dcb44d9a242b45 Role-Tiny-2.002004.tar.gz # computed by scancpan -sha256 88f4a8719c584d756dcfeebc7f35643066354188bfb57c672fbafcd44e044e9c LICENSE +sha256 a8a1595c2347f7d10e896809d4f3dea85ccc10ac5644b8073111233cd120b14a LICENSE diff --git a/package/perl-role-tiny/perl-role-tiny.mk b/package/perl-role-tiny/perl-role-tiny.mk index 0e1974fa1f..64d5085fad 100644 --- a/package/perl-role-tiny/perl-role-tiny.mk +++ b/package/perl-role-tiny/perl-role-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_ROLE_TINY_VERSION = 2.001004 +PERL_ROLE_TINY_VERSION = 2.002004 PERL_ROLE_TINY_SOURCE = Role-Tiny-$(PERL_ROLE_TINY_VERSION).tar.gz PERL_ROLE_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG PERL_ROLE_TINY_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-timedate/perl-timedate.hash b/package/perl-timedate/perl-timedate.hash index 2cd05855f8..5ea4d49cb8 100644 --- a/package/perl-timedate/perl-timedate.hash +++ b/package/perl-timedate/perl-timedate.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 87dfc984aada1c015233518432cb5951 TimeDate-2.32.tar.gz -sha256 34eca099e375e2d142ea6cc935922c4980dc21c65ce7c24823ca08457c4bb3d6 TimeDate-2.32.tar.gz +md5 5e5afe22c8d417417283d1f7f4572a57 TimeDate-2.33.tar.gz +sha256 c0b69c4b039de6f501b0d9f13ec58c86b040c1f7e9b27ef249651c143d605eb2 TimeDate-2.33.tar.gz # computed by scancpan -sha256 e72e67533eb3ddd705ae718898945e2f3bf3702e91e85bb67824575706bd5bf9 README +sha256 e72e67533eb3ddd705ae718898945e2f3bf3702e91e85bb67824575706bd5bf9 README diff --git a/package/perl-timedate/perl-timedate.mk b/package/perl-timedate/perl-timedate.mk index f6c910bbd0..89a82c042b 100644 --- a/package/perl-timedate/perl-timedate.mk +++ b/package/perl-timedate/perl-timedate.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_TIMEDATE_VERSION = 2.32 +PERL_TIMEDATE_VERSION = 2.33 PERL_TIMEDATE_SOURCE = TimeDate-$(PERL_TIMEDATE_VERSION).tar.gz PERL_TIMEDATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AT/ATOOMIC PERL_TIMEDATE_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-type-tiny/Config.in b/package/perl-type-tiny/Config.in index 96e5ea1350..5ee3db6f9b 100644 --- a/package/perl-type-tiny/Config.in +++ b/package/perl-type-tiny/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PERL_TYPE_TINY help tiny, yet Moo(se)-compatible type constraint. - http://typetiny.toby.ink/ + https://typetiny.toby.ink/ diff --git a/package/perl-type-tiny/perl-type-tiny.hash b/package/perl-type-tiny/perl-type-tiny.hash index 8263e14c9d..db0d2d43a0 100644 --- a/package/perl-type-tiny/perl-type-tiny.hash +++ b/package/perl-type-tiny/perl-type-tiny.hash @@ -1,7 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 04194fe9673ef5504be9d50aa5d6782a Type-Tiny-1.008003.tar.gz -sha256 a44e6e3ab29f05516d2a670de817278a7a06d55bce6f4ceaeb84ce032dcd00f5 Type-Tiny-1.008003.tar.gz +md5 3fac9bc52b55ba3c3bb75151493424b2 Type-Tiny-1.012003.tar.gz +sha256 d41be1d944899e47e0a56ae1c9ca0b64b8b53eccb554184d47da4b3927cd2168 Type-Tiny-1.012003.tar.gz # computed by scancpan -sha256 7cf4a3f3f81896130c0bc8041fddd737052cdf28e1bd8af7046884f63f262e53 COPYRIGHT -sha256 1fb7395e76eabf94c421912d7d0a4f7fa745d49e1acb76b222c21d605b66bd25 LICENSE +sha256 34427749499bd6d6e5d206089bc03d76c647a1350f8b5f95ea628d2b6ff56e4c LICENSE diff --git a/package/perl-type-tiny/perl-type-tiny.mk b/package/perl-type-tiny/perl-type-tiny.mk index ea1290bb2a..170ea37df0 100644 --- a/package/perl-type-tiny/perl-type-tiny.mk +++ b/package/perl-type-tiny/perl-type-tiny.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_TYPE_TINY_VERSION = 1.008003 +PERL_TYPE_TINY_VERSION = 1.012003 PERL_TYPE_TINY_SOURCE = Type-Tiny-$(PERL_TYPE_TINY_VERSION).tar.gz PERL_TYPE_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOBYINK PERL_TYPE_TINY_LICENSE = Artistic or GPL-1.0+ -PERL_TYPE_TINY_LICENSE_FILES = COPYRIGHT LICENSE +PERL_TYPE_TINY_LICENSE_FILES = LICENSE PERL_TYPE_TINY_DISTNAME = Type-Tiny $(eval $(perl-package)) diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index 02287a0645..578beed9bf 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c236e0142adecc1b1104da664bc43a79 URI-1.76.tar.gz -sha256 b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e URI-1.76.tar.gz +md5 bd66b0c620d076c4b0de9507b5f1fbdf URI-5.09.tar.gz +sha256 03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a URI-5.09.tar.gz # computed by scancpan -sha256 65cd6f88516a30f56fd4e0080fb78ea69424fc89067470dc994e4abfba08664e LICENSE +sha256 65cd6f88516a30f56fd4e0080fb78ea69424fc89067470dc994e4abfba08664e LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index 730b390526..d588e82056 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 1.76 +PERL_URI_VERSION = 5.09 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-xml-libxml/perl-xml-libxml.mk b/package/perl-xml-libxml/perl-xml-libxml.mk index 23d3e988fa..9b563e29b5 100644 --- a/package/perl-xml-libxml/perl-xml-libxml.mk +++ b/package/perl-xml-libxml/perl-xml-libxml.mk @@ -10,6 +10,8 @@ PERL_XML_LIBXML_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SH/SHLOMIF PERL_XML_LIBXML_DEPENDENCIES = zlib libxml2 PERL_XML_LIBXML_LICENSE = Artistic or GPL-1.0+ PERL_XML_LIBXML_LICENSE_FILES = LICENSE +PERL_XML_LIBXML_CPE_ID_VENDOR = xml-libxml_project +PERL_XML_LIBXML_CPE_ID_PRODUCT = xml-libxml PERL_XML_LIBXML_DISTNAME = XML-LibXML PERL_XML_LIBXML_CONF_OPTS = \ diff --git a/package/perl/Config.in b/package/perl/Config.in index 32a3fd2ee9..0ead1c4a46 100644 --- a/package/perl/Config.in +++ b/package/perl/Config.in @@ -24,4 +24,14 @@ config BR2_PACKAGE_PERL_MODULES Leave empty for all modules (as far as the external libraries are available). +config BR2_PACKAGE_PERL_THREADS + bool "thread support" + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Enable use of threads in Perl scripts + + WARNING: The use of interpreter-based threads in Perl + is officially discouraged. + See https://perldoc.perl.org/threads.html#WARNING + endif diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 7c153fedb2..42b7cc66c7 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,12 +1,12 @@ -# Hashes from: http://www.cpan.org/src/5.0/perl-5.30.2.tar.xz.{md5,sha1,sha256}.txt -md5 4bfa12b528522a50de0470b8b70b9b3b perl-5.30.2.tar.xz -sha1 d82cdaa610a3e749e821fc77004b1b4bfd5ebd28 perl-5.30.2.tar.xz -sha256 a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259 perl-5.30.2.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz.{md5,sha1,sha256}.txt +md5 7f104064b906ad8c7329ca5e409a32d7 perl-5.32.1.tar.xz +sha1 1fb4f710d139da1e1a3e1fa4eaba201fcaa8e18e perl-5.32.1.tar.xz +sha256 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.2/perl-cross-1.3.2.hash -sha256 defa12f0ad7be0b6c48b4f76e2fb5b37c1b37fbeb6e9ebe938279cd539a0c20c perl-cross-1.3.2.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.hash +sha256 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25 perl-cross-1.3.5.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 4916e95d32b84e07c045d839646f74996f577e5f497bbba8177a94b31415cee7 README +sha256 df6ad59aefea68676c38325f25f6707f026ddde6c71291b2ca231b6247859907 README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index c865fc7681..f661fef013 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -5,15 +5,17 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 30 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2 -PERL_SITE = http://www.cpan.org/src/5.0 +PERL_VERSION_MAJOR = 32 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 +PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ PERL_LICENSE_FILES = Artistic Copying README +PERL_CPE_ID_VENDOR = perl +PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.3.2 +PERL_CROSS_VERSION = 1.3.5 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz @@ -50,7 +52,7 @@ PERL_CONF_OPTS = \ --prefix=/usr \ -Dld="$(TARGET_CC)" \ -Dccflags="$(TARGET_CFLAGS)" \ - -Dldflags="$(TARGET_LDFLAGS) -lm" \ + -Dldflags="$(TARGET_LDFLAGS) -lm $(TARGET_NLS_LIBS)" \ -Dmydomain="" \ -Dmyhostname="noname" \ -Dmyuname="Buildroot $(BR2_VERSION_FULL)" \ @@ -62,6 +64,10 @@ ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1) PERL_CONF_OPTS += -Dusedevel endif +ifeq ($(BR2_PACKAGE_PERL_THREADS),y) +PERL_CONF_OPTS += -Dusethreads +endif + ifeq ($(BR2_STATIC_LIBS),y) PERL_CONF_OPTS += --all-static --no-dynaloader endif @@ -74,7 +80,7 @@ endif define PERL_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) HOSTCC='$(HOSTCC_NOCCACHE)' \ ./configure $(PERL_CONF_OPTS)) - $(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h + $(SED) 's/UNKNOWN-/Buildroot $(subst /,\/,$(BR2_VERSION_FULL)) /' $(@D)/patchlevel.h endef define PERL_BUILD_CMDS diff --git a/package/phidgetwebservice/Config.in b/package/phidgetwebservice/Config.in index 50018e0af9..b052f180f0 100644 --- a/package/phidgetwebservice/Config.in +++ b/package/phidgetwebservice/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PHIDGETWEBSERVICE bool "phidgetwebservice" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb, libphidget + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libphidget -> libusb depends on !BR2_STATIC_LIBS # libphidget select BR2_PACKAGE_LIBPHIDGET help @@ -17,6 +18,6 @@ config BR2_PACKAGE_PHIDGETWEBSERVICE http://phidgets.com/ -comment "phidgetwebservice needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_STATIC_LIBS +comment "phidgetwebservice needs a toolchain w/ threads, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/php-amqp/php-amqp.hash b/package/php-amqp/php-amqp.hash index c061efabb9..bce8ac0c9a 100644 --- a/package/php-amqp/php-amqp.hash +++ b/package/php-amqp/php-amqp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b66b8b8264749cb7a69ae4d09665dad1559b6c4f01430206c8e4187bcd8c782d amqp-1.9.4.tgz -sha256 ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8 LICENSE +sha256 0ebc61052eb12406dddf5eabfe8749a12d52c566816b8aab04fb9916d0c26ed2 amqp-1.10.2.tgz +sha256 ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8 LICENSE diff --git a/package/php-amqp/php-amqp.mk b/package/php-amqp/php-amqp.mk index c808ecdbd6..981f8274a9 100644 --- a/package/php-amqp/php-amqp.mk +++ b/package/php-amqp/php-amqp.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_AMQP_VERSION = 1.9.4 +PHP_AMQP_VERSION = 1.10.2 PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz PHP_AMQP_SITE = https://pecl.php.net/get PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/php-gnupg/php-gnupg.hash b/package/php-gnupg/php-gnupg.hash index 8d142cdaaf..99ffe87f46 100644 --- a/package/php-gnupg/php-gnupg.hash +++ b/package/php-gnupg/php-gnupg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 35e16bee11345a7d6bf57bea3cadf45e371ad1ed4e0218b0c06f6f637e4e1772 gnupg-1.4.0.tgz +sha256 d4f5f79aa483908f3df08e5b343ea3593c6d725b9ed2103e30242627659e0a64 gnupg-1.5.0.tgz sha256 da1136d4d9326317cbd320dadddf7e9b4b4edffd973eb083cb7b9754fb6a15d9 LICENSE diff --git a/package/php-gnupg/php-gnupg.mk b/package/php-gnupg/php-gnupg.mk index ae0a781154..a89f0978af 100644 --- a/package/php-gnupg/php-gnupg.mk +++ b/package/php-gnupg/php-gnupg.mk @@ -4,13 +4,13 @@ # ################################################################################ -PHP_GNUPG_VERSION = 1.4.0 +PHP_GNUPG_VERSION = 1.5.0 PHP_GNUPG_SOURCE = gnupg-$(PHP_GNUPG_VERSION).tgz PHP_GNUPG_SITE = https://pecl.php.net/get # phpize does the autoconf magic PHP_GNUPG_DEPENDENCIES = php libgpgme host-autoconf host-pkgconf PHP_GNUPG_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ - --with-gnupg=$(STAGING_DIR)/usr/include --with-gpg=/usr/bin/gpg + --with-gnupg=$(STAGING_DIR)/usr --with-gpg=/usr/bin/gpg PHP_GNUPG_LICENSE = BSD-2-Clause PHP_GNUPG_LICENSE_FILES = LICENSE diff --git a/package/php-imagick/php-imagick.hash b/package/php-imagick/php-imagick.hash index 8b62ed1d9a..e915808585 100644 --- a/package/php-imagick/php-imagick.hash +++ b/package/php-imagick/php-imagick.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1f3c5b5eeaa02800ad22f506cd100e8889a66b2ec937e192eaaa30d74562567c imagick-3.4.3.tgz +sha256 795db7c36fbacd3d33a4f53ff2d38584c846e80a04dcd04c55e9e46c28f5d229 imagick-3.5.0.tgz sha256 b6e00df9cb3b91977c0d64a7c4db48cb6f5041f6eeda6583c236775f70a35b78 LICENSE diff --git a/package/php-imagick/php-imagick.mk b/package/php-imagick/php-imagick.mk index ca0cbc7492..2dc055f0b3 100644 --- a/package/php-imagick/php-imagick.mk +++ b/package/php-imagick/php-imagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_IMAGICK_VERSION = 3.4.3 +PHP_IMAGICK_VERSION = 3.5.0 PHP_IMAGICK_SOURCE = imagick-$(PHP_IMAGICK_VERSION).tgz PHP_IMAGICK_SITE = http://pecl.php.net/get PHP_IMAGICK_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ @@ -13,6 +13,8 @@ PHP_IMAGICK_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ PHP_IMAGICK_DEPENDENCIES = imagemagick php host-autoconf PHP_IMAGICK_LICENSE = PHP-3.01 PHP_IMAGICK_LICENSE_FILES = LICENSE +PHP_IMAGICK_CPE_ID_VENDOR = php +PHP_IMAGICK_CPE_ID_PRODUCT = imagick define PHP_IMAGICK_PHPIZE (cd $(@D); \ diff --git a/package/php-memcached/php-memcached.hash b/package/php-memcached/php-memcached.hash index dd294f466a..7e918c17f6 100644 --- a/package/php-memcached/php-memcached.hash +++ b/package/php-memcached/php-memcached.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 20786213ff92cd7ebdb0d0ac10dde1e9580a2f84296618b666654fd76ea307d4 memcached-3.1.3.tgz -sha256 24e8e3a9529204ead9422fa17cf3ddd75d292a8763b87fdb20591964f2e6ebe0 LICENSE -sha256 a453a7a272fbd24105b39959f76996d50dad80b22d1c310f6c67f74f62ae4054 fastlz/LICENSE -sha256 bba8cb50c660842c5ca459c5004395bdef8f01c1b64f97a9978f1053f173cb82 g_fmt.h +sha256 b288e45f839593e16c4d8508b241de51a86df4f7322153e6becb9e1c819021fd memcached-3.1.5.tgz +sha256 24e8e3a9529204ead9422fa17cf3ddd75d292a8763b87fdb20591964f2e6ebe0 LICENSE +sha256 a453a7a272fbd24105b39959f76996d50dad80b22d1c310f6c67f74f62ae4054 fastlz/LICENSE +sha256 bba8cb50c660842c5ca459c5004395bdef8f01c1b64f97a9978f1053f173cb82 g_fmt.h diff --git a/package/php-memcached/php-memcached.mk b/package/php-memcached/php-memcached.mk index 4607d099f3..068fbb786b 100644 --- a/package/php-memcached/php-memcached.mk +++ b/package/php-memcached/php-memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_MEMCACHED_VERSION = 3.1.3 +PHP_MEMCACHED_VERSION = 3.1.5 PHP_MEMCACHED_SOURCE = memcached-$(PHP_MEMCACHED_VERSION).tgz PHP_MEMCACHED_SITE = https://pecl.php.net/get PHP_MEMCACHED_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/php-ssh2/php-ssh2.hash b/package/php-ssh2/php-ssh2.hash index 36e04f471f..3fbb0b24c8 100644 --- a/package/php-ssh2/php-ssh2.hash +++ b/package/php-ssh2/php-ssh2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 87618d6a0981afe8c24b36d6b38c21a0aa0237b62e60347d0170bd86b51f79fb ssh2-1.1.2.tgz +sha256 9093a1f8d24dc65836027b0e239c50de8d5eaebf8396bc3331fdd38c5d69afd9 ssh2-1.3.1.tgz sha256 ac7c56f1e416ce6e60abcf26269395128bc9e5a2e4f3293e5dcc124aac606508 LICENSE diff --git a/package/php-ssh2/php-ssh2.mk b/package/php-ssh2/php-ssh2.mk index c9c13010dd..b79ac04179 100644 --- a/package/php-ssh2/php-ssh2.mk +++ b/package/php-ssh2/php-ssh2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_SSH2_VERSION = 1.1.2 +PHP_SSH2_VERSION = 1.3.1 PHP_SSH2_SOURCE = ssh2-$(PHP_SSH2_VERSION).tgz PHP_SSH2_SITE = https://pecl.php.net/get PHP_SSH2_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/php-yaml/php-yaml.hash b/package/php-yaml/php-yaml.hash index c29c3e66ad..e4f31cdad9 100644 --- a/package/php-yaml/php-yaml.hash +++ b/package/php-yaml/php-yaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9786b0386e648f12cc18a038358bd57bee4906e350a2e9ab776d6a5f18fc6680 yaml-2.0.4.tgz -sha256 68d9700294396c72089bfc7bf38a5b3654a53ae415f3bd37768848c14e86f338 LICENSE +sha256 e17ad04e752e25fd099bddd2df9d26dfef183c8d00c4179bc9d7a2e1c97d7819 yaml-2.2.1.tgz +sha256 68d9700294396c72089bfc7bf38a5b3654a53ae415f3bd37768848c14e86f338 LICENSE diff --git a/package/php-yaml/php-yaml.mk b/package/php-yaml/php-yaml.mk index e23d897978..ba16c9ac62 100644 --- a/package/php-yaml/php-yaml.mk +++ b/package/php-yaml/php-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_YAML_VERSION = 2.0.4 +PHP_YAML_VERSION = 2.2.1 PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz PHP_YAML_SITE = https://pecl.php.net/get PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/php/0001-acinclude.m4-don-t-unset-variables.patch b/package/php/0001-acinclude.m4-don-t-unset-variables.patch index 982857a357..2d15552783 100644 --- a/package/php/0001-acinclude.m4-don-t-unset-variables.patch +++ b/package/php/0001-acinclude.m4-don-t-unset-variables.patch @@ -17,7 +17,7 @@ diff --git a/build/php.m4 b/build/php.m4 index e91ef988..9586c490 100644 --- a/build/php.m4 +++ b/build/php.m4 -@@ -1587,8 +1587,6 @@ dnl PHP_CHECK_FUNC_LIB +@@ -1568,8 +1568,6 @@ dnl PHP_CHECK_FUNC_LIB dnl AC_DEFUN([PHP_CHECK_FUNC_LIB],[ ifelse($2,,:,[ @@ -26,7 +26,7 @@ index e91ef988..9586c490 100644 unset found AC_CHECK_LIB($2, $1, [found=yes], [ AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) -@@ -1620,8 +1618,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and +@@ -1601,8 +1599,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and dnl HAVE_library if found and adds the library to LIBS. dnl AC_DEFUN([PHP_CHECK_FUNC],[ diff --git a/package/php/0002-iconv-tweak-iconv-detection.patch b/package/php/0002-iconv-tweak-iconv-detection.patch index 1aa8400136..19d7ab5cf9 100644 --- a/package/php/0002-iconv-tweak-iconv-detection.patch +++ b/package/php/0002-iconv-tweak-iconv-detection.patch @@ -14,58 +14,26 @@ Signed-off-by: Gustavo Zacarias [Gustavo: convert to nice m4 instead of patching configure] [Gustavo: update for 5.6.10] Signed-off-by: Adam Duskett -[aduskett@gmail.com: Update for 7.3.0] +[aduskett@gmail.com: Update for 8.0.7] +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 7.4.10 & 7.4.13] --- - build/php.m4 | 2 +- - ext/iconv/config.m4 | 22 ---------------------- - 2 files changed, 1 insertion(+), 23 deletions(-) + build/php.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/php.m4 b/build/php.m4 index 9586c490..8b3d47ed 100644 --- a/build/php.m4 +++ b/build/php.m4 -@@ -1971,7 +1971,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ +@@ -1937,7 +1937,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ dnl Check external libs for iconv funcs. if test "$found_iconv" = "no"; then - for i in $PHP_ICONV /usr/local /usr; do + for i in $PHP_ICONV; do - if test -r $i/include/giconv.h; then - AC_DEFINE(HAVE_GICONV_H, 1, [ ]) + if test -r $i/include/gnu-libiconv/iconv.h; then ICONV_DIR=$i -diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 -index fe9b47aa..70599694 100644 ---- a/ext/iconv/config.m4 -+++ b/ext/iconv/config.m4 -@@ -13,28 +13,6 @@ if test "$PHP_ICONV" != "no"; then - ]) - - if test "$iconv_avail" != "no"; then -- if test -z "$ICONV_DIR"; then -- for i in /usr/local /usr; do -- if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then -- PHP_ICONV_PREFIX="$i" -- break -- fi -- done -- if test -z "$PHP_ICONV_PREFIX"; then -- PHP_ICONV_PREFIX="/usr" -- fi -- else -- PHP_ICONV_PREFIX="$ICONV_DIR" -- fi -- -- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" -- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" -- -- if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then -- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" -- else -- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h" -- fi - - AC_MSG_CHECKING([if iconv is glibc's]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[gnu_get_libc_version();]])],[ + ICONV_INCLUDE_DIR=$i/include/gnu-libiconv -- -2.7.4 +2.31.1 diff --git a/package/php/0003-configure-disable-the-phar-tool.patch b/package/php/0003-configure-disable-the-phar-tool.patch index 7cc3637973..cc4f55a8c8 100644 --- a/package/php/0003-configure-disable-the-phar-tool.patch +++ b/package/php/0003-configure-disable-the-phar-tool.patch @@ -11,7 +11,9 @@ on the target. Signed-off-by: Gustavo Zacarias [Gustavo: update for autoreconf/configure.in] Signed-off-by: Adam Duskett -[Aduskett: update for 7.3.0] +[Aduskett: update for 8.0.7] +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 7.4.10 & 7.4.13] --- configure.ac | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) @@ -20,8 +22,8 @@ diff --git a/configure.ac b/configure.ac index 0dfab302..6026fb66 100644 --- a/configure.ac +++ b/configure.ac -@@ -1430,13 +1430,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" - INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" +@@ -1423,13 +1423,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" + CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" -if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then diff --git a/package/php/0004-Call-apxs-with-correct-prefix.patch b/package/php/0004-Call-apxs-with-correct-prefix.patch index a0a0715789..3a1a580084 100644 --- a/package/php/0004-Call-apxs-with-correct-prefix.patch +++ b/package/php/0004-Call-apxs-with-correct-prefix.patch @@ -7,7 +7,7 @@ php uses apache's apxs script from staging directory to install libphp dynamic library and update /etc/apache2/httpd.conf in the staging and target directories. Here is the full command line: "apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules' - -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php7" + -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php" This does not work for target directory as apxs sets the full path of the library and not the relative one. Indeed, apxs is smart enough to substitute away the prefix specified in $(STAGING_DIR)/usr/build/config_vars.mk so @@ -16,7 +16,7 @@ To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure Signed-off-by: Fabrice Fontaine Signed-off-by: Adam Duskett -[aduskett@gmail.com: Update for 7.3.0] +[aduskett@gmail.com: Update for 8.0.7] --- sapi/apache2handler/config.m4 | 3 +++ 1 file changed, 3 insertions(+) @@ -35,7 +35,7 @@ index 55c16179..68ce66c0 100644 INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S PREFIX='$APXS_PREFIX' \ - -i -n php7" + -i -n php" else APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` @@ -74,6 +76,7 @@ if test "$PHP_APXS2" != "no"; then @@ -43,7 +43,7 @@ index 55c16179..68ce66c0 100644 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ -S SYSCONFDIR='$APXS_SYSCONFDIR' \ + -S PREFIX='$APXS_PREFIX' \ - -i -a -n php7" + -i -a -n php" fi -- diff --git a/package/php/Config.ext b/package/php/Config.ext index 193bc1bd03..5da5d8bed9 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -10,8 +10,12 @@ config BR2_PACKAGE_PHP_EXT_FILEINFO help File Information support +comment "OPcache needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_PHP_EXT_OPCACHE bool "OPcache" + depends on !BR2_STATIC_LIBS help Enable the Zend OPcache accelerator. @@ -65,11 +69,6 @@ config BR2_PACKAGE_PHP_EXT_ZLIB comment "Cryptography extensions" -config BR2_PACKAGE_PHP_EXT_HASH - bool "hash" - help - HASH message digest framework - comment "libargon2 needs a toolchain w/ dynamic library" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS @@ -88,15 +87,13 @@ config BR2_PACKAGE_PHP_EXT_LIBSODIUM help libsodium support -config BR2_PACKAGE_PHP_EXT_MCRYPT - bool "mcrypt" - select BR2_PACKAGE_LIBMCRYPT - help - mcrypt support - config BR2_PACKAGE_PHP_EXT_OPENSSL bool "openssl" select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help openssl support @@ -136,7 +133,6 @@ endif config BR2_PACKAGE_PHP_EXT_MYSQLI bool "Mysqli" - select BR2_PACKAGE_PHP_EXT_HASH help MySQL Improved extension support @@ -168,7 +164,6 @@ if BR2_PACKAGE_PHP_EXT_PDO config BR2_PACKAGE_PHP_EXT_PDO_MYSQL bool "MySQL" - select BR2_PACKAGE_PHP_EXT_HASH help PDO driver for MySQL @@ -222,9 +217,10 @@ config BR2_PACKAGE_PHP_EXT_ICONV config BR2_PACKAGE_PHP_EXT_INTL bool "intl" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu depends on !BR2_BINFMT_FLAT # icu depends on BR2_TOOLCHAIN_HAS_THREADS # icu depends on !BR2_STATIC_LIBS @@ -232,11 +228,12 @@ config BR2_PACKAGE_PHP_EXT_INTL help Internationalization support -comment "intl support needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.8" +comment "intl support needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.9, host gcc >= 4.9" 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_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 config BR2_PACKAGE_PHP_EXT_MBSTRING bool "mbstring" @@ -256,6 +253,7 @@ config BR2_PACKAGE_PHP_EXT_GD select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_ZLIB help GD support @@ -274,11 +272,6 @@ config BR2_PACKAGE_PHP_EXT_GMP comment "Other basic extensions" -config BR2_PACKAGE_PHP_EXT_JSON - bool "JSON" - help - JavaScript Object Serialization support - config BR2_PACKAGE_PHP_EXT_TOKENIZER bool "Tokenizer" help @@ -364,13 +357,6 @@ config BR2_PACKAGE_PHP_EXT_SOAP help SOAP support -config BR2_PACKAGE_PHP_EXT_XMLRPC - bool "XML-RPC" - select BR2_PACKAGE_PHP_EXT_LIBXML2 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - XML-RPC support - comment "XML manipulation" config BR2_PACKAGE_PHP_EXT_DOM @@ -424,4 +410,15 @@ config BR2_PACKAGE_PHP_EXT_XSL help XSL transformation support +config BR2_PACKAGE_PHP_EXT_FFI + bool "FFI" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBFFI + help + Foreign Function Interface support + +comment "PHP FFI extension needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endmenu diff --git a/package/php/Config.in b/package/php/Config.in index 2469573541..226d2d5fd2 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -4,12 +4,14 @@ config BR2_PACKAGE_PHP # message like "ld.real: section .junk LMA [...,...] overlaps # section .text LMA [...,...]" depends on !BR2_BINFMT_FLAT + depends on BR2_USE_WCHAR select BR2_PACKAGE_PHP_SAPI_CGI if \ !BR2_PACKAGE_PHP_SAPI_APACHE && \ !BR2_PACKAGE_PHP_SAPI_CLI && \ !BR2_PACKAGE_PHP_SAPI_FPM && \ BR2_USE_MMU select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU + select BR2_PACKAGE_PCRE2 help PHP is a widely-used general-purpose scripting language that is especially suited for Web development @@ -48,3 +50,7 @@ config BR2_PACKAGE_PHP_SAPI_FPM source "package/php/Config.ext" endif + +comment "php needs a toolchain w/ wchar" + depends on !BR2_BINFMT_FLAT + depends on !BR2_USE_WCHAR diff --git a/package/php/php.hash b/package/php/php.hash index 4584524f1c..64ea95b9ba 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 1873c4cefdd3df9a78dcffb2198bba5c2f0464f55c9c960720c84df483fca74c php-7.4.4.tar.xz +sha256 a501017b3b0fd3023223ea25d98e87369b782f8a82310c4033d7ea6a989fea0a php-8.0.12.tar.xz # License file -sha256 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 LICENSE +sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index f62204c2a5..b7cd356282 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,20 +4,22 @@ # ################################################################################ -PHP_VERSION = 7.4.4 -PHP_SITE = http://www.php.net/distributions +PHP_VERSION = 8.0.12 +PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES PHP_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install -PHP_DEPENDENCIES = host-pkgconf +PHP_DEPENDENCIES = host-pkgconf pcre2 PHP_LICENSE = PHP-3.01 PHP_LICENSE_FILES = LICENSE +PHP_CPE_ID_VENDOR = php PHP_CONF_OPTS = \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --with-config-file-scan-dir=/etc/php.d \ --disable-all \ + --with-external-pcre \ --without-pear \ --with-config-file-path=/etc \ --disable-phpdbg \ @@ -60,7 +62,7 @@ PHP_CXXFLAGS = $(TARGET_CXXFLAGS) # The OPcache extension isn't cross-compile friendly # Throw some defines here to avoid patching heavily ifeq ($(BR2_PACKAGE_PHP_EXT_OPCACHE),y) -PHP_CONF_OPTS += --enable-opcache +PHP_CONF_OPTS += --enable-opcache --disable-opcache-jit PHP_CONF_ENV += ac_cv_func_mprotect=yes PHP_CFLAGS += \ -DHAVE_SHM_IPC \ @@ -88,7 +90,7 @@ PHP_CONF_OPTS += --with-apxs2=$(STAGING_DIR)/usr/bin/apxs # Enable thread safety option if Apache MPM is event or worker ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT)$(BR2_PACKAGE_APACHE_MPM_WORKER),y) -PHP_CONF_OPTS += --enable-maintainer-zts +PHP_CONF_OPTS += --enable-zts endif endif @@ -97,7 +99,6 @@ PHP_CONF_OPTS += \ $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \ $(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \ $(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \ - $(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \ $(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \ $(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \ $(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \ @@ -106,14 +107,13 @@ PHP_CONF_OPTS += \ $(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \ $(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \ $(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \ - $(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \ $(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \ $(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \ $(if $(BR2_PACKAGE_PHP_EXT_SHMOP),--enable-shmop) \ $(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \ $(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \ $(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \ - $(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \ + $(if $(BR2_PACKAGE_PHP_EXT_ZIP),--with-zip) \ $(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \ $(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \ $(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \ @@ -136,11 +136,6 @@ PHP_CONF_OPTS += --enable-mbstring PHP_DEPENDENCIES += oniguruma endif -ifeq ($(BR2_PACKAGE_PHP_EXT_MCRYPT),y) -PHP_CONF_OPTS += --with-mcrypt=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += libmcrypt -endif - ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y) PHP_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr PHP_DEPENDENCIES += openssl @@ -151,7 +146,7 @@ endif ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y) PHP_CONF_ENV += php_cv_libxml_build_works=yes -PHP_CONF_OPTS += --with-libxml --with-libxml-dir=$(STAGING_DIR)/usr +PHP_CONF_OPTS += --with-libxml PHP_DEPENDENCIES += libxml2 endif @@ -160,13 +155,6 @@ PHP_CONF_OPTS += --enable-wddx --with-libexpat-dir=$(STAGING_DIR)/usr PHP_DEPENDENCIES += expat endif -ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y) -PHP_CONF_OPTS += \ - --with-xmlrpc \ - $(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr) -PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) -endif - ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y) PHP_DEPENDENCIES += libzip endif @@ -259,11 +247,6 @@ define PHP_DISABLE_VALGRIND endef PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_VALGRIND -### Use external PCRE if it's available -ifeq ($(BR2_PACKAGE_PCRE2),y) -PHP_CONF_OPTS += --with-pcre-regex=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += pcre2 - ifeq ($(BR2_PACKAGE_PCRE2_JIT),y) PHP_CONF_OPTS += --with-pcre-jit=yes PHP_CONF_ENV += ac_cv_have_pcre2_jit=yes @@ -272,21 +255,6 @@ PHP_CONF_OPTS += --with-pcre-jit=no PHP_CONF_ENV += ac_cv_have_pcre2_jit=no endif -else -# The bundled pcre library is not configurable through ./configure options, -# and by default is configured to be thread-safe, so it wants pthreads. So -# we must explicitly tell it when we don't have threads. -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -PHP_CFLAGS += -DSLJIT_SINGLE_THREADED=1 -endif -# check ext/pcre/pcrelib/sljit/sljitConfigInternal.h for supported archs -ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),y) -PHP_CONF_OPTS += --with-pcre-jit -else -PHP_CONF_OPTS += --without-pcre-jit -endif -endif - ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y) PHP_CONF_OPTS += --with-curl PHP_DEPENDENCIES += libcurl @@ -327,12 +295,15 @@ endif ifeq ($(BR2_PACKAGE_PHP_EXT_GD),y) PHP_CONF_OPTS += \ - --with-gd \ - --with-jpeg-dir=$(STAGING_DIR)/usr \ - --with-png-dir=$(STAGING_DIR)/usr \ - --with-zlib-dir=$(STAGING_DIR)/usr \ - --with-freetype-dir=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += jpeg libpng freetype + --enable-gd \ + --with-jpeg \ + --with-freetype +PHP_DEPENDENCIES += jpeg libpng freetype zlib +endif + +ifeq ($(BR2_PACKAGE_PHP_EXT_FFI),y) +PHP_CONF_OPTS += --with-ffi +PHP_DEPENDENCIES += libffi endif ifeq ($(BR2_PACKAGE_PHP_SAPI_FPM),y) diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk index d27c734376..2d585bb2f5 100644 --- a/package/picocom/picocom.mk +++ b/package/picocom/picocom.mk @@ -8,6 +8,7 @@ PICOCOM_VERSION = 3.1 PICOCOM_SITE = $(call github,npat-efault,picocom,$(PICOCOM_VERSION)) PICOCOM_LICENSE = GPL-2.0+ PICOCOM_LICENSE_FILES = LICENSE.txt +PICOCOM_CPE_ID_VENDOR = picocom_project define PICOCOM_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) diff --git a/package/pifmrds/0003-Makefile-fix-static-link.patch b/package/pifmrds/0003-Makefile-fix-static-link.patch index ecd7c4fc4c..3832b77d59 100644 --- a/package/pifmrds/0003-Makefile-fix-static-link.patch +++ b/package/pifmrds/0003-Makefile-fix-static-link.patch @@ -4,6 +4,8 @@ Since libsndfile uses funtions from libm, the -lm should be specified after libsndfile for static linking. Signed-off-by: "Eric Limpens" +[Fabrice: add $(SNDFILE_LIBS) to pass all dependencies from pkg-config] +Signed-off-by: Fabrice Fontaine diff -purN pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2/src/Makefile --- pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile 2016-02-26 08:06:43.102962592 +0100 @@ -13,11 +15,11 @@ diff -purN pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile pi app: rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o - $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lm -lsndfile -+ $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lsndfile -lm ++ $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o $(SNDFILE_LIBS) -lm rds_wav: rds.o waveforms.o rds_wav.o fm_mpx.o - $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lm -lsndfile -+ $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lsndfile -lm ++ $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o $(SNDFILE_LIBS) -lm rds.o: rds.c waveforms.h $(CC) $(CFLAGS) rds.c diff --git a/package/pifmrds/pifmrds.mk b/package/pifmrds/pifmrds.mk index 509ec80876..33c13bae33 100644 --- a/package/pifmrds/pifmrds.mk +++ b/package/pifmrds/pifmrds.mk @@ -6,13 +6,14 @@ PIFMRDS_VERSION = 0bf57f9ce0d954365a38d8af8e7be6f28521c3f2 PIFMRDS_SITE = $(call github,ChristopheJacquet,PiFmRds,$(PIFMRDS_VERSION)) -PIFMRDS_DEPENDENCIES = libsndfile +PIFMRDS_DEPENDENCIES = host-pkgconf libsndfile PIFMRDS_LICENSE = GPL-3.0+ PIFMRDS_LICENSE_FILES = LICENSE define PIFMRDS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -ffast-math -c" \ + SNDFILE_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs sndfile`" \ app rds_wav endef diff --git a/package/piglit/piglit.hash b/package/piglit/piglit.hash index 8cfd04f7e0..923569a6f3 100644 --- a/package/piglit/piglit.hash +++ b/package/piglit/piglit.hash @@ -1,6 +1,6 @@ # Locally calculated -sha256 4eba46520df1c47b0aea5446c302ff51d52f905a63d1ba29230866fc6c952a2e piglit-ef761094be04d14e258ad7706e7295f80d4411f2.tar.gz -sha256 dcc398730859aee7cc1d6aa57f526f8d181b47bb3a49830e85b5723d5bc2c3bc COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licences/GPL-2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 licences/GPL-3 -sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c licences/LGPL-2 +sha256 ec2a80c49f10761980334f1591be54ee6f365165d7ac637270b4ca15a12ad674 piglit-2affee53f3ad7a96f5b397a2b6d6408af8a374b0-br1.tar.gz +sha256 dcc398730859aee7cc1d6aa57f526f8d181b47bb3a49830e85b5723d5bc2c3bc COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licences/GPL-2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 licences/GPL-3 +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c licences/LGPL-2 diff --git a/package/piglit/piglit.mk b/package/piglit/piglit.mk index d4753b9f7a..4d17405d10 100644 --- a/package/piglit/piglit.mk +++ b/package/piglit/piglit.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIGLIT_VERSION = ef761094be04d14e258ad7706e7295f80d4411f2 +PIGLIT_VERSION = 2affee53f3ad7a96f5b397a2b6d6408af8a374b0 PIGLIT_SITE = https://gitlab.freedesktop.org/mesa/piglit.git PIGLIT_SITE_METHOD = git PIGLIT_LICENSE = MIT (code), \ diff --git a/package/pigpio/pigpio.hash b/package/pigpio/pigpio.hash index 5b87acf082..fecb7ccbeb 100644 --- a/package/pigpio/pigpio.hash +++ b/package/pigpio/pigpio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dfec8d06075a9336433d96a8e2f86810f3332d616cf0d6253d98ad78094aa15a pigpio-75.tar.gz -sha256 6a90b88421a0d9b090e121daa11b3c6d55eed5eeb3281a2fcc454d6a28b5547c UNLICENCE +sha256 c5337c0b7ae888caf0262a6f476af0e2ab67065f7650148a0b21900b8d1eaed7 pigpio-79.tar.gz +sha256 6a90b88421a0d9b090e121daa11b3c6d55eed5eeb3281a2fcc454d6a28b5547c UNLICENCE diff --git a/package/pigpio/pigpio.mk b/package/pigpio/pigpio.mk index 89d8deb9ea..e34974972a 100644 --- a/package/pigpio/pigpio.mk +++ b/package/pigpio/pigpio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIGPIO_VERSION = 75 +PIGPIO_VERSION = 79 PIGPIO_SITE = $(call github,joan2937,pigpio,v$(PIGPIO_VERSION)) PIGPIO_LICENSE = Unlicense PIGPIO_LICENSE_FILES = UNLICENCE @@ -38,4 +38,14 @@ define PIGPIO_INSTALL_STAGING_CMDS ln -sf libpigpiod_if2.so.1 $(STAGING_DIR)/usr/lib/libpigpiod_if2.so endef +define PIGPIO_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/pigpio/S50pigpio \ + $(TARGET_DIR)/etc/init.d/S50pigpio +endef + +define PIGPIO_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/pigpio/pigpio.service \ + $(TARGET_DIR)/usr/lib/systemd/system/pigpio.service +endef + $(eval $(generic-package)) diff --git a/package/pigz/Config.in b/package/pigz/Config.in index a76146d8fc..af229060cf 100644 --- a/package/pigz/Config.in +++ b/package/pigz/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PIGZ bool "pigz" depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_HOST_ZLIB help pigz, which stands for parallel implementation of gzip, is a fully functional replacement for gzip that exploits multiple diff --git a/package/pigz/pigz.hash b/package/pigz/pigz.hash index ec75b4e530..512bf785c7 100644 --- a/package/pigz/pigz.hash +++ b/package/pigz/pigz.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52 pigz-2.4.tar.gz -sha256 dc8f78258cdb4478b5922f4c00eb63d3cbac06c171dc829648fd414bb0cf4493 README +sha256 577673676cd5c7219f94b236075451220bae3e1ca451cf849947a2998fbf5820 pigz-2.6.tar.gz +sha256 830b3e1b05cc20f443d89d7d8703a3c63fd64c57ab716f5e81fd178517df1e11 README diff --git a/package/pigz/pigz.mk b/package/pigz/pigz.mk index 23df0f5fcb..3e5e892797 100644 --- a/package/pigz/pigz.mk +++ b/package/pigz/pigz.mk @@ -4,12 +4,13 @@ # ################################################################################ -PIGZ_VERSION = 2.4 +PIGZ_VERSION = 2.6 PIGZ_SITE = $(call github,madler,pigz,v$(PIGZ_VERSION)) PIGZ_DEPENDENCIES = zlib HOST_PIGZ_DEPENDENCIES = host-zlib PIGZ_LICENSE = Zlib PIGZ_LICENSE_FILES = README +PIGZ_CPE_ID_VENDOR = zlib define PIGZ_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in index ef70908502..684e4eed4a 100644 --- a/package/pinentry/Config.in +++ b/package/pinentry/Config.in @@ -15,6 +15,17 @@ menuconfig BR2_PACKAGE_PINENTRY if BR2_PACKAGE_PINENTRY +config BR2_PACKAGE_PINENTRY_EFL + bool "pinentry-efl" + depends on BR2_PACKAGE_EFL + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_EFL_X_XLIB + help + The pinentry-efl tool + +comment "pinentry-efl needs efl and X" + depends on !BR2_PACKAGE_EFL || !BR2_PACKAGE_XORG7 + config BR2_PACKAGE_PINENTRY_FLTK bool "pinentry-fltk" depends on BR2_USE_MMU # fltk @@ -61,7 +72,8 @@ config BR2_PACKAGE_PINENTRY_QT5 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_HOST_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on !BR2_arc depends on !BR2_STATIC_LIBS select BR2_PACKAGE_QT5 @@ -70,10 +82,10 @@ config BR2_PACKAGE_PINENTRY_QT5 help The pinentry-qt5 tool -comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 4.8, C++, dynamic library" +comment "pinentry-qt5 needs a host gcc >= 5.0, and a toolchain w/ wchar, NPTL, gcc >= 5.0, C++, dynamic library" depends on !BR2_arc depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ - BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_5 endif diff --git a/package/pinentry/pinentry.hash b/package/pinentry/pinentry.hash index c9610d6eb1..e5f3d90652 100644 --- a/package/pinentry/pinentry.hash +++ b/package/pinentry/pinentry.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 693bdf9f48dfb3e040d92f50b1bb464e268b9fb0 pinentry-1.1.0.tar.bz2 +sha1 b8b88cab4fd844e3616d55aeba8f084f2b98fb0f pinentry-1.1.1.tar.bz2 # Locally computed -sha256 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570 pinentry-1.1.0.tar.bz2 -sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING +sha256 cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f pinentry-1.1.1.tar.bz2 +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk index 1bc1adab17..8ebd35cfab 100644 --- a/package/pinentry/pinentry.mk +++ b/package/pinentry/pinentry.mk @@ -4,7 +4,7 @@ # ################################################################################ -PINENTRY_VERSION = 1.1.0 +PINENTRY_VERSION = 1.1.1 PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2 PINENTRY_SITE = https://www.gnupg.org/ftp/gcrypt/pinentry PINENTRY_LICENSE = GPL-2.0+ @@ -22,13 +22,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) PINENTRY_CONF_ENV += LIBS=-latomic endif -# build with X if available -ifeq ($(BR2_PACKAGE_XORG7),y) -PINENTRY_CONF_OPTS += --with-x -else -PINENTRY_CONF_OPTS += --without-x -endif - ifeq ($(BR2_PACKAGE_LIBSECRET),y) PINENTRY_CONF_OPTS += --enable-libsecret PINENTRY_DEPENDENCIES += libsecret @@ -36,6 +29,14 @@ else PINENTRY_CONF_OPTS += --disable-libsecret endif +# pinentry-efl backend +ifeq ($(BR2_PACKAGE_PINENTRY_EFL),y) +PINENTRY_CONF_OPTS += --enable-pinentry-efl +PINENTRY_DEPENDENCIES += efl +else +PINENTRY_CONF_OPTS += --disable-pinentry-efl +endif + # pinentry-fltk backend ifeq ($(BR2_PACKAGE_PINENTRY_FLTK),y) PINENTRY_CONF_ENV += ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in index 57e70d65f8..6c61dd2021 100644 --- a/package/pipewire/Config.in +++ b/package/pipewire/Config.in @@ -1,9 +1,10 @@ config BR2_PACKAGE_PIPEWIRE bool "pipewire" - depends on BR2_PACKAGE_HAS_UDEV # libudev - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_USE_MMU # dbus - select BR2_PACKAGE_ALSA_LIB + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO if BR2_PACKAGE_BLUEZ5_UTILS # runtime select BR2_PACKAGE_DBUS help PipeWire is a server and user space API to deal with @@ -28,8 +29,20 @@ comment "pipewire gstreamer support needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +config BR2_PACKAGE_PIPEWIRE_V4L2 + bool "pipewire v4l2 plugin" + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + help + Build v4l2 plugin + +comment "pipewire v4l2 support needs udev and a toolchain w/ headers >= 3.18" + depends on !BR2_PACKAGE_HAS_UDEV || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + endif -comment "pipewire needs udev and a toolchain w/ threads" +comment "pipewire needs a toolchain w/ dynamic library, threads, gcc >= 5" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 81c53867e2..bcba64c6ca 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 bfaa0f6ae6c0791e2e0b59234d399753bf24f1b33dbf587682363a8463dd8df1 pipewire-0.2.7.tar.gz -sha256 88c0ca786c735a11e0eb508196d3aa1389fbaacb8d5de9adb5ccb15bcd4009d9 LICENSE -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL +sha256 8b2af6138529fd9214dd148f2a6304f13c16e0b0d3a4a98c1afa87b7e65c574f pipewire-0.3.32.tar.gz +sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING +sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index df159c5ef4..aee0191894 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,31 +4,35 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.2.7 +PIPEWIRE_VERSION = 0.3.32 PIPEWIRE_SITE = $(call github,PipeWire,pipewire,$(PIPEWIRE_VERSION)) -PIPEWIRE_LICENSE = LGPL-2.1+ -PIPEWIRE_LICENSE_FILES = LICENSE LGPL +PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) +PIPEWIRE_LICENSE_FILES = COPYING LICENSE PIPEWIRE_INSTALL_STAGING = YES -PIPEWIRE_DEPENDENCIES = host-pkgconf alsa-lib dbus udev +PIPEWIRE_DEPENDENCIES = host-pkgconf dbus $(TARGET_NLS_DEPENDENCIES) -ifeq ($(BR2_PACKAGE_FFMPEG),y) -PIPEWIRE_DEPENDENCIES += ffmpeg -endif +PIPEWIRE_CONF_OPTS += \ + -Ddocs=disabled \ + -Dexamples=disabled \ + -Dman=disabled \ + -Dtests=disabled \ + -Dspa-plugins=enabled \ + -Daudiomixer=enabled \ + -Daudioconvert=enabled \ + -Dcontrol=enabled \ + -Daudiotestsrc=enabled \ + -Dsupport=enabled \ + -Devl=disabled \ + -Dtest=disabled \ + -Dvideoconvert=enabled \ + -Dvideotestsrc=enabled \ + -Dvolume=enabled -ifeq ($(BR2_PACKAGE_LIBVA),y) -PIPEWIRE_DEPENDENCIES += libva -endif - -ifeq ($(BR2_PACKAGE_SBC),y) -PIPEWIRE_DEPENDENCIES += sbc -endif - -ifeq ($(BR2_PACKAGE_SDL2),y) -PIPEWIRE_DEPENDENCIES += sdl2 -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -PIPEWIRE_DEPENDENCIES += xlib_libX11 +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +PIPEWIRE_CONF_OPTS += -Dudev=enabled +PIPEWIRE_DEPENDENCIES += udev +else +PIPEWIRE_CONF_OPTS += -Dudev=disabled endif ifeq ($(BR2_PACKAGE_PIPEWIRE_GSTREAMER),y) @@ -39,10 +43,105 @@ PIPEWIRE_CONF_OPTS += -Dgstreamer=disabled endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) -PIPEWIRE_CONF_OPTS += -Dsystemd=true +PIPEWIRE_CONF_OPTS += -Dsystemd=enabled PIPEWIRE_DEPENDENCIES += systemd else -PIPEWIRE_CONF_OPTS += -Dsystemd=false +PIPEWIRE_CONF_OPTS += -Dsystemd=disabled +endif + +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) +PIPEWIRE_CONF_OPTS += -Dpipewire-alsa=enabled +PIPEWIRE_DEPENDENCIES += alsa-lib +ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ)$(BR2_PACKAGE_ALSA_LIB_UCM)$(BR2_PACKAGE_HAS_UDEV),yyy) +PIPEWIRE_CONF_OPTS += -Dalsa=enabled +else +PIPEWIRE_CONF_OPTS += -Dalsa=disabled +endif +else +PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled +endif + +ifeq ($(BR2_PACKAGE_AVAHI),y) +PIPEWIRE_CONF_OPTS += -Davahi=enabled +PIPEWIRE_DEPENDENCIES += avahi +else +PIPEWIRE_CONF_OPTS += -Davahi=disabled +endif + +ifeq ($(BR2_PACKAGE_JACK2),y) +PIPEWIRE_CONF_OPTS += -Dpipewire-jack=enabled -Djack=enabled +PIPEWIRE_DEPENDENCIES += jack2 +else +PIPEWIRE_CONF_OPTS += -Dpipewire-jack=disabled -Djack=disabled +endif + +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy) +PIPEWIRE_CONF_OPTS += -Dbluez5=enabled +PIPEWIRE_DEPENDENCIES += bluez5_utils sbc +else +PIPEWIRE_CONF_OPTS += -Dbluez5=disabled +endif + +ifeq ($(BR2_PACKAGE_FFMPEG),y) +PIPEWIRE_CONF_OPTS += -Dffmpeg=enabled +PIPEWIRE_DEPENDENCIES += ffmpeg +else +PIPEWIRE_CONF_OPTS += -Dffmpeg=disabled +endif + +ifeq ($(BR2_PACKAGE_PIPEWIRE_V4L2),y) +PIPEWIRE_CONF_OPTS += -Dv4l2=enabled +else +PIPEWIRE_CONF_OPTS += -Dv4l2=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBCAMERA)$(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_HAS_UDEV),yyy) +PIPEWIRE_CONF_OPTS += -Dlibcamera=enabled +PIPEWIRE_DEPENDENCIES += libcamera libdrm +else +PIPEWIRE_CONF_OPTS += -Dlibcamera=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBUSB),y) +PIPEWIRE_CONF_OPTS += -Dlibusb=enabled +PIPEWIRE_DEPENDENCIES += libusb +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 +else +PIPEWIRE_CONF_OPTS += -Dpw-cat=disabled -Dsndfile=disabled +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +PIPEWIRE_CONF_OPTS += -Dlibpulse=enabled +PIPEWIRE_DEPENDENCIES += pulseaudio +else +PIPEWIRE_CONF_OPTS += -Dlibpulse=disabled +endif + +ifeq ($(BR2_PACKAGE_SDL2),y) +PIPEWIRE_DEPENDENCIES += sdl2 +PIPEWIRE_CONF_OPTS += -Dsdl2=enabled +else +PIPEWIRE_CONF_OPTS += -Dsdl2=disabled +endif + +ifeq ($(WEBRTC_AUDIO_PROCESSING),y) +PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=enabled +PIPEWIRE_DEPENDENCIES += webrtc-audio-processing +else +PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=disabled endif $(eval $(meson-package)) diff --git a/package/pixman/pixman.hash b/package/pixman/pixman.hash index 7a79c206f1..1af632a9f4 100644 --- a/package/pixman/pixman.hash +++ b/package/pixman/pixman.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-April/002991.html -md5 16a350a8a40116ddf67632a1d2623711 pixman-0.38.4.tar.bz2 -sha1 87e1abc91ac4e5dfcc275f744f1d0ec3277ee7cd pixman-0.38.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-April/003043.html +sha256 da8ed9fe2d1c5ef8ce5d1207992db959226bd4e37e3f88acf908fd9a71e2704e pixman-0.40.0.tar.xz +sha512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270 pixman-0.40.0.tar.xz + # Locally computed -sha256 84abb7fa2541af24d9c3b34bf75d6ac60cc94ac4410061bbb295b66a29221550 pixman-0.38.4.tar.bz2 -sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING +sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index e566603d29..6fab539593 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -4,11 +4,12 @@ # ################################################################################ -PIXMAN_VERSION = 0.38.4 -PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.bz2 -PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib +PIXMAN_VERSION = 0.40.0 +PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.xz +PIXMAN_SITE = https://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT PIXMAN_LICENSE_FILES = COPYING +PIXMAN_CPE_ID_VENDOR = pixman PIXMAN_INSTALL_STAGING = YES PIXMAN_DEPENDENCIES = host-pkgconf @@ -43,12 +44,20 @@ ifneq ($(BR2_iwmmxt),y) PIXMAN_CONF_OPTS += --disable-arm-iwmmxt endif +PIXMAN_CFLAGS = $(TARGET_CFLAGS) + # toolchain gets confused about TLS access through GOT (PIC), so disable TLS # movhi r4, %got_hiadj(%tls_ldo(fast_path_cache)) # {standard input}:172: Error: bad expression ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII),y) -PIXMAN_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DPIXMAN_NO_TLS" +PIXMAN_CFLAGS += -DPIXMAN_NO_TLS endif +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) +PIXMAN_CFLAGS += -O0 +endif + +PIXMAN_CONF_OPTS += CFLAGS="$(PIXMAN_CFLAGS)" + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/pixz/pixz.hash b/package/pixz/pixz.hash index 5491a016dc..9e2a211cdc 100644 --- a/package/pixz/pixz.hash +++ b/package/pixz/pixz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 02c50746b134fa1b1aae41fcc314d7c6f1919b3d48bcdea01bf11769f83f72e8 pixz-1.0.6.tar.xz +sha256 e5e32c6eb0bf112b98e74a5da8fb63b9f2cae71800f599d97ce540e150c8ddc5 pixz-1.0.7.tar.xz sha256 d036806b4d1efee7c6d86276451c4d833e9798751417e25daae62dfbe348641b LICENSE diff --git a/package/pixz/pixz.mk b/package/pixz/pixz.mk index 8d80f78617..680c05c32c 100644 --- a/package/pixz/pixz.mk +++ b/package/pixz/pixz.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIXZ_VERSION = 1.0.6 +PIXZ_VERSION = 1.0.7 PIXZ_SITE = https://github.com/vasi/pixz/releases/download/v$(PIXZ_VERSION) PIXZ_SOURCE = pixz-$(PIXZ_VERSION).tar.xz PIXZ_DEPENDENCIES = host-pkgconf libarchive xz diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 57bfea9be5..4ee100a0c6 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -22,10 +22,10 @@ # Set compiler variables. ifeq ($(BR2_CCACHE),y) -CMAKE_HOST_C_COMPILER = $(HOST_DIR)/bin/ccache -CMAKE_HOST_CXX_COMPILER = $(HOST_DIR)/bin/ccache -CMAKE_HOST_C_COMPILER_ARG1 = $(HOSTCC_NOCCACHE) -CMAKE_HOST_CXX_COMPILER_ARG1 = $(HOSTCXX_NOCCACHE) +CMAKE_HOST_C_COMPILER = $(HOSTCC_NOCCACHE) +CMAKE_HOST_CXX_COMPILER = $(HOSTCXX_NOCCACHE) +CMAKE_HOST_C_COMPILER_LAUNCHER = $(HOST_DIR)/bin/ccache +CMAKE_HOST_CXX_COMPILER_LAUNCHER = $(HOST_DIR)/bin/ccache else CMAKE_HOST_C_COMPILER = $(HOSTCC) CMAKE_HOST_CXX_COMPILER = $(HOSTCXX) @@ -58,7 +58,7 @@ $(2)_MAKE_ENV ?= $(2)_MAKE_OPTS ?= $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast +$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -134,9 +134,9 @@ define $(2)_CONFIGURE_CMDS -DCMAKE_ASM_COMPILER="$$(HOSTAS)" \ -DCMAKE_C_COMPILER="$$(CMAKE_HOST_C_COMPILER)" \ -DCMAKE_CXX_COMPILER="$$(CMAKE_HOST_CXX_COMPILER)" \ - $(if $$(CMAKE_HOST_C_COMPILER_ARG1),\ - -DCMAKE_C_COMPILER_ARG1="$$(CMAKE_HOST_C_COMPILER_ARG1)" \ - -DCMAKE_CXX_COMPILER_ARG1="$$(CMAKE_HOST_CXX_COMPILER_ARG1)" \ + $(if $$(CMAKE_HOST_C_COMPILER_LAUNCHER),\ + -DCMAKE_C_COMPILER_LAUNCHER="$$(CMAKE_HOST_C_COMPILER_LAUNCHER)" \ + -DCMAKE_CXX_COMPILER_LAUNCHER="$$(CMAKE_HOST_CXX_COMPILER_LAUNCHER)" \ ) \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \ @@ -146,6 +146,7 @@ define $(2)_CONFIGURE_CMDS -DBUILD_TEST=OFF \ -DBUILD_TESTS=OFF \ -DBUILD_TESTING=OFF \ + -DBUILD_SHARED_LIBS=ON \ $$(CMAKE_QUIET) \ $$($$(PKG)_CONF_OPTS) \ ) @@ -263,8 +264,9 @@ define TOOLCHAIN_CMAKE_INSTALL_FILES -e 's#@@TARGET_CXX@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CXX)))#' \ -e 's#@@TARGET_FC@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_FC)))#' \ -e 's#@@CMAKE_SYSTEM_PROCESSOR@@#$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR))#' \ + -e 's#@@TOOLCHAIN_HAS_CXX@@#$(if $(BR2_INSTALL_LIBSTDCPP),1,0)#' \ -e 's#@@TOOLCHAIN_HAS_FORTRAN@@#$(if $(BR2_TOOLCHAIN_HAS_FORTRAN),1,0)#' \ - -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_DEBUG),Debug,Release)#' \ + -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release)#' \ $(TOPDIR)/support/misc/toolchainfile.cmake.in \ > $(HOST_DIR)/share/buildroot/toolchainfile.cmake $(Q)$(INSTALL) -D -m 0644 support/misc/Buildroot.cmake \ diff --git a/package/pkg-download.mk b/package/pkg-download.mk index de619ba90a..2527ba5c60 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -17,6 +17,11 @@ export HG := $(call qstrip,$(BR2_HG)) export SCP := $(call qstrip,$(BR2_SCP)) export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) +# Version of the format of the archives we generate in the corresponding +# download backend: +BR_FMT_VERSION_git = -br1 +BR_FMT_VERSION_svn = -br2 + DL_WRAPPER = support/download/dl-wrapper # DL_DIR may have been set already from the environment @@ -56,6 +61,9 @@ domainseparator = $(if $(1),$(1),/) # github(user,package,version): returns site of GitHub repository github = https://github.com/$(1)/$(2)/archive/$(3) +# gitlab(user,package,version): returns site of Gitlab-generated tarball +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. @@ -99,7 +107,8 @@ endif define DOWNLOAD $(Q)mkdir -p $($(2)_DL_DIR) - $(Q)$(EXTRA_ENV) flock $($(2)_DL_DIR)/ $(DL_WRAPPER) \ + $(Q)$(EXTRA_ENV) $($(2)_DL_ENV) \ + flock $($(2)_DL_DIR)/.lock $(DL_WRAPPER) \ -c '$($(2)_DL_VERSION)' \ -d '$($(2)_DL_DIR)' \ -D '$(DL_DIR)' \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 7679c41556..97ee204b80 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -55,62 +55,6 @@ define step_time endef GLOBAL_INSTRUMENTATION_HOOKS += step_time -# Hooks to collect statistics about installed files - -# $(1): package name -# $(2): base directory to search in -# $(3): suffix of file (optional) -define step_pkg_size_before - cd $(2); \ - LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ - | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(3).before -endef - -# $(1): package name -# $(2): base directory to search in -# $(3): suffix of file (optional) -define step_pkg_size_after - cd $(2); \ - LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ - | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(3).after - LC_ALL=C comm -13 \ - $($(PKG)_DIR)/.files-list$(3).before \ - $($(PKG)_DIR)/.files-list$(3).after \ - | sed -r -e 's/^[^,]+/$(1)/' \ - > $($(PKG)_DIR)/.files-list$(3).txt - rm -f $($(PKG)_DIR)/.files-list$(3).before - rm -f $($(PKG)_DIR)/.files-list$(3).after -endef - -define step_pkg_size - $(if $(filter start-install-target,$(1)-$(2)),\ - $(call step_pkg_size_before,$(3),$(TARGET_DIR))) - $(if $(filter start-install-staging,$(1)-$(2)),\ - $(call step_pkg_size_before,$(3),$(STAGING_DIR),-staging)) - $(if $(filter start-install-host,$(1)-$(2)),\ - $(call step_pkg_size_before,$(3),$(HOST_DIR),-host)) - - $(if $(filter end-install-target,$(1)-$(2)),\ - $(call step_pkg_size_after,$(3),$(TARGET_DIR))) - $(if $(filter end-install-staging,$(1)-$(2)),\ - $(call step_pkg_size_after,$(3),$(STAGING_DIR),-staging)) - $(if $(filter end-install-host,$(1)-$(2)),\ - $(call step_pkg_size_after,$(3),$(HOST_DIR),-host)) -endef -GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size - -# Relies on step_pkg_size, so must be after -define check_bin_arch - $(if $(filter end-install-target,$(1)-$(2)),\ - support/scripts/check-bin-arch -p $(3) \ - -l $($(PKG)_DIR)/.files-list.txt \ - $(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \ - -r $(TARGET_READELF) \ - -a $(BR2_READELF_ARCH_NAME)) -endef - -GLOBAL_INSTRUMENTATION_HOOKS += check_bin_arch - # This hook checks that host packages that need libraries that we build # have a proper DT_RPATH or DT_RUNPATH tag define check_host_rpath @@ -153,11 +97,62 @@ endif # $2: staging directory of the package ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) define fixup-libtool-files - $(Q)find $(2)/usr/lib* -name "*.la" | xargs --no-run-if-empty \ + $(Q)find $(2) \( -path '$(2)/lib*' -o -path '$(2)/usr/lib*' \) \ + -name "*.la" -print0 | xargs -0 --no-run-if-empty \ $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g" endef endif +# Functions to collect statistics about installed files + +# $(1): base directory to search in +# $(2): suffix of file (optional) +define pkg_size_before + cd $(1); \ + LC_ALL=C find . -not -path './$(STAGING_SUBDIR)/*' \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ + | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(2).before +endef + +# $(1): base directory to search in +# $(2): suffix of file (optional) +define pkg_size_after + cd $(1); \ + LC_ALL=C find . -not -path './$(STAGING_SUBDIR)/*' \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ + | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(2).after + LC_ALL=C comm -13 \ + $($(PKG)_DIR)/.files-list$(2).before \ + $($(PKG)_DIR)/.files-list$(2).after \ + | sed -r -e 's/^[^,]+/$($(PKG)_NAME)/' \ + > $($(PKG)_DIR)/.files-list$(2).txt + rm -f $($(PKG)_DIR)/.files-list$(2).before + rm -f $($(PKG)_DIR)/.files-list$(2).after +endef + +define check_bin_arch + support/scripts/check-bin-arch -p $($(PKG)_NAME) \ + -l $($(PKG)_DIR)/.files-list.txt \ + $(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \ + -r $(TARGET_READELF) \ + -a $(BR2_READELF_ARCH_NAME) +endef + +# Functions to remove conflicting and useless files + +# $1: base directory (target, staging, host) +define remove-conflicting-useless-files + $(if $(strip $($(PKG)_DROP_FILES_OR_DIRS)), + $(Q)$(RM) -rf $(patsubst %, $(1)%, $($(PKG)_DROP_FILES_OR_DIRS))) +endef +define REMOVE_CONFLICTING_USELESS_FILES_IN_HOST + $(call remove-conflicting-useless-files,$(HOST_DIR)) +endef +define REMOVE_CONFLICTING_USELESS_FILES_IN_STAGING + $(call remove-conflicting-useless-files,$(STAGING_DIR)) +endef +define REMOVE_CONFLICTING_USELESS_FILES_IN_TARGET + $(call remove-conflicting-useless-files,$(TARGET_DIR)) +endef + ################################################################################ # Implicit targets -- produce a stamp file for each step of a package build ################################################################################ @@ -253,8 +248,14 @@ $(foreach dir,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)),\ $(BUILD_DIR)/%/.stamp_configured: @$(call step_start,configure) @$(call MESSAGE,"Configuring") + $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) + @$(call pkg_size_before,$(TARGET_DIR)) + @$(call pkg_size_before,$(STAGING_DIR),-staging) + @$(call pkg_size_before,$(HOST_DIR),-host) + $(call fixup-libtool-files,$(NAME),$(HOST_DIR)) $(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) + $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) @@ -273,7 +274,6 @@ $(BUILD_DIR)/%/.stamp_built:: # Install to host dir $(BUILD_DIR)/%/.stamp_host_installed: - @mkdir -p $(HOST_DIR) @$(call step_start,install-host) @$(call MESSAGE,"Installing to host directory") $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) @@ -303,7 +303,6 @@ $(BUILD_DIR)/%/.stamp_host_installed: # empty when we use an internal toolchain. # $(BUILD_DIR)/%/.stamp_staging_installed: - @mkdir -p $(STAGING_DIR) @$(call step_start,install-staging) @$(call MESSAGE,"Installing to staging directory") $(foreach hook,$($(PKG)_PRE_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) @@ -346,7 +345,6 @@ $(BUILD_DIR)/%/.stamp_staging_installed: # Install to images dir $(BUILD_DIR)/%/.stamp_images_installed: - @mkdir -p $(BINARIES_DIR) @$(call step_start,install-image) @$(call MESSAGE,"Installing to images directory") $(foreach hook,$($(PKG)_PRE_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) @@ -357,7 +355,6 @@ $(BUILD_DIR)/%/.stamp_images_installed: # Install to target dir $(BUILD_DIR)/%/.stamp_target_installed: - @mkdir -p $(TARGET_DIR) @$(call step_start,install-target) @$(call MESSAGE,"Installing to target") $(foreach hook,$($(PKG)_PRE_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) @@ -376,6 +373,15 @@ $(BUILD_DIR)/%/.stamp_target_installed: @$(call step_end,install-target) $(Q)touch $@ +# Final installation step, completed when all installation steps +# (host, images, staging, target) have completed +$(BUILD_DIR)/%/.stamp_installed: + @$(call pkg_size_after,$(TARGET_DIR)) + @$(call pkg_size_after,$(STAGING_DIR),-staging) + @$(call pkg_size_after,$(HOST_DIR),-host) + @$(call check_bin_arch) + $(Q)touch $@ + # Remove package sources $(BUILD_DIR)/%/.stamp_dircleaned: $(if $(BR2_PER_PACKAGE_DIRECTORIES),rm -Rf $(PER_PACKAGE_DIR)/$(NAME)) @@ -532,7 +538,7 @@ ifndef $(2)_SOURCE ifdef $(3)_SOURCE $(2)_SOURCE = $$($(3)_SOURCE) else ifdef $(2)_VERSION - $(2)_SOURCE ?= $$($(2)_BASENAME_RAW).tar.gz + $(2)_SOURCE ?= $$($(2)_BASENAME_RAW)$$(call pkg_source_ext,$(2)) endif endif @@ -577,10 +583,16 @@ ifndef $(2)_DL_OPTS endif endif -ifneq ($$(filter bzr cvs hg svn,$$($(2)_SITE_METHOD)),) +ifneq ($$(filter bzr cvs hg,$$($(2)_SITE_METHOD)),) BR_NO_CHECK_HASH_FOR += $$($(2)_SOURCE) endif +ifndef $(2)_GIT_SUBMODULES + ifdef $(3)_GIT_SUBMODULES + $(2)_GIT_SUBMODULES = $$($(3)_GIT_SUBMODULES) + endif +endif + # Do not accept to download git submodule if not using the git method ifneq ($$($(2)_GIT_SUBMODULES),) ifneq ($$($(2)_SITE_METHOD),git) @@ -622,6 +634,76 @@ $(2)_REDISTRIBUTE ?= YES $(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_BASENAME_RAW) +# If any of the _CPE_ID_* variables are set, we assume the CPE ID +# information is valid for this package. +ifneq ($$($(2)_CPE_ID_VENDOR)$$($(2)_CPE_ID_PRODUCT)$$($(2)_CPE_ID_VERSION)$$($(2)_CPE_ID_UPDATE)$$($(2)_CPE_ID_PREFIX),) +$(2)_CPE_ID_VALID = YES +endif + +# When we're a host package, make sure to use the variables of the +# corresponding target package, if any. +ifneq ($$($(3)_CPE_ID_VENDOR)$$($(3)_CPE_ID_PRODUCT)$$($(3)_CPE_ID_VERSION)$$($(3)_CPE_ID_UPDATE)$$($(3)_CPE_ID_PREFIX),) +$(2)_CPE_ID_VALID = YES +endif + +# If the CPE ID is valid for the target package so it is for the host +# package +ifndef $(2)_CPE_ID_VALID + ifdef $(3)_CPE_ID_VALID + $(2)_CPE_ID_VALID = $$($(3)_CPE_ID_VALID) + endif +endif + +ifeq ($$($(2)_CPE_ID_VALID),YES) + # CPE_ID_VENDOR + ifndef $(2)_CPE_ID_VENDOR + ifdef $(3)_CPE_ID_VENDOR + $(2)_CPE_ID_VENDOR = $$($(3)_CPE_ID_VENDOR) + else + $(2)_CPE_ID_VENDOR = $$($(2)_RAWNAME)_project + endif + endif + + # CPE_ID_PRODUCT + ifndef $(2)_CPE_ID_PRODUCT + ifdef $(3)_CPE_ID_PRODUCT + $(2)_CPE_ID_PRODUCT = $$($(3)_CPE_ID_PRODUCT) + else + $(2)_CPE_ID_PRODUCT = $$($(2)_RAWNAME) + endif + endif + + # CPE_ID_VERSION + ifndef $(2)_CPE_ID_VERSION + ifdef $(3)_CPE_ID_VERSION + $(2)_CPE_ID_VERSION = $$($(3)_CPE_ID_VERSION) + else + $(2)_CPE_ID_VERSION = $$($(2)_VERSION) + endif + endif + + # CPE_ID_UPDATE + ifndef $(2)_CPE_ID_UPDATE + ifdef $(3)_CPE_ID_UPDATE + $(2)_CPE_ID_UPDATE = $$($(3)_CPE_ID_UPDATE) + else + $(2)_CPE_ID_UPDATE = * + endif + endif + + # CPE_ID_PREFIX + ifndef $(2)_CPE_ID_PREFIX + ifdef $(3)_CPE_ID_PREFIX + $(2)_CPE_ID_PREFIX = $$($(3)_CPE_ID_PREFIX) + else + $(2)_CPE_ID_PREFIX = cpe:2.3:a + endif + endif + + # Calculate complete CPE ID + $(2)_CPE_ID = $$($(2)_CPE_ID_PREFIX):$$($(2)_CPE_ID_VENDOR):$$($(2)_CPE_ID_PRODUCT):$$($(2)_CPE_ID_VERSION):$$($(2)_CPE_ID_UPDATE):*:*:*:*:*:* +endif # ifeq ($$($(2)_CPE_ID_VALID),YES) + # When a target package is a toolchain dependency set this variable to # 'NO' so the 'toolchain' dependency is not added to prevent a circular # dependency. @@ -706,11 +788,8 @@ $(2)_FINAL_RECURSIVE_RDEPENDENCIES = $$(sort \ ) \ $$($(2)_FINAL_RECURSIVE_RDEPENDENCIES__X)) -$(2)_INSTALL_STAGING ?= NO -$(2)_INSTALL_IMAGES ?= NO -$(2)_INSTALL_TARGET ?= YES - # define sub-target stamps +$(2)_TARGET_INSTALL = $$($(2)_DIR)/.stamp_installed $(2)_TARGET_INSTALL_TARGET = $$($(2)_DIR)/.stamp_target_installed $(2)_TARGET_INSTALL_STAGING = $$($(2)_DIR)/.stamp_staging_installed $(2)_TARGET_INSTALL_IMAGES = $$($(2)_DIR)/.stamp_images_installed @@ -757,6 +836,7 @@ $(2)_PRE_LEGAL_INFO_HOOKS ?= $(2)_POST_LEGAL_INFO_HOOKS ?= $(2)_TARGET_FINALIZE_HOOKS ?= $(2)_ROOTFS_PRE_CMD_HOOKS ?= +$(2)_POST_PREPARE_HOOKS ?= ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) @@ -764,13 +844,36 @@ $$(error "Package $(1) defines host variant before target variant!") endif endif -# human-friendly targets and target sequencing -$(1): $(1)-install +# Globaly remove following conflicting and useless files +$(2)_DROP_FILES_OR_DIRS += /share/info/dir ifeq ($$($(2)_TYPE),host) -$(1)-install: $(1)-install-host +$(2)_POST_INSTALL_HOOKS += REMOVE_CONFLICTING_USELESS_FILES_IN_HOST else -$(1)-install: $(1)-install-staging $(1)-install-target $(1)-install-images +$(2)_POST_INSTALL_STAGING_HOOKS += REMOVE_CONFLICTING_USELESS_FILES_IN_STAGING +$(2)_POST_INSTALL_TARGET_HOOKS += REMOVE_CONFLICTING_USELESS_FILES_IN_TARGET +endif + +# human-friendly targets and target sequencing +$(1): $(1)-install +$(1)-install: $$($(2)_TARGET_INSTALL) +$$($(2)_TARGET_INSTALL): $$($(2)_TARGET_BUILD) + +ifeq ($$($(2)_TYPE),host) +$$($(2)_TARGET_INSTALL): $$($(2)_TARGET_INSTALL_HOST) +else +$(2)_INSTALL_STAGING ?= NO +$(2)_INSTALL_IMAGES ?= NO +$(2)_INSTALL_TARGET ?= YES +ifeq ($$($(2)_INSTALL_TARGET),YES) +$$($(2)_TARGET_INSTALL): $$($(2)_TARGET_INSTALL_TARGET) +endif +ifeq ($$($(2)_INSTALL_STAGING),YES) +$$($(2)_TARGET_INSTALL): $$($(2)_TARGET_INSTALL_STAGING) +endif +ifeq ($$($(2)_INSTALL_IMAGES),YES) +$$($(2)_TARGET_INSTALL): $$($(2)_TARGET_INSTALL_IMAGES) +endif endif ifeq ($$($(2)_INSTALL_TARGET),YES) @@ -920,6 +1023,7 @@ $(1)-clean-for-reinstall: ifneq ($$($(2)_OVERRIDE_SRCDIR),) rm -f $$($(2)_TARGET_RSYNC) endif + rm -f $$($(2)_TARGET_INSTALL) rm -f $$($(2)_TARGET_INSTALL_STAGING) rm -f $$($(2)_TARGET_INSTALL_TARGET) rm -f $$($(2)_TARGET_INSTALL_IMAGES) @@ -939,6 +1043,7 @@ $(1)-reconfigure: $(1)-clean-for-reconfigure $(1) # define the PKG variable for all targets, containing the # uppercase package variable prefix +$$($(2)_TARGET_INSTALL): PKG=$(2) $$($(2)_TARGET_INSTALL_TARGET): PKG=$(2) $$($(2)_TARGET_INSTALL_STAGING): PKG=$(2) $$($(2)_TARGET_INSTALL_IMAGES): PKG=$(2) @@ -962,6 +1067,7 @@ $$($(2)_TARGET_DIRCLEAN): NAME=$(1) # Compute the name of the Kconfig option that correspond to the # package being enabled. We handle three cases: the special Linux # kernel case, the bootloaders case, and the normal packages case. +# Virtual packages are handled separately (see below). ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) @@ -1084,10 +1190,19 @@ endif ifneq ($$($(2)_USERS),) PACKAGES_USERS += $$($(2)_USERS)$$(sep) endif +ifneq ($$($(2)_LINUX_CONFIG_FIXUPS),) +PACKAGES_LINUX_CONFIG_FIXUPS += $$($(2)_LINUX_CONFIG_FIXUPS)$$(sep) +endif TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) KEEP_PYTHON_PY_FILES += $$($(2)_KEEP_PY_FILES) +ifneq ($$($(2)_SELINUX_MODULES),) +PACKAGES_SELINUX_MODULES += $$($(2)_SELINUX_MODULES) +endif +PACKAGES_SELINUX_EXTRA_MODULES_DIRS += \ + $$(if $$(wildcard $$($(2)_PKGDIR)/selinux),$$($(2)_PKGDIR)/selinux) + ifeq ($$($(2)_SITE_METHOD),svn) DL_TOOLS_DEPENDENCIES += svn else ifeq ($$($(2)_SITE_METHOD),git) @@ -1151,6 +1266,22 @@ ifneq ($$($(2)_HELP_CMDS),) HELP_PACKAGES += $(2) endif +# Virtual packages are not built but it's useful to allow them to have +# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. +else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR + +ifneq ($$($(2)_PERMISSIONS),) +PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) +endif +ifneq ($$($(2)_DEVICES),) +PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) +endif +ifneq ($$($(2)_USERS),) +PACKAGES_USERS += $$($(2)_USERS)$$(sep) +endif +TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) +ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) + endif # $(2)_KCONFIG_VAR endef # inner-generic-package diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 2494ce028c..d07242310d 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -23,22 +23,6 @@ GO_BIN = $(HOST_DIR)/bin/go -# We pass an empty GOBIN, otherwise "go install: cannot install -# cross-compiled binaries when GOBIN is set" -GO_COMMON_ENV = \ - PATH=$(BR_PATH) \ - GOBIN= \ - CGO_ENABLED=$(HOST_GO_CGO_ENABLED) - -GO_TARGET_ENV = \ - $(HOST_GO_TARGET_ENV) \ - $(GO_COMMON_ENV) - -GO_HOST_ENV = \ - CGO_CFLAGS="$(HOST_CFLAGS)" \ - CGO_LDFLAGS="$(HOST_LDFLAGS)" \ - $(GO_COMMON_ENV) - ################################################################################ # inner-golang-package -- defines how the configuration, compilation and # installation of a Go package should be done, implements a few hooks to tune @@ -56,8 +40,6 @@ GO_HOST_ENV = \ define inner-golang-package -$(2)_WORKSPACE ?= _gopath - $(2)_BUILD_OPTS += \ -ldflags "$$($(2)_LDFLAGS)" \ -tags "$$($(2)_TAGS)" \ @@ -79,25 +61,25 @@ endif $(2)_INSTALL_BINS ?= $(1) -# Source files in Go should be extracted in a precise folder in the hierarchy -# of GOPATH. It usually resolves around domain/vendor/software. By default, we -# derive domain/vendor/software from the upstream URL of the project, but we -# allow $(2)_SRC_SUBDIR to be overridden if needed. +# Source files in Go usually use an import path resolved around +# domain/vendor/software. We infer domain/vendor/software from the upstream URL +# of the project. $(2)_SRC_DOMAIN = $$(call domain,$$($(2)_SITE)) $(2)_SRC_VENDOR = $$(word 1,$$(subst /, ,$$(call notdomain,$$($(2)_SITE)))) $(2)_SRC_SOFTWARE = $$(word 2,$$(subst /, ,$$(call notdomain,$$($(2)_SITE)))) -$(2)_SRC_SUBDIR ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) -$(2)_SRC_PATH = $$(@D)/$$($(2)_WORKSPACE)/src/$$($(2)_SRC_SUBDIR) +# $(2)_GOMOD is the root Go module path for the project, inferred if not set. +# If the go.mod file does not exist, one is written with this root path. +$(2)_GOMOD ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) -# Configure step. Only define it if not already defined by the package .mk -# file. -ifndef $(2)_CONFIGURE_CMDS -define $(2)_CONFIGURE_CMDS - mkdir -p $$(dir $$($(2)_SRC_PATH)) - ln -sf $$(@D) $$($(2)_SRC_PATH) +# Generate a go.mod file if it doesn't exist. Note: Go is configured +# to use the "vendor" dir and not make network calls. +define $(2)_GEN_GOMOD + if [ ! -f $$(@D)/go.mod ]; then \ + printf "module $$($(2)_GOMOD)\n" > $$(@D)/go.mod; \ + fi endef -endif +$(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD # Build step. Only define it if not already defined by the package .mk # file. @@ -111,26 +93,24 @@ endif # Build package for target define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ - cd $$($(2)_SRC_PATH); \ - $$(GO_TARGET_ENV) \ - GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \ + cd $$(@D); \ + $$(HOST_GO_TARGET_ENV) \ $$($(2)_GO_ENV) \ $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ -o $$(@D)/bin/$$(or $$($(2)_BIN_NAME),$$(notdir $$(d))) \ - ./$$(d) + $$($(2)_GOMOD)/$$(d) ) endef else # Build package for host define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ - cd $$($(2)_SRC_PATH); \ - $$(GO_HOST_ENV) \ - GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \ + cd $$(@D); \ + $$(HOST_GO_HOST_ENV) \ $$($(2)_GO_ENV) \ $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ -o $$(@D)/bin/$$(or $$($(2)_BIN_NAME),$$(notdir $$(d))) \ - ./$$(d) + $$($(2)_GOMOD)/$$(d) ) endef endif @@ -141,7 +121,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(TARGET_DIR)/usr/bin/$$(d) + $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) ) endef endif @@ -150,7 +130,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(HOST_DIR)/bin/$$(d) + $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) ) endef endif diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index e2d52ee8ed..23a291fccf 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -12,12 +12,12 @@ ################################################################################ # Macro to update back the custom (def)config file +# Must only be called if $(PKG)_KCONFIG_FILE is set and $(PKG)_KCONFIG_DEFCONFIG) +# is not set. # $(1): file to copy from define kconfig-package-update-config @$(if $($(PKG)_KCONFIG_FRAGMENT_FILES), \ echo "Unable to perform $(@) when fragment files are set"; exit 1) - @$(if $($(PKG)_KCONFIG_DEFCONFIG), \ - echo "Unable to perform $(@) when using a defconfig rule"; exit 1) $(Q)if [ -d $($(PKG)_KCONFIG_FILE) ]; then \ echo "Unable to perform $(@) when $($(PKG)_KCONFIG_FILE) is a directory"; \ exit 1; \ @@ -28,12 +28,12 @@ define kconfig-package-update-config endef PKG_KCONFIG_COMMON_OPTS = \ - HOSTCC=$(HOSTCC_NOCCACHE) + HOSTCC="$(HOSTCC_NOCCACHE)" # Macro to save the defconfig file # $(1): the name of the package in upper-case letters define kconfig-package-savedefconfig - $($(1)_MAKE_ENV) $(MAKE) -C $($(1)_DIR) \ + $($(1)_MAKE_ENV) $($(1)_MAKE) -C $($(1)_DIR) \ $(PKG_KCONFIG_COMMON_OPTS) $($(1)_KCONFIG_OPTS) savedefconfig endef @@ -78,23 +78,48 @@ endef define inner-kconfig-package +# Default values +$(2)_MAKE ?= $$(MAKE) +$(2)_KCONFIG_EDITORS ?= menuconfig +$(2)_KCONFIG_OPTS ?= +$(2)_KCONFIG_FIXUP_CMDS ?= +$(2)_KCONFIG_FRAGMENT_FILES ?= +$(2)_KCONFIG_DOTCONFIG ?= .config +$(2)_KCONFIG_SUPPORTS_DEFCONFIG ?= YES + # Register the kconfig dependencies as regular dependencies, so that # they are also accounted for in the generated graphs. $(2)_DEPENDENCIES += $$($(2)_KCONFIG_DEPENDENCIES) +# Generate the kconfig-related help: one entry for each editor. +# Additionally, if the package is *not* using an in-tree defconfig +# name, an entry for updating the package configuration file. +ifndef $(2)_HELP_CMDS +define $(2)_HELP_CMDS + $$(foreach editor, $$($(2)_KCONFIG_EDITORS), \ + @printf ' %-22s - Run %s %s\n' $(1)-$$(editor) $(1) $$(editor) + ) + $$(if $$($(2)_KCONFIG_DEFCONFIG),,\ + $$(if $$(filter YES,$$($(2)_KCONFIG_SUPPORTS_DEFCONFIG)),\ + @printf ' %-22s - Save the %s configuration as a defconfig file\n' \ + $(1)-update-defconfig $(1) + @printf ' %-22s to %s\n' '' $$($(2)_KCONFIG_FILE) + @printf ' %-22s (or override with %s_KCONFIG_FILE)\n' '' $(2) + ) + @printf ' %-22s - Save the %s configuration as a full .config file\n' \ + $(1)-update-config $(1) + @printf ' %-22s to %s\n' '' $$($(2)_KCONFIG_FILE) + @printf ' %-22s (or override with %s_KCONFIG_FILE)\n' '' $(2) + ) +endef +endif + # Call the generic package infrastructure to generate the necessary # make targets. # Note: this must be done _before_ attempting to use $$($(2)_DIR) in a # dependency expression $(call inner-generic-package,$(1),$(2),$(3),$(4)) -# Default values -$(2)_KCONFIG_EDITORS ?= menuconfig -$(2)_KCONFIG_OPTS ?= -$(2)_KCONFIG_FIXUP_CMDS ?= -$(2)_KCONFIG_FRAGMENT_FILES ?= -$(2)_KCONFIG_DOTCONFIG ?= .config - # Do not use $(2)_KCONFIG_DOTCONFIG as stamp file, because the package # buildsystem (e.g. linux >= 4.19) may touch it, thus rendering our # timestamps out of date, thus re-trigerring the build of the package. @@ -116,13 +141,13 @@ $(2)_KCONFIG_STAMP_DOTCONFIG = .stamp_dotconfig $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch for f in $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES); do \ if [ ! -f "$$$${f}" ]; then \ - printf "Kconfig fragment '%s' for '%s' does not exist\n" "$$$${f}" "$(1)"; \ + printf "Kconfig file or fragment '%s' for '%s' does not exist\n" "$$$${f}" "$(1)"; \ exit 1; \ fi; \ done $(2)_KCONFIG_MAKE = \ - $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ + $$($(2)_MAKE_ENV) $$($(2)_MAKE) -C $$($(2)_DIR) \ $$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) # $(2)_KCONFIG_MAKE may already rely on shell expansion. As the $() syntax @@ -166,6 +191,7 @@ define $(2)_FIXUP_DOT_CONFIG $$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done endef +$$($(2)_DIR)/.stamp_kconfig_fixup_done: PKG=$(2) $$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG) $$($(2)_FIXUP_DOT_CONFIG) @@ -223,8 +249,9 @@ $(2)_CONFIGURATOR_MAKE_ENV = \ # end up having a valid @D. # $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_% +$$($(2)_DIR)/.kconfig_editor_%: PKG=$(2) $$($(2)_DIR)/.kconfig_editor_%: $$($(2)_DIR)/.stamp_kconfig_fixup_done - $$($(2)_CONFIGURATOR_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ + $$($(2)_CONFIGURATOR_MAKE_ENV) $$($(2)_MAKE) -C $$($(2)_DIR) \ $$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) $$(*) rm -f $$($(2)_DIR)/.stamp_{kconfig_fixup_done,configured,built} rm -f $$($(2)_DIR)/.stamp_{target,staging,images}_installed @@ -252,23 +279,33 @@ $(1)-check-configuration-done: exit 1; \ fi +ifeq ($$($(2)_KCONFIG_SUPPORTS_DEFCONFIG),YES) +.PHONY: $(1)-savedefconfig $(1)-savedefconfig: $(1)-check-configuration-done $$(call kconfig-package-savedefconfig,$(2)) +endif +ifeq ($$($(2)_KCONFIG_DEFCONFIG),) # Target to copy back the configuration to the source configuration file # Even though we could use 'cp --preserve-timestamps' here, the separate # cp and 'touch --reference' is used for symmetry with $(1)-update-defconfig. +.PHONY: $(1)-update-config $(1)-update-config: PKG=$(2) $(1)-update-config: $(1)-check-configuration-done $$(call kconfig-package-update-config,$$($(2)_KCONFIG_DOTCONFIG)) +ifeq ($$($(2)_KCONFIG_SUPPORTS_DEFCONFIG),YES) # Note: make sure the timestamp of the stored configuration is not newer than # the .config to avoid a useless rebuild. Note that, contrary to # $(1)-update-config, the reference for 'touch' is _not_ the file from which # we copy. +.PHONY: $(1)-update-defconfig $(1)-update-defconfig: PKG=$(2) $(1)-update-defconfig: $(1)-savedefconfig $$(call kconfig-package-update-config,defconfig) +endif + +endif # Target to output differences between the configuration obtained via the # defconfig + fragments (if any) and the current configuration. @@ -287,10 +324,7 @@ $(1)-diff-config: $(1)-check-configuration-done endif # package enabled .PHONY: \ - $(1)-update-config \ - $(1)-update-defconfig \ $(1)-diff-config \ - $(1)-savedefconfig \ $(1)-check-configuration-done \ $$($(2)_DIR)/.kconfig_editor_% \ $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)) diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk index 78d6c325f8..fd79855878 100644 --- a/package/pkg-luarocks.mk +++ b/package/pkg-luarocks.mk @@ -17,6 +17,17 @@ # ################################################################################ +LUAROCKS_RUN_CMD = $(HOST_DIR)/bin/luarocks +LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC +HOST_LUAROCKS_CFLAGS = $(HOST_CFLAGS) -fPIC +ifeq ($(BR2_PACKAGE_LUA_5_3),y) +LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2 +HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2 +else ifeq ($(BR2_PACKAGE_LUA_5_4),y) +LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3 +HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3 +endif + ################################################################################ # inner-luarocks-package -- defines how the configuration, compilation and # installation of a LuaRocks package should be done, implements a few hooks to @@ -33,16 +44,50 @@ define inner-luarocks-package -$(2)_BUILD_OPTS ?= -$(2)_NAME_UPSTREAM ?= $(1) -$(2)_SUBDIR ?= $$($(2)_NAME_UPSTREAM)-$$(shell echo "$$($(2)_VERSION)" | sed -e "s/-[0-9]$$$$//") -$(2)_ROCKSPEC ?= $$(call LOWERCASE,$$($(2)_NAME_UPSTREAM))-$$($(2)_VERSION).rockspec -$(2)_SOURCE ?= $$(call LOWERCASE,$$($(2)_NAME_UPSTREAM))-$$($(2)_VERSION).src.rock -$(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR)) +ifndef $(2)_NAME_UPSTREAM + ifdef $(3)_NAME_UPSTREAM + $(2)_NAME_UPSTREAM = $($(3)_NAME_UPSTREAM) + else + $(2)_NAME_UPSTREAM ?= $(1) + endif +endif -# Since we do not support host-luarocks-package, we know this is -# a target package, and can just add the required dependencies -$(2)_DEPENDENCIES += luainterpreter +ifndef $(2)_SUBDIR + ifdef $(3)_SUBDIR + $(2)_SUBDIR = $($(3)_SUBDIR) + else + $(2)_SUBDIR ?= $$($(3)_NAME_UPSTREAM)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//") + endif +endif + +ifndef $(2)_ROCKSPEC + ifdef $(3)_ROCKSPEC + $(2)_ROCKSPEC = $($(3)_ROCKSPEC) + else + $(2)_ROCKSPEC ?= $$(call LOWERCASE,$$($(3)_NAME_UPSTREAM))-$$($(3)_VERSION).rockspec + endif +endif + +ifndef $(2)_SOURCE + ifdef $(3)_SOURCE + $(2)_SOURCE = $($(3)_SOURCE) + else + $(2)_SOURCE ?= $$(call LOWERCASE,$$($(3)_NAME_UPSTREAM))-$$($(3)_VERSION).src.rock + endif +endif + +ifndef $(2)_SITE + ifdef $(3)_SITE + $(2)_SITE = $($(3)_SITE) + else + $(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR)) + endif +endif + +ifeq ($(4),target) +$(2)_DEPENDENCIES += luainterpreter +endif +# host-luarocks implies host-luainterpreter $(2)_EXTRACT_DEPENDENCIES += host-luarocks # @@ -53,7 +98,7 @@ ifndef $(2)_EXTRACT_CMDS define $(2)_EXTRACT_CMDS mkdir -p $$($(2)_DIR)/luarocks-extract cd $$($(2)_DIR)/luarocks-extract && \ - $$(LUAROCKS_RUN_ENV) $$(LUAROCKS_RUN_CMD) unpack --force $$($(2)_DL_DIR)/$$($(2)_SOURCE) + $$(LUAROCKS_RUN_CMD) unpack --force $$($(2)_DL_DIR)/$$($(2)_SOURCE) mv $$($(2)_DIR)/luarocks-extract/*/* $$($(2)_DIR) endef endif @@ -63,8 +108,30 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$($(2)_SRCDIR) && $$(LUAROCKS_RUN_ENV) \ - $$(LUAROCKS_RUN_CMD) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS) + cd $$($(2)_SRCDIR) && \ + LUAROCKS_CONFIG=$$(LUAROCKS_CONFIG_FILE) \ + $$(LUAROCKS_RUN_CMD) make --keep --deps-mode none \ + --tree "$$(TARGET_DIR)/usr" \ + DEPS_DIR="$$(STAGING_DIR)/usr" \ + LUA_INCDIR="$$(STAGING_DIR)/usr/include" \ + LUA_LIBDIR="$$(STAGING_DIR)/usr/lib" \ + CC=$$(TARGET_CC) \ + LD=$$(TARGET_CC) \ + CFLAGS="$$(LUAROCKS_CFLAGS)" \ + LIBFLAG="-shared $$(TARGET_LDFLAGS)" \ + $$($(2)_BUILD_OPTS) $$($(2)_ROCKSPEC) +endef +endif + +ifndef $(2)_INSTALL_CMDS +define $(2)_INSTALL_CMDS + cd $$($(2)_SRCDIR) && \ + LUAROCKS_CONFIG=$$(HOST_LUAROCKS_CONFIG_FILE) \ + $$(LUAROCKS_RUN_CMD) make --keep --deps-mode none \ + DEPS_DIR="$$(HOST_DIR)" \ + CFLAGS="$$(HOST_LUAROCKS_CFLAGS)" \ + LIBFLAG="-shared $$(HOST_LDFLAGS)" \ + $$($(2)_BUILD_OPTS) $$($(2)_ROCKSPEC) endef endif @@ -85,4 +152,4 @@ endef ################################################################################ luarocks-package = $(call inner-luarocks-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) -# host-luarocks-package not supported +host-luarocks-package = $(call inner-luarocks-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index b234d0672f..16a90d157b 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -71,21 +71,29 @@ define $(2)_CONFIGURE_CMDS -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ - -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ - -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ + -e "s%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g" \ + -e "s%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g" \ + -e "s%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g" \ -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ + -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \ -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ -e "/^\[properties\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_PROPERTIES),\n$$(x)):" \ package/meson/cross-compilation.conf.in \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf - PATH=$$(BR_PATH) $$($$(PKG)_CONF_ENV) $$(MESON) \ + PATH=$$(BR_PATH) \ + CC_FOR_BUILD="$$(HOSTCC)" \ + CXX_FOR_BUILD="$$(HOSTCXX)" \ + $$($$(PKG)_CONF_ENV) \ + $$(MESON) \ --prefix=/usr \ --libdir=lib \ --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \ - --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \ + --buildtype=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) \ --cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \ + -Db_pie=false \ + -Dstrip=false \ + -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build endef @@ -103,6 +111,7 @@ define $(2)_CONFIGURE_CMDS --localstatedir=$$(HOST_DIR)/var \ --default-library=shared \ --buildtype=release \ + -Dstrip=true \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build endef @@ -188,11 +197,12 @@ define PKG_MESON_INSTALL_CROSS_CONF -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$(call make-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \ + -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g" \ + -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g" \ -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ + -e 's%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g' \ $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ > $(HOST_DIR)/etc/meson/cross-compilation.conf.in sed -e 's%@PKG_TARGET_CFLAGS@%%g' \ @@ -202,4 +212,4 @@ define PKG_MESON_INSTALL_CROSS_CONF > $(HOST_DIR)/etc/meson/cross-compilation.conf endef -TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += PKG_MESON_INSTALL_CROSS_CONF +TOOLCHAIN_TARGET_FINALIZE_HOOKS += PKG_MESON_INSTALL_CROSS_CONF diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 4bf762e662..59a48e5a87 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -20,9 +20,11 @@ # ################################################################################ -define PKG_PYTHON_SYSCONFIGDATA_NAME -$(basename $(notdir $(wildcard $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/_sysconfigdata__linux_*.py))) -endef +# basename does not evaluate if a file exists, so we must check to ensure +# the _sysconfigdata__linux_*.py file exists. The "|| true" is added to return +# an empty string if the file does not exist. +PKG_PYTHON_SYSCONFIGDATA_PATH = $(PYTHON3_PATH)/_sysconfigdata__linux_*.py +PKG_PYTHON_SYSCONFIGDATA_NAME = `{ [ -e $(PKG_PYTHON_SYSCONFIGDATA_PATH) ] && basename $(PKG_PYTHON_SYSCONFIGDATA_PATH) .py; } || true` # Target distutils-based packages PKG_PYTHON_DISTUTILS_ENV = \ diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 46d2b22d04..a77286fe3a 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -20,6 +20,13 @@ # ################################################################################ +# +# Hook to sync Qt headers +# +define QT_HEADERS_SYNC_HOOK + $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) +endef + ################################################################################ # inner-qmake-package -- defines how the configuration, compilation and # installation of a qmake package should be done, implements a few hooks @@ -44,12 +51,18 @@ ifneq ($(1),qt5base) $(2)_DEPENDENCIES += qt5base endif +ifeq ($$($(2)_SYNC_QT_HEADERS),YES) +$(2)_DEPENDENCIES += host-perl +$(2)_PRE_CONFIGURE_HOOKS += QT_HEADERS_SYNC_HOOK +endif + # # Configure step. Only define it if not already defined by the package # .mk file. # ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS + $$(QT5_QT_CONF_FIXUP) cd $$($(2)_BUILDDIR) && \ $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) endef diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index d324934dba..ae3c7f9da9 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -11,20 +11,27 @@ # package, and more. # -define KCONFIG_ENABLE_OPT # (option, file) - $(SED) "/\\<$(1)\\>/d" $(2) - echo '$(1)=y' >> $(2) +# KCONFIG_DOT_CONFIG ([file]) +# Returns the path to the .config file that should be used, which will +# be $(1) if provided, or the current package .config file otherwise. +KCONFIG_DOT_CONFIG = $(strip \ + $(if $(strip $(1)), $(1), \ + $($(PKG)_BUILDDIR)/$($(PKG)_KCONFIG_DOTCONFIG) \ + ) \ +) + +# KCONFIG_MUNGE_DOT_CONFIG (option, newline [, file]) +define KCONFIG_MUNGE_DOT_CONFIG + $(SED) "/\\<$(strip $(1))\\>/d" $(call KCONFIG_DOT_CONFIG,$(3)) + echo '$(strip $(2))' >> $(call KCONFIG_DOT_CONFIG,$(3)) endef -define KCONFIG_SET_OPT # (option, value, file) - $(SED) "/\\<$(1)\\>/d" $(3) - echo '$(1)=$(2)' >> $(3) -endef - -define KCONFIG_DISABLE_OPT # (option, file) - $(SED) "/\\<$(1)\\>/d" $(2) - echo '# $(1) is not set' >> $(2) -endef +# KCONFIG_ENABLE_OPT (option [, file]) +KCONFIG_ENABLE_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=y, $(2)) +# KCONFIG_SET_OPT (option, value [, file]) +KCONFIG_SET_OPT = $(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)) # Helper functions to determine the name of a package and its # directory from its makefile directory, using the $(MAKEFILE_LIST) @@ -33,6 +40,11 @@ endef pkgdir = $(dir $(lastword $(MAKEFILE_LIST))) pkgname = $(lastword $(subst /, ,$(pkgdir))) +# Helper to build the extension for a package archive, based on various +# conditions. +# $(1): upper-case package name +pkg_source_ext = $(BR_FMT_VERSION_$($(1)_SITE_METHOD)).tar.gz + # Define extractors for different archive suffixes INFLATE.bz2 = $(BZCAT) INFLATE.gz = $(ZCAT) @@ -84,6 +96,7 @@ endef # $(1): upper-case package or filesystem name define json-info "$($(1)_NAME)": { + "name": "$($(1)_RAWNAME)", "type": "$($(1)_TYPE)", $(if $(filter rootfs,$($(1)_TYPE)), \ $(call _json-info-fs,$(1)), \ @@ -100,21 +113,32 @@ define _json-info-pkg "virtual": false$(comma) $(call _json-info-pkg-details,$(1)) \ ) + "build_dir": "$(patsubst $(BASE_DIR)/%,%,$($(1)_BUILDDIR))", + $(if $(filter target,$($(1)_TYPE)), \ + "install_target": $(call yesno-to-bool,$($(1)_INSTALL_TARGET))$(comma) \ + "install_staging": $(call yesno-to-bool,$($(1)_INSTALL_STAGING))$(comma) \ + "install_images": $(call yesno-to-bool,$($(1)_INSTALL_IMAGES))$(comma) \ + ) "dependencies": [ $(call make-comma-list,$(sort $($(1)_FINAL_ALL_DEPENDENCIES))) ], "reverse_dependencies": [ $(call make-comma-list,$(sort $($(1)_RDEPENDENCIES))) ] + $(if $($(1)_CPE_ID_VALID), \ + $(comma) "cpe-id": "$($(1)_CPE_ID)" \ + ) + $(if $($(1)_IGNORE_CVES), + $(comma) "ignore_cves": [ + $(call make-comma-list,$(sort $($(1)_IGNORE_CVES))) + ] + ) endef define _json-info-pkg-details "version": "$($(1)_DL_VERSION)", "licenses": "$($(1)_LICENSE)", "dl_dir": "$($(1)_DL_SUBDIR)", - "install_target": $(call yesno-to-bool,$($(1)_INSTALL_TARGET)), - "install_staging": $(call yesno-to-bool,$($(1)_INSTALL_STAGING)), - "install_images": $(call yesno-to-bool,$($(1)_INSTALL_IMAGES)), "downloads": [ $(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)), { @@ -132,6 +156,10 @@ define _json-info-pkg-details endef define _json-info-fs + "image_name": $(if $($(1)_FINAL_IMAGE_NAME), \ + "$($(1)_FINAL_IMAGE_NAME)", \ + null \ + ), "dependencies": [ $(call make-comma-list,$(sort $($(1)_DEPENDENCIES))) ] @@ -143,8 +171,9 @@ endef clean-json = $(strip \ $(subst $(comma)},}, $(subst $(comma)$(space)},$(space)}, \ $(subst $(comma)],], $(subst $(comma)$(space)],$(space)], \ + $(subst \,\\, \ $(strip $(1)) \ - )))) \ + ))))) \ ) ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index a32d5dab33..038d89454e 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -36,8 +36,8 @@ define inner-waf-package -# We need host-python to run waf -$(2)_DEPENDENCIES += host-python +# We need host-python3 to run waf +$(2)_DEPENDENCIES += host-python3 $(2)_NEEDS_EXTERNAL_WAF ?= NO @@ -46,7 +46,7 @@ ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) $(2)_DEPENDENCIES += host-waf $(2)_WAF = $$(HOST_DIR)/bin/waf else -$(2)_WAF = ./waf +$(2)_WAF ?= ./waf endif $(2)_BUILD_OPTS ?= @@ -63,7 +63,7 @@ define $(2)_CONFIGURE_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_CONFIGURE_OPTS) \ $$($(2)_CONF_ENV) \ - $$(HOST_DIR)/bin/python2 $$($(2)_WAF) configure \ + $$(HOST_DIR)/bin/python3 $$($(2)_WAF) configure \ --prefix=/usr \ --libdir=/usr/lib \ $$($(2)_CONF_OPTS) \ @@ -78,7 +78,7 @@ endif ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ $$($(2)_WAF_OPTS) endef @@ -91,7 +91,7 @@ endif ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ install --destdir=$$(STAGING_DIR) \ $$($(2)_INSTALL_STAGING_OPTS) \ $$($(2)_WAF_OPTS) @@ -105,7 +105,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ install --destdir=$$(TARGET_DIR) \ $$($(2)_INSTALL_TARGET_OPTS) \ $$($(2)_WAF_OPTS) diff --git a/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch b/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch index a7811752d2..a039d0c1bc 100644 --- a/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch +++ b/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch @@ -30,7 +30,7 @@ diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c index 8523709..7cd2fff 100644 --- a/libpkgconf/tuple.c +++ b/libpkgconf/tuple.c -@@ -160,6 +160,21 @@ dequote(const char *value) +@@ -161,6 +161,21 @@ dequote(const char *value) return buf; } @@ -52,7 +52,7 @@ index 8523709..7cd2fff 100644 /* * !doc * -@@ -180,6 +192,8 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch +@@ -181,6 +193,8 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch { char *dequote_value; pkgconf_tuple_t *tuple = calloc(sizeof(pkgconf_tuple_t), 1); @@ -61,7 +61,7 @@ index 8523709..7cd2fff 100644 pkgconf_tuple_find_delete(list, key); -@@ -187,9 +201,13 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch +@@ -188,9 +202,13 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch PKGCONF_TRACE(client, "adding tuple to @%p: %s => %s (parsed? %d)", list, key, dequote_value, parse); @@ -76,7 +76,7 @@ index 8523709..7cd2fff 100644 else tuple->value = strdup(dequote_value); -@@ -233,27 +251,14 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c +@@ -234,27 +252,14 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c return NULL; } @@ -107,7 +107,7 @@ index 8523709..7cd2fff 100644 bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf); for (ptr = value; *ptr != '\0' && bptr - buf < PKGCONF_BUFSIZE; ptr++) -@@ -293,7 +298,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const +@@ -294,7 +299,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const if (kv != NULL) { @@ -116,7 +116,7 @@ index 8523709..7cd2fff 100644 strncpy(bptr, parsekv, PKGCONF_BUFSIZE - (bptr - buf)); bptr += strlen(parsekv); -@@ -338,6 +343,25 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const +@@ -339,6 +344,25 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const return strdup(buf); } diff --git a/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch b/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch index e79bea93a5..f659a3b07f 100644 --- a/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch +++ b/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch @@ -19,7 +19,7 @@ diff --git a/cli/main.c b/cli/main.c index b52cc85..c5acc10 100644 --- a/cli/main.c +++ b/cli/main.c -@@ -955,18 +955,8 @@ main(int argc, char *argv[]) +@@ -1002,18 +1002,8 @@ main(int argc, char *argv[]) if ((want_flags & PKG_VERSION) == PKG_VERSION) { diff --git a/package/pkgconf/pkgconf.hash b/package/pkgconf/pkgconf.hash index 45848af943..f210869c03 100644 --- a/package/pkgconf/pkgconf.hash +++ b/package/pkgconf/pkgconf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 22b9ee38438901f9d60f180e5182821180854fa738fd071f593ea26a81da208c pkgconf-1.6.1.tar.xz -sha256 07ee94b50a41ee3fc4e13a9b9c60b26fc28488494c465639f7e5f07a3952ec04 COPYING +sha256 61f0b31b0d5ea0e862b454a80c170f57bad47879c0c42bd8de89200ff62ea210 pkgconf-1.6.3.tar.xz +sha256 07ee94b50a41ee3fc4e13a9b9c60b26fc28488494c465639f7e5f07a3952ec04 COPYING diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index 1851ecfca4..5d65f69c10 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -4,11 +4,12 @@ # ################################################################################ -PKGCONF_VERSION = 1.6.1 +PKGCONF_VERSION = 1.6.3 PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license PKGCONF_LICENSE_FILES = COPYING +PKGCONF_CPE_ID_VENDOR = pkgconf PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/bin/pkg-config diff --git a/package/pngquant/pngquant.hash b/package/pngquant/pngquant.hash index f67807cb8f..9fa51c93d2 100644 --- a/package/pngquant/pngquant.hash +++ b/package/pngquant/pngquant.hash @@ -1,4 +1,4 @@ # From https://pngquant.org/releases.html -sha256 3638936cf6270eeeaabcee42e10768d78e4dc07cac9310307835c1f58b140808 pngquant-2.12.5-src.tar.gz +sha256 718aabbc346b82ed93564d8e757b346988d86de268ee03d2904207cd5d64c829 pngquant-2.15.1-src.tar.gz # Locally computed -sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT +sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk index a8845c7972..bc6c6129e4 100644 --- a/package/pngquant/pngquant.mk +++ b/package/pngquant/pngquant.mk @@ -4,11 +4,12 @@ # ################################################################################ -PNGQUANT_VERSION = 2.12.5 +PNGQUANT_VERSION = 2.15.1 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ PNGQUANT_LICENSE_FILES = COPYRIGHT +PNGQUANT_CPE_ID_VENDOR = pngquant HOST_PNGQUANT_DEPENDENCIES = host-libpng PNGQUANT_DEPENDENCIES = libpng diff --git a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch index 5453cba13f..fbabfc8f26 100644 --- a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch +++ b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch @@ -1,4 +1,4 @@ -From a3cb6e42fc2cfa0620ba737148fcbea0cf96a984 Mon Sep 17 00:00:00 2001 +From a53f3fd64a0f36ec9bc1307d7e66cdc2dee4aeaa Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 4 Aug 2015 10:14:00 +0200 Subject: [PATCH] poco: add the staging path to search path @@ -14,19 +14,21 @@ must be set from the make command line. Signed-off-by: Baruch Siach [Jörg: Update to version 1.6.1 from github] Signed-off-by: Jörg Krause +[Julien: Rebased on version 1.10.1] +Signed-off-by: Julien Olivain --- Data/MySQL/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile -index c6fc2ac1c..955fee2d4 100644 +index 64a7d3f82..955fee2d4 100644 --- a/Data/MySQL/Makefile +++ b/Data/MySQL/Makefile @@ -6,8 +6,8 @@ include $(POCO_BASE)/build/rules/global --SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient +-SYSLIBS += -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient -INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include +SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient +INCLUDE += -I$(MYSQL_INCDIR) @@ -34,5 +36,5 @@ index c6fc2ac1c..955fee2d4 100644 objects = Binder Extractor SessionImpl Connector \ -- -2.14.4 +2.26.2 diff --git a/package/poco/0002-Add-support-for-m68000-1856.patch b/package/poco/0002-Add-support-for-m68000-1856.patch index 1cf99bf09c..bc04a9bf69 100644 --- a/package/poco/0002-Add-support-for-m68000-1856.patch +++ b/package/poco/0002-Add-support-for-m68000-1856.patch @@ -1,4 +1,4 @@ -From e49753f7654dc62087e47731832d5992cc4d194e Mon Sep 17 00:00:00 2001 +From 221e308ad452035f4c1dc25e194f817a30f38f7b Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Wed, 23 Aug 2017 16:50:51 +0200 Subject: [PATCH] Add support for m68000 (#1856) @@ -8,16 +8,18 @@ Originally taken from https://github.com/google/double-conversion/commit/da11179623145f53b204105a93b8bbca431141da Signed-off-by: Thomas Petazzoni +[Julien: rebased on version 1.10.1] +Signed-off-by: Julien Olivain --- Foundation/src/utils.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index 69cea1aca..a7bda0171 100644 +index c87cee13c..e891c0f10 100644 --- a/Foundation/src/utils.h +++ b/Foundation/src/utils.h -@@ -65,6 +65,8 @@ - defined(__AARCH64EL__) || \ +@@ -66,6 +66,8 @@ + defined(__AARCH64EL__) || \ defined(nios2) || defined(__nios2) || defined(__nios2__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +#elif defined(__mc68000__) @@ -26,5 +28,5 @@ index 69cea1aca..a7bda0171 100644 #if defined(_WIN32) // Windows uses a 64bit wide floating point stack. -- -2.14.4 +2.26.2 diff --git a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch index 8193457f97..c06eebe8b0 100644 --- a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch +++ b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch @@ -1,4 +1,4 @@ -From b077b4a5afbfde47288baed072152a6b7f318250 Mon Sep 17 00:00:00 2001 +From fe7d230da03a35725ef768c07ce064324f941863 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Jul 2018 15:37:47 +0200 Subject: [PATCH] Foundation/src/utils.h: backport double-conversion change for @@ -10,23 +10,25 @@ allows Poco to build on AArch64 big-endian. Signed-off-by: Thomas Petazzoni Upstream: https://github.com/pocoproject/poco/pull/2378 +[Julien: rebased on version 1.10.1] +Signed-off-by: Julien Olivain --- Foundation/src/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index a7bda0171..fd49e1768 100644 +index e891c0f10..892f7db18 100644 --- a/Foundation/src/utils.h +++ b/Foundation/src/utils.h -@@ -62,7 +62,7 @@ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ +@@ -63,7 +63,7 @@ defined(__SH4__) || defined(__alpha__) || \ defined(_MIPS_ARCH_MIPS32R2) || \ -- defined(__AARCH64EL__) || \ -+ defined(__AARCH64EL__) || defined(__aarch64__) || \ + defined(__riscv) || \ +- defined(__AARCH64EL__) || \ ++ defined(__AARCH64EL__) || defined(__aarch64__) || \ defined(nios2) || defined(__nios2) || defined(__nios2__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(__mc68000__) -- -2.14.4 +2.26.2 diff --git a/package/poco/Config.in b/package/poco/Config.in index f8f921de04..24514a3714 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -1,12 +1,22 @@ +config BR2_PACKAGE_POCO_ARCH_SUPPORTS + bool + default y + depends on !BR2_arc + depends on !BR2_microblaze + depends on !BR2_mipsel + depends on !BR2_or1k + depends on !BR2_RISCV_32 + depends on !BR2_xtensa + 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 # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() - depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \ - || BR2_or1k || BR2_riscv || BR2_xtensa) + depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS select BR2_PACKAGE_ZLIB select BR2_PACKAGE_PCRE help @@ -80,10 +90,15 @@ config BR2_PACKAGE_POCO_DATA_MYSQL select BR2_PACKAGE_POCO_DATA select BR2_PACKAGE_MYSQL +config BR2_PACKAGE_POCO_JWT + bool "jwt" + select BR2_PACKAGE_POCO_JSON + select BR2_PACKAGE_POCO_CRYPTO + endif # BR2_PACKAGE_POCO -comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library" +comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS - depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \ - || BR2_or1k || BR2_xtensa) + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 0cdaf0d3f3..2a2629733d 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 367014cdbcfe9df8f1d746239902149d2398af9b49ba2c1aaaa88616fd538f61 poco-1.9.4.tar.gz +sha256 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818 poco-1.10.1.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index d2b668ae13..857f215e3a 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,10 +4,11 @@ # ################################################################################ -POCO_VERSION = 1.9.4 +POCO_VERSION = 1.10.1 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE +POCO_CPE_ID_VENDOR = pocoproject POCO_INSTALL_STAGING = YES POCO_DEPENDENCIES = zlib pcre \ @@ -31,7 +32,8 @@ POCO_OMIT = Data/ODBC PageCompiler \ $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) + $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ + $(if $(BR2_PACKAGE_POCO_JWT),,JWT) ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) POCO_CONF_OPTS += --no-fpenvironment --no-wstring @@ -59,6 +61,7 @@ define POCO_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure \ --config=Linux \ --prefix=/usr \ + --cflags=-std=c++14 \ --omit="$(POCO_OMIT)" \ $(POCO_CONF_OPTS) \ --unbundled \ diff --git a/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch index 57833d8176..aa75ca63c0 100644 --- a/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch +++ b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch @@ -12,26 +12,27 @@ accomodate version 2.5 Signed-off-by: Clayton Shotwell Signed-off-by: Niranjan Reddy -Signed-off-by: Adam Duskett Signed-off-by: Fabrice Fontaine [Update for 2.8] +Signed-off-by: Adam Duskett +[Update for 3.2] --- setfiles/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setfiles/Makefile b/setfiles/Makefile -index c08e2dd..36c0638 100644 +index a3bbbe1..df675cf 100644 --- a/setfiles/Makefile +++ b/setfiles/Makefile -@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr +@@ -3,7 +3,7 @@ LINGUAS ?= ru PREFIX ?= /usr SBINDIR ?= /sbin MANDIR = $(PREFIX)/share/man -AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) +AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y) - ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }') - + CFLAGS ?= -g -Werror -Wall -W + override LDLIBS += -lselinux -lsepol -- 2.13.6 diff --git a/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch b/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch index ffe5fcbd44..2daed57c97 100644 --- a/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch +++ b/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch @@ -6,41 +6,39 @@ Subject: [PATCH] Add PREFIX to host paths Updates the remaining hardcoded host paths used in the build to be prefixed with a PREFIX path to allow cross compilation. -Updated to work with version 2.5 +Updated to work with version 3.2 Signed-off-by: Clayton Shotwell Signed-off-by: Niranjan Reddy -Signed-off-by: Adam Duskett Signed-off-by: Fabrice Fontaine [Update for 2.8] +Signed-off-by: Adam Duskett +[Update for 3.2] --- - load_policy/Makefile | 2 +- - newrole/Makefile | 6 +++--- - run_init/Makefile | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) + newrole/Makefile | 4 ++-- + run_init/Makefile | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/newrole/Makefile b/newrole/Makefile -index 196af92..896708f 100644 +index 0e7ebce..3188cec 100644 --- a/newrole/Makefile +++ b/newrole/Makefile -@@ -3,9 +3,9 @@ PREFIX ?= $(DESTDIR)/usr +@@ -4,8 +4,8 @@ PREFIX ?= /usr BINDIR ?= $(PREFIX)/bin MANDIR ?= $(PREFIX)/share/man ETCDIR ?= /etc - LOCALEDIR = $(DESTDIR)$(PREFIX)/share/locale --PAMH ?= $(shell test -f /usr/include/security/pam_appl.h && echo y) --AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) -+PAMH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/security/pam_appl.h && echo y) -+AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y) +-LOCALEDIR = $(DESTDIR)$(PREFIX)/share/locale +-INCLUDEDIR ?= $(PREFIX)/include ++LOCALEDIR = $(DESTDIR)$(PREFIX) ++INCLUDEDIR ?= $(LOCALEDIR)/include + PAMH ?= $(shell test -f $(INCLUDEDIR)/security/pam_appl.h && echo y) + AUDITH ?= $(shell test -f $(INCLUDEDIR)/libaudit.h && echo y) # Enable capabilities to permit newrole to generate audit records. - # This will make newrole a setuid root program. - # The capabilities used are: CAP_AUDIT_WRITE. diff --git a/run_init/Makefile b/run_init/Makefile -index 921f0b0..e1566fc 100644 +index e86364a..20a64d4 100644 --- a/run_init/Makefile +++ b/run_init/Makefile -@@ -4,9 +4,9 @@ PREFIX ?= $(DESTDIR)/usr - SBINDIR ?= $(PREFIX)/sbin +@@ -6,8 +6,8 @@ SBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man ETCDIR ?= /etc LOCALEDIR ?= $(DESTDIR)$(PREFIX)/share/locale @@ -52,5 +50,5 @@ index 921f0b0..e1566fc 100644 CFLAGS ?= -Werror -Wall -W override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -- -2.13.6 +2.31.1 diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash index c601c7818b..7d08636370 100644 --- a/package/policycoreutils/policycoreutils.hash +++ b/package/policycoreutils/policycoreutils.hash @@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 c53c344f28007b3c0742bd958751e9b5d2385898adeb8aec6281ae57342f0f7b policycoreutils-2.9.tar.gz +sha256 d1331c6fa766c547b071c491de90b9f343c8dbffdb119be8a5a7e491199b93a9 policycoreutils-3.2.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 6cd5a019c5..a486f8ddc3 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -4,10 +4,11 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 2.9 -POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +POLICYCOREUTILS_VERSION = 3.2 +POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(POLICYCOREUTILS_VERSION) POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = COPYING +POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) @@ -23,7 +24,7 @@ endif ifeq ($(BR2_PACKAGE_AUDIT),y) POLICYCOREUTILS_DEPENDENCIES += audit -POLICYCOREUTILS_MAKE_OPTS += AUDIT_LOG_PRIV=y +POLICYCOREUTILS_MAKE_OPTS += AUDIT_LOG_PRIV=y USE_AUDIT=y endif # Enable LSPP_PRIV if both audit and linux pam are enabled diff --git a/package/polkit/0001-make-netgroup-support-optional.patch b/package/polkit/0001-make-netgroup-support-optional.patch index 86916aba34..09c48d7791 100644 --- a/package/polkit/0001-make-netgroup-support-optional.patch +++ b/package/polkit/0001-make-netgroup-support-optional.patch @@ -16,6 +16,7 @@ Fixes bug 50145. Signed-off-by: A. Wilcox Signed-off-by: Khem Raj +[Adam: Extend patch to work with duktape integration.] Signed-off-by: Adam Duskett [Thomas: add introspection.m4.] Signed-off-by: Thomas Petazzoni @@ -24,12 +25,13 @@ Signed-off-by: Thomas Petazzoni configure.ac | 2 +- src/polkit/polkitidentity.c | 16 ++ src/polkit/polkitunixnetgroup.c | 3 + + .../polkitbackendduktapeauthority.c | 2 + .../polkitbackendinteractiveauthority.c | 14 +- - .../polkitbackendjsauthority.cpp | 2 + + .../polkitbackendjsauthority.cpp | 3 +- test/polkit/polkitidentitytest.c | 9 +- test/polkit/polkitunixnetgrouptest.c | 3 + .../test-polkitbackendjsauthority.c | 2 + - 9 files changed, 185 insertions(+), 8 deletions(-) + 10 files changed, 187 insertions(+), 9 deletions(-) create mode 100644 buildutil/introspection.m4 diff --git a/buildutil/introspection.m4 b/buildutil/introspection.m4 @@ -184,7 +186,7 @@ diff --git a/configure.ac b/configure.ac index 5cedb4e..87aa0ad 100644 --- a/configure.ac +++ b/configure.ac -@@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], +@@ -111,7 +111,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) AC_SUBST(EXPAT_LIBS) @@ -249,6 +251,26 @@ index 8a2b369..83f8d4a 100644 g_return_val_if_fail (name != NULL, NULL); return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_NETGROUP, "name", name, +diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c +index 4b4f8fd..e19b009 100644 +--- a/src/polkitbackend/polkitbackendduktapeauthority.c ++++ b/src/polkitbackend/polkitbackendduktapeauthority.c +@@ -1036,6 +1036,7 @@ js_polkit_user_is_in_netgroup (duk_context *cx) + const char *netgroup; + gboolean is_in_netgroup = FALSE; + ++#ifdef HAVE_SETNETGRENT + user = duk_require_string (cx, 0); + netgroup = duk_require_string (cx, 1); + +@@ -1046,6 +1047,7 @@ js_polkit_user_is_in_netgroup (duk_context *cx) + { + is_in_netgroup = TRUE; + } ++#endif + + duk_push_boolean (cx, is_in_netgroup); + return 1; diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c index 056d9a8..36c2f3d 100644 --- a/src/polkitbackend/polkitbackendinteractiveauthority.c @@ -298,7 +320,7 @@ diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/ index 9b752d1..09b2878 100644 --- a/src/polkitbackend/polkitbackendjsauthority.cpp +++ b/src/polkitbackend/polkitbackendjsauthority.cpp -@@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, +@@ -1520,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, JS::CallArgs args = JS::CallArgsFromVp (argc, vp); @@ -306,14 +328,15 @@ index 9b752d1..09b2878 100644 JS::RootedString usrstr (authority->priv->cx); usrstr = args[0].toString(); user = JS_EncodeStringToUTF8 (cx, usrstr); -@@ -1519,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - - JS_free (cx, netgroup); - JS_free (cx, user); +@@ -1534,7 +1535,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, + { + is_in_netgroup = true; + } +- +#endif - ret = true; + args.rval ().setBoolean (is_in_netgroup); diff --git a/test/polkit/polkitidentitytest.c b/test/polkit/polkitidentitytest.c index e91967b..e829aaa 100644 --- a/test/polkit/polkitidentitytest.c diff --git a/package/polkit/Config.in b/package/polkit/Config.in index f54b6b4cda..622cbbb90b 100644 --- a/package/polkit/Config.in +++ b/package/polkit/Config.in @@ -1,18 +1,14 @@ config BR2_PACKAGE_POLKIT bool "polkit" - depends on BR2_HOST_GCC_AT_LEAST_4_9 # spidermonkey - depends on BR2_INSTALL_LIBSTDCPP # spidermonkey - depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS # spidermonkey - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # spidermonkey - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # spidermonkey + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, dbus depends on BR2_USE_MMU # libglib2, dbus depends on BR2_USE_WCHAR # libglib2 - depends on !BR2_STATIC_LIBS # spidermonkey - depends on !BR2_TOOLCHAIN_USES_UCLIBC # spidermonkey + depends on !BR2_STATIC_LIBS # duktape select BR2_PACKAGE_DBUS # runtime + select BR2_PACKAGE_DUKTAPE select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_SPIDERMONKEY help PolicyKit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged @@ -20,13 +16,7 @@ config BR2_PACKAGE_POLKIT http://www.freedesktop.org/wiki/Software/polkit -comment "polkit needs a glibc or musl toolchain with C++, wchar, dynamic library, NPTL, gcc >= 4.9" +comment "polkit needs a toolchain with dynamic library, wchar, threads, gcc >= 7" depends on BR2_USE_MMU - depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_INSTALL_LIBSTDCPP || \ - BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_HOST_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_USE_WCHAR + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index bacd682139..9677e19bb0 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1 polkit-0.116.tar.gz +sha256 88d078f1d1f653fd31fe42e46cc3d9b7dd468e70684075e32fe1766dc7ece517 polkit-0.119.tar.gz # Locally calculated -sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING +sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index 8572d8b9ba..3a8c442dbb 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,19 +4,19 @@ # ################################################################################ -POLKIT_VERSION = 0.116 -POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases +POLKIT_VERSION = 0.119 +POLKIT_SITE = $(call github,aduskett,polkit-duktape,v$(POLKIT_VERSION)) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING +POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_AUTORECONF = YES POLKIT_INSTALL_STAGING = YES POLKIT_DEPENDENCIES = \ - libglib2 host-intltool expat spidermonkey $(TARGET_NLS_DEPENDENCIES) + duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) -# spidermonkey needs C++11 POLKIT_CONF_ENV = \ - CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ + CXXFLAGS="$(TARGET_CXXFLAGS)" \ LIBS=$(TARGET_NLS_LIBS) POLKIT_CONF_OPTS = \ @@ -24,7 +24,15 @@ POLKIT_CONF_OPTS = \ --disable-man-pages \ --disable-examples \ --disable-libelogind \ - --disable-libsystemd-login + --disable-libsystemd-login \ + --with-duktape + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +POLKIT_CONF_OPTS += --enable-introspection +POLKIT_DEPENDENCIES += gobject-introspection +else +POLKIT_CONF_OPTS += --disable-introspection +endif ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLKIT_DEPENDENCIES += linux-pam @@ -33,6 +41,16 @@ else POLKIT_CONF_OPTS += --with-authfw=shadow endif +# polkit.{its,loc} are needed for gvfs and must be installed in $(HOST_DIR) +# and not $(STAGING_DIR) +define POLKIT_INSTALL_ITS + $(INSTALL) -D -m 644 $(@D)/data/polkit.its \ + $(HOST_DIR)/share/gettext/its/polkit.its + $(INSTALL) -D -m 644 $(@D)/data/polkit.loc \ + $(HOST_DIR)/share/gettext/its/polkit.loc +endef +POLKIT_POST_INSTALL_TARGET_HOOKS += POLKIT_INSTALL_ITS + define POLKIT_USERS polkitd -1 polkitd -1 * - - - Polkit Daemon endef @@ -43,4 +61,15 @@ define POLKIT_PERMISSIONS /usr/bin/pkexec f 4755 root root - - - - - endef +define POLKIT_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(POLKIT_PKGDIR)/polkit.service \ + $(TARGET_DIR)/usr/lib/systemd/system/polkit.service + +endef + +define POLKIT_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/polkit/S50polkit \ + $(TARGET_DIR)/etc/init.d/S50polkit +endef + $(eval $(autotools-package)) diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index e452c2336d..a5a97d974b 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -10,6 +10,7 @@ POPPLER_SITE = http://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING +POPPLER_CPE_ID_VENDOR = freedesktop POPPLER_INSTALL_STAGING = YES POPPLER_CONF_OPTS = \ @@ -17,14 +18,14 @@ POPPLER_CONF_OPTS = \ -DBUILD_GTK_TESTS=OFF \ -DBUILD_QT5_TESTS=OFF \ -DBUILD_CPP_TESTS=OFF \ - -DENABLE_GOBJECT_INTROSPECTION=OFF \ -DENABLE_GTK_DOC=OFF -# cmake older than 3.10 requires this to avoid try_run() in FindThreads -POPPLER_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -POPPLER_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +POPPLER_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ifeq ($(BR2_PACKAGE_BOOST),y) +POPPLER_DEPENDENCIES += boost endif ifeq ($(BR2_PACKAGE_JPEG),y) @@ -34,6 +35,13 @@ else POPPLER_CONF_OPTS += -DENABLE_DCTDECODER=none -DWITH_JPEG=OFF endif +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +POPPLER_DEPENDENCIES += gobject-introspection +POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=ON +else +POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=OFF +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) POPPLER_DEPENDENCIES += libpng POPPLER_CONF_OPTS += -DWITH_PNG=ON @@ -98,6 +106,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) POPPLER_DEPENDENCIES += libglib2 +POPPLER_CONF_OPTS += -DENABLE_GLIB=ON +else +POPPLER_CONF_OPTS += -DENABLE_GLIB=OFF endif ifeq ($(BR2_PACKAGE_LIBNSS),y) diff --git a/package/popt/Config.in b/package/popt/Config.in index cbcdc15dc0..80bac7ff6a 100644 --- a/package/popt/Config.in +++ b/package/popt/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_POPT help Popt is a C library for parsing command line parameters. - http://rpm5.org + https://github.com/rpm-software-management/popt diff --git a/package/popt/popt.hash b/package/popt/popt.hash index 1422f4b920..9b5efe4be6 100644 --- a/package/popt/popt.hash +++ b/package/popt/popt.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 popt-1.16.tar.gz -sha256 518d4f2a05064cb9a8ec0ea02e86408af4feed6916f78ef42171465db8b383c5 COPYING +sha256 5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1 popt-1.18.tar.gz +sha256 518d4f2a05064cb9a8ec0ea02e86408af4feed6916f78ef42171465db8b383c5 COPYING diff --git a/package/popt/popt.mk b/package/popt/popt.mk index 99c5138bdf..f00bf115ee 100644 --- a/package/popt/popt.mk +++ b/package/popt/popt.mk @@ -4,14 +4,17 @@ # ################################################################################ -POPT_VERSION = 1.16 -POPT_SITE = http://rpm5.org/files/popt +POPT_VERSION = 1.18 +POPT_SITE = http://ftp.rpm.org/popt/releases/popt-1.x POPT_INSTALL_STAGING = YES POPT_LICENSE = MIT POPT_LICENSE_FILES = COPYING -POPT_AUTORECONF = YES +POPT_CPE_ID_VENDOR = popt_project + POPT_GETTEXTIZE = YES POPT_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +# We're patching configure.ac +POPT_AUTORECONF = YES POPT_CONF_ENV = ac_cv_va_copy=yes diff --git a/package/portaudio/portaudio.hash b/package/portaudio/portaudio.hash index 903d760ce0..ba3c506f18 100644 --- a/package/portaudio/portaudio.hash +++ b/package/portaudio/portaudio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 pa_stable_v190600_20161030.tgz +sha256 47efbf42c77c19a05d22e627d42873e991ec0c1357219c0d74ce6a2948cb2def pa_stable_v190700_20210406.tgz sha256 ec52a1952d701f94e5135719a47376da4ee0b4a0201f1cafb49f61db6480ac3d LICENSE.txt diff --git a/package/portaudio/portaudio.mk b/package/portaudio/portaudio.mk index 0cf754c7d5..58798dda87 100644 --- a/package/portaudio/portaudio.mk +++ b/package/portaudio/portaudio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PORTAUDIO_VERSION = v190600_20161030 -PORTAUDIO_SITE = http://www.portaudio.com/archives -PORTAUDIO_SOURCE = pa_stable_$(PORTAUDIO_VERSION).tgz +PORTAUDIO_VERSION = 190700_20210406 +PORTAUDIO_SITE = http://files.portaudio.com/archives +PORTAUDIO_SOURCE = pa_stable_v$(PORTAUDIO_VERSION).tgz PORTAUDIO_INSTALL_STAGING = YES PORTAUDIO_MAKE = $(MAKE1) PORTAUDIO_LICENSE = portaudio license (MIT-like plus special clause) diff --git a/package/postgresql/Config.in b/package/postgresql/Config.in index 2f677daf5b..b42b219558 100644 --- a/package/postgresql/Config.in +++ b/package/postgresql/Config.in @@ -6,6 +6,9 @@ config BR2_PACKAGE_POSTGRESQL # postgresql is unlikely to be used in a pure statically # linked environment. depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help PostgreSQL is a powerful, open source object-relational database system. @@ -19,6 +22,15 @@ config BR2_PACKAGE_POSTGRESQL http://www.postgresql.org +if BR2_PACKAGE_POSTGRESQL + +config BR2_PACKAGE_POSTGRESQL_FULL + bool "postgresql-full" + help + Build PostgreSQL, contrib, and documentation. + +endif + comment "postgresql needs a toolchain w/ dynamic library, wchar" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/package/postgresql/pg_config b/package/postgresql/pg_config index 642252f27f..099f1ee390 100644 --- a/package/postgresql/pg_config +++ b/package/postgresql/pg_config @@ -2,7 +2,6 @@ # # Minimal pg_config implementation as replacement for the native pg_config application -# Only implements --includedir and --libdir # prefix=/usr @@ -11,12 +10,70 @@ case "$1" in --includedir) echo "$prefix/include" ;; + --pkgincludedir) + echo "$prefix/include/postgresql" + ;; + --includedir-server) + echo "$prefix/include/postgresql/server" + ;; --libdir) echo "$prefix/lib" ;; --version) echo "PostgreSQL @POSTGRESQL_VERSION@" ;; + --configure) + echo "@POSTGRESQL_CONF_OPTIONS@" + ;; + --pgxs) + echo "$prefix/lib/postgresql/pgxs/src/makefiles/pgxs.mk" + ;; + --cflags) + echo "@TARGET_CFLAGS@" + ;; + --cflags_sl) + # defined at src/template/linux + echo "-fPIC" + ;; + --cc) + echo "@TARGET_CC@" + ;; + --pkglibdir) + echo "/usr/lib/postgresql" + ;; + --bindir) + echo "/usr/bin" + ;; + --sharedir) + echo "/usr/share/postgresql" + ;; + --localedir) + echo "/usr/share/locale" + ;; + --docdir) + echo "/usr/share/doc/postgresql" + ;; + --mandir) + echo "/usr/share/man" + ;; *) - echo "Usage: $0 {--includedir|--libdir|--version}" + echo "Usage: $0 {OPTION}" + echo + echo "Options:" + echo + echo " --includedir show location of C header files of the client interfaces" + echo " --pkgincludedir show location of other C header files" + echo " --includedir-server show location of C header files for the server" + echo " --libdir show location of object code libraries" + echo " --version show the PostgreSQL version" + echo " --configure show options given to configure script" + echo " --pgxs show location of extension makefile" + echo " --cflags show CFLAGS value used when PostgreSQL was built" + echo " --cc show CC value used when PostgreSQL was built" + echo " --pkglibdir show location of dynamically loadable modules" + echo " --bindir show location of user executables" + echo " --sharedir show location of architecture-independent support files" + echo " --localedir show location of locale support files" + echo " --docdir show location of documentation files" + echo " --mandir show location of manual pages" esac diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 7cb0c67d63..2dcc1823d6 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,7 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v12.2/postgresql-12.2.tar.bz2.md5 -md5 a88ceea8ecf2741307f663e4539b58b7 postgresql-12.2.tar.bz2 -# From https://ftp.postgresql.org/pub/source/v12.2/postgresql-12.2.tar.bz2.sha256 -sha256 ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de postgresql-12.2.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v13.4/postgresql-13.4.tar.bz2.sha256 +sha256 ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd postgresql-13.4.tar.bz2 # License file, Locally calculated -sha256 739e5d454d81d31a482469338b7c856f1f5c6b4cdda1551cea6f0f6d18eef62c COPYRIGHT +sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 378197d33b..3b6c6e21e7 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,17 +4,17 @@ # ################################################################################ -POSTGRESQL_VERSION = 12.2 +POSTGRESQL_VERSION = 13.4 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL POSTGRESQL_LICENSE_FILES = COPYRIGHT +POSTGRESQL_CPE_ID_VENDOR = postgresql +POSTGRESQL_SELINUX_MODULES = postgresql POSTGRESQL_INSTALL_STAGING = YES POSTGRESQL_CONFIG_SCRIPTS = pg_config POSTGRESQL_CONF_ENV = \ ac_cv_type_struct_sockaddr_in6=yes \ - pgac_cv_snprintf_long_long_int_modifier="ll" \ - pgac_cv_snprintf_size_t_support=yes \ LIBS=$(TARGET_NLS_LIBS) POSTGRESQL_CONF_OPTS = --disable-rpath POSTGRESQL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) @@ -24,6 +24,12 @@ POSTGRESQL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # manually, you must unset MAKELEVEL or set it to zero" POSTGRESQL_MAKE_OPTS = MAKELEVEL=0 +ifeq ($(BR2_PACKAGE_POSTGRESQL_FULL),y) +POSTGRESQL_MAKE_OPTS += world +POSTGRESQL_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-world +POSTGRESQL_INSTALL_STAGING_OPTS += DESTDIR=$(STAGING_DIR) install-world +endif + ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) # PostgreSQL does not build against uClibc with locales # enabled, due to an uClibc bug, see @@ -115,7 +121,10 @@ POSTGRESQL_POST_INSTALL_TARGET_HOOKS += POSTGRESQL_INSTALL_TARGET_FIXUP define POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG $(INSTALL) -m 0755 -D package/postgresql/pg_config \ $(STAGING_DIR)/usr/bin/pg_config + $(SED) "s|@POSTGRESQL_CONF_OPTIONS@|$(POSTGRESQL_CONF_OPTS)|g" $(STAGING_DIR)/usr/bin/pg_config $(SED) "s|@POSTGRESQL_VERSION@|$(POSTGRESQL_VERSION)|g" $(STAGING_DIR)/usr/bin/pg_config + $(SED) "s|@TARGET_CFLAGS@|$(TARGET_CFLAGS)|g" $(STAGING_DIR)/usr/bin/pg_config + $(SED) "s|@TARGET_CC@|$(TARGET_CC)|g" $(STAGING_DIR)/usr/bin/pg_config endef POSTGRESQL_POST_INSTALL_STAGING_HOOKS += POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG diff --git a/package/postgresql/postgresql.service b/package/postgresql/postgresql.service index 53e6f84f00..539eea8964 100644 --- a/package/postgresql/postgresql.service +++ b/package/postgresql/postgresql.service @@ -15,7 +15,6 @@ Group=postgres StandardOutput=syslog StandardError=syslog SyslogIdentifier=postgres -PIDFile=/var/lib/pgsql/postmaster.pid ExecStartPre=/bin/sh -c "if [ ! -f /var/lib/pgsql/PG_VERSION ]; then /usr/bin/pg_ctl initdb -D /var/lib/pgsql; fi" ExecStart=/usr/bin/postgres -D /var/lib/pgsql diff --git a/package/powerpc-utils/powerpc-utils.hash b/package/powerpc-utils/powerpc-utils.hash index 0e86d8ccae..8d0b10425b 100644 --- a/package/powerpc-utils/powerpc-utils.hash +++ b/package/powerpc-utils/powerpc-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 77efe3978ac9c251c4728a35b9aebd6076583939a8e26cc7f07ffa86432a8bf0 powerpc-utils-1.3.5.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 4e3a21419863c08adde49f0795eff0fbfe4597ce82593fa5fe1f1177913fb7b9 powerpc-utils-1.3.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/powerpc-utils/powerpc-utils.mk b/package/powerpc-utils/powerpc-utils.mk index 221e5b04e6..b12194ae8e 100644 --- a/package/powerpc-utils/powerpc-utils.mk +++ b/package/powerpc-utils/powerpc-utils.mk @@ -4,21 +4,23 @@ # ################################################################################ -POWERPC_UTILS_VERSION = 1.3.5 +POWERPC_UTILS_VERSION = 1.3.8 POWERPC_UTILS_SITE = $(call github,ibm-power-utilities,powerpc-utils,v$(POWERPC_UTILS_VERSION)) POWERPC_UTILS_DEPENDENCIES = zlib POWERPC_UTILS_AUTORECONF = YES POWERPC_UTILS_LICENSE = GPL-2.0+ POWERPC_UTILS_LICENSE_FILES = COPYING +POWERPC_UTILS_CPE_ID_VENDOR = powerpc-utils_project POWERPC_UTILS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) +POWERPC_UTILS_CONF_OPTS = --disable-werror ifeq ($(BR2_PACKAGE_POWERPC_UTILS_RTAS),y) POWERPC_UTILS_DEPENDENCIES += librtas -POWERPC_UTILS_CONF_OPTS = --with-librtas +POWERPC_UTILS_CONF_OPTS += --with-librtas else -POWERPC_UTILS_CONF_OPTS = --without-librtas +POWERPC_UTILS_CONF_OPTS += --without-librtas endif $(eval $(autotools-package)) diff --git a/package/powertop/powertop.hash b/package/powertop/powertop.hash index a3261789d2..fc8f3cc52f 100644 --- a/package/powertop/powertop.hash +++ b/package/powertop/powertop.hash @@ -1,3 +1,5 @@ -# Locally-generated hash -sha256 ae68c913784f78b497076e0b1d588f59854a66c074690d545dae7956e4f5d64f powertop-v2.11-1-g7ef7f79.tar.gz -sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING +# Locally calculated after checking pgp signature +# https://01.org/sites/default/files/downloads/powertop-2.13.tar.gz.asc.txt +# using key 22E8F306C8FA4BAA2A5F36F3A0303B060918941C +sha256 a65f992ca4a419bc73b623651060eb9fc00c5a86fa03556358cd9db011ef3178 powertop-2.13.tar.gz +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/powertop/powertop.mk b/package/powertop/powertop.mk index 3dbc015cef..c3e8d2549c 100644 --- a/package/powertop/powertop.mk +++ b/package/powertop/powertop.mk @@ -4,9 +4,8 @@ # ################################################################################ -POWERTOP_VERSION = 2.11 +POWERTOP_VERSION = 2.13 POWERTOP_SITE = https://01.org/sites/default/files/downloads -POWERTOP_SOURCE = powertop-v$(POWERTOP_VERSION)-1-g7ef7f79.tar.gz POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) POWERTOP_LICENSE = GPL-2.0 diff --git a/package/pppd/Config.in b/package/pppd/Config.in index 7db5674bf1..66c935abb1 100644 --- a/package/pppd/Config.in +++ b/package/pppd/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_PPPD depends on !BR2_TOOLCHAIN_USES_MUSL # Use __P() macro all over the tree depends on BR2_USE_MMU select BR2_PACKAGE_OPENSSL if BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL \ + && BR2_TOOLCHAIN_USES_GLIBC help An implementation of the Point-to-point protocol. diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 685666a200..098c6a8e6f 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,6 +10,9 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c +PPPD_CPE_ID_VENDOR = samba +PPPD_CPE_ID_PRODUCT = ppp +PPPD_SELINUX_MODULES = ppp # 0001-pppd-Fix-bounds-check.patch PPPD_IGNORE_CVES += CVE-2020-8597 diff --git a/package/prelink-cross/prelink-cross.hash b/package/prelink-cross/prelink-cross.hash index 3ac33ac3d0..5bd2c61082 100644 --- a/package/prelink-cross/prelink-cross.hash +++ b/package/prelink-cross/prelink-cross.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cb3f5d833cd74b7e90e38465c9c948b0f4138c017509cb91e391b0931063429e prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2.tar.gz +sha256 d7c95e81993edead813accf417f6d5b05bcc84eea9ee2d711b9505ffb4f2865b prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2-br1.tar.gz sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/package/privoxy/privoxy.hash b/package/privoxy/privoxy.hash index 9cf08f1163..92ecd1dd21 100644 --- a/package/privoxy/privoxy.hash +++ b/package/privoxy/privoxy.hash @@ -1,5 +1,6 @@ -# From http://sourceforge.net/projects/ijbswa/files/Sources/3.0.26%20%28stable%29/ -md5 8a1c842112ccea68c19b7ceb4a0e999f privoxy-3.0.26-stable-src.tar.gz -sha1 b646624006225979f83453ba542e448667f45998 privoxy-3.0.26-stable-src.tar.gz +# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.32%20%28stable%29/ +md5 3a0a8ebdf80e0a29154683e74cbf510b privoxy-3.0.32-stable-src.tar.gz +sha1 3a298ab2599fc92555c86dc29a37742d7396a0d3 privoxy-3.0.32-stable-src.tar.gz # Locally computed +sha256 c61de4008c62445ec18f1f270407cbf2372eaba93beaccdc9e3238bb2defeed7 privoxy-3.0.32-stable-src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/privoxy/privoxy.mk b/package/privoxy/privoxy.mk index df0e7372ac..c1859ed5f2 100644 --- a/package/privoxy/privoxy.mk +++ b/package/privoxy/privoxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.26 +PRIVOXY_VERSION = 3.0.32 PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped @@ -12,5 +12,7 @@ PRIVOXY_AUTORECONF = YES PRIVOXY_DEPENDENCIES = pcre zlib PRIVOXY_LICENSE = GPL-2.0+ PRIVOXY_LICENSE_FILES = LICENSE +PRIVOXY_CPE_ID_VENDOR = privoxy +PRIVOXY_SELINUX_MODULES = privoxy $(eval $(autotools-package)) diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 6a41e9b322..84ada1b133 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -9,6 +9,7 @@ PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps) PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB +PROCPS_NG_CPE_ID_VENDOR = procps-ng_project PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) @@ -44,6 +45,11 @@ ifeq ($(BR2_STATIC_LIBS),y) PROCPS_NG_CONF_OPTS += --disable-numa endif +# Avoid installing S02sysctl, since openrc provides /etc/init.d/sysctl. +define PROCPS_NG_INSTALL_INIT_OPENRC + @: +endef + define PROCPS_NG_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/procps-ng/S02sysctl \ $(TARGET_DIR)/etc/init.d/S02sysctl diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in index 4a544f0c50..83094028a0 100644 --- a/package/proftpd/Config.in +++ b/package/proftpd/Config.in @@ -29,6 +29,7 @@ config BR2_PACKAGE_PROFTPD_MOD_REDIS config BR2_PACKAGE_PROFTPD_MOD_SFTP bool "mod_sftp support" select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help Compile ProFTPD with mod_sftp support @@ -47,6 +48,13 @@ config BR2_PACKAGE_PROFTPD_MOD_SQL_SQLITE endif +config BR2_PACKAGE_PROFTPD_MOD_SFTP_SQL + bool "mod_sftp_sql support" + select BR2_PACKAGE_PROFTPD_MOD_SQL + select BR2_PACKAGE_PROFTPD_MOD_SFTP + help + Compile ProFTPD with mod_sftp_sql support + config BR2_PACKAGE_PROFTPD_MOD_QUOTATAB bool "mod_quotatab support" help diff --git a/package/proftpd/proftpd.hash b/package/proftpd/proftpd.hash index 1ac54de4ca..983500bb8e 100644 --- a/package/proftpd/proftpd.hash +++ b/package/proftpd/proftpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fa3541c4b34136a7b80cb12a2f6f9a0cab5118a5b0a1653d40af49c6479c35ad proftpd-1.3.6c.tar.gz +sha256 2dbe684034ab592742ebdb778a8a234b70f959efeb30feedee3ea77f26f74fbb proftpd-1.3.6e.tar.gz sha256 391a473d755c29b5326fb726326ff3c37e42512f53a8f5789fc310232150bf80 COPYING diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 946a37d69e..64c16a84eb 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -4,10 +4,12 @@ # ################################################################################ -PROFTPD_VERSION = 1.3.6c +PROFTPD_VERSION = 1.3.6e PROFTPD_SITE = $(call github,proftpd,proftpd,v$(PROFTPD_VERSION)) PROFTPD_LICENSE = GPL-2.0+ PROFTPD_LICENSE_FILES = COPYING +PROFTPD_CPE_ID_VENDOR = proftpd +PROFTPD_SELINUX_MODULES = ftp PROFTPD_CONF_ENV = \ ac_cv_func_setpgrp_void=yes \ @@ -60,6 +62,10 @@ PROFTPD_MODULES += mod_sql_sqlite PROFTPD_DEPENDENCIES += sqlite endif +ifeq ($(BR2_PACKAGE_PROFTPD_MOD_SFTP_SQL),y) +PROFTPD_MODULES += mod_sftp_sql +endif + ifeq ($(BR2_PACKAGE_PROFTPD_MOD_QUOTATAB),y) PROFTPD_MODULES += mod_quotatab endif diff --git a/package/proj/proj.hash b/package/proj/proj.hash index ade9502b67..27cbc38490 100644 --- a/package/proj/proj.hash +++ b/package/proj/proj.hash @@ -1,5 +1,5 @@ -# Fetched from http://download.osgeo.org/proj/proj-6.3.0.tar.gz.md5 -md5 09243feb4f243a2bdd455035a2007384 proj-6.3.0.tar.gz +# Fetched from http://download.osgeo.org/proj/proj-7.2.1.tar.gz.md5 +md5 befbafd25e65ddf0c26a8321d8bcdcd2 proj-7.2.1.tar.gz # Locally calculated -sha256 68ce9ba0005d442c2c1d238a3b9bc6654c358159b4af467b91e8d5b407c79c77 proj-6.3.0.tar.gz -sha256 2dcac4af6990093ef48b896bfb81452d46a31b08d46cce34b27e83f93b2e37f6 COPYING +sha256 b384f42e5fb9c6d01fe5fa4d31da2e91329668863a684f97be5d4760dbbf0a14 proj-7.2.1.tar.gz +sha256 2dcac4af6990093ef48b896bfb81452d46a31b08d46cce34b27e83f93b2e37f6 COPYING diff --git a/package/proj/proj.mk b/package/proj/proj.mk index 2be0004023..03ed9c0a2e 100644 --- a/package/proj/proj.mk +++ b/package/proj/proj.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROJ_VERSION = 6.3.0 +PROJ_VERSION = 7.2.1 PROJ_SITE = http://download.osgeo.org/proj PROJ_LICENSE = MIT PROJ_LICENSE_FILES = COPYING @@ -23,4 +23,18 @@ PROJ_CONF_ENV = \ CFLAGS="$(PROJ_CFLAGS)" \ CXXFLAGS="$(PROJ_CXXFLAGS)" +ifeq ($(BR2_PACKAGE_LIBCURL),y) +PROJ_DEPENDENCIES += libcurl +PROJ_CONF_OPTS += --with-curl=$(STAGING_DIR)/usr/bin/curl-config +else +PROJ_CONF_OPTS += --without-curl +endif + +ifeq ($(BR2_PACKAGE_TIFF),y) +PROJ_DEPENDENCIES += tiff +PROJ_CONF_OPTS += --enable-tiff +else +PROJ_CONF_OPTS += --disable-tiff +endif + $(eval $(autotools-package)) diff --git a/package/prosody/0001-enable-syslog.patch b/package/prosody/0001-enable-syslog.patch index 16acc89c5a..5f09fa903e 100644 --- a/package/prosody/0001-enable-syslog.patch +++ b/package/prosody/0001-enable-syslog.patch @@ -11,7 +11,7 @@ diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index a0fc6c9e..af3cc0e4 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist -@@ -155,7 +155,7 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week +@@ -166,7 +166,7 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week log = { info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging error = "prosody.err"; diff --git a/package/prosody/0002-add-pidfile.patch b/package/prosody/0002-add-pidfile.patch index 6221fd0856..0653ed7239 100644 --- a/package/prosody/0002-add-pidfile.patch +++ b/package/prosody/0002-add-pidfile.patch @@ -11,7 +11,7 @@ diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index af3cc0e4..675db12f 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist -@@ -176,6 +176,9 @@ log = { +@@ -187,6 +187,9 @@ log = { -- HTTPS currently only supports a single certificate, specify it here: --https_certificate = "certs/localhost.crt" diff --git a/package/prosody/Config.in b/package/prosody/Config.in index c32ca20e23..d93350702c 100644 --- a/package/prosody/Config.in +++ b/package/prosody/Config.in @@ -2,9 +2,9 @@ config BR2_PACKAGE_PROSODY bool "prosody" depends on BR2_USE_MMU # fork depends on BR2_PACKAGE_HAS_LUAINTERPRETER - depends on !BR2_PACKAGE_LUA_5_3 + depends on !BR2_PACKAGE_LUA_5_4 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem - select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime + select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1 # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime @@ -22,5 +22,5 @@ comment "prosody needs the lua interpreter, dynamic library" depends on !BR2_PACKAGE_HAS_LUAINTERPRETER || BR2_STATIC_LIBS depends on BR2_USE_MMU -comment "prosody needs a Lua 5.1/5.2 interpreter" - depends on BR2_PACKAGE_LUA_5_3 +comment "prosody needs a Lua <= 5.3" + depends on BR2_PACKAGE_LUA_5_4 diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index e39fafde69..4579545e39 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 375a3737ffd6831d967fb1917f097372 prosody-0.11.4.tar.gz -sha1 59e9e684230c26daf53526e18b0e6e2efb0d63c5 prosody-0.11.4.tar.gz -sha256 b5f26fa343c7f32f6242721d6991cb35f5d2a28d2bf59d2bc329a940523704fd prosody-0.11.4.tar.gz -sha512 0c3aa3373c53f803b88a87dad4ca18b215de7a485d29b0bc4b186d97f7c48262840199a74f62aba6b7b4f1766fdfb37327ed4ff24e877c3a6dfca58764a035c3 prosody-0.11.4.tar.gz +md5 6130b79fb64141909330caf83a79a131 prosody-0.11.10.tar.gz +sha1 4dc8b2f783b43e7a5e781b1fc8aee48b0e106def prosody-0.11.10.tar.gz +sha256 c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1 prosody-0.11.10.tar.gz +sha512 419d8f8465f1807015f0a52d8f35ee89892b0869084dae38b60fc833d63c3d70892d8e59ae00039cd15e0e25f46d042954896f51f8c0520650a877f5296707cb prosody-0.11.10.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 7245afdc6c..0eeb32cd3f 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,10 +4,11 @@ # ################################################################################ -PROSODY_VERSION = 0.11.4 +PROSODY_VERSION = 0.11.10 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING +PROSODY_CPE_ID_VENDOR = prosody PROSODY_DEPENDENCIES = host-luainterpreter luainterpreter libidn openssl PROSODY_CFLAGS = $(TARGET_CFLAGS) -fPIC -std=c99 \ diff --git a/package/protobuf-c/protobuf-c.hash b/package/protobuf-c/protobuf-c.hash index 4f9c75a02f..abc11afc58 100644 --- a/package/protobuf-c/protobuf-c.hash +++ b/package/protobuf-c/protobuf-c.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5205312e561b75b9d2db671b22f28d67afb5c7d1fef94a6f2d29d775ca4e0519 protobuf-c-1.3.2.tar.gz -sha256 20e800cad4550f4b19bb37fc9577dac21de13333ae66497c4c45ae489c35c34a LICENSE +sha256 8515da8b84ea36768ae69a52f9ede8d718936d6058077265b6e458cfc55f8bdb protobuf-c-1.3.3.tar.gz +sha256 20e800cad4550f4b19bb37fc9577dac21de13333ae66497c4c45ae489c35c34a LICENSE diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk index 2770d35b7b..f28f5ff57f 100644 --- a/package/protobuf-c/protobuf-c.mk +++ b/package/protobuf-c/protobuf-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROTOBUF_C_VERSION = 1.3.2 +PROTOBUF_C_VERSION = 1.3.3 PROTOBUF_C_SITE = $(call github,protobuf-c,protobuf-c,v$(PROTOBUF_C_VERSION)) PROTOBUF_C_DEPENDENCIES = host-protobuf-c HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in index 46c820b9cf..30050950aa 100644 --- a/package/protobuf/Config.in +++ b/package/protobuf/Config.in @@ -24,6 +24,7 @@ config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS default y if BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_USE_MMU # fork() + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 config BR2_PACKAGE_PROTOBUF bool "protobuf" diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index df5e9c62d9..2a65156cb3 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ba4bbc3e6b58d2ccfe406e616576ef48710a2aae205f463618025fc691549cfe protobuf-cpp-3.11.4.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE +sha256 51cec99f108b83422b7af1170afd7aeb2dd77d2bcbb7b6bad1f92509e9ccf8cb protobuf-cpp-3.17.3.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 381649a4e7..fa8ea890e2 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -5,13 +5,14 @@ ################################################################################ # When bumping this package, make sure to also verify if the -# python-protobuf package still works, as they share the same -# version/site variables. -PROTOBUF_VERSION = 3.11.4 +# python-protobuf package still works and to update its hash, +# as they share the same version/site variables. +PROTOBUF_VERSION = 3.17.3 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz -PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION) +PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause PROTOBUF_LICENSE_FILES = LICENSE +PROTOBUF_CPE_ID_VENDOR = google # N.B. Need to use host protoc during cross compilation. PROTOBUF_DEPENDENCIES = host-protobuf @@ -23,6 +24,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) PROTOBUF_CXXFLAGS += -O0 endif +ifeq ($(BR2_or1k),y) +PROTOBUF_CXXFLAGS += -mcmodel=large +endif + PROTOBUF_CONF_ENV = CXXFLAGS="$(PROTOBUF_CXXFLAGS)" ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) @@ -35,5 +40,12 @@ ifeq ($(BR2_PACKAGE_ZLIB),y) PROTOBUF_DEPENDENCIES += zlib endif +define PROTOBUF_REMOVE_UNNECESSARY_TARGET_FILES + rm -rf $(TARGET_DIR)/usr/bin/protoc + rm -rf $(TARGET_DIR)/usr/lib/libprotoc.so* +endef + +PROTOBUF_POST_INSTALL_TARGET_HOOKS += PROTOBUF_REMOVE_UNNECESSARY_TARGET_FILES + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/proxychains-ng/proxychains-ng.hash b/package/proxychains-ng/proxychains-ng.hash index 9781b77af1..779f6b626d 100644 --- a/package/proxychains-ng/proxychains-ng.hash +++ b/package/proxychains-ng/proxychains-ng.hash @@ -1,6 +1,4 @@ -# From https://sourceforge.net/projects/proxychains-ng/files/ -md5 34d840eb184e96bff418201c28a935c5 proxychains-ng-4.11.tar.bz2 -sha1 00bc3dc18f2b638c79112c99f082a7a2878beaad proxychains-ng-4.11.tar.bz2 +# From https://github.com/rofl0r/proxychains-ng/releases/tag/v4.14 +sha512 75a1a4629d2b7ebac9b909a694b395339cf669fa4e23bfcc57938e46377b5619f31c9651d2bc457d1ad10ec1be7747981106392bf8bf65999cb7bb9c748d7e95 proxychains-ng-4.14.tar.xz # Locally computed: -sha256 dcc4149808cd1fb5d9663cc09791f478805816b1f017381f424414c47f6376b6 proxychains-ng-4.11.tar.bz2 sha256 86728623caeff60e9bcc37e03b432fd191de927eed48a72a3bb4ac4e53fe20df COPYING diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk index a9f3fc9561..bb7c9ff687 100644 --- a/package/proxychains-ng/proxychains-ng.mk +++ b/package/proxychains-ng/proxychains-ng.mk @@ -4,11 +4,12 @@ # ################################################################################ -PROXYCHAINS_NG_VERSION = 4.11 -PROXYCHAINS_NG_SOURCE = proxychains-ng-$(PROXYCHAINS_NG_VERSION).tar.bz2 +PROXYCHAINS_NG_VERSION = 4.14 +PROXYCHAINS_NG_SOURCE = proxychains-ng-$(PROXYCHAINS_NG_VERSION).tar.xz PROXYCHAINS_NG_SITE = http://downloads.sourceforge.net/project/proxychains-ng PROXYCHAINS_NG_LICENSE = GPL-2.0+ PROXYCHAINS_NG_LICENSE_FILES = COPYING +PROXYCHAINS_NG_CPE_ID_VENDOR = proxychains-ng_project define PROXYCHAINS_NG_CONFIGURE_CMDS cd $(@D) && \ diff --git a/package/pru-software-support/pru-software-support.hash b/package/pru-software-support/pru-software-support.hash index 9deb3e6661..cd81488e1b 100644 --- a/package/pru-software-support/pru-software-support.hash +++ b/package/pru-software-support/pru-software-support.hash @@ -1,3 +1,3 @@ # Locally-calculated hash -sha256 d6d1f76ab5a50dbdf1dff834b271f9d3ffa7424e4d9615e00713f3f81ed5787e pru-software-support-package-v5.6.0.tar.gz -sha256 a68530804624227e4f2e007eacb5c2d616695426082e895ee1e2d77d3833f5f7 PRU-Package-v6.0-Manifest.html +sha256 57e47128dc5437c5a64d4ef94f419d9ea38e894c0c31ab10cad99c0da614b296 pru-software-support-package-v5.7.0.tar.gz +sha256 62a2f56498cd1bac2d4ea6ea1c941affba1e4bb65bfdf2dcffd8e5079fa34399 PRU-Package-v6.1-Manifest.html diff --git a/package/pru-software-support/pru-software-support.mk b/package/pru-software-support/pru-software-support.mk index b56ac0af12..91f41bcb91 100644 --- a/package/pru-software-support/pru-software-support.mk +++ b/package/pru-software-support/pru-software-support.mk @@ -4,12 +4,11 @@ # ################################################################################ -PRU_SOFTWARE_SUPPORT_VERSION = 5.6.0 -# https://git.ti.com/cgit/pru-software-support-package/pru-software-support-package/snapshot/pru-software-support-package-5.6.0.tar.gz +PRU_SOFTWARE_SUPPORT_VERSION = 5.7.0 PRU_SOFTWARE_SUPPORT_SITE = https://git.ti.com/cgit/pru-software-support-package/pru-software-support-package/snapshot PRU_SOFTWARE_SUPPORT_SOURCE = $(PRU_SOFTWARE_SUPPORT_NAME)-package-v$(PRU_SOFTWARE_SUPPORT_VERSION).tar.gz -PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3-Clause, GPL-2.0, Public Domain -PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v6.0-Manifest.html +PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3-Clause, Public Domain +PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v6.1-Manifest.html PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru diff --git a/package/psmisc/psmisc.hash b/package/psmisc/psmisc.hash index 8e380a5591..47e44f6921 100644 --- a/package/psmisc/psmisc.hash +++ b/package/psmisc/psmisc.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/psmisc/files/psmisc/ -md5 0524258861f00be1a02d27d39d8e5e62 psmisc-23.2.tar.xz -sha1 2bf3ec1c87ab3bc0610c819452c21cf4b849b0b8 psmisc-23.2.tar.xz +md5 8114cd4489b95308efe2509c3a406bbf psmisc-23.4.tar.xz +sha1 a4c34111e570c43967efb2bbd8a4f31d94d22e0f psmisc-23.4.tar.xz # Locally computed: -sha256 4b7cbffdc9373474da49b85dc3457ae511c43dc7fa7d94513fe06f89dcb87880 psmisc-23.2.tar.xz +sha256 7f0cceeace2050c525f3ebb35f3ba01d618b8d690620580bdb8cd8269a0c1679 psmisc-23.4.tar.xz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index e9a7b00c9d..3d0d2c5367 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -4,7 +4,7 @@ # ################################################################################ -PSMISC_VERSION = 23.2 +PSMISC_VERSION = 23.4 PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc PSMISC_SOURCE = psmisc-$(PSMISC_VERSION).tar.xz PSMISC_LICENSE = GPL-2.0+ diff --git a/package/psplash/psplash.hash b/package/psplash/psplash.hash index 46d5e12ceb..87fcdadd6d 100644 --- a/package/psplash/psplash.hash +++ b/package/psplash/psplash.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0042192bf94be4f5792d9ff6b7a2ddff77c79e51274745180d14be5815b3a0f4 psplash-fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c.tar.gz -sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING +sha256 2c1344dd8414415d80a01484b1cc29e78f99c31d5266189540e5966a7dc6e10e psplash-fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c-br1.tar.gz +sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/psplash/psplash.mk b/package/psplash/psplash.mk index 39fcc2235f..a0f01869b4 100644 --- a/package/psplash/psplash.mk +++ b/package/psplash/psplash.mk @@ -9,7 +9,7 @@ PSPLASH_SITE = git://git.yoctoproject.org/psplash PSPLASH_LICENSE = GPL-2.0+ PSPLASH_LICENSE_FILES = COPYING PSPLASH_AUTORECONF = YES -PSPLASH_DEPENDENCIES = host-pkgconf +PSPLASH_DEPENDENCIES = host-gdk-pixbuf host-pkgconf ifeq ($(BR2_PACKAGE_SYSTEMD),y) PSPLASH_DEPENDENCIES += systemd diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash index 79ae75e83b..5c629ac66f 100644 --- a/package/pugixml/pugixml.hash +++ b/package/pugixml/pugixml.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a pugixml-1.10.tar.gz -sha256 16582559c91ecf831d6289d472a903032e7d7994a86521c5c39513568d6ad208 readme.txt +sha256 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 pugixml-1.11.4.tar.gz +sha256 ee495f34aeff0c578a99f3350a2050d4e5860d27b2004c03c384a594fa2b0a7a LICENSE.md diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 800a3836ce..ddda5a3ccc 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -4,10 +4,12 @@ # ################################################################################ -PUGIXML_VERSION = 1.10 +PUGIXML_VERSION = 1.11.4 PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT -PUGIXML_LICENSE_FILES = readme.txt +PUGIXML_LICENSE_FILES = LICENSE.md +PUGIXML_CPE_ID_VENDOR = pugixml_project + PUGIXML_INSTALL_STAGING = YES # Pugixml will automatically enable 'long long' support on C++11 compilers, diff --git a/package/pulseaudio/Config.in b/package/pulseaudio/Config.in index 6600006a60..dcc88f3841 100644 --- a/package/pulseaudio/Config.in +++ b/package/pulseaudio/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_PULSEAUDIO depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO if BR2_PACKAGE_BLUEZ5_UTILS # runtime select BR2_PACKAGE_LIBTOOL select BR2_PACKAGE_LIBSNDFILE select BR2_PACKAGE_PULSEAUDIO_ENABLE_ATOMIC diff --git a/package/pulseaudio/pulseaudio.hash b/package/pulseaudio/pulseaudio.hash index 11d9a275c8..b3e19fdcca 100644 --- a/package/pulseaudio/pulseaudio.hash +++ b/package/pulseaudio/pulseaudio.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2019-September/031373.html -sha256 961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057 pulseaudio-13.0.tar.xz +# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2021-January/031990.html +sha256 75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1 pulseaudio-14.2.tar.xz # Locally computed -sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL -sha256 a1064b9838b6b4feee61eaeb0925da4b4834c984b77716558860c4294ed6c015 LICENSE +sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL +sha256 a1064b9838b6b4feee61eaeb0925da4b4834c984b77716558860c4294ed6c015 LICENSE diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index e64aa6f97b..19e08f55ae 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -4,12 +4,13 @@ # ################################################################################ -PULSEAUDIO_VERSION = 13.0 +PULSEAUDIO_VERSION = 14.2 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz -PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases +PULSEAUDIO_SITE = https://freedesktop.org/software/pulseaudio/releases PULSEAUDIO_INSTALL_STAGING = YES PULSEAUDIO_LICENSE = LGPL-2.1+ (specific license for modules, see LICENSE file) PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL +PULSEAUDIO_CPE_ID_VENDOR = pulseaudio PULSEAUDIO_CONF_OPTS = \ --disable-default-build-tests \ --disable-legacy-database-entry-format \ @@ -22,6 +23,7 @@ PULSEAUDIO_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \ $(if $(BR2_PACKAGE_DBUS),dbus) \ + $(if $(BR2_PACKAGE_NCURSES),ncurses) \ $(if $(BR2_PACKAGE_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_FFTW_SINGLE),fftw-single) \ $(if $(BR2_PACKAGE_SYSTEMD),systemd) diff --git a/package/pulseview/Config.in b/package/pulseview/Config.in index ea9bdc2605..b8d94332a3 100644 --- a/package/pulseview/Config.in +++ b/package/pulseview/Config.in @@ -17,6 +17,8 @@ config BR2_PACKAGE_PULSEVIEW select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5BASE_PNG select BR2_PACKAGE_QT5SVG + select BR2_PACKAGE_QT5TOOLS + select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_SYSTEM diff --git a/package/pulseview/pulseview.hash b/package/pulseview/pulseview.hash index 27e27ce1ce..b72000774b 100644 --- a/package/pulseview/pulseview.hash +++ b/package/pulseview/pulseview.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9ee7ce3dd1457c6a5f5e4e9c2469903a1f070ba077ea68535cc29ef1dfac6f2f pulseview-0.4.1.tar.gz +sha256 f042f77a3e1b35bf30666330e36ec38fab8d248c3693c37b7e35d401c3bfabcb pulseview-0.4.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/pulseview/pulseview.mk b/package/pulseview/pulseview.mk index 67d525f626..f079dfbbce 100644 --- a/package/pulseview/pulseview.mk +++ b/package/pulseview/pulseview.mk @@ -4,11 +4,11 @@ # ################################################################################ -PULSEVIEW_VERSION = 0.4.1 +PULSEVIEW_VERSION = 0.4.2 PULSEVIEW_SITE = http://sigrok.org/download/source/pulseview PULSEVIEW_LICENSE = GPL-3.0+ PULSEVIEW_LICENSE_FILES = COPYING -PULSEVIEW_DEPENDENCIES = libsigrok qt5base qt5svg boost +PULSEVIEW_DEPENDENCIES = libsigrok qt5base qt5svg qt5tools boost PULSEVIEW_CONF_OPTS = -DDISABLE_WERROR=TRUE ifeq ($(BR2_PACKAGE_BOOST_TEST),y) diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk index 7b7c7d9637..7e3d18b433 100644 --- a/package/pure-ftpd/pure-ftpd.mk +++ b/package/pure-ftpd/pure-ftpd.mk @@ -9,6 +9,7 @@ PURE_FTPD_SITE = https://download.pureftpd.org/pub/pure-ftpd/releases PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2 PURE_FTPD_LICENSE = ISC PURE_FTPD_LICENSE_FILES = COPYING +PURE_FTPD_CPE_ID_VENDOR = pureftpd PURE_FTPD_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) # 0001-listdir-reuse-a-single-buffer-to-store-every-file-name-to-display.patch diff --git a/package/putty/putty.hash b/package/putty/putty.hash index 8600281efc..8974aaac5e 100644 --- a/package/putty/putty.hash +++ b/package/putty/putty.hash @@ -1,7 +1,8 @@ -# Hashes from: http://the.earth.li/~sgtatham/putty/0.73/{sha1,sha256,sha512}sums -sha1 17daebb82e476adfd578f6934c28f4d2c209b7d8 putty-0.73.tar.gz -sha256 3db0b5403fb41aecd3aa506611366650d927650b6eb3d839ad4dcc782519df1c putty-0.73.tar.gz -sha512 4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5 putty-0.73.tar.gz +# Hashes from: http://the.earth.li/~sgtatham/putty/0.75/{md5,sha1,sha256,sha512}sums +md5 fae57a9ab209f303cc9e9f83eecaa27c putty-0.75.tar.gz +sha1 cdb976811a35eed67c5a2c588908b08edf6e3e1d putty-0.75.tar.gz +sha256 d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5 putty-0.75.tar.gz +sha512 3dbc15485008a98daf60236061253e66b94a6e5da123fc84c5f0ac006c84e17c70fe748987677775e3b54a12297eb826cccf70a4fc039b633bc2d512938b3028 putty-0.75.tar.gz # Locally calculated -sha256 b517b4a9504ba0f651d5e590245197b88d9a81d073905cc798cc9464c5ca7ba8 LICENCE +sha256 3f3e870dd3d0867d79370b1d433602c60bb91b59de04e5d8f2a149b788530d53 LICENCE diff --git a/package/putty/putty.mk b/package/putty/putty.mk index 5313a4f8be..a1c588a382 100644 --- a/package/putty/putty.mk +++ b/package/putty/putty.mk @@ -4,12 +4,15 @@ # ################################################################################ -PUTTY_VERSION = 0.73 +PUTTY_VERSION = 0.75 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_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -Wno-error" + +# 0002-New-option-to-reject-trivial-success-of-userauth.patch +PUTTY_IGNORE_CVES += CVE-2021-36367 ifeq ($(BR2_PACKAGE_LIBGTK2),y) PUTTY_CONF_OPTS += --with-gtk=2 diff --git a/package/pwgen/pwgen.mk b/package/pwgen/pwgen.mk index ad9465b82c..89925bb300 100644 --- a/package/pwgen/pwgen.mk +++ b/package/pwgen/pwgen.mk @@ -8,6 +8,7 @@ PWGEN_VERSION = 2.08 PWGEN_SITE = http://downloads.sourceforge.net/project/pwgen/pwgen/$(PWGEN_VERSION) PWGEN_LICENSE = GPL-2.0 PWGEN_LICENSE_FILES = debian/copyright +PWGEN_CPE_ID_VENDOR = pwgen_project $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/python-aenum/python-aenum.mk b/package/python-aenum/python-aenum.mk index 1d5322ef41..97fcbb5e86 100644 --- a/package/python-aenum/python-aenum.mk +++ b/package/python-aenum/python-aenum.mk @@ -11,4 +11,13 @@ PYTHON_AENUM_SETUP_TYPE = setuptools PYTHON_AENUM_LICENSE = BSD-3-Clause PYTHON_AENUM_LICENSE_FILES = aenum/LICENSE +ifeq ($(BR2_PACKAGE_PYTHON),y) +# only needed/valid for python 3.x +define PYTHON_AENUM_RM_PY3_FILE + rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/aenum/test_v3.py +endef + +PYTHON_AENUM_POST_INSTALL_TARGET_HOOKS += PYTHON_AENUM_RM_PY3_FILE +endif + $(eval $(python-package)) diff --git a/package/python-aioblescan/python-aioblescan.hash b/package/python-aioblescan/python-aioblescan.hash index 902a7a30f8..2592aace33 100644 --- a/package/python-aioblescan/python-aioblescan.hash +++ b/package/python-aioblescan/python-aioblescan.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioblescan/json -md5 9ad3f04ea7ad4c81a53f8e1316985527 aioblescan-0.2.6.tar.gz -sha256 2e45c325e070a0ee4e952a7d0c56e95ad230643e1057fb5f3e95ea5c99081436 aioblescan-0.2.6.tar.gz +md5 f59934c040a817192fcd3e713633cf20 aioblescan-0.2.8.tar.gz +sha256 2b048f5fe6e85b18fe306bdb63307705f3d1139563d3187d751b8657065a5bd9 aioblescan-0.2.8.tar.gz # Locally computed sha256 checksums -sha256 c2066cd44079e0c706234001af18cb6ad4b62fc68d0d08d29fdc7319916647e0 LICENSE.txt +sha256 c2066cd44079e0c706234001af18cb6ad4b62fc68d0d08d29fdc7319916647e0 LICENSE.txt diff --git a/package/python-aioblescan/python-aioblescan.mk b/package/python-aioblescan/python-aioblescan.mk index 6350007c70..8a9db927ac 100644 --- a/package/python-aioblescan/python-aioblescan.mk +++ b/package/python-aioblescan/python-aioblescan.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOBLESCAN_VERSION = 0.2.6 +PYTHON_AIOBLESCAN_VERSION = 0.2.8 PYTHON_AIOBLESCAN_SOURCE = aioblescan-$(PYTHON_AIOBLESCAN_VERSION).tar.gz -PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/66/b8/888c2eb4323ed498dbc7deeb8aee0cfec9edd8c25184b06a8874bb0cf84f +PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/d2/10/b8b496903f33935c99f3602200d44ccc0b0a57b87e5fa65b89466c1b1f31 PYTHON_AIOBLESCAN_SETUP_TYPE = setuptools PYTHON_AIOBLESCAN_LICENSE = MIT PYTHON_AIOBLESCAN_LICENSE_FILES = LICENSE.txt diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 93173e4721..45139a6606 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 8eeeee86f96c51d202e69f0e0a56eaad aioconsole-0.1.16.tar.gz -sha256 a5d98a99539e060f514b96425f19839abc4bc2b487b39cdb76b91df2367c647a aioconsole-0.1.16.tar.gz +md5 b8cbcb6e00d8e535256526dfe4f27db3 aioconsole-0.3.2.tar.gz +sha256 9355b36d41d5fbdd3dbb01510deb2b985b508b2ebcd5b8bd85af61a707e2f6c8 aioconsole-0.3.2.tar.gz +# Locally computed sha256 checksums +sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index ef0aa2faee..75ea3c2a2a 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.1.16 +PYTHON_AIOCONSOLE_VERSION = 0.3.2 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/70/08/5dbb71777058a4f3b6e61b61ffc5b5021056c4a139e118938773b93e9304 +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/7a/b2/747ab3cb965596cd84c5159941613d901d8771acad3c51c4f5da362aa9f0 PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 +PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-aiodns/python-aiodns.hash b/package/python-aiodns/python-aiodns.hash index c9511ce776..2cdedc6f95 100644 --- a/package/python-aiodns/python-aiodns.hash +++ b/package/python-aiodns/python-aiodns.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiodns/json -md5 3e121f9eb7ef3ba3556ba7ec28c6f63a aiodns-2.0.0.tar.gz -sha256 815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d aiodns-2.0.0.tar.gz +md5 181e11935c78965de2b2b7b0e5efba8d aiodns-3.0.0.tar.gz +sha256 946bdfabe743fceeeb093c8a010f5d1645f708a241be849e17edfb0e49e08cd6 aiodns-3.0.0.tar.gz # Locally computed sha256 checksums -sha256 eb0455d35129425ed399883cd710923de3e246a510e2eb84d9f00032d0bbec97 LICENSE +sha256 eb0455d35129425ed399883cd710923de3e246a510e2eb84d9f00032d0bbec97 LICENSE diff --git a/package/python-aiodns/python-aiodns.mk b/package/python-aiodns/python-aiodns.mk index f02b4b75a3..2318dcab3a 100644 --- a/package/python-aiodns/python-aiodns.mk +++ b/package/python-aiodns/python-aiodns.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIODNS_VERSION = 2.0.0 +PYTHON_AIODNS_VERSION = 3.0.0 PYTHON_AIODNS_SOURCE = aiodns-$(PYTHON_AIODNS_VERSION).tar.gz -PYTHON_AIODNS_SITE = https://files.pythonhosted.org/packages/30/2e/b86ce168485b68d40c6a810838669deacf0abf41845c383659c2b613e69f +PYTHON_AIODNS_SITE = https://files.pythonhosted.org/packages/27/79/df72e25df0fdd9bf5a5ab068539731d27c5f2ae5654621ae0c92ceca94cf PYTHON_AIODNS_SETUP_TYPE = setuptools PYTHON_AIODNS_LICENSE = MIT PYTHON_AIODNS_LICENSE_FILES = LICENSE diff --git a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash index 3563d2ab4b..44e2ae463f 100644 --- a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash +++ b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-jinja2/json -md5 7eb1a9be9e776c94d3bff73330c213d0 aiohttp-jinja2-1.2.0.tar.gz -sha256 2dfe29cfd278d07cd0a851afb98471bc8ce2a830968443e40d67636f3c035d79 aiohttp-jinja2-1.2.0.tar.gz +md5 d474a6440ac906a9d818a03a540830ba aiohttp-jinja2-1.4.2.tar.gz +sha256 9c22a0e48e3b277fc145c67dd8c3b8f609dab36bce9eb337f70dfe716663c9a0 aiohttp-jinja2-1.4.2.tar.gz # Locally computed sha256 checksums -sha256 2a86817fedf0c52baaa47d7dd975073639dfaaebd37312bd279de54d7f841791 LICENSE +sha256 d9d867affaeac220a60381cc544681dcd37c668ed6ea5ddbf9948617f828889a LICENSE diff --git a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk index 94a0c9d75a..724acdb601 100644 --- a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk +++ b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_JINJA2_VERSION = 1.2.0 +PYTHON_AIOHTTP_JINJA2_VERSION = 1.4.2 PYTHON_AIOHTTP_JINJA2_SOURCE = aiohttp-jinja2-$(PYTHON_AIOHTTP_JINJA2_VERSION).tar.gz -PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/9c/fb/8f1f8941e1e1937247c6de552668d73ab8ef860a1d633072d9f4e3c9b542 +PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/da/4f/3b1a0c7177fdb0417308a95bfa8340f19cf84b44f8f2d734cd3052f56644 PYTHON_AIOHTTP_JINJA2_SETUP_TYPE = setuptools PYTHON_AIOHTTP_JINJA2_LICENSE = Apache-2.0 PYTHON_AIOHTTP_JINJA2_LICENSE_FILES = LICENSE diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash index 069cdeda1f..a9a6cad2df 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-remotes/json -md5 70213413433ece4e2110ae90a070d279 aiohttp_remotes-0.1.2.tar.gz -sha256 43c3f7e1c5ba27f29fb4dbde5d43b900b5b5fc7e37bf7e35e6eaedabaec4a3fc aiohttp_remotes-0.1.2.tar.gz +md5 e90fad4b7aa088207f831698fddd9eea aiohttp_remotes-1.0.0.tar.gz +sha256 caec1681de70bac82daa676078d9b125758fb3952fdaa893a6b42bdd995562ef aiohttp_remotes-1.0.0.tar.gz # Locally computed sha256 checksums -sha256 5240758b8a5c34a46c166294eaae7dc7034ec45c727fce889c9abf7ef5afc158 LICENSE +sha256 4e7d0edf250abe2a28027788b8c55a53d1b5c9ff961b8a00643c76aed637ba13 LICENSE diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk index 5b38ae9112..f04cecd89d 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_REMOTES_VERSION = 0.1.2 +PYTHON_AIOHTTP_REMOTES_VERSION = 1.0.0 PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz -PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/cd/2f/93e9198a01485f588d12e19c87cd277542dc28d8b31dc8e1c09fa1c75548 +PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/40/b6/1178bd1e26e88f9f29b7d1bbfae7b38d39ec9cf787d4685f83ade2e7aa7f PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = distutils PYTHON_AIOHTTP_REMOTES_LICENSE = MIT PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk index 8fcd8e21b9..fa724fdb86 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.mk +++ b/package/python-aiohttp-session/python-aiohttp-session.mk @@ -10,5 +10,7 @@ PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/f8/fe/53df PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE +PYTHON_AIOHTTP_SESSION_CPE_ID_VENDOR = aiohttp-session_project +PYTHON_AIOHTTP_SESSION_CPE_ID_PRODUCT = aiohttp-session $(eval $(python-package)) diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in index d75c440225..9ffea088e4 100644 --- a/package/python-aiohttp/Config.in +++ b/package/python-aiohttp/Config.in @@ -1,13 +1,14 @@ config BR2_PACKAGE_PYTHON_AIOHTTP bool "python-aiohttp" depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_AIODNS # runtime + select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CCHARDET if BR2_INSTALL_LIBSTDCPP # runtime select BR2_PACKAGE_PYTHON_CHARDET if !BR2_INSTALL_LIBSTDCPP # runtime select BR2_PACKAGE_PYTHON_MULTIDICT # runtime - select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_YARL # runtime - select BR2_PACKAGE_PYTHON_AIODNS # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Async http client/server framework (asyncio). diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index fd02bc80d6..bdcb72a695 100644 --- a/package/python-aiohttp/python-aiohttp.hash +++ b/package/python-aiohttp/python-aiohttp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp/json -md5 ca40144c199a09fc1a141960cf6295f0 aiohttp-3.6.2.tar.gz -sha256 259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326 aiohttp-3.6.2.tar.gz +md5 7052a8e9877921d73da98d2b18c9a145 aiohttp-3.7.4.post0.tar.gz +sha256 493d3299ebe5f5a7c66b9819eacdcfbbaaf1a8e84911ddffcdc48888497afecf aiohttp-3.7.4.post0.tar.gz # Locally computed sha256 checksums -sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt +sha256 96627bed0ad08e9b2efa9f4e04e80837cd0550e7694a0fec33b1dab2550282ab LICENSE.txt diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 5a5964ed5f..ef0ce8b635 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.6.2 +PYTHON_AIOHTTP_VERSION = 3.7.4.post0 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/00/94/f9fa18e8d7124d7850a5715a0b9c0584f7b9375d331d35e157cee50f27cc +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/99/f5/90ede947a3ce2d6de1614799f5fea4e93c19b6520a59dc5d2f64123b032f 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_PRODUCT = aiohttp $(eval $(python-package)) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index 8556f5ebd3..2398b15424 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 8eccf28315b4f851f6f7e9332edeec52 aiorwlock-0.6.0.tar.gz -sha256 cd310f33a7ea3bf6fd76fcf0c1ba6e4d7eef4d5ded59e95859494425fb7e599d aiorwlock-0.6.0.tar.gz +md5 8d89ed0d80820aad8d9320204779fd62 aiorwlock-1.0.0.tar.gz +sha256 4f773e31d78037e3ec27056a22200af482768b43da66e2cc33dd64aa5ea6518a aiorwlock-1.0.0.tar.gz # Locally computed sha256 checksums -sha256 56fb2baf14d84c59c15abbfbb1fdf30a724017e2ce97894a8236764513d10397 LICENSE +sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index 48e74c02fd..f6f3c97404 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 0.6.0 +PYTHON_AIORWLOCK_VERSION = 1.0.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/77/cf/2a2584c4fc1096ae959d7d189f205eb9c872ec58aca2cde16009d2d83b9e +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/40/af/e55b3266352f3383c723e0a3304b0df46a59dfc6235b0b1a0a416afd60c1 PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE diff --git a/package/python-aiozipkin/python-aiozipkin.hash b/package/python-aiozipkin/python-aiozipkin.hash index 8034381751..af07285c23 100644 --- a/package/python-aiozipkin/python-aiozipkin.hash +++ b/package/python-aiozipkin/python-aiozipkin.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiozipkin/json -md5 01766aa607ae121d2cbb3ebf15a8cd0b aiozipkin-0.6.0.tar.gz -sha256 7270cdaff81f4a6ea70de48b3e4597629c3beef76740bfe6f7c9b58b45b67c73 aiozipkin-0.6.0.tar.gz +md5 7be9acaa48d4d4dc14abcc79edfd6c16 aiozipkin-0.7.1.tar.gz +sha256 aa99984832225378d900a5cd0d4e8e89af7ec9f359612c2e311f55b9039ed501 aiozipkin-0.7.1.tar.gz # Locally computed sha256 checksums -sha256 9b42fe3a288996988c552e387e7877be7525a1649e62086aedd6b32d3cb56365 LICENSE +sha256 9b42fe3a288996988c552e387e7877be7525a1649e62086aedd6b32d3cb56365 LICENSE diff --git a/package/python-aiozipkin/python-aiozipkin.mk b/package/python-aiozipkin/python-aiozipkin.mk index 2f5b54be6c..e351dbacfe 100644 --- a/package/python-aiozipkin/python-aiozipkin.mk +++ b/package/python-aiozipkin/python-aiozipkin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOZIPKIN_VERSION = 0.6.0 +PYTHON_AIOZIPKIN_VERSION = 0.7.1 PYTHON_AIOZIPKIN_SOURCE = aiozipkin-$(PYTHON_AIOZIPKIN_VERSION).tar.gz -PYTHON_AIOZIPKIN_SITE = https://files.pythonhosted.org/packages/8d/14/33c79497c3082dd93172f834e4f3d1d6d0eb9b957b6885c919ca73462ed6 +PYTHON_AIOZIPKIN_SITE = https://files.pythonhosted.org/packages/9e/33/120925f90470b7f52f46e2b9f71caf2514e389f42b3ed3b62f6389baee95 PYTHON_AIOZIPKIN_SETUP_TYPE = setuptools PYTHON_AIOZIPKIN_LICENSE = Apache-2.0 PYTHON_AIOZIPKIN_LICENSE_FILES = LICENSE diff --git a/package/python-asgiref/python-asgiref.hash b/package/python-asgiref/python-asgiref.hash index 782a13fe5c..c349ad5a44 100644 --- a/package/python-asgiref/python-asgiref.hash +++ b/package/python-asgiref/python-asgiref.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asgiref/json -md5 39218c10eee0bf66a3d893491d835e86 asgiref-3.2.3.tar.gz -sha256 7e06d934a7718bf3975acbf87780ba678957b87c7adc056f13b6215d610695a0 asgiref-3.2.3.tar.gz +md5 5afe03ecc39ae94950ff95e80166d945 asgiref-3.3.4.tar.gz +sha256 d1216dfbdfb63826470995d31caed36225dcaf34f182e0fa257a4dd9e86f1b78 asgiref-3.3.4.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-asgiref/python-asgiref.mk b/package/python-asgiref/python-asgiref.mk index b29903509e..0353f5d5a0 100644 --- a/package/python-asgiref/python-asgiref.mk +++ b/package/python-asgiref/python-asgiref.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASGIREF_VERSION = 3.2.3 +PYTHON_ASGIREF_VERSION = 3.3.4 PYTHON_ASGIREF_SOURCE = asgiref-$(PYTHON_ASGIREF_VERSION).tar.gz -PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/80/c4/83a01607f2d10024c172097126264c8e00c6a4827b35d631ece9625e6ba2 +PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/d8/3f/ef696a6d8254f182b1a089aeffb638d2eb83055e603146d3a40605c5b7da PYTHON_ASGIREF_SETUP_TYPE = setuptools PYTHON_ASGIREF_LICENSE = BSD-3-Clause PYTHON_ASGIREF_LICENSE_FILES = LICENSE diff --git a/package/python-asn1crypto/python-asn1crypto.hash b/package/python-asn1crypto/python-asn1crypto.hash index b00474bdcd..fb2da94ed5 100644 --- a/package/python-asn1crypto/python-asn1crypto.hash +++ b/package/python-asn1crypto/python-asn1crypto.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asn1crypto/json -md5 daad112940181917e3ff169b47b9bd9a asn1crypto-1.3.0.tar.gz -sha256 5a215cb8dc12f892244e3a113fe05397ee23c5c4ca7a69cd6e69811755efc42d asn1crypto-1.3.0.tar.gz +md5 00bf5b72d37778e62cc73b1d8909ae27 asn1crypto-1.4.0.tar.gz +sha256 f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c asn1crypto-1.4.0.tar.gz # Locally computed sha256 checksums -sha256 a88480656ec98943fb04344f6a477ee74062896f3ddb1a6f99e5f05f0109a286 LICENSE +sha256 a88480656ec98943fb04344f6a477ee74062896f3ddb1a6f99e5f05f0109a286 LICENSE diff --git a/package/python-asn1crypto/python-asn1crypto.mk b/package/python-asn1crypto/python-asn1crypto.mk index 2d8d384cca..af4e43b3d0 100644 --- a/package/python-asn1crypto/python-asn1crypto.mk +++ b/package/python-asn1crypto/python-asn1crypto.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASN1CRYPTO_VERSION = 1.3.0 +PYTHON_ASN1CRYPTO_VERSION = 1.4.0 PYTHON_ASN1CRYPTO_SOURCE = asn1crypto-$(PYTHON_ASN1CRYPTO_VERSION).tar.gz -PYTHON_ASN1CRYPTO_SITE = https://files.pythonhosted.org/packages/9f/3d/8beae739ed8c1c8f00ceac0ab6b0e97299b42da869e24cf82851b27a9123 +PYTHON_ASN1CRYPTO_SITE = https://files.pythonhosted.org/packages/6b/b4/42f0e52ac2184a8abb31f0a6f98111ceee1aac0b473cee063882436e0e09 PYTHON_ASN1CRYPTO_SETUP_TYPE = setuptools PYTHON_ASN1CRYPTO_LICENSE = MIT PYTHON_ASN1CRYPTO_LICENSE_FILES = LICENSE diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index f8c38ee4ed..3841595754 100644 --- a/package/python-attrs/python-attrs.hash +++ b/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 5b2db50fcc31be34d32798183c9bd062 attrs-19.3.0.tar.gz -sha256 f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72 attrs-19.3.0.tar.gz -# Locally computer sha256 -sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE +md5 5b2db50fcc31be34d32798183c9bd062 attrs-19.3.0.tar.gz +sha256 f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72 attrs-19.3.0.tar.gz +# Locally computed sha256 +sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 1ecac0d5b7..a5aa2a5a7d 100644 --- a/package/python-autobahn/python-autobahn.hash +++ b/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 f4f7da4a23a9fa56bd299cc872b90538 autobahn-20.3.1.tar.gz -sha256 88e150e4b3d284b83daafd8e0b289a5625ee00c633a2c580055bf1be2d391002 autobahn-20.3.1.tar.gz +md5 dcae3cf26203aa4bbd9912137e5c9512 autobahn-20.4.3.tar.gz +sha256 c6fe745d52ba9f9eecf791cd31f558df42aebfc4f9ee558a8f1d18c707e1ae1f autobahn-20.4.3.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index 8b1e0e73b5..81e2b7a4ca 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 20.3.1 +PYTHON_AUTOBAHN_VERSION = 20.4.3 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/54/bc/ec75ee259752ad65ddc30782a3128dadd79345f1aa0d4f76722996f37480 +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/cb/16/38d27874ef827974f44acb6dd64a92a9248b624734c0e84b91083c2d9350 PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE +PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar +PYTHON_AUTOBAHN_CPE_ID_PRODUCT = autobahn PYTHON_AUTOBAHN_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-avro/python-avro.hash b/package/python-avro/python-avro.hash index fbc466a94f..2428be96e5 100644 --- a/package/python-avro/python-avro.hash +++ b/package/python-avro/python-avro.hash @@ -1,5 +1,5 @@ -# From https://www-eu.apache.org/dist/avro/avro-1.9.2/py3/avro-python3-1.9.2.tar.gz.sha512 -sha512 f981fd72bc64eb71e6c132c551700e89a8ebdd6cd9d7e6fa7559831cee69749fc255a49ee0859afd106e0d913c36327b27ca4c7b36efbf740515881b92076cb6 avro-python3-1.9.2.tar.gz +# From https://downloads.apache.org/avro/avro-1.10.0/py3/avro-python3-1.10.0.tar.gz.sha512 +sha512 fb41f9227d2410c29cde10d7573aebbc142c2bf3f5945a1aaffdeac8b4b5ec690b0befdfc813a8762289dbbb7fc4e1be1564ba0c69d03092b84d8e938d6156f6 avro-python3-1.10.0.tar.gz # License files sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE diff --git a/package/python-backcall/python-backcall.hash b/package/python-backcall/python-backcall.hash index 2eccbdef5d..063b4bed27 100644 --- a/package/python-backcall/python-backcall.hash +++ b/package/python-backcall/python-backcall.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/backcall/json -md5 87ce0c7839808e6a3427d57df6a792e7 backcall-0.1.0.tar.gz -sha256 38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4 backcall-0.1.0.tar.gz +md5 1f4c9a370c78743406296f48e56e8821 backcall-0.2.0.tar.gz +sha256 5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e backcall-0.2.0.tar.gz +# Locally computed sha256 checksums +sha256 d422f8ce77312733c07f5fec8ccbe61d58d539774f7a66f37e4bc54740d86020 LICENSE diff --git a/package/python-backcall/python-backcall.mk b/package/python-backcall/python-backcall.mk index 3f95ea3d24..2ead3421a8 100644 --- a/package/python-backcall/python-backcall.mk +++ b/package/python-backcall/python-backcall.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_BACKCALL_VERSION = 0.1.0 +PYTHON_BACKCALL_VERSION = 0.2.0 PYTHON_BACKCALL_SOURCE = backcall-$(PYTHON_BACKCALL_VERSION).tar.gz -PYTHON_BACKCALL_SITE = https://files.pythonhosted.org/packages/84/71/c8ca4f5bb1e08401b916c68003acf0a0655df935d74d93bf3f3364b310e0 +PYTHON_BACKCALL_SITE = https://files.pythonhosted.org/packages/a2/40/764a663805d84deee23043e1426a9175567db89c8b3287b5c2ad9f71aa93 PYTHON_BACKCALL_SETUP_TYPE = distutils -# From https://github.com/takluyver/backcall/blob/master/LICENSE PYTHON_BACKCALL_LICENSE = BSD-3-Clause +PYTHON_BACKCALL_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-bcrypt/Config.in b/package/python-bcrypt/Config.in index 4fa6c31a9e..81becad322 100644 --- a/package/python-bcrypt/Config.in +++ b/package/python-bcrypt/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_BCRYPT bool "python-bcrypt" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime help Modern password hashing for your software and your servers. diff --git a/package/python-bcrypt/python-bcrypt.hash b/package/python-bcrypt/python-bcrypt.hash index a9c070f2e1..b1970d8684 100644 --- a/package/python-bcrypt/python-bcrypt.hash +++ b/package/python-bcrypt/python-bcrypt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bcrypt/json -md5 5d6f93b575ce52470af37a8e7dce76fe bcrypt-3.1.7.tar.gz -sha256 0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42 bcrypt-3.1.7.tar.gz +md5 fe31390dab603728f756cd3d6830c80a bcrypt-3.2.0.tar.gz +sha256 5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29 bcrypt-3.2.0.tar.gz # Locally computed sha256 checksums -sha256 8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90 LICENSE +sha256 8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90 LICENSE diff --git a/package/python-bcrypt/python-bcrypt.mk b/package/python-bcrypt/python-bcrypt.mk index 381d003475..ad770cc974 100644 --- a/package/python-bcrypt/python-bcrypt.mk +++ b/package/python-bcrypt/python-bcrypt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BCRYPT_VERSION = 3.1.7 +PYTHON_BCRYPT_VERSION = 3.2.0 PYTHON_BCRYPT_SOURCE = bcrypt-$(PYTHON_BCRYPT_VERSION).tar.gz -PYTHON_BCRYPT_SITE = https://files.pythonhosted.org/packages/fa/aa/025a3ab62469b5167bc397837c9ffc486c42a97ef12ceaa6699d8f5a5416 +PYTHON_BCRYPT_SITE = https://files.pythonhosted.org/packages/d8/ba/21c475ead997ee21502d30f76fd93ad8d5858d19a3fad7cd153de698c4dd PYTHON_BCRYPT_SETUP_TYPE = setuptools PYTHON_BCRYPT_LICENSE = Apache-2.0 PYTHON_BCRYPT_LICENSE_FILES = LICENSE diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash index 07586d5300..04e4914696 100644 --- a/package/python-bitstring/python-bitstring.hash +++ b/package/python-bitstring/python-bitstring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bitstring/json -md5 38372014dd629be75c3a0ff7d799aa3f bitstring-3.1.6.tar.gz -sha256 c97a8e2a136e99b523b27da420736ae5cb68f83519d633794a6a11192f69f8bf bitstring-3.1.6.tar.gz +md5 18661a3e5c47c59bd926dd0fefae0baa bitstring-3.1.7.tar.gz +sha256 fdf3eb72b229d2864fb507f8f42b1b2c57af7ce5fec035972f9566de440a864a bitstring-3.1.7.tar.gz # Locally computed sha256 checksums -sha256 2e97cff64585d7cb66190ad298e9d77fd791e8b91bcc97967fa743edf8c2ba1b LICENSE +sha256 ea3c0e2288994d3dfeaac0fd2163f2cf5f9671c3ae70a9e9d563795e28cfb0b9 LICENSE diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk index 636ae0e0c0..c36993416d 100644 --- a/package/python-bitstring/python-bitstring.mk +++ b/package/python-bitstring/python-bitstring.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_BITSTRING_VERSION = 3.1.6 +PYTHON_BITSTRING_VERSION = 3.1.7 PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/f4/87/fe6f7093088f4396e84c1b5d5dfb08c4840487ad46ff4805b7008c8f5ffc -PYTHON_BITSTRING_SETUP_TYPE = setuptools +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/c3/fc/ffac2c199d2efe1ec5111f55efeb78f5f2972456df6939fea849f103f9f5 +PYTHON_BITSTRING_SETUP_TYPE = distutils PYTHON_BITSTRING_LICENSE = MIT PYTHON_BITSTRING_LICENSE_FILES = LICENSE diff --git a/package/python-bluezero/Config.in b/package/python-bluezero/Config.in index ed2277dc31..c391bfa858 100644 --- a/package/python-bluezero/Config.in +++ b/package/python-bluezero/Config.in @@ -1,11 +1,19 @@ config BR2_PACKAGE_PYTHON_BLUEZERO bool "python-bluezero" + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_DBUS # runtime + select BR2_PACKAGE_DBUS_PYTHON # runtime + select BR2_PACKAGE_PYTHON_GOBJECT # runtime help Python library for Bluetooth Low Energy (BLE) on Linux. - For central.py, peripheral.py and broadcaster.py you need - to enable the dbus-python and the bluez5-utils package. - For observer.py, you need to enable the python-aioblescan - package. - https://github.com/ukBaz/python-bluezero + +comment "python-bluezero needs a glibc toolchain, gcc >= 4.9" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-bluezero/python-bluezero.hash b/package/python-bluezero/python-bluezero.hash index 738688d7a9..59e8c5af5b 100644 --- a/package/python-bluezero/python-bluezero.hash +++ b/package/python-bluezero/python-bluezero.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bluezero/json -md5 eeb444ecaf7c6bd2613d8ff0eb92d0ac bluezero-0.3.0.tar.gz -sha256 7ebe7243169b5c7600941cb6aa31bc3f8b475c22f5ac32a94d2b0200d5faf684 bluezero-0.3.0.tar.gz +md5 b26e6425d8adc4613b7cdf1d131f8c0b bluezero-0.6.0.tar.gz +sha256 d94f0672b1de3ff0040801538143fe9a42c501d8db79bcd183c9e051b8da83bc bluezero-0.6.0.tar.gz +# Locally computed sha256 checksums +sha256 59319e80b4caa94ace4817c9f84aa16abc9d4d2b5f7866251b5fda92e87ccdef LICENSE diff --git a/package/python-bluezero/python-bluezero.mk b/package/python-bluezero/python-bluezero.mk index 97b1aeb78d..7e244fe3f0 100644 --- a/package/python-bluezero/python-bluezero.mk +++ b/package/python-bluezero/python-bluezero.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_BLUEZERO_VERSION = 0.3.0 +PYTHON_BLUEZERO_VERSION = 0.6.0 PYTHON_BLUEZERO_SOURCE = bluezero-$(PYTHON_BLUEZERO_VERSION).tar.gz -PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/e4/d8/c5451133c0773a0378cadb6c014d7f03b5786da1d39af2f9eaa8028e6662 +PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/be/15/4a806580ffd359a03184776f37cf201298918f302b414b8a3e594d1be65c PYTHON_BLUEZERO_SETUP_TYPE = setuptools PYTHON_BLUEZERO_LICENSE = MIT +PYTHON_BLUEZERO_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-bottle/python-bottle.hash b/package/python-bottle/python-bottle.hash index 03558c1abc..7dcaac8dc6 100644 --- a/package/python-bottle/python-bottle.hash +++ b/package/python-bottle/python-bottle.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bottle/json -md5 c7d8a42dbc6955593e5b9f957e650a60 bottle-0.12.17.tar.gz -sha256 e9eaa412a60cc3d42ceb42f58d15864d9ed1b92e9d630b8130c871c5bb16107c bottle-0.12.17.tar.gz +md5 50075544706b5e662a3fbd9a98e24b07 bottle-0.12.19.tar.gz +sha256 a9d73ffcbc6a1345ca2d7949638db46349f5b2b77dac65d6494d45c23628da2c bottle-0.12.19.tar.gz # Locally computed sha256 checksums sha256 d0e7211f1c3c1a1c56f39d18bcb07f27f480c8a9552617756dda3a335933b8a6 LICENSE diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk index a8879010e8..d19a439f8c 100644 --- a/package/python-bottle/python-bottle.mk +++ b/package/python-bottle/python-bottle.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_BOTTLE_VERSION = 0.12.17 +PYTHON_BOTTLE_VERSION = 0.12.19 PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz -PYTHON_BOTTLE_SITE = https://files.pythonhosted.org/packages/c4/a5/6bf41779860e9b526772e1b3b31a65a22bd97535572988d16028c5ab617d +PYTHON_BOTTLE_SITE = https://files.pythonhosted.org/packages/ea/80/3d2dca1562ffa1929017c74635b4cb3645a352588de89e90d0bb53af3317 PYTHON_BOTTLE_LICENSE = MIT PYTHON_BOTTLE_LICENSE_FILES = LICENSE +PYTHON_BOTTLE_CPE_ID_VENDOR = bottlepy +PYTHON_BOTTLE_CPE_ID_PRODUCT = bottle PYTHON_BOTTLE_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-brotli/python-brotli.hash b/package/python-brotli/python-brotli.hash index eaf59ae71e..de4964dd25 100644 --- a/package/python-brotli/python-brotli.hash +++ b/package/python-brotli/python-brotli.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/brotli/json -md5 3444b534e86f65f9f229fd123965be87 Brotli-1.0.7.zip -sha256 0538dc1744fd17c314d2adc409ea7d1b779783b89fd95bcfb0c2acc93a6ea5a7 Brotli-1.0.7.zip +md5 08f1f098697c64aa4596468b556d0c94 Brotli-1.0.9.zip +sha256 4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438 Brotli-1.0.9.zip # Locally computed sha256 checksums -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 LICENSE diff --git a/package/python-brotli/python-brotli.mk b/package/python-brotli/python-brotli.mk index 2ec549ed0c..ff78e6ab2c 100644 --- a/package/python-brotli/python-brotli.mk +++ b/package/python-brotli/python-brotli.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BROTLI_VERSION = 1.0.7 +PYTHON_BROTLI_VERSION = 1.0.9 PYTHON_BROTLI_SOURCE = Brotli-$(PYTHON_BROTLI_VERSION).zip -PYTHON_BROTLI_SITE = https://files.pythonhosted.org/packages/cd/9c/7955895f5672ecc85270244582c6b53ff95bb4c24bf77bd9271d42351635 +PYTHON_BROTLI_SITE = https://files.pythonhosted.org/packages/2a/18/70c32fe9357f3eea18598b23aa9ed29b1711c3001835f7cf99a9818985d0 PYTHON_BROTLI_SETUP_TYPE = setuptools PYTHON_BROTLI_LICENSE = MIT PYTHON_BROTLI_LICENSE_FILES = LICENSE diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index 0a945eb006..5330e5899c 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,4 +1,4 @@ -# sha256 from https://pypi.org/pypi/python-can/json -sha256 8dc9e0f926e880cd57a3badbaebc6393cde7adffdd3e1975a78a82c48d4e3bbe python-can-3.3.1.tar.gz +# sha256 from https://pypi.org/pypi/python-can +sha256 2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449 python-can-3.3.4.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index 749583f961..1ab813e2c9 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 3.3.1 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/d1/7e/d92889e3fa6ed625b5d6f065bff1c1b5921519a5133553905affb0d6b97c +PYTHON_CAN_VERSION = 3.3.4 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/97/dd/5e5ae96db41ba57dde127e0600c3d324239ed692e167296c5fdb992cbf41 PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt diff --git a/package/python-cchardet/Config.in b/package/python-cchardet/Config.in index 74153126fb..0f8645aafe 100644 --- a/package/python-cchardet/Config.in +++ b/package/python-cchardet/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_CCHARDET bool "python-cchardet" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP help cChardet is high speed universal character encoding @@ -8,4 +9,5 @@ config BR2_PACKAGE_PYTHON_CCHARDET https://github.com/PyYoshi/cChardet comment "python-cchardet needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-cchardet/python-cchardet.hash b/package/python-cchardet/python-cchardet.hash index 960801f889..1ecfd6fa95 100644 --- a/package/python-cchardet/python-cchardet.hash +++ b/package/python-cchardet/python-cchardet.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cchardet/json -md5 ee884e2c7762e56e8a0600aa34ad4fa3 cchardet-2.1.6.tar.gz -sha256 b76afb2059ad69eab576949980a17413c1e9e5a5624abf9e43542d8853f146b3 cchardet-2.1.6.tar.gz +md5 8a76472ad09c68c12069203ea9348ee3 cchardet-2.1.7.tar.gz +sha256 c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf cchardet-2.1.7.tar.gz # Locally computed sha256 checksums sha256 107a29ccdd2d778aa2df5462f85dddfa099059abd22e064e07ec2cc9bafc37cd COPYING diff --git a/package/python-cchardet/python-cchardet.mk b/package/python-cchardet/python-cchardet.mk index 78daf6075e..396e9d6c53 100644 --- a/package/python-cchardet/python-cchardet.mk +++ b/package/python-cchardet/python-cchardet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CCHARDET_VERSION = 2.1.6 +PYTHON_CCHARDET_VERSION = 2.1.7 PYTHON_CCHARDET_SOURCE = cchardet-$(PYTHON_CCHARDET_VERSION).tar.gz -PYTHON_CCHARDET_SITE = https://files.pythonhosted.org/packages/41/e6/2e2184a3bc887bfb6e6b97aef5e94af9b8de43806ce14b023ddbbcb0b30d +PYTHON_CCHARDET_SITE = https://files.pythonhosted.org/packages/a8/5d/090c9f0312b7988a9433246c9cf0b566b1ae1374368cfb8ac897218a4f65 PYTHON_CCHARDET_SETUP_TYPE = setuptools PYTHON_CCHARDET_LICENSE = MPL-1.1 PYTHON_CCHARDET_LICENSE_FILES = COPYING diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index 122ad55cad..ae122ffc23 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 cadd4e373fc08f649fa39b82aed9ad96 certifi-2019.9.11.tar.gz -sha256 e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50 certifi-2019.9.11.tar.gz +md5 4b38238b7305fcb3ffbc4368be4e8845 certifi-2021.5.30.tar.gz +sha256 2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee certifi-2021.5.30.tar.gz # Locally computed sha256 checksums -sha256 6a70a4bf6b010016d59a64b8ae4ad8dc7f5ef16f1fb453cc2ecd771c5a341131 LICENSE +sha256 be9d82f36112f87a7f1d74ecd4887e1467bbae8878a84004a00117b1e475a3e2 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index e614b8356e..7c63633a8d 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2019.9.11 +PYTHON_CERTIFI_VERSION = 2021.5.30 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/62/85/7585750fd65599e88df0fed59c74f5075d4ea2fe611deceb95dd1c2fb25b +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/6d/78/f8db8d57f520a54f0b8a438319c342c61c22759d8f9a1cd2e2180b5e5ea9 PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE diff --git a/package/python-cffi/python-cffi.hash b/package/python-cffi/python-cffi.hash index 8c2beb06a4..8ab672a56f 100644 --- a/package/python-cffi/python-cffi.hash +++ b/package/python-cffi/python-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cffi/json -md5 74845f8d2b7b583dd9a3574f402edf39 cffi-1.14.0.tar.gz -sha256 2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6 cffi-1.14.0.tar.gz +md5 5c118a18ea897df164dbff67a32876fc cffi-1.14.6.tar.gz +sha256 c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd cffi-1.14.6.tar.gz # Locally computed sha256 checksums sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index 8f76e7c1d1..2504cf18f4 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_CFFI_VERSION = 1.14.0 +# Please keep in sync with package/python3-cffi/python3-cffi.mk +PYTHON_CFFI_VERSION = 1.14.6 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/05/54/3324b0c46340c31b909fcec598696aaec7ddc8c18a63f2db352562d3354c +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 PYTHON_CFFI_SETUP_TYPE = setuptools PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi PYTHON_CFFI_LICENSE = MIT diff --git a/package/python-chardet/python-chardet.hash b/package/python-chardet/python-chardet.hash index a1804603a2..fb4260a227 100644 --- a/package/python-chardet/python-chardet.hash +++ b/package/python-chardet/python-chardet.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/chardet/json -md5 7dd1ba7f9c77e32351b0a0cfacf4055c chardet-3.0.4.tar.gz +# md5, sha256 from https://pypi.org/pypi/chardet/json +md5 bc9a5603d8d0994b2d4cbf255f99e654 chardet-4.0.0.tar.gz +sha256 0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa chardet-4.0.0.tar.gz # Locally computed -sha256 84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae chardet-3.0.4.tar.gz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/package/python-chardet/python-chardet.mk b/package/python-chardet/python-chardet.mk index 5161098945..448877d056 100644 --- a/package/python-chardet/python-chardet.mk +++ b/package/python-chardet/python-chardet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARDET_VERSION = 3.0.4 +PYTHON_CHARDET_VERSION = 4.0.0 PYTHON_CHARDET_SOURCE = chardet-$(PYTHON_CHARDET_VERSION).tar.gz -PYTHON_CHARDET_SITE = https://pypi.python.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d +PYTHON_CHARDET_SITE = https://files.pythonhosted.org/packages/ee/2d/9cdc2b527e127b4c9db64b86647d567985940ac3698eeabc7ffaccb4ea61 PYTHON_CHARDET_SETUP_TYPE = setuptools PYTHON_CHARDET_LICENSE = LGPL-2.1+ PYTHON_CHARDET_LICENSE_FILES = LICENSE diff --git a/package/python-cheetah/python-cheetah.hash b/package/python-cheetah/python-cheetah.hash index 286b41fd9e..f7094a8bb1 100644 --- a/package/python-cheetah/python-cheetah.hash +++ b/package/python-cheetah/python-cheetah.hash @@ -1,5 +1,5 @@ # From https://pypi.org/pypi/Cheetah3/json -md5 8c0ac643263ffc3454fb321342284d0a Cheetah3-3.2.4.tar.gz -sha256 caabb9c22961a3413ac85cd1e5525ec9ca80daeba6555f4f60802b6c256e252b Cheetah3-3.2.4.tar.gz +md5 42bb9da785974c7e4089aa754ff99a73 Cheetah3-3.2.6.post2.tar.gz +sha256 63157d7a00a273b59676b5be5aa817c75c37efc88478231f1a160f4cfb7f7878 Cheetah3-3.2.6.post2.tar.gz # Locally computed sha256 checksums sha256 635349ae512fafc2e60eb74a50d0a5276fa06c00b5ecb20da53546449ddc45ea LICENSE diff --git a/package/python-cheetah/python-cheetah.mk b/package/python-cheetah/python-cheetah.mk index 1ad49a43b7..02877e03c4 100644 --- a/package/python-cheetah/python-cheetah.mk +++ b/package/python-cheetah/python-cheetah.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_CHEETAH_VERSION = 3.2.4 +# Please keep in sync with package/python3-cheetah/python3-cheetah.mk +PYTHON_CHEETAH_VERSION = 3.2.6.post2 PYTHON_CHEETAH_SOURCE = Cheetah3-$(PYTHON_CHEETAH_VERSION).tar.gz -PYTHON_CHEETAH_SITE = https://files.pythonhosted.org/packages/4e/72/e6a7d92279e3551db1b68fd336fd7a6e3d2f2ec742bf486486e6150d77d2 +PYTHON_CHEETAH_SITE = https://files.pythonhosted.org/packages/c0/97/c3fa47e223207e6ca6b501a954c5c959ed3e99f2a1ceec9918238ce38418 PYTHON_CHEETAH_LICENSE = MIT PYTHON_CHEETAH_LICENSE_FILES = LICENSE PYTHON_CHEETAH_SETUP_TYPE = setuptools diff --git a/package/python-click/python-click.hash b/package/python-click/python-click.hash index 911f13dfa3..fb6e457ad5 100644 --- a/package/python-click/python-click.hash +++ b/package/python-click/python-click.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/click/json -md5 7f53d50f7b7373ebc7963f9ff697450a Click-7.0.tar.gz -sha256 5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7 Click-7.0.tar.gz +md5 53692f62cb99a1a10c59248f1776d9c0 click-7.1.2.tar.gz +sha256 d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a click-7.1.2.tar.gz # Locally computed sha256 -sha256 e212319faefa4f459c8ac937fdc8557040a3cab8af29366ca2a48d239025225c LICENSE.rst +sha256 9a8ad106a394e853bfe21f42f4e72d592819a22805d991b5f3275029292b658d LICENSE.rst diff --git a/package/python-click/python-click.mk b/package/python-click/python-click.mk index 12539f557b..a829257f5e 100644 --- a/package/python-click/python-click.mk +++ b/package/python-click/python-click.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CLICK_VERSION = 7.0 -PYTHON_CLICK_SOURCE = Click-$(PYTHON_CLICK_VERSION).tar.gz -PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/f8/5c/f60e9d8a1e77005f664b76ff8aeaee5bc05d0a91798afd7f53fc998dbc47 +PYTHON_CLICK_VERSION = 7.1.2 +PYTHON_CLICK_SOURCE = click-$(PYTHON_CLICK_VERSION).tar.gz +PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/27/6f/be940c8b1f1d69daceeb0032fee6c34d7bd70e3e649ccac0951500b4720e PYTHON_CLICK_LICENSE = BSD-3-Clause PYTHON_CLICK_LICENSE_FILES = LICENSE.rst PYTHON_CLICK_SETUP_TYPE = setuptools diff --git a/package/python-colorama/python-colorama.hash b/package/python-colorama/python-colorama.hash index 06f61f80af..e975a66363 100644 --- a/package/python-colorama/python-colorama.hash +++ b/package/python-colorama/python-colorama.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/colorama/json -md5 f927529cd1735f6f50ee2c61628e9c1f colorama-0.4.1.tar.gz -sha256 05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d colorama-0.4.1.tar.gz +md5 57b22f2597f63df051b69906fbf310cc colorama-0.4.4.tar.gz +sha256 5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b colorama-0.4.4.tar.gz # Locally computed sha256 checksums -sha256 cac35c02686e5d04a5a7140bfb3b36e73aed496656e891102e428886d7930318 LICENSE.txt +sha256 cac35c02686e5d04a5a7140bfb3b36e73aed496656e891102e428886d7930318 LICENSE.txt diff --git a/package/python-colorama/python-colorama.mk b/package/python-colorama/python-colorama.mk index 2f4bc5e1f1..d3d29a63e9 100644 --- a/package/python-colorama/python-colorama.mk +++ b/package/python-colorama/python-colorama.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COLORAMA_VERSION = 0.4.1 +PYTHON_COLORAMA_VERSION = 0.4.4 PYTHON_COLORAMA_SOURCE = colorama-$(PYTHON_COLORAMA_VERSION).tar.gz -PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/76/53/e785891dce0e2f2b9f4b4ff5bc6062a53332ed28833c7afede841f46a5db +PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/1f/bb/5d3246097ab77fa083a61bd8d3d527b7ae063c7d8e8671b1cf8c4ec10cbe PYTHON_COLORAMA_SETUP_TYPE = setuptools PYTHON_COLORAMA_LICENSE = BSD-3-Clause PYTHON_COLORAMA_LICENSE_FILES = LICENSE.txt diff --git a/package/python-colorlog/python-colorlog.hash b/package/python-colorlog/python-colorlog.hash index b7b27b59d9..7c6fb73be7 100644 --- a/package/python-colorlog/python-colorlog.hash +++ b/package/python-colorlog/python-colorlog.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/colorlog/json -md5 25f79b76421132e2a9e08da15e4e0a73 colorlog-4.1.0.tar.gz -sha256 30aaef5ab2a1873dec5da38fd6ba568fa761c9fa10b40241027fa3edea47f3d2 colorlog-4.1.0.tar.gz +md5 2111508f7c512976a34b107c17586f79 colorlog-4.8.0.tar.gz +sha256 59b53160c60902c405cdec28d38356e09d40686659048893e026ecbd589516b1 colorlog-4.8.0.tar.gz # Locally computed sha256 checksums -sha256 915d2c0c578d5015fb561f69ce2970a0d0ed566f0b99bdb6a4ebb439e9c81b0d LICENSE +sha256 915d2c0c578d5015fb561f69ce2970a0d0ed566f0b99bdb6a4ebb439e9c81b0d LICENSE diff --git a/package/python-colorlog/python-colorlog.mk b/package/python-colorlog/python-colorlog.mk index 18c077e4ab..eb4074d464 100644 --- a/package/python-colorlog/python-colorlog.mk +++ b/package/python-colorlog/python-colorlog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COLORLOG_VERSION = 4.1.0 +PYTHON_COLORLOG_VERSION = 4.8.0 PYTHON_COLORLOG_SOURCE = colorlog-$(PYTHON_COLORLOG_VERSION).tar.gz -PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/a5/51/c6e1f2c7e6d7524b580d5a8d7691fd4530f894ae8a23ba66a065291ceba2 +PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/75/32/cdfba08674d72fe7895a8ec7be8f171e8502274999cae9497e4545404873 PYTHON_COLORLOG_SETUP_TYPE = setuptools PYTHON_COLORLOG_LICENSE = MIT PYTHON_COLORLOG_LICENSE_FILES = LICENSE diff --git a/package/python-crc16/Config.in b/package/python-crc16/Config.in index b7a10b66ad..06ad00778c 100644 --- a/package/python-crc16/Config.in +++ b/package/python-crc16/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CRC16 bool "python-crc16" - depends on BR2_PACKAGE_PYTHON help This library calculates only CRC16 (16-bit codes) and the only supported variant at the moment is CRC-CCITT (XModem). diff --git a/package/python-crontab/python-crontab.hash b/package/python-crontab/python-crontab.hash index f22e782a69..2247cf3d3d 100644 --- a/package/python-crontab/python-crontab.hash +++ b/package/python-crontab/python-crontab.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-crontab/json -md5 663bd09882c7caaa18be3c0cc0c7e716 python-crontab-2.4.1.tar.gz -sha256 2366c7aa373118315de7c082401907bacd28e8b1e4e0a6d702334d17b89e71aa python-crontab-2.4.1.tar.gz +md5 7731a2253e853abfb6eceb8045368f22 python-crontab-2.5.1.tar.gz +sha256 4bbe7e720753a132ca4ca9d4094915f40e9d9dc8a807a4564007651018ce8c31 python-crontab-2.5.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-crontab/python-crontab.mk b/package/python-crontab/python-crontab.mk index 2abb4eed74..ddb1067db2 100644 --- a/package/python-crontab/python-crontab.mk +++ b/package/python-crontab/python-crontab.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CRONTAB_VERSION = 2.4.1 -PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/09/b1/31d3ccf2ad3d4f7727b325ad7ea77d042e1939c5cacbf1d7478e391cca51 +PYTHON_CRONTAB_VERSION = 2.5.1 +PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/1b/7e/fb78b96de58a49b8ef807c321870ef4de3de5928fd71a40a400aed714310 PYTHON_CRONTAB_SETUP_TYPE = setuptools PYTHON_CRONTAB_LICENSE = LGPL-3.0+ PYTHON_CRONTAB_LICENSE_FILES = COPYING diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in index 526d9871be..50b70b8e02 100644 --- a/package/python-crossbar/Config.in +++ b/package/python-crossbar/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_PYTHON_CROSSBAR select BR2_PACKAGE_PYTHON_AUTOBAHN select BR2_PACKAGE_PYTHON_BITSTRING select BR2_PACKAGE_PYTHON_CBOR + select BR2_PACKAGE_PYTHON_CBOR2 select BR2_PACKAGE_PYTHON_CLICK select BR2_PACKAGE_PYTHON_CONSTANTLY select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY @@ -39,6 +40,7 @@ config BR2_PACKAGE_PYTHON_CROSSBAR select BR2_PACKAGE_PYTHON_U_MSGPACK select BR2_PACKAGE_PYTHON_UBJSON select BR2_PACKAGE_PYTHON_WATCHDOG + select BR2_PACKAGE_PYTHON_WERKZEUG select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE help Crossbar.io is an open-source WAMP application router that diff --git a/package/python-crossbar/python-crossbar.hash b/package/python-crossbar/python-crossbar.hash index 1be4c72b76..486b4d5695 100644 --- a/package/python-crossbar/python-crossbar.hash +++ b/package/python-crossbar/python-crossbar.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/crossbar/json -md5 bacb1f25cbf8fcdd0568325ef04a721c crossbar-20.2.1.tar.gz -sha256 a63951780fde8c46834c70a637d97f3b2028da637b7a4f793b624532f7a45863 crossbar-20.2.1.tar.gz +md5 f1756c5a7eac95aa0ff3e307cdd960df crossbar-20.4.2.tar.gz +sha256 67a14864850b562c2b5586eca37f39b2eff3d650ba955bace894e6b5d0633dbb crossbar-20.4.2.tar.gz # Locally computed sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 crossbar/LICENSE diff --git a/package/python-crossbar/python-crossbar.mk b/package/python-crossbar/python-crossbar.mk index 84d4177daa..99ddc67df7 100644 --- a/package/python-crossbar/python-crossbar.mk +++ b/package/python-crossbar/python-crossbar.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CROSSBAR_VERSION = 20.2.1 +PYTHON_CROSSBAR_VERSION = 20.4.2 PYTHON_CROSSBAR_SOURCE = crossbar-$(PYTHON_CROSSBAR_VERSION).tar.gz -PYTHON_CROSSBAR_SITE = https://files.pythonhosted.org/packages/78/f0/82970d84abd532bdea007322b73bfe2d7762194b85155296b76ba48724e9 +PYTHON_CROSSBAR_SITE = https://files.pythonhosted.org/packages/3f/a2/d8aff4b366b565669236e6bbb09d9f1bbe9162eb542822e89210141dd738 PYTHON_CROSSBAR_LICENSE = AGPL-3.0 PYTHON_CROSSBAR_LICENSE_FILES = crossbar/LICENSE PYTHON_CROSSBAR_SETUP_TYPE = setuptools diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in index d1c2917ea9..da4252d6da 100644 --- a/package/python-cryptography/Config.in +++ b/package/python-cryptography/Config.in @@ -1,19 +1,15 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY bool "python-cryptography" + depends on BR2_PACKAGE_PYTHON3 # python-idna depends on BR2_INSTALL_LIBSTDCPP # python-pyasn select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime - select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_ASN1CRYPTO # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. @@ -21,4 +17,5 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY https://cryptography.io comment "python-cryptography needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 30ffa73d72..7cb38c8d3d 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,7 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/cryptography/json -md5 77730058b556c6d9838679a94c6229ce cryptography-2.8.tar.gz -sha256 3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651 cryptography-2.8.tar.gz +md5 e2ce2ec8a63965fad351f36ed70fde4b cryptography-3.3.2.tar.gz +sha256 5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed cryptography-3.3.2.tar.gz # Locally computed sha256 checksums -sha256 35452b557fab0efb1e80d7edb9c4e5118b9384082adaa051dde342102cb9de8d LICENSE -sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE -sha256 602c4c7482de6479dd2e9793cda275e5e63d773dacd1eca689232ab7008fb4fb LICENSE.BSD +sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE +sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE +sha256 602c4c7482de6479dd2e9793cda275e5e63d773dacd1eca689232ab7008fb4fb LICENSE.BSD diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 54437ae688..98c65e1528 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,13 +4,15 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 2.8 +# Please keep in sync with package/python3-cryptography/python3-cryptography.mk +PYTHON_CRYPTOGRAPHY_VERSION = 3.3.2 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/be/60/da377e1bed002716fb2d5d1d1cab720f298cb33ecff7bf7adea72788e4e4 +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d559879912eb8a1c5d16ad9f25d35f7c4f4c PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD +PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project +PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl -PYTHON_CRYPTOGRAPHY_ENV = CFLAGS="$(TARGET_CFLAGS) -pthread" $(eval $(python-package)) diff --git a/package/python-cycler/Config.in b/package/python-cycler/Config.in index 854873c969..813bc69dd4 100644 --- a/package/python-cycler/Config.in +++ b/package/python-cycler/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CYCLER bool "python-cycler" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help Creates a Cycler objects much like cycler, but includes input validation. diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 06ebbd5a9d..70469c012b 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 63c819697ed7ce89c6455ff578312a26 Cython-0.29.15.tar.gz -sha256 60d859e1efa5cc80436d58aecd3718ff2e74b987db0518376046adedba97ac30 Cython-0.29.15.tar.gz +md5 81aff945f5bfdfb86e7a5d24f5467668 Cython-0.29.24.tar.gz +sha256 cdf04d07c3600860e8c2ebaad4e8f52ac3feb212453c1764a49ac08c827e8443 Cython-0.29.24.tar.gz # Locally computed sha256 checksums -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt -sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt +sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 997a38db1c..ffc8e719cd 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.15 +# Please keep in sync with package/python3-cython/python3-cython.mk +PYTHON_CYTHON_VERSION = 0.29.24 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/d9/82/d01e767abb9c4a5c07a6a1e6f4d5a8dfce7369318d31f48a52374094372e +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/59/e3/78c921adf4423fff68da327cc91b73a16c63f29752efe7beb6b88b6dd79d PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt diff --git a/package/python-dataproperty/Config.in b/package/python-dataproperty/Config.in index 2d42b02c6c..3de9cc685e 100644 --- a/package/python-dataproperty/Config.in +++ b/package/python-dataproperty/Config.in @@ -1,10 +1,7 @@ config BR2_PACKAGE_PYTHON_DATAPROPERTY bool "python-dataproperty" - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_FUTURES if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help Python library for extract property from data. diff --git a/package/python-dataproperty/python-dataproperty.hash b/package/python-dataproperty/python-dataproperty.hash index 2a16250650..4ea9ddddbc 100644 --- a/package/python-dataproperty/python-dataproperty.hash +++ b/package/python-dataproperty/python-dataproperty.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dataproperty/json -md5 8280a85691959d988e58f52c0ed3d311 DataProperty-0.43.1.tar.gz -sha256 ac2bc221a53fcd2afa140d1feb45cadbe62b335f667dba1e08e3c43a93339103 DataProperty-0.43.1.tar.gz +md5 edd3352ecd0ec124e8227a5c4db61b98 DataProperty-0.50.1.tar.gz +sha256 cad9080e5d1bac85a3bd33a016743537370d524ae683b012345ed9b5b7715f6b DataProperty-0.50.1.tar.gz # Locally computed sha256 checksums -sha256 98799b7c99b561c5ffa3ac86600e501f761afa8e72af8a2515026445fe134105 LICENSE +sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-dataproperty/python-dataproperty.mk b/package/python-dataproperty/python-dataproperty.mk index 74eeb859a8..b89ff83f1c 100644 --- a/package/python-dataproperty/python-dataproperty.mk +++ b/package/python-dataproperty/python-dataproperty.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DATAPROPERTY_VERSION = 0.43.1 +PYTHON_DATAPROPERTY_VERSION = 0.50.1 PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/95/68/fb3498145a106f700ff304158b6d0f0c76eb3001ee5129a4f16c9846b338 +PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/8f/8c/e9f2a862ff561ef32d64cc45d296e7c25479941c90d81a238a3233019a05 PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools PYTHON_DATAPROPERTY_LICENSE = MIT PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE diff --git a/package/python-dateutil/python-dateutil.hash b/package/python-dateutil/python-dateutil.hash index f3dc69f272..a52fb30a0f 100644 --- a/package/python-dateutil/python-dateutil.hash +++ b/package/python-dateutil/python-dateutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-dateutil/json -md5 f2a1d4b680b297b367a974664ca3a4f6 python-dateutil-2.8.1.tar.gz -sha256 73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c python-dateutil-2.8.1.tar.gz +md5 5970010bb72452344df3d76a10281b65 python-dateutil-2.8.2.tar.gz +sha256 0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 python-dateutil-2.8.2.tar.gz # Locally computed sha256 checksums -sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE +sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE diff --git a/package/python-dateutil/python-dateutil.mk b/package/python-dateutil/python-dateutil.mk index 759261d2d1..b75f510bce 100644 --- a/package/python-dateutil/python-dateutil.mk +++ b/package/python-dateutil/python-dateutil.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_DATEUTIL_VERSION = 2.8.1 -PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/be/ed/5bbc91f03fa4c839c4c7360375da77f9659af5f7086b7a7bdda65771c8e0 +PYTHON_DATEUTIL_VERSION = 2.8.2 +PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/4c/c4/13b4776ea2d76c115c1d1b84579f3764ee6d57204f6be27119f13a61d0a9 PYTHON_DATEUTIL_SETUP_TYPE = setuptools PYTHON_DATEUTIL_LICENSE = BSD-3-Clause PYTHON_DATEUTIL_LICENSE_FILES = LICENSE diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk index 8df1dd70c9..7c4b353aaa 100644 --- a/package/python-decorator/python-decorator.mk +++ b/package/python-decorator/python-decorator.mk @@ -4,12 +4,14 @@ # ################################################################################ +# Please keep in sync with package/python3-decorator/python3-decorator.mk PYTHON_DECORATOR_VERSION = 4.4.1 PYTHON_DECORATOR_SITE = https://files.pythonhosted.org/packages/dc/c3/9d378af09f5737cfd524b844cd2fbb0d2263a35c11d712043daab290144d PYTHON_DECORATOR_SOURCE = decorator-$(PYTHON_DECORATOR_VERSION).tar.gz PYTHON_DECORATOR_LICENSE = BSD-2-Clause PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt +PYTHON_DECORATOR_CPE_ID_VENDOR = python +PYTHON_DECORATOR_CPE_ID_PRODUCT = decorator PYTHON_DECORATOR_SETUP_TYPE = setuptools $(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package/python-dialog3/python-dialog3.hash b/package/python-dialog3/python-dialog3.hash index 83e26c5727..42a7512e4f 100644 --- a/package/python-dialog3/python-dialog3.hash +++ b/package/python-dialog3/python-dialog3.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/pythondialog/json -md5 3d5ebc33e85f6313964f5eef720dab19 pythondialog-3.4.0.tar.bz2 +md5 07e257d91099b804e040c6ea5ec56041 pythondialog-3.5.1.tar.gz # Locally computed -sha256 019cdbffe3f61d32d6fb158ce48a767478af2aac2f31fb40460b39aefae604fe pythondialog-3.4.0.tar.bz2 +sha256 34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8 pythondialog-3.5.1.tar.gz sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/python-dialog3/python-dialog3.mk b/package/python-dialog3/python-dialog3.mk index 4048447e1f..6051985640 100644 --- a/package/python-dialog3/python-dialog3.mk +++ b/package/python-dialog3/python-dialog3.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_DIALOG3_VERSION = 3.4.0 -PYTHON_DIALOG3_SOURCE = pythondialog-$(PYTHON_DIALOG3_VERSION).tar.bz2 -PYTHON_DIALOG3_SITE = https://pypi.python.org/packages/fa/f4/686742f01ebb5863d4c5e1acab620acfed0fe97280a26b4ed25917f4f333 +PYTHON_DIALOG3_VERSION = 3.5.1 +PYTHON_DIALOG3_SOURCE = pythondialog-$(PYTHON_DIALOG3_VERSION).tar.gz +PYTHON_DIALOG3_SITE = https://files.pythonhosted.org/packages/72/3c/26ed0db035f97196704d0197d8b2254b8a6ca93a2d132430b0b0d597aa79 PYTHON_DIALOG3_LICENSE = LGPL-2.1+ PYTHON_DIALOG3_LICENSE_FILES = COPYING -PYTHON_DIALOG3_SETUP_TYPE = distutils +PYTHON_DIALOG3_SETUP_TYPE = setuptools PYTHON_DIALOG3_DEPENDENCIES = dialog $(eval $(python-package)) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index af5e4bb6e0..ab89f0341c 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 0b0299419770eaff86ff3a4af519cd6a Django-3.0.4.tar.gz -sha256 50b781f6cbeb98f673aa76ed8e572a019a45e52bdd4ad09001072dfd91ab07c8 Django-3.0.4.tar.gz +md5 2ade1eecca77640abbde6c4589da27dd Django-3.2.7.tar.gz +sha256 95b318319d6997bac3595517101ad9cc83fe5672ac498ba48d1a410f47afecd2 Django-3.2.7.tar.gz # Locally computed sha256 checksums -sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE +sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 0cc5749a9b..0850aa1358 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,12 +4,14 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.0.4 +PYTHON_DJANGO_VERSION = 3.2.7 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/1d/38/89ea18b5aeb9b56fff7430388946e8e9dfd7a451f3e6ddb8a9b637f442c1 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/59/45/c6fbb3a206df0b7dc3e6e8fae738e042c63d4ddf828c6e1ba10d7417a1d9 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE +PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject +PYTHON_DJANGO_CPE_ID_PRODUCT = django PYTHON_DJANGO_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-dnspython/python-dnspython.mk b/package/python-dnspython/python-dnspython.mk index 18d98efd72..ed11687291 100644 --- a/package/python-dnspython/python-dnspython.mk +++ b/package/python-dnspython/python-dnspython.mk @@ -17,4 +17,11 @@ define PYTHON_DNSPYTHON_EXTRACT_CMDS $(RM) -r $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION) endef +define HOST_PYTHON_DNSPYTHON_EXTRACT_CMDS + $(UNZIP) -d $(@D) $(HOST_PYTHON_DNSPYTHON_DL_DIR)/$(HOST_PYTHON_DNSPYTHON_SOURCE) + mv $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION)/* $(@D) + $(RM) -r $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION) +endef + $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in index df5e4887f4..41b4aacd5e 100644 --- a/package/python-docker/Config.in +++ b/package/python-docker/Config.in @@ -1,10 +1,8 @@ config BR2_PACKAGE_PYTHON_DOCKER bool "python-docker" - # docker-engine may be running on another host, so no dependency - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME \ - if BR2_PACKAGE_PYTHON # runtime + depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna + # docker-engine may be running on another host, so no other dependency + select BR2_PACKAGE_PYTHON3_SSL # 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-docker/python-docker.mk b/package/python-docker/python-docker.mk index 67cb150b48..f476a1badd 100644 --- a/package/python-docker/python-docker.mk +++ b/package/python-docker/python-docker.mk @@ -10,5 +10,7 @@ PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/de/54/a822d7116ff2f PYTHON_DOCKER_SETUP_TYPE = setuptools PYTHON_DOCKER_LICENSE = Apache-2.0 PYTHON_DOCKER_LICENSE_FILES = LICENSE +PYTHON_DOCKER_CPE_ID_VENDOR = docker +PYTHON_DOCKER_CPE_ID_PRODUCT = docker-py $(eval $(python-package)) diff --git a/package/python-dpkt/Config.in b/package/python-dpkt/Config.in index d8e3388d7e..9bd7a98d26 100644 --- a/package/python-dpkt/Config.in +++ b/package/python-dpkt/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_DPKT bool "python-dpkt" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_ZLIB + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime help Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols. diff --git a/package/python-ecdsa/python-ecdsa.hash b/package/python-ecdsa/python-ecdsa.hash index efe396bf0a..fcb8093826 100644 --- a/package/python-ecdsa/python-ecdsa.hash +++ b/package/python-ecdsa/python-ecdsa.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ecdsa/json -md5 821d543047941dd26f543f62912230d4 ecdsa-0.15.tar.gz -sha256 8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277 ecdsa-0.15.tar.gz +md5 98c0da4c046286e892fdba727f93edea ecdsa-0.16.1.tar.gz +sha256 cfc046a2ddd425adbd1a78b3c46f0d1325c657811c0f45ecc3a0a6236c1e50ff ecdsa-0.16.1.tar.gz # Locally computed sha256 checksums -sha256 3eca9845773d2e5b8cc9d8c119d345f00a4806e4bd660d4a3d6cdf9c0e9d8bb2 LICENSE +sha256 3eca9845773d2e5b8cc9d8c119d345f00a4806e4bd660d4a3d6cdf9c0e9d8bb2 LICENSE diff --git a/package/python-ecdsa/python-ecdsa.mk b/package/python-ecdsa/python-ecdsa.mk index ffb51a3aa5..75c970518e 100644 --- a/package/python-ecdsa/python-ecdsa.mk +++ b/package/python-ecdsa/python-ecdsa.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_ECDSA_VERSION = 0.15 +PYTHON_ECDSA_VERSION = 0.16.1 PYTHON_ECDSA_SOURCE = ecdsa-$(PYTHON_ECDSA_VERSION).tar.gz -PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/e3/7c/b508ade1feb47cd79222e06d85e477f5cfc4fb0455ad3c70eb6330fc49aa +PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/1d/d4/0684a83b3c16a9d1446ace27a506cef1db9b23984ac7ed6aaf764fdd56e8 PYTHON_ECDSA_SETUP_TYPE = setuptools PYTHON_ECDSA_LICENSE = MIT PYTHON_ECDSA_LICENSE_FILES = LICENSE +PYTHON_ECDSA_CPE_ID_VENDOR = python-ecdsa_project $(eval $(python-package)) diff --git a/package/python-engineio/python-engineio.hash b/package/python-engineio/python-engineio.hash index f10e69af65..ef852cf1ad 100644 --- a/package/python-engineio/python-engineio.hash +++ b/package/python-engineio/python-engineio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-engineio/json -md5 bec3b06a112a7f09a0a9c92b627282fe python-engineio-3.10.0.tar.gz -sha256 9c9a6035b4b5e5a225f426f846afa14cf627f7571d1ae02167cb703fefd134b7 python-engineio-3.10.0.tar.gz +md5 e6ea8b3f2f32eeeb02014c46092f2adb python-engineio-3.12.1.tar.gz +sha256 2481732d93646998f7372ef0ecf003af7817b82720b881db173c3d50b4887916 python-engineio-3.12.1.tar.gz # Locally computed sha256 checksums -sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE +sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/package/python-engineio/python-engineio.mk b/package/python-engineio/python-engineio.mk index 62036a9c76..4f835da0a4 100644 --- a/package/python-engineio/python-engineio.mk +++ b/package/python-engineio/python-engineio.mk @@ -4,10 +4,21 @@ # ################################################################################ -PYTHON_ENGINEIO_VERSION = 3.10.0 -PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/78/8e/c58cf2725fd17d65b9fe818b70aff4ccce4903b47aaee6f4321727a8b8bb +PYTHON_ENGINEIO_VERSION = 3.12.1 +PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/71/5d/620b75396ce993001cbccc80dd786ab09a16a8e3f6c4878ad05f051064d6 PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE +PYTHON_ENGINEIO_CPE_ID_VENDOR = python-engineio_project + +ifeq ($(BR2_PACKAGE_PYTHON),y) +# only needed/valid for python 3.x +define PYTHON_ENGINEIO_RM_PY3_FILES + rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/engineio/async_drivers \ + $(TARGET_DIR)/usr/lib/python*/site-packages/engineio/asyncio_*.py +endef + +PYTHON_ENGINEIO_POST_INSTALL_TARGET_HOOKS += PYTHON_ENGINEIO_RM_PY3_FILES +endif $(eval $(python-package)) diff --git a/package/python-enum34/python-enum34.mk b/package/python-enum34/python-enum34.mk index 3d3ce38830..0bd00508aa 100644 --- a/package/python-enum34/python-enum34.mk +++ b/package/python-enum34/python-enum34.mk @@ -10,6 +10,8 @@ PYTHON_ENUM34_SITE = https://files.pythonhosted.org/packages/11/c4/2da1f4952ba47 PYTHON_ENUM34_SETUP_TYPE = setuptools PYTHON_ENUM34_LICENSE = BSD-3-Clause PYTHON_ENUM34_LICENSE_FILES = enum/LICENSE +PYTHON_ENUM34_CPE_ID_VENDOR = python +PYTHON_ENUM34_CPE_ID_PRODUCT = enum34 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in index 08b84e3e08..570f9aa42f 100644 --- a/package/python-esptool/Config.in +++ b/package/python-esptool/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_PYTHON_ESPTOOL select BR2_PACKAGE_PYTHON_ECDSA # runtime select BR2_PACKAGE_PYTHON_PYAES # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 help A serial utility to communicate & flash code to Espressif ESP8266 & ESP32 chips. diff --git a/package/python-esptool/python-esptool.hash b/package/python-esptool/python-esptool.hash index b4dac7ed51..7a707d34c6 100644 --- a/package/python-esptool/python-esptool.hash +++ b/package/python-esptool/python-esptool.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/esptool/json -md5 d17b9293910773045b9de0d5caa0597d esptool-2.8.tar.gz -sha256 1e4288d9f00e55ba36809cc79c493643c623bfa036d7b019a0ebe396284bc317 esptool-2.8.tar.gz +md5 d62d71041896d105d7abd9e9c40f1995 esptool-3.1.tar.gz +sha256 ec6b943c53b4d71f87f98776333d5b4b99905766898a7002c28a9090b92b2de4 esptool-3.1.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index 0cdc98ce16..92f9bfce18 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 2.8 +PYTHON_ESPTOOL_VERSION = 3.1 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/68/91/08c182f66fa3f12a96e754ae8ec7762abb2d778429834638f5746f81977a +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/9c/c8/28f21b3d3b5e1f1d249be52cdd91793c8c3f7c4f4f255ece7d50984fb05d PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE diff --git a/package/python-falcon/Config.in b/package/python-falcon/Config.in index 1bf93064bb..f90ef55b30 100644 --- a/package/python-falcon/Config.in +++ b/package/python-falcon/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_FALCON bool "python-falcon" + depends on BR2_PACKAGE_PYTHON3 help An unladen web framework for building APIs and app backends. diff --git a/package/python-falcon/python-falcon.hash b/package/python-falcon/python-falcon.hash index 68b8d4cb2c..979419c25a 100644 --- a/package/python-falcon/python-falcon.hash +++ b/package/python-falcon/python-falcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/falcon/json -md5 77c52c144dd284e6259d257c6f008072 falcon-2.0.0.tar.gz -sha256 eea593cf466b9c126ce667f6d30503624ef24459f118c75594a69353b6c3d5fc falcon-2.0.0.tar.gz +md5 4a70cfeeacb453f5fd7eb791bdd3ac01 falcon-3.0.1.tar.gz +sha256 c41d84db325881a870e8b7129d5ecfd972fa4323cf77b7119a1d2a21966ee681 falcon-3.0.1.tar.gz # Locally computed sha256 checksums -sha256 e9e7f1a7ba764f042e56afce6f3563c2be9c4fffbb1404b20f8050ae051f577c LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-falcon/python-falcon.mk b/package/python-falcon/python-falcon.mk index 1d7c869d6d..1f400f9a1f 100644 --- a/package/python-falcon/python-falcon.mk +++ b/package/python-falcon/python-falcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FALCON_VERSION = 2.0.0 +PYTHON_FALCON_VERSION = 3.0.1 PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz -PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/19/30/edff5a1fea7a8e9876c8391e170263e1bb207875b6a65cd619818487b27b +PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/63/22/6a9009c53ad78e65d88a44db8eccc7f39c6f54fc05fb43b1e9cbbc481d06 PYTHON_FALCON_SETUP_TYPE = setuptools PYTHON_FALCON_LICENSE = Apache-2.0 PYTHON_FALCON_LICENSE_FILES = LICENSE diff --git a/package/python-fire/python-fire.hash b/package/python-fire/python-fire.hash index 411270b70e..d86376c52b 100644 --- a/package/python-fire/python-fire.hash +++ b/package/python-fire/python-fire.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fire/json -md5 9f3a91c285b50351d039b6f0bb91aac3 fire-0.2.1.tar.gz -sha256 6865fefc6981a713d2ce56a2a2c92c56c729269f74a6cddd6f4b94d16ae084c9 fire-0.2.1.tar.gz +md5 799be84cbbd7df2cf159cdcb538ab6f9 fire-0.4.0.tar.gz +sha256 c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62 fire-0.4.0.tar.gz # Locally computed sha256 checksums -sha256 a5de77b62266bca0bb97bf058992f0b0f308a83a8ca55ee10fbf6bd8ed8f7ed0 LICENSE +sha256 a5de77b62266bca0bb97bf058992f0b0f308a83a8ca55ee10fbf6bd8ed8f7ed0 LICENSE diff --git a/package/python-fire/python-fire.mk b/package/python-fire/python-fire.mk index 6471a4d143..7ba971abc4 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -4,11 +4,20 @@ # ################################################################################ -PYTHON_FIRE_VERSION = 0.2.1 +PYTHON_FIRE_VERSION = 0.4.0 PYTHON_FIRE_SOURCE = fire-$(PYTHON_FIRE_VERSION).tar.gz -PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/d9/69/faeaae8687f4de0f5973694d02e9d6c3eb827636a009157352d98de1129e +PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/11/07/a119a1aa04d37bc819940d95ed7e135a7dcca1c098123a3764a6dcace9e7 PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_PYTHON),y) +# only needed/valid for python 3.x +define PYTHON_FIRE_RM_PY3_FILE + rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/fire/test_components_py3.py +endef + +PYTHON_FIRE_POST_INSTALL_TARGET_HOOKS += PYTHON_FIRE_RM_PY3_FILE +endif + $(eval $(python-package)) diff --git a/package/python-flask-babel/python-flask-babel.hash b/package/python-flask-babel/python-flask-babel.hash index e059a594d5..46a019c98b 100644 --- a/package/python-flask-babel/python-flask-babel.hash +++ b/package/python-flask-babel/python-flask-babel.hash @@ -1,5 +1,6 @@ -# md5, sha256 from https://pypi.org/pypi/flask-babel/json -md5 fcf2f360ff279d3133e40974804efd72 Flask-Babel-0.12.2.tar.gz -sha256 316ad183e42003f3922957fa643d0a1e8e34a0f0301a88c3a8f605bc37ba5c86 Flask-Babel-0.12.2.tar.gz -# Locally computed sha256 checksums +# From: https://pypi.org/project/Flask-Babel/#copy-hash-modal-80f92a70-1c66-4cce-bb3d-8d6f98287e3f +md5 50d5e92d96ef58787bf85b5a1b0a5567 Flask-Babel-2.0.0.tar.gz +sha256 f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d Flask-Babel-2.0.0.tar.gz + +# License files sha256 a526100a7047237360a394ba4f70ae801b50ff9b8c9b9e73e7795480a59f6b7e LICENSE diff --git a/package/python-flask-babel/python-flask-babel.mk b/package/python-flask-babel/python-flask-babel.mk index 978d29943b..35241e78db 100644 --- a/package/python-flask-babel/python-flask-babel.mk +++ b/package/python-flask-babel/python-flask-babel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_BABEL_VERSION = 0.12.2 +PYTHON_FLASK_BABEL_VERSION = 2.0.0 PYTHON_FLASK_BABEL_SOURCE = Flask-Babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz -PYTHON_FLASK_BABEL_SITE = https://files.pythonhosted.org/packages/82/b0/986b29938d4e8be7deb552ebfd1ef16c311276a59bcae10dec567a5b3d20 +PYTHON_FLASK_BABEL_SITE = https://files.pythonhosted.org/packages/d7/fe/655e6a5a99ceb815fe839f0698956a9d6c7d5bcc06ca1ee7c6eb6dac154b PYTHON_FLASK_BABEL_LICENSE = BSD-3-Clause PYTHON_FLASK_BABEL_SETUP_TYPE = setuptools PYTHON_FLASK_BABEL_LICENSE_FILES = LICENSE diff --git a/package/python-flask-cors/python-flask-cors.hash b/package/python-flask-cors/python-flask-cors.hash index a893b7c890..94ec262db8 100644 --- a/package/python-flask-cors/python-flask-cors.hash +++ b/package/python-flask-cors/python-flask-cors.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-cors/json -md5 551cc4c0305a171d28caa2b3bc838867 Flask-Cors-3.0.8.tar.gz -sha256 72170423eb4612f0847318afff8c247b38bd516b7737adfc10d1c2cdbb382d16 Flask-Cors-3.0.8.tar.gz +md5 647ff0632b960ba063a077fb4063077e Flask-Cors-3.0.10.tar.gz +sha256 b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de Flask-Cors-3.0.10.tar.gz # Locally computed sha256 checksums -sha256 6e1a1bdc54834c1e0740cbce5d5f6f2cae1c846fd2a7f482b11649594fafbd5d LICENSE +sha256 6e1a1bdc54834c1e0740cbce5d5f6f2cae1c846fd2a7f482b11649594fafbd5d LICENSE diff --git a/package/python-flask-cors/python-flask-cors.mk b/package/python-flask-cors/python-flask-cors.mk index 60454e27c4..d600157263 100644 --- a/package/python-flask-cors/python-flask-cors.mk +++ b/package/python-flask-cors/python-flask-cors.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_FLASK_CORS_VERSION = 3.0.8 +PYTHON_FLASK_CORS_VERSION = 3.0.10 PYTHON_FLASK_CORS_SOURCE = Flask-Cors-$(PYTHON_FLASK_CORS_VERSION).tar.gz -PYTHON_FLASK_CORS_SITE = https://files.pythonhosted.org/packages/9e/11/ca8b95c5bf9644471601e425f0de8cbd09a506bb6c24842cb17a6cd1eea8 +PYTHON_FLASK_CORS_SITE = https://files.pythonhosted.org/packages/cf/25/e3b2553d22ed542be807739556c69621ad2ab276ae8d5d2560f4ed20f652 PYTHON_FLASK_CORS_SETUP_TYPE = setuptools PYTHON_FLASK_CORS_LICENSE = MIT PYTHON_FLASK_CORS_LICENSE_FILES = LICENSE +PYTHON_FLASK_CORS_CPE_ID_VENDOR = flask-cors_project +PYTHON_FLASK_CORS_CPE_ID_PRODUCT = flask-cors $(eval $(python-package)) diff --git a/package/python-flask-login/python-flask-login.hash b/package/python-flask-login/python-flask-login.hash index 75dbe30c7a..9ff1f82a09 100644 --- a/package/python-flask-login/python-flask-login.hash +++ b/package/python-flask-login/python-flask-login.hash @@ -1,6 +1,6 @@ -# from https://pypi.python.org/pypi/flask_login/json -md5 25b34c74bd509792f291c16e184225df Flask-Login-0.4.1.tar.gz -sha256 c815c1ac7b3e35e2081685e389a665f2c74d7e077cb93cecabaea352da4752ec Flask-Login-0.4.1.tar.gz +# From https://pypi.org/project/Flask-Login/#copy-hash-modal-8bb2ac58-b80a-4793-84d4-4f32b92976d9 +md5 a2d94aa6ae935345ebc68eb3cbb5fccd Flask-Login-0.5.0.tar.gz +sha256 6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b Flask-Login-0.5.0.tar.gz -# Locally computed -sha256 7a9dfb9c5da204ed1370f3b62c13e2992a12da1da707f47e156897eeb4344e5b LICENSE +# License files +sha256 7a9dfb9c5da204ed1370f3b62c13e2992a12da1da707f47e156897eeb4344e5b LICENSE diff --git a/package/python-flask-login/python-flask-login.mk b/package/python-flask-login/python-flask-login.mk index f81a4cdffe..efb63b262b 100644 --- a/package/python-flask-login/python-flask-login.mk +++ b/package/python-flask-login/python-flask-login.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_LOGIN_VERSION = 0.4.1 +PYTHON_FLASK_LOGIN_VERSION = 0.5.0 PYTHON_FLASK_LOGIN_SOURCE = Flask-Login-$(PYTHON_FLASK_LOGIN_VERSION).tar.gz -PYTHON_FLASK_LOGIN_SITE = https://files.pythonhosted.org/packages/c1/ff/bd9a4d2d81bf0c07d9e53e8cd3d675c56553719bbefd372df69bf1b3c1e4 +PYTHON_FLASK_LOGIN_SITE = https://files.pythonhosted.org/packages/f9/01/f6c0a3a654ca125cf9cd273314c03a8bc6a47bf861765c8c1d375e15a28d PYTHON_FLASK_LOGIN_LICENSE = MIT PYTHON_FLASK_LOGIN_LICENSE_FILES = LICENSE PYTHON_FLASK_LOGIN_SETUP_TYPE = setuptools diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in index 72fcb61999..0e5b64ce59 100644 --- a/package/python-flask/Config.in +++ b/package/python-flask/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_FLASK bool "python-flask" select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime - select BR2_PACKAGE_PYTHON_LXML # runtime select BR2_PACKAGE_PYTHON_WERKZEUG # runtime select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime @@ -14,4 +13,4 @@ config BR2_PACKAGE_PYTHON_FLASK Flask is a microframework for Python based on Werkzeug, Jinja 2 and good intentions. - http://flask.pocoo.org/ + https://palletsprojects.com/p/flask diff --git a/package/python-flask/python-flask.hash b/package/python-flask/python-flask.hash index 24f68c6605..c6ccd633f8 100644 --- a/package/python-flask/python-flask.hash +++ b/package/python-flask/python-flask.hash @@ -1,6 +1,7 @@ -# md5, sha256 from https://pypi.org/pypi/flask/json -md5 0e3ed44ece1c489ed835d1b7047e349c Flask-1.1.1.tar.gz -sha256 13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52 Flask-1.1.1.tar.gz -# Locally computed sha256 checksums +# From https://pypi.org/project/Flask/#copy-hash-modal-911ffb67-fe84-4e25-a1a9-f4c745a0a980 +md5 0da4145d172993cd28a6c619630cc19c Flask-1.1.2.tar.gz +sha256 4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060 Flask-1.1.2.tar.gz + +# License files sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst sha256 0ef3ae025f4a398761079f0d687ff3d66f4fef3a32ac2607318e909c0cba9150 docs/license.rst diff --git a/package/python-flask/python-flask.mk b/package/python-flask/python-flask.mk index 0cd1a18018..077aa600b8 100644 --- a/package/python-flask/python-flask.mk +++ b/package/python-flask/python-flask.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_FLASK_VERSION = 1.1.1 +PYTHON_FLASK_VERSION = 1.1.2 PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz -PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/2e/80/3726a729de758513fd3dbc64e93098eb009c49305a97c6751de55b20b694 +PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/4e/0b/cb02268c90e67545a0e3a37ea1ca3d45de3aca43ceb7dbf1712fb5127d5d PYTHON_FLASK_SETUP_TYPE = setuptools PYTHON_FLASK_LICENSE = BSD-3-Clause PYTHON_FLASK_LICENSE_FILES = LICENSE.rst docs/license.rst +PYTHON_FLASK_CPE_ID_VENDOR = palletsprojects +PYTHON_FLASK_CPE_ID_PRODUCT = flask $(eval $(python-package)) diff --git a/package/python-flatbuffers/python-flatbuffers.hash b/package/python-flatbuffers/python-flatbuffers.hash index 0cb5437906..a27d94160a 100644 --- a/package/python-flatbuffers/python-flatbuffers.hash +++ b/package/python-flatbuffers/python-flatbuffers.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/flatbuffers/json -md5 b5f6c2246f45636dd49d9ff8a00d7f1c flatbuffers-1.11.tar.gz -sha256 f24185db54193540e3d684dc98aa7c2d89882341641548ceb36fd2589fef6c4e flatbuffers-1.11.tar.gz +md5 b2ce60d9a7c1f8a2ddac6d49a1b700a4 flatbuffers-2.0.tar.gz +sha256 12158ab0272375eab8db2d663ae97370c33f152b27801fa6024e1d6105fd4dd2 flatbuffers-2.0.tar.gz diff --git a/package/python-flatbuffers/python-flatbuffers.mk b/package/python-flatbuffers/python-flatbuffers.mk index d0374c4787..705dc0ad5a 100644 --- a/package/python-flatbuffers/python-flatbuffers.mk +++ b/package/python-flatbuffers/python-flatbuffers.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLATBUFFERS_VERSION = 1.11 +PYTHON_FLATBUFFERS_VERSION = 2.0 PYTHON_FLATBUFFERS_SOURCE = flatbuffers-$(PYTHON_FLATBUFFERS_VERSION).tar.gz -PYTHON_FLATBUFFERS_SITE = https://files.pythonhosted.org/packages/c6/b6/21478b76aa7ccab58da3beb85746b6844dee2112c0cc25b51ec64b46bdbb +PYTHON_FLATBUFFERS_SITE = https://files.pythonhosted.org/packages/10/41/09e9ab2134895b82466fada08b69b800f9a724bc81fcca3d4474ce48ffce PYTHON_FLATBUFFERS_LICENSE = Apache-2.0 PYTHON_FLATBUFFERS_SETUP_TYPE = setuptools diff --git a/package/python-flup/Config.in b/package/python-flup/Config.in index 2c21323515..f40f250163 100644 --- a/package/python-flup/Config.in +++ b/package/python-flup/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_FLUP bool "python-flup" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON3 help flup provides of a collection of WSGI modules for Python. It allows a webserver to use scgi-mod and fastcgi-mod diff --git a/package/python-frozenlist/python-frozenlist.hash b/package/python-frozenlist/python-frozenlist.hash index 4a006586d2..0ecc5f9cdf 100644 --- a/package/python-frozenlist/python-frozenlist.hash +++ b/package/python-frozenlist/python-frozenlist.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/frozenlist/json -md5 7d493070a7fe12b6be753585c1995abe frozenlist-1.0.0.tar.gz -sha256 d1076a40cd1bef6edf148cc05aecce52a11c9bbd2a3d60ce37cc07e03c8dc6c7 frozenlist-1.0.0.tar.gz +md5 2a83a520014203d0a56993c332ff7e23 frozenlist-1.1.0.tar.gz +sha256 d167a5050628323fcb3db410375eb06390ab135454fd85fd79c5832f5ec2b8ed frozenlist-1.1.0.tar.gz # Locally computed sha256 checksums -sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt +sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index 1d36b4df51..b113c38080 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.0.0 +PYTHON_FROZENLIST_VERSION = 1.1.0 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/85/32/12f1247bf4915b74a00264aa0033745ee871759daee47499641bd13aeee7 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/12/0e/119f1f186e93c21d078db1ddd7b21247a8a49261689d9284dec28be3b08e PYTHON_FROZENLIST_SETUP_TYPE = setuptools PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE.txt diff --git a/package/python-future/Config.in b/package/python-future/Config.in index 29303f334d..8a3fd38f36 100644 --- a/package/python-future/Config.in +++ b/package/python-future/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FUTURE bool "python-future" - depends on BR2_PACKAGE_PYTHON help Easy, clean, reliable Python 2/3 compatibility. diff --git a/package/python-gobject/Config.in b/package/python-gobject/Config.in index d7ed437e8b..1c9303b0ba 100644 --- a/package/python-gobject/Config.in +++ b/package/python-gobject/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_GOBJECT bool "python-gobject" depends on BR2_USE_MMU # libglib2, gobject-introspection - depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS # gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection depends on BR2_PACKAGE_PYTHON3 # gobject-introspection @@ -14,6 +14,6 @@ config BR2_PACKAGE_PYTHON_GOBJECT comment "python-gobject needs a glibc toolchain, gcc >= 4.9" depends on BR2_USE_MMU - depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-gobject/python-gobject.hash b/package/python-gobject/python-gobject.hash index 5ae7553abb..fd2235f201 100644 --- a/package/python-gobject/python-gobject.hash +++ b/package/python-gobject/python-gobject.hash @@ -1,3 +1,3 @@ -# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.36/pygobject-3.36.0.sha256sum -sha256 8683d2dfb5baa9e501a9a64eeba5c2c1117eadb781ab1cd7a9d255834af6daef pygobject-3.36.0.tar.xz +# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.36/pygobject-3.36.1.sha256sum +sha256 d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f pygobject-3.36.1.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/python-gobject/python-gobject.mk b/package/python-gobject/python-gobject.mk index c93140fc66..0cada82fb7 100644 --- a/package/python-gobject/python-gobject.mk +++ b/package/python-gobject/python-gobject.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_GOBJECT_VERSION_MAJOR = 3.36 -PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).0 +PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).1 PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz PYTHON_GOBJECT_SITE = https://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR) PYTHON_GOBJECT_LICENSE = LGPL-2.1+ diff --git a/package/python-gunicorn/Config.in b/package/python-gunicorn/Config.in index 518157bf93..b3d11cf199 100644 --- a/package/python-gunicorn/Config.in +++ b/package/python-gunicorn/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_GUNICORN bool "python-gunicorn" + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime help diff --git a/package/python-h2/python-h2.hash b/package/python-h2/python-h2.hash index 1d5df8878d..4193567d37 100644 --- a/package/python-h2/python-h2.hash +++ b/package/python-h2/python-h2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/h2/json -md5 950b5a62a2a608dc4547a01edf99aa8f h2-3.1.1.tar.gz -sha256 b8a32bd282594424c0ac55845377eea13fa54fe4a8db012f3a198ed923dc3ab4 h2-3.1.1.tar.gz +md5 197a99c09f344a0dd987fab9801dc8d0 h2-3.2.0.tar.gz +sha256 875f41ebd6f2c44781259005b157faed1a5031df3ae5aa7bcb4628a6c0782f14 h2-3.2.0.tar.gz # Locally computed sha256 checksums -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 LICENSE diff --git a/package/python-h2/python-h2.mk b/package/python-h2/python-h2.mk index 0043ee2d50..81397bbb10 100644 --- a/package/python-h2/python-h2.mk +++ b/package/python-h2/python-h2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_H2_VERSION = 3.1.1 +PYTHON_H2_VERSION = 3.2.0 PYTHON_H2_SOURCE = h2-$(PYTHON_H2_VERSION).tar.gz -PYTHON_H2_SITE = https://files.pythonhosted.org/packages/56/73/0bc3a2f4238bdfbd9b0dc41a972fb558d96e8580ef2a37129ee5a54fa04e +PYTHON_H2_SITE = https://files.pythonhosted.org/packages/08/0a/033df0fc05fe94f72517ccd393dd9ff99b1773fd198307638e6d3568a518 PYTHON_H2_SETUP_TYPE = setuptools PYTHON_H2_LICENSE = MIT PYTHON_H2_LICENSE_FILES = LICENSE diff --git a/package/python-hiredis/Config.in b/package/python-hiredis/Config.in index a401de055d..aacdc87cd2 100644 --- a/package/python-hiredis/Config.in +++ b/package/python-hiredis/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_HIREDIS bool "python-hiredis" + depends on BR2_PACKAGE_PYTHON3 help Python wrapper for hiredis. diff --git a/package/python-hiredis/python-hiredis.hash b/package/python-hiredis/python-hiredis.hash index 1a013bb3a2..2e73d2f37b 100644 --- a/package/python-hiredis/python-hiredis.hash +++ b/package/python-hiredis/python-hiredis.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/hiredis/json -md5 ad421ea848734c7be5c10689caa2a6f1 hiredis-1.0.1.tar.gz -sha256 aa59dd63bb3f736de4fc2d080114429d5d369dfb3265f771778e8349d67a97a4 hiredis-1.0.1.tar.gz +md5 0ab76a8b29deb737c9bfc7f631969e38 hiredis-2.0.0.tar.gz +sha256 81d6d8e39695f2c37954d1011c0480ef7cf444d4e3ae24bc5e89ee5de360139a hiredis-2.0.0.tar.gz # Locally computed sha256 checksums -sha256 70edfa6d3e11f9d7497c2c2f298d06f33b11d10f37f76605102c5ab3b1f28262 COPYING -sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb vendor/hiredis/COPYING +sha256 70edfa6d3e11f9d7497c2c2f298d06f33b11d10f37f76605102c5ab3b1f28262 COPYING +sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb vendor/hiredis/COPYING diff --git a/package/python-hiredis/python-hiredis.mk b/package/python-hiredis/python-hiredis.mk index 435918feb6..55f9a09f55 100644 --- a/package/python-hiredis/python-hiredis.mk +++ b/package/python-hiredis/python-hiredis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HIREDIS_VERSION = 1.0.1 +PYTHON_HIREDIS_VERSION = 2.0.0 PYTHON_HIREDIS_SOURCE = hiredis-$(PYTHON_HIREDIS_VERSION).tar.gz -PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/7f/5c/62e5c6b811b4dcef4125b4a01f76db82c496d79299dd67053b8f9c0732c0 +PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/0c/39/eae11344d69ba435ec13d6bcc1a9eea3d2278324506fcd0e52d1ed8958c8 PYTHON_HIREDIS_SETUP_TYPE = setuptools PYTHON_HIREDIS_LICENSE = BSD-3-Clause PYTHON_HIREDIS_LICENSE_FILES = COPYING vendor/hiredis/COPYING diff --git a/package/python-httplib2/Config.in b/package/python-httplib2/Config.in index e42f5132b7..39671f2386 100644 --- a/package/python-httplib2/Config.in +++ b/package/python-httplib2/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_HTTPLIB2 select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PYPARSING # runtime help httplib2 is a comprehensive HTTP client library, httplib2.py supports many features left out of other HTTP libraries. diff --git a/package/python-httplib2/python-httplib2.hash b/package/python-httplib2/python-httplib2.hash index fe9995a9b3..2c5914c5f6 100644 --- a/package/python-httplib2/python-httplib2.hash +++ b/package/python-httplib2/python-httplib2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httplib2/json -md5 4a55ae1d33721110bf81b4d197bfa862 httplib2-0.17.0.tar.gz -sha256 de96d0a49f46d0ee7e0aae80141d37b8fcd6a68fb05d02e0b82c128592dd8261 httplib2-0.17.0.tar.gz -# Locally computer sha256 checksums -sha256 bbc124e160cd5c0381fe9560aaed43462dd60371210dbb2c87f00b7fec9a05ba PKG-INFO +md5 de7f5e3a4adb3105889867327bdd39dc httplib2-0.19.1.tar.gz +sha256 0b12617eeca7433d4c396a100eaecfa4b08ee99aa881e6df6e257a7aad5d533d httplib2-0.19.1.tar.gz +# Locally computed sha256 checksums +sha256 589eec38f72df2be203711d3b8cbece9b908c5e7ff00bc3cab7f63bae9e366b4 LICENSE diff --git a/package/python-httplib2/python-httplib2.mk b/package/python-httplib2/python-httplib2.mk index f9e1d8b3d7..a259c33c73 100644 --- a/package/python-httplib2/python-httplib2.mk +++ b/package/python-httplib2/python-httplib2.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_HTTPLIB2_VERSION = 0.17.0 +PYTHON_HTTPLIB2_VERSION = 0.19.1 PYTHON_HTTPLIB2_SOURCE = httplib2-$(PYTHON_HTTPLIB2_VERSION).tar.gz -PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/6d/97/8225643419a53dd52d84c34d9d1e99bdbe18083dc760e7a2d0c47c0fab93 +PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/ed/cd/533a1e9e04671bcee5d2854b4f651a3fab9586d698de769d93b05ee2bff1 PYTHON_HTTPLIB2_SETUP_TYPE = setuptools PYTHON_HTTPLIB2_LICENSE = MIT -PYTHON_HTTPLIB2_LICENSE_FILES = PKG-INFO +PYTHON_HTTPLIB2_LICENSE_FILES = LICENSE +PYTHON_HTTPLIB2_CPE_ID_VENDOR = httplib2_project +PYTHON_HTTPLIB2_CPE_ID_PRODUCT = httplib2 $(eval $(python-package)) diff --git a/package/python-hyperlink/Config.in b/package/python-hyperlink/Config.in index 8dad0af19a..3a85e6f461 100644 --- a/package/python-hyperlink/Config.in +++ b/package/python-hyperlink/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_HYPERLINK bool "python-hyperlink" + depends on BR2_PACKAGE_PYTHON3 # python-idna select BR2_PACKAGE_PYTHON_IDNA # runtime help A featureful, correct URL for Python. diff --git a/package/python-ibmiotf/Config.in b/package/python-ibmiotf/Config.in index 0f5f75be5e..3f3f7e1965 100644 --- a/package/python-ibmiotf/Config.in +++ b/package/python-ibmiotf/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_PYTHON_IBMIOTF bool "python-ibmiotf" + depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_ISO8601 # runtime select BR2_PACKAGE_PYTHON_PAHO_MQTT # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help Python Client for IBM Watson IoT Platform. diff --git a/package/python-idna/Config.in b/package/python-idna/Config.in index e3e548d493..3df634f9bf 100644 --- a/package/python-idna/Config.in +++ b/package/python-idna/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_IDNA bool "python-idna" - select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_UNICODEDATA help A library to support the Internationalised Domain Names in Applications (IDNA) protocol as specified in RFC 5891. This diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash index 50897f045b..08a7be9d56 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json -md5 870b8b80267f00f0faf1b7ba4bdbf14e idna-2.9.tar.gz -sha256 7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb idna-2.9.tar.gz +md5 08ea8e2ce09e522424e872409c221138 idna-3.2.tar.gz +sha256 467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3 idna-3.2.tar.gz # Locally computed sha256 checksums -sha256 412014420d2473dba06117c3d4d9e0eecaa6dde0ca30cd951f4ec2be39426f32 LICENSE.rst +sha256 a2d6e4d940bd24dbe7b9645cde19a9792cc51db7ae0d5acd301ac860caa3e836 LICENSE.md diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index eb4c1036cf..7314d85493 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 2.9 +PYTHON_IDNA_VERSION = 3.2 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/19/57503b5de719ee45e83472f339f617b0c01ad75cba44aba1e4c97c2b0abd +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/38/4c4d00ddfa48abe616d7e572e02a04273603db446975ab46bbcd36552005 PYTHON_IDNA_LICENSE = BSD-3-Clause -PYTHON_IDNA_LICENSE_FILES = LICENSE.rst +PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-ifaddr/python-ifaddr.hash b/package/python-ifaddr/python-ifaddr.hash index 18df40ac4c..57b155caa5 100644 --- a/package/python-ifaddr/python-ifaddr.hash +++ b/package/python-ifaddr/python-ifaddr.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ifaddr/json -md5 cc1b7f0a587ef38491f07e50bf91d82e ifaddr-0.1.6.tar.gz -sha256 c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93 ifaddr-0.1.6.tar.gz -# Locally calculated -sha256 926c6fdac9ede91ae54c67066597466b04f9b4f956a24f9c77931e7765607b2c setup.py +md5 97c4eb7505643b5f1fe17733cb42abd9 ifaddr-0.1.7.tar.gz +sha256 1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94 ifaddr-0.1.7.tar.gz +# Locally computed sha256 checksums +sha256 8700856576ae2bc80c63bc970250510d9213fb02fed006d5f22742c9ddde24d7 LICENSE.txt diff --git a/package/python-ifaddr/python-ifaddr.mk b/package/python-ifaddr/python-ifaddr.mk index 23c4ee365e..f1154d9de8 100644 --- a/package/python-ifaddr/python-ifaddr.mk +++ b/package/python-ifaddr/python-ifaddr.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_IFADDR_VERSION = 0.1.6 +PYTHON_IFADDR_VERSION = 0.1.7 PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).tar.gz -PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/9f/54/d92bda685093ebc70e2057abfa83ef1b3fb0ae2b6357262a3e19dfe96bb8 +PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/3d/fc/4ce147e3997cd0ea470ad27112087545cf83bf85015ddb3054673cb471bb PYTHON_IFADDR_SETUP_TYPE = setuptools PYTHON_IFADDR_LICENSE = MIT -PYTHON_IFADDR_LICENSE_FILES = setup.py +PYTHON_IFADDR_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) diff --git a/package/python-influxdb/Config.in b/package/python-influxdb/Config.in index a848e4f2ae..48c300f90d 100644 --- a/package/python-influxdb/Config.in +++ b/package/python-influxdb/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_PYTHON_INFLUXDB bool "python-influxdb" + depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime diff --git a/package/python-influxdb/python-influxdb.hash b/package/python-influxdb/python-influxdb.hash index d1f25552c7..7b43091eca 100644 --- a/package/python-influxdb/python-influxdb.hash +++ b/package/python-influxdb/python-influxdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/influxdb/json -md5 01db77f4ca825d554a78804a4be4a353 influxdb-5.2.3.tar.gz -sha256 30276c7e04bf7659424c733b239ba2f0804d7a1f3c59ec5dd3f88c56176c8d36 influxdb-5.2.3.tar.gz +md5 d528c8ccd8ab40bc608ad1e507e7788a influxdb-5.3.0.tar.gz +sha256 9bcaafd57ac152b9824ab12ed19f204206ef5df8af68404770554c5b55b475f6 influxdb-5.3.0.tar.gz # Locally computed sha256 checksums -sha256 70146f78d168b33ac5903490a918469e22a801a8d3a81103f3d8706dc0024c9a LICENSE +sha256 b654917e2c25a69d2bd56e72dddbc6eb29bf7e40384d7c46bb291d5c5185213b LICENSE diff --git a/package/python-influxdb/python-influxdb.mk b/package/python-influxdb/python-influxdb.mk index 160a9d4136..e5b1aea70f 100644 --- a/package/python-influxdb/python-influxdb.mk +++ b/package/python-influxdb/python-influxdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INFLUXDB_VERSION = 5.2.3 +PYTHON_INFLUXDB_VERSION = 5.3.0 PYTHON_INFLUXDB_SOURCE = influxdb-$(PYTHON_INFLUXDB_VERSION).tar.gz -PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/d2/0d/351a346886ecbe61211cbfcad8ac73f99f5a9bf526916631c5668dbad601 +PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/be/8d/85ec8f11299a6dfc115244db71fd8f13e9a69f5e9eb77dc3392f4f959e9a PYTHON_INFLUXDB_SETUP_TYPE = setuptools PYTHON_INFLUXDB_LICENSE = MIT PYTHON_INFLUXDB_LICENSE_FILES = LICENSE diff --git a/package/python-iptables/Config.in b/package/python-iptables/Config.in index e55359963e..a35577bad3 100644 --- a/package/python-iptables/Config.in +++ b/package/python-iptables/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_PYTHON_IPTABLES bool "python-iptables" + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_IPTABLES # runtime dependency help Python bindings for iptables. https://github.com/ldx/python-iptables + +comment "python-iptables needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/python-iptables/python-iptables.hash b/package/python-iptables/python-iptables.hash index 46786699ac..ee5f765fba 100644 --- a/package/python-iptables/python-iptables.hash +++ b/package/python-iptables/python-iptables.hash @@ -1,5 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/python-iptables/json -md5 98ee55f239bf8f2d002915d76b416c22 python-iptables-0.14.0.tar.gz -sha256 61b23850ad5d917436aa73c2847ab941bc0edbe79a324b0eebdb98af0b65b10d python-iptables-0.14.0.tar.gz +md5 3fb27da1107bdb62196850fa70e8b0d4 python-iptables-1.0.0.tar.gz +sha256 480470adb5f29bf84269b4e53dbad9623af91c79aa666cc0274dec199a555bc5 python-iptables-1.0.0.tar.gz + # Locally calculated sha256 b827789c74144d9bb92595ed3bc568aef767a7e8d930fba61c2cdd9f6ec27599 NOTICE diff --git a/package/python-iptables/python-iptables.mk b/package/python-iptables/python-iptables.mk index 66e478a89a..72bf292c77 100644 --- a/package/python-iptables/python-iptables.mk +++ b/package/python-iptables/python-iptables.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_IPTABLES_VERSION = 0.14.0 -PYTHON_IPTABLES_SITE = https://files.pythonhosted.org/packages/08/5e/16a5ca35c420b8059eeb72716e316eeb6f0e59ce028998d36b2dc87554e5 +PYTHON_IPTABLES_VERSION = 1.0.0 +PYTHON_IPTABLES_SITE = https://files.pythonhosted.org/packages/ca/6e/cba9c6f4b5a1963b7f5b015f5ed5e2eec7a94ac460570e3474177c4004d6 PYTHON_IPTABLES_SETUP_TYPE = setuptools PYTHON_IPTABLES_LICENSE = Apache-2.0 PYTHON_IPTABLES_LICENSE_FILES = NOTICE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index f340e9b013..8136353ae2 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -9,6 +9,8 @@ PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/c0/e5/ba19ae58e9bdd80832332873cb4e11a90cf2049df052c1aadeabc2cdadeb 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 PYTHON_IPYTHON_SETUP_TYPE = distutils $(eval $(python-package)) diff --git a/package/python-iso8601/Config.in b/package/python-iso8601/Config.in index 9e4610cf61..9d61b1d426 100644 --- a/package/python-iso8601/Config.in +++ b/package/python-iso8601/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_PYTHON_ISO8601 help Simple module to parse ISO 8601 dates. - https://bitbucket.org/micktwomey/pyiso8601 + https://github.com/micktwomey/pyiso8601 diff --git a/package/python-iso8601/python-iso8601.hash b/package/python-iso8601/python-iso8601.hash index 57604cc97b..76dd5ec452 100644 --- a/package/python-iso8601/python-iso8601.hash +++ b/package/python-iso8601/python-iso8601.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/iso8601/json, sha256 locally computed -md5 4de940f691c5ea759fb254384c8ddcf6 iso8601-0.1.12.tar.gz -sha256 49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82 iso8601-0.1.12.tar.gz +# md5, sha256 from https://pypi.org/pypi/iso8601/json +md5 d6fe8ccc847aaf8ac965da3b6023e697 iso8601-0.1.14.tar.gz +sha256 8aafd56fa0290496c5edbb13c311f78fa3a241f0853540da09d9363eae3ebd79 iso8601-0.1.14.tar.gz +# Locally computed sha256 checksums sha256 116d368d14a8cf0061027c944c60ee20b476ce42814818a7d627396906761f16 LICENSE diff --git a/package/python-iso8601/python-iso8601.mk b/package/python-iso8601/python-iso8601.mk index 7fc171d603..3f128d15e4 100644 --- a/package/python-iso8601/python-iso8601.mk +++ b/package/python-iso8601/python-iso8601.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ISO8601_VERSION = 0.1.12 +PYTHON_ISO8601_VERSION = 0.1.14 PYTHON_ISO8601_SOURCE = iso8601-$(PYTHON_ISO8601_VERSION).tar.gz -PYTHON_ISO8601_SITE = https://pypi.python.org/packages/45/13/3db24895497345fb44c4248c08b16da34a9eb02643cea2754b21b5ed08b0 +PYTHON_ISO8601_SITE = https://files.pythonhosted.org/packages/f9/ed/b97abc7877e5b253eef96a469f47d617b0ebcccc735405fa1a620c7ee833 PYTHON_ISO8601_SETUP_TYPE = setuptools PYTHON_ISO8601_LICENSE = MIT PYTHON_ISO8601_LICENSE_FILES = LICENSE diff --git a/package/python-janus/python-janus.hash b/package/python-janus/python-janus.hash index 5098769901..7d914389d2 100644 --- a/package/python-janus/python-janus.hash +++ b/package/python-janus/python-janus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/janus/json -md5 26283b122439fbca4ae1db18ff839b7c janus-0.4.0.tar.gz -sha256 cfc221683160b91b35bae1917e2957b78dad10a2e634f4f8ed119ed72e2a88ef janus-0.4.0.tar.gz +md5 dad6a03e7664cb800ce45ef8bcf12439 janus-0.6.1.tar.gz +sha256 4712e0ef75711fe5947c2db855bc96221a9a03641b52e5ae8e25c2b705dd1d0c janus-0.6.1.tar.gz # Locally computed sha256 checksums -sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE +sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE diff --git a/package/python-janus/python-janus.mk b/package/python-janus/python-janus.mk index f718d0c19d..2b08733c18 100644 --- a/package/python-janus/python-janus.mk +++ b/package/python-janus/python-janus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JANUS_VERSION = 0.4.0 +PYTHON_JANUS_VERSION = 0.6.1 PYTHON_JANUS_SOURCE = janus-$(PYTHON_JANUS_VERSION).tar.gz -PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/e2/39/41fd545b99eac81d47fe346b8c78c09a3b187ce2fd9f3c9656dfe035e39a +PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/7c/1b/8769c2dca84dd8ca92e48b14750c7106ff4313df4fee651dbc3cd9e345a9 PYTHON_JANUS_SETUP_TYPE = setuptools PYTHON_JANUS_LICENSE = Apache-2.0 PYTHON_JANUS_LICENSE_FILES = LICENSE diff --git a/package/python-jedi/Config.in b/package/python-jedi/Config.in index 8ceaa1530c..e14fa54ffb 100644 --- a/package/python-jedi/Config.in +++ b/package/python-jedi/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JEDI bool "python-jedi" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PARSO # runtime help An autocompletion tool for Python that can be used for text diff --git a/package/python-jedi/python-jedi.hash b/package/python-jedi/python-jedi.hash index 1fc3a3da50..018429bdfe 100644 --- a/package/python-jedi/python-jedi.hash +++ b/package/python-jedi/python-jedi.hash @@ -1,6 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/jedi/json -md5 ba88266caac41988ffb4fd6041a3c354 jedi-0.15.1.tar.gz -sha256 ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e jedi-0.15.1.tar.gz +md5 72707c00e8d6d0b190a5e5664be1cac5 jedi-0.18.0.tar.gz +sha256 92550a404bad8afed881a137ec9a461fed49eca661414be45059329614ed0707 jedi-0.18.0.tar.gz # Locally computed sha256 checksums -sha256 78e60cd0b8f28694f30195482c33d76908d846b0d15278deb7332aa22ba8e412 LICENSE.txt -sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE +sha256 78e60cd0b8f28694f30195482c33d76908d846b0d15278deb7332aa22ba8e412 LICENSE.txt +sha256 235e993965d399a25e7d493d25c8622f78718510884b9c051f1f1866b6f34e9d jedi/third_party/django-stubs/LICENSE.txt +sha256 b41b78f562a2e65b75cab44354335f6f435d4ef73065509600ac910cf4e22fe0 jedi/third_party/typeshed/LICENSE diff --git a/package/python-jedi/python-jedi.mk b/package/python-jedi/python-jedi.mk index e11146def7..bfe56b7c36 100644 --- a/package/python-jedi/python-jedi.mk +++ b/package/python-jedi/python-jedi.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_JEDI_VERSION = 0.15.1 +PYTHON_JEDI_VERSION = 0.18.0 PYTHON_JEDI_SOURCE = jedi-$(PYTHON_JEDI_VERSION).tar.gz -PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/85/03/cd5a6e44a5753b4d539288d9d1f9645caac889c17dd2950292a8818f86b2 +PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/ac/11/5c542bf206efbae974294a61febc61e09d74cb5d90d8488793909db92537 PYTHON_JEDI_SETUP_TYPE = setuptools -PYTHON_JEDI_LICENSE = MIT, BSD-3-Clause (flask theme) -PYTHON_JEDI_LICENSE_FILES = LICENSE.txt docs/_themes/flask/LICENSE +PYTHON_JEDI_LICENSE = MIT, Apache-2.0 (typeshed) +PYTHON_JEDI_LICENSE_FILES = LICENSE.txt jedi/third_party/django-stubs/LICENSE.txt jedi/third_party/typeshed/LICENSE $(eval $(python-package)) diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash index e366b9e180..51590b17d2 100644 --- a/package/python-jinja2/python-jinja2.hash +++ b/package/python-jinja2/python-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jinja2/json -md5 5d88c7e77aa63fc852a04f65dbfe5594 Jinja2-2.11.1.tar.gz -sha256 93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250 Jinja2-2.11.1.tar.gz -# Locally computed sha256 -sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst +md5 231dc00d34afb2672c497713fa9cdaaa Jinja2-2.11.3.tar.gz +sha256 a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6 Jinja2-2.11.3.tar.gz +# Locally computed sha256 checksums +sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index 64b4c60c9b..f91cac6937 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -4,12 +4,15 @@ # ################################################################################ -PYTHON_JINJA2_VERSION = 2.11.1 +# Please keep in sync with package/python3-jinja2/python3-jinja2.mk +PYTHON_JINJA2_VERSION = 2.11.3 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/d8/03/e491f423379ea14bb3a02a5238507f7d446de639b623187bccc111fbecdf +PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7 PYTHON_JINJA2_SETUP_TYPE = setuptools PYTHON_JINJA2_LICENSE = BSD-3-Clause PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst +PYTHON_JINJA2_CPE_ID_VENDOR = pocoo +PYTHON_JINJA2_CPE_ID_PRODUCT = jinja2 # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe diff --git a/package/python-keyring/Config.in b/package/python-keyring/Config.in index 2dc990a50c..f7bb1ae820 100644 --- a/package/python-keyring/Config.in +++ b/package/python-keyring/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_KEYRING bool "python-keyring" - depends on BR2_PACKAGE_PYTHON3 # python-secretstorage + depends on BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP # python-secretstorage + select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime help The Python keyring lib provides a easy way to access the @@ -10,4 +11,5 @@ config BR2_PACKAGE_PYTHON_KEYRING https://pypi.python.org/pypi/keyring comment "python-keyring needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-keyring/python-keyring.hash b/package/python-keyring/python-keyring.hash index a57419039e..159579f79c 100644 --- a/package/python-keyring/python-keyring.hash +++ b/package/python-keyring/python-keyring.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/keyring/json, sha256 locally computed -md5 9c53e4f2427ebaa59d304a826311fbcf keyring-10.5.0.tar.gz -sha256 0e6129e8c5bc80da34cc1942d30daad79ed40419fcaaa538278c3b2ff235b313 keyring-10.5.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/keyring/json +md5 1eb6d586ee5794de4bf39c1f513a3139 keyring-19.2.0.tar.gz +sha256 91037ccaf0c9a112a76f7740e4a416b9457a69b66c2799421581bee710a974b3 keyring-19.2.0.tar.gz +# Locally computed sha256 checksums sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index 27db2802ed..0e05738605 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -4,12 +4,14 @@ # ################################################################################ -PYTHON_KEYRING_VERSION = 10.5.0 +PYTHON_KEYRING_VERSION = 19.2.0 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://pypi.python.org/packages/42/2e/51bd1739fe335095a2174db3f2f230346762e7e572471059540146a521f6 +PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/ee/46/77fdb7cd2b0f1f684afbc35a59b3d7ebb6961fe528f97b86900002968914 PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE +PYTHON_KEYRING_CPE_ID_VENDOR = python +PYTHON_KEYRING_CPE_ID_PRODUCT = keyring PYTHON_KEYRING_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-libusb1/Config.in b/package/python-libusb1/Config.in index 1c4a72edae..e464a0394d 100644 --- a/package/python-libusb1/Config.in +++ b/package/python-libusb1/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_PYTHON_LIBUSB1 bool "python-libusb1" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Pure-python wrapper for libusb-1.0. http://github.com/vpelletier/python-libusb1 -comment "python-libusb1 needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "python-libusb1 needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash index 569d1d0bd6..cb28536d3f 100644 --- a/package/python-lmdb/python-lmdb.hash +++ b/package/python-lmdb/python-lmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lmdb/json -md5 ae2efef18202e51c9e4a807a47900ce2 lmdb-0.98.tar.gz -sha256 0625bc28bf0893e6000a83be7234f915ca078c32f9e73d8ae48b3508db7af708 lmdb-0.98.tar.gz +md5 507049767b995c3c6a93b3bd97567c71 lmdb-0.99.tar.gz +sha256 f9eb844aaaacc8a4bc175e1c1f8a8fb538c330e378fd9eb40e8708d4dca7dc89 lmdb-0.99.tar.gz # Locally computed sha256 checksums sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index f92c7f775b..bf98ba19c8 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 0.98 +PYTHON_LMDB_VERSION = 0.99 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/c0/5c/d56dbc2532ecf14fa004c543927500c0f645eaca8bd7ec39420c7546396a +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/3b/66/aa6f3a3e338a3ca263575ce6f722c2fdcd21039a03b55c722e0ae0b216db PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_SETUP_TYPE = setuptools diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index 593a5e1c56..dd6446e6cc 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 8620ce80f50d023d414183bf90cc2576c2837b88e00bea3f33ad2630133bbb60 lxml-4.5.0.tar.gz +sha256 39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468 lxml-4.6.3.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index cfb87bb6fd..0d3775a1bd 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.5.0 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/39/2b/0a66d5436f237aff76b91e68b4d8c041d145ad0a2cdeefe2c42f76ba2857 +PYTHON_LXML_VERSION = 4.6.3 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e5/21/a2e4517e3d216f0051687eea3d3317557bde68736f038a3b105ac3809247 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. @@ -15,6 +15,8 @@ PYTHON_LXML_LICENSE_FILES = \ doc/licenses/BSD.txt \ doc/licenses/elementtree.txt \ src/lxml/isoschematron/resources/rng/iso-schematron.rng +PYTHON_LXML_CPE_ID_VENDOR = lxml +PYTHON_LXML_CPE_ID_PRODUCT = lxml # python-lxml can use either setuptools, or distutils as a fallback. # So, we use setuptools. @@ -26,11 +28,11 @@ HOST_PYTHON_LXML_DEPENDENCIES = host-libxml2 host-libxslt host-zlib # python-lxml needs these scripts in order to properly detect libxml2 and # libxslt compiler and linker flags PYTHON_LXML_BUILD_OPTS = \ - --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ - --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config + --xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ + --xml2-config=$(STAGING_DIR)/usr/bin/xml2-config HOST_PYTHON_LXML_BUILD_OPTS = \ - --with-xslt-config=$(HOST_DIR)/bin/xslt-config \ - --with-xml2-config=$(HOST_DIR)/bin/xml2-config + --xslt-config=$(HOST_DIR)/bin/xslt-config \ + --xml2-config=$(HOST_DIR)/bin/xml2-config $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-mako/python-mako.hash b/package/python-mako/python-mako.hash index a1c18c9916..353799923f 100644 --- a/package/python-mako/python-mako.hash +++ b/package/python-mako/python-mako.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mako/json -md5 2660a4916f2f63456e6885c727b7cd2f Mako-1.1.1.tar.gz -sha256 2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4 Mako-1.1.1.tar.gz +md5 184bb2ba4b937127e7c557b93db89377 Mako-1.1.3.tar.gz +sha256 8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27 Mako-1.1.3.tar.gz # Locally computed sha256 checksums -sha256 47cd0d41b1092f9161cfb629ed15e5cea185144710ff4633a4281ef088ff5de7 LICENSE +sha256 47cd0d41b1092f9161cfb629ed15e5cea185144710ff4633a4281ef088ff5de7 LICENSE diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 5be9937fee..d5d49f252d 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python3-mako/python3-mako.mk -PYTHON_MAKO_VERSION = 1.1.1 +PYTHON_MAKO_VERSION = 1.1.3 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/28/03/329b21f00243fc2d3815399413845dbbfb0745cff38a29d3597e97f8be58 +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/72/89/402d2b4589e120ca76a6aed8fee906a0f5ae204b50e455edd36eda6e778d PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE diff --git a/package/python-markdown/Config.in b/package/python-markdown/Config.in index 6706684142..454c2729bd 100644 --- a/package/python-markdown/Config.in +++ b/package/python-markdown/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PYTHON_MARKDOWN bool "python-markdown" + depends on BR2_PACKAGE_PYTHON3 # runtime dependency on Python's xml module - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT help This is a Python implementation of John Gruber's Markdown diff --git a/package/python-markdown/python-markdown.hash b/package/python-markdown/python-markdown.hash index 4d54ce9243..b64ac77be0 100644 --- a/package/python-markdown/python-markdown.hash +++ b/package/python-markdown/python-markdown.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markdown/json -md5 7a894dc55992b37cdbcba5c4049455fc Markdown-3.2.1.tar.gz -sha256 90fee683eeabe1a92e149f7ba74e5ccdc81cd397bd6c516d93a8da0ef90b6902 Markdown-3.2.1.tar.gz +md5 b6833c6326e9164ee0c662218a75e7f0 Markdown-3.3.4.tar.gz +sha256 31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49 Markdown-3.3.4.tar.gz # Locally computed sha256 sha256 6f1193cb634718e65c3a537d6e25ebd614820ec0ef693cfc12248112638d64da LICENSE.md diff --git a/package/python-markdown/python-markdown.mk b/package/python-markdown/python-markdown.mk index 1f352fd7f1..801360d778 100644 --- a/package/python-markdown/python-markdown.mk +++ b/package/python-markdown/python-markdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN_VERSION = 3.2.1 +PYTHON_MARKDOWN_VERSION = 3.3.4 PYTHON_MARKDOWN_SOURCE = Markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz -PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/98/79/ce6984767cb9478e6818bd0994283db55c423d733cc62a88a3ffb8581e11 +PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/49/02/37bd82ae255bb4dfef97a4b32d95906187b7a7a74970761fca1360c4ba22 PYTHON_MARKDOWN_LICENSE = BSD-3-Clause PYTHON_MARKDOWN_LICENSE_FILES = LICENSE.md PYTHON_MARKDOWN_SETUP_TYPE = setuptools diff --git a/package/python-markdown2/python-markdown2.hash b/package/python-markdown2/python-markdown2.hash index 2d72a78053..03315fd3ea 100644 --- a/package/python-markdown2/python-markdown2.hash +++ b/package/python-markdown2/python-markdown2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markdown2/json -md5 a8dee88993d05a3e10765a57b1e1ea07 markdown2-2.3.8.tar.gz -sha256 7ff88e00b396c02c8e1ecd8d176cfa418fb01fe81234dcea77803e7ce4f05dbe markdown2-2.3.8.tar.gz +md5 5c1f9002060cf534bde0bdd584d6b70a markdown2-2.3.9.tar.gz +sha256 89526090907ae5ece66d783c434b35c29ee500c1986309e306ce2346273ada6a markdown2-2.3.9.tar.gz # Locally computed sha256 checksums -sha256 f8c7c4d554409cf621b8d653dbfffb719745fd36f5c49b8305258649b403ef9c LICENSE.txt +sha256 f8c7c4d554409cf621b8d653dbfffb719745fd36f5c49b8305258649b403ef9c LICENSE.txt diff --git a/package/python-markdown2/python-markdown2.mk b/package/python-markdown2/python-markdown2.mk index d8b946e140..3ffa35796f 100644 --- a/package/python-markdown2/python-markdown2.mk +++ b/package/python-markdown2/python-markdown2.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_MARKDOWN2_VERSION = 2.3.8 +PYTHON_MARKDOWN2_VERSION = 2.3.9 PYTHON_MARKDOWN2_SOURCE = markdown2-$(PYTHON_MARKDOWN2_VERSION).tar.gz -PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/e3/93/d37055743009d1a492b2670cc215831a388b3d6e4a28b7672fdf0f7854f5 +PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/14/69/c542025f80916457ff4fe962404a27ab6417d43822fe54bf88ee2dd1b36f PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt +PYTHON_MARKDOWN2_CPE_ID_VENDOR = python-markdown2_project $(eval $(python-package)) diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk index b527706091..f067d94f34 100644 --- a/package/python-markupsafe/python-markupsafe.mk +++ b/package/python-markupsafe/python-markupsafe.mk @@ -4,6 +4,7 @@ # ################################################################################ +# Please keep in sync with package/python3-markupsafe/python3-markupsafe.mk PYTHON_MARKUPSAFE_VERSION = 1.1.1 PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094 diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index e6ed8cda2f..afc090856f 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -23,8 +23,17 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB https://matplotlib.org/ -comment "python-matplotlib needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +if BR2_PACKAGE_PYTHON_MATPLOTLIB -comment "python-matplotlib needs glibc or musl" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) +config BR2_PACKAGE_PYTHON_MATPLOTLIB_QT + bool "qt display" + depends on BR2_PACKAGE_QT5 # python-pyqt5 + select BR2_PACKAGE_PYTHON_PYQT5 + select BR2_PACKAGE_QT5BASE_FONTCONFIG + select BR2_PACKAGE_QT5BASE_WIDGETS + +endif + +comment "python-matplotlib needs a glibc or musl toolchain w/ C++" + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ + !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk index 7082637d09..8d00ac8a07 100644 --- a/package/python-matplotlib/python-matplotlib.mk +++ b/package/python-matplotlib/python-matplotlib.mk @@ -13,4 +13,8 @@ PYTHON_MATPLOTLIB_DEPENDENCIES = host-pkgconf freetype host-python-numpy \ libpng python-cycler PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools +ifeq ($(BR2_PACKAGE_PYTHON_MATPLOTLIB_QT),y) +PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 +endif + $(eval $(python-package)) diff --git a/package/python-mbstrdecoder/Config.in b/package/python-mbstrdecoder/Config.in index 017002c97a..5ba3a19cc4 100644 --- a/package/python-mbstrdecoder/Config.in +++ b/package/python-mbstrdecoder/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_MBSTRDECODER bool "python-mbstrdecoder" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_CHARDET # runtime help multi-byte character string decoder. diff --git a/package/python-mbstrdecoder/python-mbstrdecoder.hash b/package/python-mbstrdecoder/python-mbstrdecoder.hash index b46f5d7cf9..296930f607 100644 --- a/package/python-mbstrdecoder/python-mbstrdecoder.hash +++ b/package/python-mbstrdecoder/python-mbstrdecoder.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mbstrdecoder/json -md5 6dd814b20e7c68c2da2afe5bf72a5e9d mbstrdecoder-0.8.1.tar.gz -sha256 dabfae008a6b3b78f09847c2a73e9e866f97dcd9b52f7ccadf3b05a10a3656e6 mbstrdecoder-0.8.1.tar.gz +md5 aa377cfa117318583dffa1fd96123bdf mbstrdecoder-1.0.1.tar.gz +sha256 f895e1fb97496855ab5e43de99588787169c01f782c71625142d1a62729e9f9d mbstrdecoder-1.0.1.tar.gz # Locally computed sha256 checksums -sha256 7fcef461a93fea587224132a865d1285969c9bec15baf59caeb7a8c7638a8744 LICENSE +sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-mbstrdecoder/python-mbstrdecoder.mk b/package/python-mbstrdecoder/python-mbstrdecoder.mk index 4400cd6731..6474324b78 100644 --- a/package/python-mbstrdecoder/python-mbstrdecoder.mk +++ b/package/python-mbstrdecoder/python-mbstrdecoder.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MBSTRDECODER_VERSION = 0.8.1 +PYTHON_MBSTRDECODER_VERSION = 1.0.1 PYTHON_MBSTRDECODER_SOURCE = mbstrdecoder-$(PYTHON_MBSTRDECODER_VERSION).tar.gz -PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/fd/0f/11982e1321f484b5ec85bb3e03878c9636ca5328fbcbed8b25ecbd76fd44 +PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/b7/3b/2524dd4771dfca572269036fb08356715cb78a1c1c2a4dae3a810a86b777 PYTHON_MBSTRDECODER_SETUP_TYPE = setuptools PYTHON_MBSTRDECODER_LICENSE = MIT PYTHON_MBSTRDECODER_LICENSE_FILES = LICENSE diff --git a/package/python-more-itertools/python-more-itertools.hash b/package/python-more-itertools/python-more-itertools.hash index 3bb65897c0..189498ec5e 100644 --- a/package/python-more-itertools/python-more-itertools.hash +++ b/package/python-more-itertools/python-more-itertools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/more-itertools/json -md5 f647bfd27243a7bebe53b5ddb6a3b1c4 more-itertools-7.2.0.tar.gz -sha256 409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832 more-itertools-7.2.0.tar.gz +md5 0912041c05148ed079984cff69af2e99 more-itertools-8.4.0.tar.gz +sha256 68c70cc7167bdf5c7c9d8f6954a7837089c6a36bf565383919bb595efb8a17e5 more-itertools-8.4.0.tar.gz # Locally computed sha256 checksums sha256 09f1c8c9e941af3e584d59641ea9b87d83c0cb0fd007eb5ef391a7e2643c1a46 LICENSE diff --git a/package/python-more-itertools/python-more-itertools.mk b/package/python-more-itertools/python-more-itertools.mk index 4932fdc4a0..ef21f4d27d 100644 --- a/package/python-more-itertools/python-more-itertools.mk +++ b/package/python-more-itertools/python-more-itertools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MORE_ITERTOOLS_VERSION = 7.2.0 +PYTHON_MORE_ITERTOOLS_VERSION = 8.4.0 PYTHON_MORE_ITERTOOLS_SOURCE = more-itertools-$(PYTHON_MORE_ITERTOOLS_VERSION).tar.gz -PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/c2/31/45f61c8927c9550109f1c4b99ba3ca66d328d889a9c9853a808bff1c9fa0 +PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/67/4a/16cb3acf64709eb0164e49ba463a42dc45366995848c4f0cf770f57b8120 PYTHON_MORE_ITERTOOLS_SETUP_TYPE = setuptools PYTHON_MORE_ITERTOOLS_LICENSE = MIT PYTHON_MORE_ITERTOOLS_LICENSE_FILES = LICENSE diff --git a/package/python-msgfy/Config.in b/package/python-msgfy/Config.in index 7875379e9e..f5a471633a 100644 --- a/package/python-msgfy/Config.in +++ b/package/python-msgfy/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_MSGFY bool "python-msgfy" + depends on BR2_PACKAGE_PYTHON3 help msgfy is a Python library for convert Exception instance to a human-readable error message. diff --git a/package/python-msgfy/python-msgfy.hash b/package/python-msgfy/python-msgfy.hash index 8f664ec2e5..c795f7fa5e 100644 --- a/package/python-msgfy/python-msgfy.hash +++ b/package/python-msgfy/python-msgfy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgfy/json -md5 3a94f49d7b31cc7bca21e0a9bfadf767 msgfy-0.0.7.tar.gz -sha256 370c54bb036d3728af8004e750b7cd7bc5a4ac25f9cdb8be13b7865cae3c73ee msgfy-0.0.7.tar.gz +md5 4a3d8ac9908acd5f661a58b12f9e0d17 msgfy-0.1.0.tar.gz +sha256 474c08302cd56ccee1300ac7976a01ebd1e42716fc9bcd947d39a311a15b7012 msgfy-0.1.0.tar.gz # Locally computed sha256 checksums -sha256 fcfe96f8fb1bf3478a51c828e7f7afee01500ce1c2d4345d052edb858be05227 LICENSE +sha256 fcfe96f8fb1bf3478a51c828e7f7afee01500ce1c2d4345d052edb858be05227 LICENSE diff --git a/package/python-msgfy/python-msgfy.mk b/package/python-msgfy/python-msgfy.mk index 0a642b4344..c187061d41 100644 --- a/package/python-msgfy/python-msgfy.mk +++ b/package/python-msgfy/python-msgfy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGFY_VERSION = 0.0.7 +PYTHON_MSGFY_VERSION = 0.1.0 PYTHON_MSGFY_SOURCE = msgfy-$(PYTHON_MSGFY_VERSION).tar.gz -PYTHON_MSGFY_SITE = https://files.pythonhosted.org/packages/23/82/b61a8353c36e60c2c8291c56ad7d00aa37918ef56811727510acada09f7f +PYTHON_MSGFY_SITE = https://files.pythonhosted.org/packages/24/b5/7cc6ba75b6489245f9b75f11a85202b934fa92f6c99a4fa1c639f08d68e8 PYTHON_MSGFY_SETUP_TYPE = setuptools PYTHON_MSGFY_LICENSE = MIT PYTHON_MSGFY_LICENSE_FILES = LICENSE diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 431a94247a..6b78301200 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 9a1ed2cc0cd3e5dd2e71921104f2b760 multidict-4.7.5.tar.gz -sha256 aee283c49601fa4c13adc64c09c978838a7e812f85377ae130a24d7198c0331e multidict-4.7.5.tar.gz +md5 b1dab3349efe90934ae3612f1202b733 multidict-5.0.2.tar.gz +sha256 e5bf89fe57f702a046c7ec718fe330ed50efd4bcf74722940db2eb0919cddb1c multidict-5.0.2.tar.gz # Locally computed sha256 checksums sha256 a1c5825513279d3085a0ba46880e148ea3710c149bbaedcf2d11605a5ed3c4ad LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 2f80b1f851..a7043643c5 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 4.7.5 +PYTHON_MULTIDICT_VERSION = 5.0.2 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/61/b4/475114b3f1671da634f89239e61038f8742d9ac13aa34b32a05bf8022d22 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/da/e6/50c7f52781f45c2b37c77e962c30a3944a9e79a46ea92956e826c24d3432 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE diff --git a/package/python-mwclient/Config.in b/package/python-mwclient/Config.in index 76bf794892..1af60fdcd0 100644 --- a/package/python-mwclient/Config.in +++ b/package/python-mwclient/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_PYTHON_MWCLIENT bool "python-mwclient" + depends on BR2_PACKAGE_PYTHON3 # python-requests-oauthlib -> python-requests -> python-idna select BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help - MediaWiki API client. + Python client library to interface with the MediaWiki API - https://github.com/btongminh/mwclient + https://github.com/mwclient/mwclient diff --git a/package/python-mwclient/python-mwclient.hash b/package/python-mwclient/python-mwclient.hash index a61dfd6963..354bd685e4 100644 --- a/package/python-mwclient/python-mwclient.hash +++ b/package/python-mwclient/python-mwclient.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mwclient/json -md5 c1b9f69d0eb71a031c1254b1ed16f678 mwclient-0.10.0.tar.gz -sha256 c3f1598a5f75fb80e9b8373f6574042208358aed81470fc2178a8ae7474069af mwclient-0.10.0.tar.gz +md5 148bd36bfaaf591bd9c0076cbf1ed888 mwclient-0.10.1.tar.gz +sha256 79363dd8d12f5e3b91b92b63152bf9dfef27da786c076a244e1f148c8dd67139 mwclient-0.10.1.tar.gz # Locally computed -sha256 0e713ce8e3e490bdc15ac1e59feba3009daef3fff10dd80d8baa6e5f9a294f32 LICENSE.md +sha256 67689d1fd48a5adba31272eed653c12160dd3abbfe92ab056ac42a155e12e523 LICENSE.md diff --git a/package/python-mwclient/python-mwclient.mk b/package/python-mwclient/python-mwclient.mk index de66a42740..07aa877ed9 100644 --- a/package/python-mwclient/python-mwclient.mk +++ b/package/python-mwclient/python-mwclient.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MWCLIENT_VERSION = 0.10.0 +PYTHON_MWCLIENT_VERSION = 0.10.1 PYTHON_MWCLIENT_SOURCE = mwclient-$(PYTHON_MWCLIENT_VERSION).tar.gz -PYTHON_MWCLIENT_SITE = https://files.pythonhosted.org/packages/c1/ec/6206a7b3834572b3c1082f58dc960f4e49543395aa55955b598c29c9f8ad +PYTHON_MWCLIENT_SITE = https://files.pythonhosted.org/packages/97/b4/5fc70ad3286a8d8ec4b9ac01acad0f6b00c5a48d4a16b9d3be6519b7eb21 PYTHON_MWCLIENT_LICENSE = MIT PYTHON_MWCLIENT_LICENSE_FILES = LICENSE.md PYTHON_MWCLIENT_SETUP_TYPE = setuptools diff --git a/package/python-mwscrape/Config.in b/package/python-mwscrape/Config.in index 273ce9a4a8..cb1e30506f 100644 --- a/package/python-mwscrape/Config.in +++ b/package/python-mwscrape/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE bool "python-mwscrape" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_COUCHDB # runtime - select BR2_PACKAGE_PYTHON_FUTURES # runtime select BR2_PACKAGE_PYTHON_MWCLIENT # runtime select BR2_PACKAGE_PYTHON_PYLRU # runtime help diff --git a/package/python-mwscrape/python-mwscrape.hash b/package/python-mwscrape/python-mwscrape.hash index e6bdf396c8..0f64a9e19c 100644 --- a/package/python-mwscrape/python-mwscrape.hash +++ b/package/python-mwscrape/python-mwscrape.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8de8a5ef257851f6e1e41247f64710f48859a5e3f91ebc7200bb60769f02f296 python-mwscrape-6a58d7801eb1e884fd0516f1adbedbd4481c10e6.tar.gz +sha256 2d0e6c747f6a866dedbc759f78830b3f496e8d03401a3c727d0b48735341c5b6 python-mwscrape-568ccbe6e12dd6391277df02adf724ba0e5f9197.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE.txt diff --git a/package/python-mwscrape/python-mwscrape.mk b/package/python-mwscrape/python-mwscrape.mk index 47b943f45f..3ffe9d6880 100644 --- a/package/python-mwscrape/python-mwscrape.mk +++ b/package/python-mwscrape/python-mwscrape.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6 +PYTHON_MWSCRAPE_VERSION = 568ccbe6e12dd6391277df02adf724ba0e5f9197 PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION)) PYTHON_MWSCRAPE_LICENSE = MPL-2.0 PYTHON_MWSCRAPE_LICENSE_FILES = LICENSE.txt diff --git a/package/python-mwscrape2slob/Config.in b/package/python-mwscrape2slob/Config.in index dc2b2ae3bd..6d543bda28 100644 --- a/package/python-mwscrape2slob/Config.in +++ b/package/python-mwscrape2slob/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB bool "python-mwscrape2slob" depends on !BR2_BINFMT_FLAT # python-slob -> python-pyicu -> icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu depends on BR2_INSTALL_LIBSTDCPP # python-slob -> python-pyicu -> icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # python-slob -> python-pyicu -> icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_COUCHDB # runtime select BR2_PACKAGE_PYTHON_CSSSELECT # runtime @@ -15,7 +16,8 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB https://github.com/itkach/mwscrape2slob -comment "python-mwscrape2slob needs a toolchain w/ C++, gcc >= 4.8" +comment "python-mwscrape2slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/python-mwscrape2slob/python-mwscrape2slob.hash b/package/python-mwscrape2slob/python-mwscrape2slob.hash index f1f5e4f166..51b625856c 100644 --- a/package/python-mwscrape2slob/python-mwscrape2slob.hash +++ b/package/python-mwscrape2slob/python-mwscrape2slob.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 367ffc3203f7eb2cc26211f58c0693526652d9a238af48c88f936920e804faf7 python-mwscrape2slob-0f9124ed62009dff6a230947d80340f5a61a6f49.tar.gz +sha256 f1c1c79526fb3e0dac1c2c43e57a38b8641672e7008c5530d4b75e864eff232a python-mwscrape2slob-e01d3e92f0a372ebd0f57390e437a28f9d3c0438.tar.gz diff --git a/package/python-mwscrape2slob/python-mwscrape2slob.mk b/package/python-mwscrape2slob/python-mwscrape2slob.mk index 519f5e5ed2..cd8ae35234 100644 --- a/package/python-mwscrape2slob/python-mwscrape2slob.mk +++ b/package/python-mwscrape2slob/python-mwscrape2slob.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_MWSCRAPE2SLOB_VERSION = 0f9124ed62009dff6a230947d80340f5a61a6f49 +PYTHON_MWSCRAPE2SLOB_VERSION = e01d3e92f0a372ebd0f57390e437a28f9d3c0438 PYTHON_MWSCRAPE2SLOB_SITE = $(call github,itkach,mwscrape2slob,$(PYTHON_MWSCRAPE2SLOB_VERSION)) PYTHON_MWSCRAPE2SLOB_LICENSE = GPL-3.0, Apache-2.0 (MathJax), GPL (MediaWiki monobook style sheet) PYTHON_MWSCRAPE2SLOB_SETUP_TYPE = distutils diff --git a/package/python-netaddr/python-netaddr.hash b/package/python-netaddr/python-netaddr.hash index c834721d2c..91b200768f 100644 --- a/package/python-netaddr/python-netaddr.hash +++ b/package/python-netaddr/python-netaddr.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/netaddr/json -md5 51019ef59c93f3979bcb37d3b8527e07 netaddr-0.7.19.tar.gz +md5 34cad578473b66ad77bc3b2a7613ed4a netaddr-0.8.0.tar.gz # Locally computed -sha256 38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd netaddr-0.7.19.tar.gz +sha256 d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2b5a243 netaddr-0.8.0.tar.gz sha256 0e53de62547787462f41eefb5cee31a14f7ea767ba0362c6f9304f1742486d47 LICENSE diff --git a/package/python-netaddr/python-netaddr.mk b/package/python-netaddr/python-netaddr.mk index a539845d54..e3ffe4e85b 100644 --- a/package/python-netaddr/python-netaddr.mk +++ b/package/python-netaddr/python-netaddr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_NETADDR_VERSION = 0.7.19 +PYTHON_NETADDR_VERSION = 0.8.0 PYTHON_NETADDR_SOURCE = netaddr-$(PYTHON_NETADDR_VERSION).tar.gz -PYTHON_NETADDR_SITE = https://pypi.python.org/packages/0c/13/7cbb180b52201c07c796243eeff4c256b053656da5cfe3916c3f5b57b3a0 +PYTHON_NETADDR_SITE = https://pypi.python.org/packages/c3/3b/fe5bda7a3e927d9008c897cf1a0858a9ba9924a6b4750ec1824c9e617587 PYTHON_NETADDR_LICENSE = BSD-3-Clause PYTHON_NETADDR_LICENSE_FILES = LICENSE PYTHON_NETADDR_SETUP_TYPE = setuptools diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in index 0f3e86f497..2ae3841dfa 100644 --- a/package/python-networkx/Config.in +++ b/package/python-networkx/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_NETWORKX bool "python-networkx" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_DECORATOR # runtime help A Python package for the creation, manipulation, diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash index 92383e75c4..6c4b793e0d 100644 --- a/package/python-networkx/python-networkx.hash +++ b/package/python-networkx/python-networkx.hash @@ -1,4 +1,4 @@ -# md5 from https://pypi.python.org/pypi/networks/json, sha256 locally computed -md5 6ef584a879e9163013e9a762e1cf7cd1 networkx-1.11.tar.gz -sha256 0d0e70e10dfb47601cbb3425a00e03e2a2e97477be6f80638fef91d54dd1e4b8 networkx-1.11.tar.gz -sha256 f4c13bf0e83bef45116ebda6c360066df6fd99610efaea9790b998c5441b0c0d LICENSE.txt +# From: https://pypi.org/project/networkx/ +sha256 f8f4ff0b6f96e4f9b16af6b84622597b5334bf9cae8cf9b2e42e7985d5c95c64 networkx-2.4.tar.gz +# Locally computed +sha256 f421f7c5d30022aa268174976e43e488b856ad953f32cdd13f0675630996d8c0 LICENSE.txt diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index 4dfdbd5a1c..8ebbc84bde 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -4,14 +4,16 @@ # ################################################################################ -# The current version of setools (v4.1.1) does not work with python-networkx past v1.11 -PYTHON_NETWORKX_VERSION = 1.11 +PYTHON_NETWORKX_VERSION = 2.4 PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz -PYTHON_NETWORKX_SITE = https://pypi.python.org/packages/c2/93/dbb41b03cf7c878a7409c8e92226531f840a423c9309ea534873a83c9192 +PYTHON_NETWORKX_SITE = https://pypi.python.org/packages/bf/63/7b579dd3b1c49ce6b7fd8f6f864038f255201410905dd183cf7f4a3845cf PYTHON_NETWORKX_LICENSE = BSD-3-Clause PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt +PYTHON_NETWORKX_CPE_ID_VENDOR = python +PYTHON_NETWORKX_CPE_ID_PRODUCT = networkx PYTHON_NETWORKX_SETUP_TYPE = setuptools -HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator +HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python3-decorator +HOST_PYTHON_NETWORKX_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-nfc/Config.in b/package/python-nfc/Config.in index 9a8102c23c..7008723f60 100644 --- a/package/python-nfc/Config.in +++ b/package/python-nfc/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_NFC bool "python-nfc" depends on BR2_PACKAGE_PYTHON depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -9,6 +10,7 @@ config BR2_PACKAGE_PYTHON_NFC https://launchpad.net/nfcpy -comment "python-nfc needs a toolchain w/ threads" +comment "python-nfc needs a toolchain w/ threads, gcc >= 4.9" depends on BR2_PACKAGE_PYTHON - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index 5b9ee5803b..23dcbc7986 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL @@ -28,4 +29,6 @@ config BR2_PACKAGE_PYTHON_NUMPY http://www.numpy.org/ comment "python-numpy needs glibc or musl" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash index eb4123e3f6..ff9d02643c 100644 --- a/package/python-numpy/python-numpy.hash +++ b/package/python-numpy/python-numpy.hash @@ -1,9 +1,9 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.16.4 -sha256 a3bccb70ad94091a5b9e2469fabd41ac877c140a6828c2022e35560a2ec0346c numpy-1.16.4.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.18.1 +sha256 da204ce460aa4247e595b7c7189d2fb2ed5f796bc03197055de01dac61d0125e numpy-1.18.2.tar.gz # License files, locally calculated -sha256 6b5086f61fe0c71564a79304ecbaa60f11fa3f3debf82f73d16a611cab102adc LICENSE.txt -sha256 426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641 doc/sphinxext/LICENSE.txt +sha256 ad81d0c21843ba6ce6fe5fa3eaacb61120be70cd798c52f63df3f4c12a843f0c LICENSE.txt +sha256 d3045980e80a6b39f98586c24bc7f39a7625b4b9f08ce72e367d12814743d047 numpy/core/src/multiarray/dragon4.c +sha256 426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641 doc/sphinxext/LICENSE.txt sha256 154a8706fa0fdeff1073bf6239c4ecf51f562ab107066eef839dade1a45c824c doc/scipy-sphinx-theme/LICENSE.txt -sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt -sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt -sha256 d37526b4a34c0aa859afe6f9b7e64ca7c306b7430df8113dd5ac6fcb246bd2d4 numpy/core/src/multiarray/dragon4.c +sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt +sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 3b474efa6e..72c6e0c981 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.16.4 +PYTHON_NUMPY_VERSION = 1.18.2 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) PYTHON_NUMPY_LICENSE = BSD-3-Clause, BSD-2-Clause, PSF, Apache-2.0, MIT, Zlib @@ -14,9 +14,11 @@ PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt doc/sphinxext/LICENSE.txt \ tools/npy_tempita/license.txt \ numpy/core/src/multiarray/dragon4.c PYTHON_NUMPY_SETUP_TYPE = setuptools +PYTHON_NUMPY_DEPENDENCIES = host-python-cython +HOST_PYTHON_NUMPY_DEPENDENCIES = host-python-cython -ifeq ($(BR2_PACKAGE_CLAPACK),y) -PYTHON_NUMPY_DEPENDENCIES += clapack +ifeq ($(BR2_PACKAGE_LAPACK),y) +PYTHON_NUMPY_DEPENDENCIES += lapack else PYTHON_NUMPY_ENV += BLAS=None LAPACK=None endif diff --git a/package/python-pam/Config.in b/package/python-pam/Config.in index 02865d00d6..92ba105ebf 100644 --- a/package/python-pam/Config.in +++ b/package/python-pam/Config.in @@ -1,7 +1,6 @@ -comment "python-pam needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "python-pam needs a toolchain w/ wchar, locale, dynamic library" depends on BR2_PACKAGE_PYTHON - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ - BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS config BR2_PACKAGE_PYTHON_PAM bool "python-pam" @@ -10,7 +9,6 @@ config BR2_PACKAGE_PYTHON_PAM depends on BR2_USE_WCHAR # linux-pam depends on BR2_USE_MMU # linux-pam depends on !BR2_STATIC_LIBS # linux-pam - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam select BR2_PACKAGE_LINUX_PAM help PAM (Pluggable Authentication Module) bindings for Python. diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index e33199c82c..4b8495d76d 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,16 +1,16 @@ config BR2_PACKAGE_PYTHON_PARAMIKO bool "python-paramiko" + depends on BR2_PACKAGE_PYTHON3 # python-bcrypt depends on BR2_INSTALL_LIBSTDCPP # python-cryptography select BR2_PACKAGE_PYTHON_BCRYPT # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime - select BR2_PACKAGE_PYTHON_PYASN1 # runtime select BR2_PACKAGE_PYTHON_PYNACL # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help SSH2 protocol library. https://github.com/paramiko/paramiko/ comment "python-paramiko needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index 6054e8d492..b11acf1dbc 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 bf8239dc820ca86dd3c3226f4281c35f paramiko-2.7.1.tar.gz -sha256 920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f paramiko-2.7.1.tar.gz +md5 44136d79da4cd7619e368018ad022619 paramiko-2.7.2.tar.gz +sha256 7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035 paramiko-2.7.2.tar.gz # Locally computed sha256 checksums -sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE +sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index c9e144c96e..3c135cf9b1 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.7.1 +PYTHON_PARAMIKO_VERSION = 2.7.2 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/ac/15/4351003352e11300b9f44a13576bff52dcdc6e4a911129c07447bda0a358 +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/cf/a1/20d00ce559a692911f11cadb7f94737aca3ede1c51de16e002c7d3a888e0 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE +PYTHON_PARAMIKO_CPE_ID_VENDOR = paramiko +PYTHON_PARAMIKO_CPE_ID_PRODUCT = paramiko $(eval $(python-package)) diff --git a/package/python-parso/Config.in b/package/python-parso/Config.in index ea1c5a4732..4f5482d8a0 100644 --- a/package/python-parso/Config.in +++ b/package/python-parso/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PARSO bool "python-parso" + depends on BR2_PACKAGE_PYTHON3 help A Python Parser. diff --git a/package/python-parso/python-parso.hash b/package/python-parso/python-parso.hash index e687c437c4..538ffccf37 100644 --- a/package/python-parso/python-parso.hash +++ b/package/python-parso/python-parso.hash @@ -1,7 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/parso/json -md5 cfdc0d7ce446ac3984cd7ef3e5850354 parso-0.5.1.tar.gz -sha256 666b0ee4a7a1220f65d367617f2cd3ffddff3e205f3f16a0284df30e774c2a9c parso-0.5.1.tar.gz +md5 dd8fed40ceb890d3e277ad44a678c1f1 parso-0.8.2.tar.gz +sha256 12b83492c6239ce32ff5eed6d3639d6a536170723c6f3f1506869f1ace413398 parso-0.8.2.tar.gz # Locally computed sha256 checksums -sha256 fa67973073753d17624caf8684d5ee816d70c89d912c5bca7ca0f08e7b150edb LICENSE.txt -sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE -sha256 368780dd953e09148834e8d8c6cc1b09b3d621e77dbd1c4f5e8873561acda873 test/normalizer_issue_files/LICENSE +sha256 fa67973073753d17624caf8684d5ee816d70c89d912c5bca7ca0f08e7b150edb LICENSE.txt +sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE +sha256 368780dd953e09148834e8d8c6cc1b09b3d621e77dbd1c4f5e8873561acda873 test/normalizer_issue_files/LICENSE diff --git a/package/python-parso/python-parso.mk b/package/python-parso/python-parso.mk index 28f699d641..6862a7e97d 100644 --- a/package/python-parso/python-parso.mk +++ b/package/python-parso/python-parso.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_PARSO_VERSION = 0.5.1 +PYTHON_PARSO_VERSION = 0.8.2 PYTHON_PARSO_SOURCE = parso-$(PYTHON_PARSO_VERSION).tar.gz -PYTHON_PARSO_SITE = https://files.pythonhosted.org/packages/21/40/615957db4d178b7504c87b1a5b85fa5945b0b4fa5f5a845e31fc7aad6018 +PYTHON_PARSO_SITE = https://files.pythonhosted.org/packages/5e/61/d119e2683138a934550e47fc8ec023eb7f11b194883e9085dca3af5d4951 PYTHON_PARSO_SETUP_TYPE = setuptools PYTHON_PARSO_LICENSE = MIT, Python-2.0, BSD-3-Clause (flask theme) PYTHON_PARSO_LICENSE_FILES = LICENSE.txt docs/_themes/flask/LICENSE test/normalizer_issue_files/LICENSE +PYTHON_PARSO_CPE_ID_VENDOR = parso_project +PYTHON_PARSO_CPE_ID_PRODUCT = parso $(eval $(python-package)) diff --git a/package/python-passlib/Config.in b/package/python-passlib/Config.in index 23546a18a5..ed4097c562 100644 --- a/package/python-passlib/Config.in +++ b/package/python-passlib/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_PASSLIB comprehensive password hashing framework supporting over 30 schemes. - https://bitbucket.org/ecollins/passlib + https://passlib.readthedocs.io diff --git a/package/python-passlib/python-passlib.hash b/package/python-passlib/python-passlib.hash index 867223e19a..c0652865aa 100644 --- a/package/python-passlib/python-passlib.hash +++ b/package/python-passlib/python-passlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/passlib/json -md5 b908529cfd4c33057c244324c692eae7 passlib-1.7.2.tar.gz -sha256 8d666cef936198bc2ab47ee9b0410c94adf2ba798e5a84bf220be079ae7ab6a8 passlib-1.7.2.tar.gz +md5 3a229cbd00dfb33e99885b43325e0591 passlib-1.7.4.tar.gz +sha256 defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04 passlib-1.7.4.tar.gz # Locally computed sha256 checksums -sha256 49a74ad666f456493d6b9e2cda7c55e46ad512ce2c67db4accaddb27bb240bb9 LICENSE +sha256 a95ba8f1af88ff8d5f0d0c33519f430b7f9d8992b69d4bc369ac0423a7a05a89 LICENSE diff --git a/package/python-passlib/python-passlib.mk b/package/python-passlib/python-passlib.mk index 6ab94fd66e..013fec74de 100644 --- a/package/python-passlib/python-passlib.mk +++ b/package/python-passlib/python-passlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PASSLIB_VERSION = 1.7.2 +PYTHON_PASSLIB_VERSION = 1.7.4 PYTHON_PASSLIB_SOURCE = passlib-$(PYTHON_PASSLIB_VERSION).tar.gz -PYTHON_PASSLIB_SITE = https://files.pythonhosted.org/packages/6d/6b/4bfca0c13506535289b58f9c9761d20f56ed89439bfe6b8e07416ce58ee1 +PYTHON_PASSLIB_SITE = https://files.pythonhosted.org/packages/b6/06/9da9ee59a67fae7761aab3ccc84fa4f3f33f125b370f1ccdb915bf967c11 PYTHON_PASSLIB_SETUP_TYPE = setuptools PYTHON_PASSLIB_LICENSE = BSD-3-Clause PYTHON_PASSLIB_LICENSE_FILES = LICENSE diff --git a/package/python-periphery/python-periphery.hash b/package/python-periphery/python-periphery.hash index e9c3869eb7..24e104d3ad 100644 --- a/package/python-periphery/python-periphery.hash +++ b/package/python-periphery/python-periphery.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e6da8dcf8f639d1c3be3f19d27cbd472ef904db204c5453b250f87ab9bca2025 python-periphery-2.0.1.tar.gz -sha256 bf032b9319cfd918368219450a9917529f131925e698cbab1b63f42b629ff505 LICENSE +sha256 385716bdbd11fcf2c5728548c3d42f12ebc0974faa64fa1a98b89b4a44dc004c python-periphery-2.3.0.tar.gz +sha256 76fe342043adfe8d9453c4979aa165476875137e15b0ddea1f4c3f3fa9808361 LICENSE diff --git a/package/python-periphery/python-periphery.mk b/package/python-periphery/python-periphery.mk index 97cb52e58b..2c533fa2c2 100644 --- a/package/python-periphery/python-periphery.mk +++ b/package/python-periphery/python-periphery.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PERIPHERY_VERSION = 2.0.1 +PYTHON_PERIPHERY_VERSION = 2.3.0 PYTHON_PERIPHERY_SITE = $(call github,vsergeev,python-periphery,v$(PYTHON_PERIPHERY_VERSION)) PYTHON_PERIPHERY_LICENSE = MIT PYTHON_PERIPHERY_LICENSE_FILES = LICENSE diff --git a/package/python-pigpio/python-pigpio.hash b/package/python-pigpio/python-pigpio.hash index dd7b7954a7..7e02054b23 100644 --- a/package/python-pigpio/python-pigpio.hash +++ b/package/python-pigpio/python-pigpio.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/pigpio/json -md5 5247f61642f14f65c2b42e130d49ab50 pigpio-1.46.tar.gz -sha256 f5f2562f8f7aab0c6cf7235e501e72bedbf063efda725c6086c352b5e4b2f59d pigpio-1.46.tar.gz +md5 e05e3f5cb6c50f4b3eeb4ac50627507e pigpio-1.78.tar.gz +sha256 91efa50e4990649da97408a384782d6ccf58342fc59cdfe21ed7a42911569975 pigpio-1.78.tar.gz diff --git a/package/python-pigpio/python-pigpio.mk b/package/python-pigpio/python-pigpio.mk index fda5efb1ae..73e326cba1 100644 --- a/package/python-pigpio/python-pigpio.mk +++ b/package/python-pigpio/python-pigpio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIGPIO_VERSION = 1.46 +PYTHON_PIGPIO_VERSION = 1.78 PYTHON_PIGPIO_SOURCE = pigpio-$(PYTHON_PIGPIO_VERSION).tar.gz -PYTHON_PIGPIO_SITE = https://files.pythonhosted.org/packages/5d/ad/75966e59159a64f3d496bf730c54d6222d69a72261f1556232e25ce59edf +PYTHON_PIGPIO_SITE = https://files.pythonhosted.org/packages/a9/4a/3ebdfd90906553fb5420e80a475eb52f0809f2a29b547ba3b260db0cbc8f PYTHON_PIGPIO_SETUP_TYPE = setuptools PYTHON_PIGPIO_LICENSE = Unlicense diff --git a/package/python-pillow/Config.in b/package/python-pillow/Config.in index f824d1371e..ae6d8c8346 100644 --- a/package/python-pillow/Config.in +++ b/package/python-pillow/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_PYTHON_PILLOW bool "python-pillow" depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_ZLIB help Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 0d66c4bb3c..3b5bdf2535 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,5 +1,6 @@ -# md5, sha256 from https://pypi.org/project/Pillow/ -md5 d099946335c1ba372f5b1fa68ca71645 Pillow-7.0.0.tar.gz -sha256 4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946 Pillow-7.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/pillow/json +md5 a7fc550b80819eab11e01cc097913700 Pillow-8.3.2.tar.gz +sha256 dde3f3ed8d00c72631bc19cbfff8ad3b6215062a5eed402381ad365f82f0c18c Pillow-8.3.2.tar.gz + # Locally computed sha256 checksums -sha256 04a04a908e52921829c7f51528e5619c79becdde99c484ab7d4f235e2927968c LICENSE +sha256 5bb11d96b393a698df70018069a986248021f286344c437a13f299c3daf1dfd4 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 5ff2dcfdb6..168c9d632c 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 7.0.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/39/47/f28067b187dd664d205f75b07dcc6e0e95703e134008a14814827eebcaab +PYTHON_PILLOW_VERSION = 8.3.2 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/90/d4/a7c9b6c5d176654aa3dbccbfd0be4fd3a263355dc24122a5f1937bdc2689 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz -PYTHON_PILLOW_LICENSE = PIL Software License +PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE +PYTHON_PILLOW_CPE_ID_VENDOR = python +PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing @@ -26,6 +28,20 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg endif +ifeq ($(BR2_PACKAGE_LCMS2),y) +PYTHON_PILLOW_DEPENDENCIES += lcms2 +PYTHON_PILLOW_BUILD_OPTS += --enable-lcms +else +PYTHON_PILLOW_BUILD_OPTS += --disable-lcms +endif + +ifeq ($(BR2_PACKAGE_LIBXCB),y) +PYTHON_PILLOW_DEPENDENCIES += libxcb +PYTHON_PILLOW_BUILD_OPTS += --enable-xcb +else +PYTHON_PILLOW_BUILD_OPTS += --disable-xcb +endif + ifeq ($(BR2_PACKAGE_OPENJPEG),y) PYTHON_PILLOW_DEPENDENCIES += openjpeg PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000 @@ -43,19 +59,18 @@ endif ifeq ($(BR2_PACKAGE_WEBP),y) PYTHON_PILLOW_DEPENDENCIES += webp PYTHON_PILLOW_BUILD_OPTS += --enable-webp +ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) +PYTHON_PILLOW_BUILD_OPTS += --enable-webpmux else -PYTHON_PILLOW_BUILD_OPTS += --disable-webp +PYTHON_PILLOW_BUILD_OPTS += --disable-webpmux endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -PYTHON_PILLOW_DEPENDENCIES += zlib -PYTHON_PILLOW_BUILD_OPTS += --enable-zlib else -PYTHON_PILLOW_BUILD_OPTS += --disable-zlib +PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif define PYTHON_PILLOW_BUILD_CMDS cd $(PYTHON_PILLOW_BUILDDIR); \ + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) @@ -63,6 +78,7 @@ endef define PYTHON_PILLOW_INSTALL_TARGET_CMDS cd $(PYTHON_PILLOW_BUILDDIR); \ + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ $(PYTHON_PILLOW_BUILD_OPTS) install \ diff --git a/package/python-pip/Config.in b/package/python-pip/Config.in index d1b7e7f74b..61d8d7d317 100644 --- a/package/python-pip/Config.in +++ b/package/python-pip/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PIP bool "python-pip" + select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index cc40eecdfe..e37d526a73 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,11 +4,17 @@ # ################################################################################ +# Please keep in sync with package/python3-pip/python3-pip.mk PYTHON_PIP_VERSION = 20.0.2 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/8e/76/66066b7bc71817238924c7e4b448abdb17eb0c92d645769c223f9ace478f PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt +PYTHON_PIP_CPE_ID_VENDOR = pypa +PYTHON_PIP_CPE_ID_PRODUCT = pip + +#0001-Don-t-split-git-references-on-unicode-separators.patch +PYTHON_PIP_IGNORE_CVES += CVE-2021-3572 $(eval $(python-package)) diff --git a/package/python-ply/python-ply.mk b/package/python-ply/python-ply.mk index 5dc7964d5f..50a3e32bc2 100644 --- a/package/python-ply/python-ply.mk +++ b/package/python-ply/python-ply.mk @@ -4,6 +4,7 @@ # ################################################################################ +# Please keep in sync with package/python3-ply/python3-ply.mk PYTHON_PLY_VERSION = 3.11 PYTHON_PLY_SOURCE = ply-$(PYTHON_PLY_VERSION).tar.gz PYTHON_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da diff --git a/package/python-protobuf/Config.in b/package/python-protobuf/Config.in index c53ef7f822..1af82112b4 100644 --- a/package/python-protobuf/Config.in +++ b/package/python-protobuf/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_PYTHON_PROTOBUF platform-neutral, extensible mechanism for serializing structured data. - https://github.com/protobuf-c/protobuf-c + https://developers.google.com/protocol-buffers diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index 929f88548a..8eca476884 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5fe38d70962e4a6bb4d663e63b0906d5bd08a1b590841e08c5148cdbb63732b5 protobuf-python-3.11.4.tar.gz +sha256 3253c6d17ec0bb6f6382e555cf5ca0a9ffab8d81b691f100f96ce9f5e753018e protobuf-python-3.17.3.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index 7f3d629d66..1a053cc368 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 b2c94e0368fc6e6f237a7252f8e85ca2 psutil-5.6.7.tar.gz -sha256 ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa psutil-5.6.7.tar.gz +md5 50bf39b4faa268ba1da8a9730bb38bb6 psutil-5.7.2.tar.gz +sha256 90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb psutil-5.7.2.tar.gz # Locally computed sha256 checksums -sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE +sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 62a94f3c41..9dbc472213 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,11 +4,14 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.6.7 +# Please keep in sync with package/python3-psutil/python3-psutil.mk +PYTHON_PSUTIL_VERSION = 5.7.2 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/73/93/4f8213fbe66fc20cb904f35e6e04e20b47b85bee39845cc66a0bcf5ccdcb +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/aa/3e/d18f2c04cf2b528e18515999b0c8e698c136db78f62df34eee89cee205f1 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE +PYTHON_PSUTIL_CPE_ID_VENDOR = psutil_project +PYTHON_PSUTIL_CPE_ID_PRODUCT = psutil $(eval $(python-package)) diff --git a/package/python-psycopg2/python-psycopg2.hash b/package/python-psycopg2/python-psycopg2.hash index 5f98e359be..bf73f8ad25 100644 --- a/package/python-psycopg2/python-psycopg2.hash +++ b/package/python-psycopg2/python-psycopg2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psycopg2/json -md5 dbb5a67dd57cfa905de37ab9678a92f6 psycopg2-2.8.4.tar.gz -sha256 f898e5cc0a662a9e12bde6f931263a1bbd350cfb18e1d5336a12927851825bb6 psycopg2-2.8.4.tar.gz +md5 c232ff3e3bfee35e1a0e15bc089cb294 psycopg2-2.8.5.tar.gz +sha256 f7d46240f7a1ae1dd95aab38bd74f7428d46531f69219954266d669da60c0818 psycopg2-2.8.5.tar.gz # Locally computed sha256 checksums -sha256 9614b85dfc9a72c5b2ca33144c1d7e1ed3b1c297459d9fb28a6a5762c2e8d71b LICENSE +sha256 9614b85dfc9a72c5b2ca33144c1d7e1ed3b1c297459d9fb28a6a5762c2e8d71b LICENSE diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk index a32099e3b9..b6f1f6ab70 100644 --- a/package/python-psycopg2/python-psycopg2.mk +++ b/package/python-psycopg2/python-psycopg2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSYCOPG2_VERSION = 2.8.4 +PYTHON_PSYCOPG2_VERSION = 2.8.5 PYTHON_PSYCOPG2_SOURCE = psycopg2-$(PYTHON_PSYCOPG2_VERSION).tar.gz -PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/84/d7/6a93c99b5ba4d4d22daa3928b983cec66df4536ca50b22ce5dcac65e4e71 +PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/a8/8f/1c5690eebf148d1d1554fc00ccf9101e134636553dbb75bdfef4f85d7647 PYTHON_PSYCOPG2_SETUP_TYPE = setuptools PYTHON_PSYCOPG2_LICENSE = LGPL-3.0+ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE diff --git a/package/python-pudb/Config.in b/package/python-pudb/Config.in index d4a4f73e6a..b3a93058b5 100644 --- a/package/python-pudb/Config.in +++ b/package/python-pudb/Config.in @@ -1,10 +1,10 @@ config BR2_PACKAGE_PYTHON_PUDB bool "python-pudb" + depends on BR2_PACKAGE_PYTHON3 # pygments select BR2_PACKAGE_PYTHON_URWID # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_CURSES # runtime help A full-screen, console-based Python debugger. diff --git a/package/python-py/python-py.hash b/package/python-py/python-py.hash index f8e6446338..2d9928f376 100644 --- a/package/python-py/python-py.hash +++ b/package/python-py/python-py.hash @@ -1,5 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/py/json -md5 d9e30436ce7e79f30847f9b30b62e149 py-1.8.0.tar.gz -sha256 dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53 py-1.8.0.tar.gz +md5 5f108bfe00d5468cbdb8071051f86a55 py-1.10.0.tar.gz +sha256 21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3 py-1.10.0.tar.gz # Locally computed sha256 checksums -sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE +sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE +sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 py/_vendored_packages/iniconfig-1.1.1.dist-info/LICENSE diff --git a/package/python-py/python-py.mk b/package/python-py/python-py.mk index 1592b5c6b4..d8cb6fa544 100644 --- a/package/python-py/python-py.mk +++ b/package/python-py/python-py.mk @@ -4,12 +4,14 @@ # ################################################################################ -PYTHON_PY_VERSION = 1.8.0 +PYTHON_PY_VERSION = 1.10.0 PYTHON_PY_SOURCE = py-$(PYTHON_PY_VERSION).tar.gz -PYTHON_PY_SITE = https://files.pythonhosted.org/packages/f1/5a/87ca5909f400a2de1561f1648883af74345fe96349f34f737cdfc94eba8c +PYTHON_PY_SITE = https://files.pythonhosted.org/packages/0d/8c/50e9f3999419bb7d9639c37e83fa9cdcf0f601a9d407162d6c37ad60be71 PYTHON_PY_DEPENDENCIES = host-python-setuptools-scm PYTHON_PY_SETUP_TYPE = setuptools PYTHON_PY_LICENSE = MIT -PYTHON_PY_LICENSE_FILES = LICENSE +PYTHON_PY_LICENSE_FILES = LICENSE py/_vendored_packages/iniconfig-1.1.1.dist-info/LICENSE +PYTHON_PY_CPE_ID_VENDOR = pytest +PYTHON_PY_CPE_ID_PRODUCT = py $(eval $(python-package)) diff --git a/package/python-pycairo/Config.in b/package/python-pycairo/Config.in index 0d8de977e1..a44a0421e6 100644 --- a/package/python-pycairo/Config.in +++ b/package/python-pycairo/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYCAIRO bool "python-pycairo" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_CAIRO help Python interface for cairo. diff --git a/package/python-pycairo/python-pycairo.hash b/package/python-pycairo/python-pycairo.hash index f0b76b1e38..c617d8b601 100644 --- a/package/python-pycairo/python-pycairo.hash +++ b/package/python-pycairo/python-pycairo.hash @@ -1,7 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/pycairo/json -md5 be2ba51f234270dec340f28f1695a95e pycairo-1.18.2.tar.gz -sha256 dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531 pycairo-1.18.2.tar.gz +md5 59bc5c5d1debc3af0f6791af9d612551 pycairo-1.19.1.tar.gz +sha256 2c143183280feb67f5beb4e543fd49990c28e7df427301ede04fc550d3562e84 pycairo-1.19.1.tar.gz # Locally computed sha256 checksums -sha256 22c7747e2decb1b26e395b45dbaeb627784ef7fdbf2b80ac09a26a560277e58a COPYING -sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING-LGPL-2.1 -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING-MPL-1.1 +sha256 360b9a526d47c51a7cab7f1ec49ca5893050562d639b742d588934ff84823a72 COPYING +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING-LGPL-2.1 +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING-MPL-1.1 diff --git a/package/python-pycairo/python-pycairo.mk b/package/python-pycairo/python-pycairo.mk index 5a48a2a29a..c635498d52 100644 --- a/package/python-pycairo/python-pycairo.mk +++ b/package/python-pycairo/python-pycairo.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCAIRO_VERSION = 1.18.2 +PYTHON_PYCAIRO_VERSION = 1.19.1 PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz -PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/3c/1a/c0478ecab31baae50fda9956547788afbd0ca563adc52c9b03cab30f17eb +PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/e8/9d/c8be300fc6b1298559d37a071c3833b0b251e0fff334d2e4c408d5789162 PYTHON_PYCAIRO_SETUP_TYPE = setuptools PYTHON_PYCAIRO_DEPENDENCIES = cairo PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1 diff --git a/package/python-pycares/python-pycares.hash b/package/python-pycares/python-pycares.hash index c8c46175dc..7f749938a1 100644 --- a/package/python-pycares/python-pycares.hash +++ b/package/python-pycares/python-pycares.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycares/json -md5 8ac802d79b318efa27d3a9949d0604d1 pycares-3.1.1.tar.gz -sha256 18dfd4fd300f570d6c4536c1d987b7b7673b2a9d14346592c5d6ed716df0d104 pycares-3.1.1.tar.gz +md5 5908c5762f08d07310f081aa2d8397a2 pycares-4.0.0.tar.gz +sha256 d0154fc5753b088758fbec9bc137e1b24bb84fc0c6a09725c8bac25a342311cd pycares-4.0.0.tar.gz # Locally computed sha256 checksums -sha256 427bb3a5372024a26e2c290b24382512bcc7ca123431c4dd178dd613beea7eee LICENSE +sha256 427bb3a5372024a26e2c290b24382512bcc7ca123431c4dd178dd613beea7eee LICENSE diff --git a/package/python-pycares/python-pycares.mk b/package/python-pycares/python-pycares.mk index dea34f82bf..b0abb1a41a 100644 --- a/package/python-pycares/python-pycares.mk +++ b/package/python-pycares/python-pycares.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCARES_VERSION = 3.1.1 +PYTHON_PYCARES_VERSION = 4.0.0 PYTHON_PYCARES_SOURCE = pycares-$(PYTHON_PYCARES_VERSION).tar.gz -PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/4e/09/f49ef1c4b6a5ad50fc08a8acd015f1938594dd7a6b4a6a96d049d9bbec7d +PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/25/5a/ed8cc3340b7e83a5e572b5d27387a968a7e52b1e3c269442076ca902b7ba PYTHON_PYCARES_SETUP_TYPE = setuptools PYTHON_PYCARES_LICENSE = MIT PYTHON_PYCARES_LICENSE_FILES = LICENSE diff --git a/package/python-pycparser/python-pycparser.hash b/package/python-pycparser/python-pycparser.hash index 6230f7cc83..0426444399 100644 --- a/package/python-pycparser/python-pycparser.hash +++ b/package/python-pycparser/python-pycparser.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycparser/json -md5 76396762adc3fa769c83d8e202d36b6f pycparser-2.19.tar.gz -sha256 a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3 pycparser-2.19.tar.gz +md5 b8f88de737db8c346ee8d31c07c7a25a pycparser-2.20.tar.gz +sha256 2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 pycparser-2.20.tar.gz # Locally computed sha256 checksums -sha256 3c76629880aec2f8578ed914701a4ff9e5da8b60acb8b7ec675abf83c90c5168 LICENSE +sha256 3c76629880aec2f8578ed914701a4ff9e5da8b60acb8b7ec675abf83c90c5168 LICENSE diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index c07edaaa25..5f44a562af 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_PYCPARSER_VERSION = 2.19 +# Please keep in sync with package/python3-pycparser/python3-pycparser.mk +PYTHON_PYCPARSER_VERSION = 2.20 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz -PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7fdeab8567783e83e1b9ab5585e6206a +PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd PYTHON_PYCPARSER_SETUP_TYPE = setuptools PYTHON_PYCPARSER_LICENSE = BSD-3-Clause PYTHON_PYCPARSER_LICENSE_FILES = LICENSE diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 2f2ca3ca7f..1016672af8 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 c55b52fc81cbf795fb7c302b0cc19b9f pycryptodomex-3.9.6.tar.gz -sha256 c021b66f5b3c4ea0c45422ec3241bfea4a16651e1ee5459a136639d0716ccb3c pycryptodomex-3.9.6.tar.gz +md5 08bc8fbbcd6060c06f1f10e2dc18b834 pycryptodomex-3.9.9.tar.gz +sha256 7b5b7c5896f8172ea0beb283f7f9428e0ab88ec248ce0a5b8c98d73e26267d51 pycryptodomex-3.9.9.tar.gz # Locally computed sha256 checksums -sha256 d1af3fab2ef8cc53b6c7f48bdeb178ac874b04faf4ba0159a96b6109f1d393e2 LICENSE.rst -sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto +sha256 d1af3fab2ef8cc53b6c7f48bdeb178ac874b04faf4ba0159a96b6109f1d393e2 LICENSE.rst +sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index 7bc871678a..341d1fa0f5 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.9.6 +# Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk +PYTHON_PYCRYPTODOMEX_VERSION = 3.9.9 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/d7/4f/20258a48e6760cff6523a176ecec671c85cad3f199754a8b89728d130aa8 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/14/90/f4a934bffae029e16fb33f3bd87014a0a18b4bec591249c4fc01a18d3ab6 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ @@ -15,3 +16,4 @@ PYTHON_PYCRYPTODOMEX_LICENSE = \ PYTHON_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index ccc388d932..224f32856f 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,3 +1,3 @@ -# sha256 from https://pypi.org/project/pyDAL/#files -sha256 763ed017f431fc3d9fa9243f6be2519ff49b8a260d15763c4733762d9c086904 python-pydal-18.09.tar.gz -sha256 ae7d7b6888bb72f26af2bcbee69ae6f8a49e12f66c99e78f2a8b806effc5219d LICENSE +# sha256 locally computed +sha256 df54be164bcdab8ffc8db88cb72333cc4b27997ce58c302dd8ade36462d799ea python-pydal-20200910.1.tar.gz +sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index 8ef06bc036..2cac839a9e 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 18.09 +PYTHON_PYDAL_VERSION = 20200910.1 PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) PYTHON_PYDAL_LICENSE = BSD-3-Clause -PYTHON_PYDAL_LICENSE_FILES = LICENSE +PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt PYTHON_PYDAL_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-pyelftools/python-pyelftools.hash b/package/python-pyelftools/python-pyelftools.hash index 80900b711d..a309b90e15 100644 --- a/package/python-pyelftools/python-pyelftools.hash +++ b/package/python-pyelftools/python-pyelftools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyelftools/json -md5 c5629b9a5d19c82107a946cce52eeec2 pyelftools-0.25.tar.gz -sha256 89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24 pyelftools-0.25.tar.gz +md5 061d67c669a9b1f8d07f28c47fb6a65f pyelftools-0.27.tar.gz +sha256 cde854e662774c5457d688ca41615f6594187ba7067af101232df889a6b7a66b pyelftools-0.27.tar.gz # Locally computed sha256 checksums -sha256 ae18bf4cb82f92af7547259177bc28bc48e4fc732518bcedfe690226288d3445 LICENSE +sha256 ae18bf4cb82f92af7547259177bc28bc48e4fc732518bcedfe690226288d3445 LICENSE diff --git a/package/python-pyelftools/python-pyelftools.mk b/package/python-pyelftools/python-pyelftools.mk index 21b9e409be..3ae0a4ffc2 100644 --- a/package/python-pyelftools/python-pyelftools.mk +++ b/package/python-pyelftools/python-pyelftools.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_PYELFTOOLS_VERSION = 0.25 +# Please keep in sync with package/python3-pyelftools/python3-pyelftools.mk +PYTHON_PYELFTOOLS_VERSION = 0.27 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz -PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/fa/9a/0674cb1725196568bdbca98304f2efb17368b57af1a4bb3fc772c026f474 +PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0 PYTHON_PYELFTOOLS_LICENSE = Public domain PYTHON_PYELFTOOLS_LICENSE_FILES = LICENSE PYTHON_PYELFTOOLS_SETUP_TYPE = setuptools diff --git a/package/python-pygments/Config.in b/package/python-pygments/Config.in index f097c52397..d74e53d4c8 100644 --- a/package/python-pygments/Config.in +++ b/package/python-pygments/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYGMENTS bool "python-pygments" + depends on BR2_PACKAGE_PYTHON3 help Pygments is a syntax highlighting package written in Python. diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash index ad3604ee54..09b47b2bdc 100644 --- a/package/python-pygments/python-pygments.hash +++ b/package/python-pygments/python-pygments.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pygments/json -md5 5ecc3fbb2a783e917b369271fc0e6cd1 Pygments-2.4.2.tar.gz -sha256 881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297 Pygments-2.4.2.tar.gz +md5 390a49fa0eb5486a795b2b54b9a7b666 Pygments-2.7.4.tar.gz +sha256 df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337 Pygments-2.7.4.tar.gz # Locally computed sha256 checksums -sha256 45b88d3449c37806594758bf3c484d9d98b12b1ecc163f65431fe07fea6025f0 LICENSE +sha256 c012cf17a2ba79142977c8cc5bb1497a675401bf79c2c9b95a7604e2ddfde8b8 LICENSE diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk index 5d190c4990..781b16353b 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.4.2 +PYTHON_PYGMENTS_VERSION = 2.7.4 PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/7e/ae/26808275fc76bf2832deb10d3a3ed3107bc4de01b85dcccbe525f2cd6d1e +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/e1/86/8059180e8217299079d8719c6e23d674aadaba0b1939e25e0cc15dcf075b PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE +PYTHON_PYGMENTS_CPE_ID_VENDOR = pygments +PYTHON_PYGMENTS_CPE_ID_PRODUCT = pygments PYTHON_PYGMENTS_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-pyicu/Config.in b/package/python-pyicu/Config.in index efab0853e4..93eac53387 100644 --- a/package/python-pyicu/Config.in +++ b/package/python-pyicu/Config.in @@ -1,15 +1,17 @@ config BR2_PACKAGE_PYTHON_PYICU bool "python-pyicu" depends on !BR2_BINFMT_FLAT # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu depends on BR2_INSTALL_LIBSTDCPP # icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu select BR2_PACKAGE_ICU help Python extension wrapping the ICU C++ API. https://github.com/ovalhub/pyicu -comment "python-pyicu needs a toolchain w/ C++, gcc >= 4.8" +comment "python-pyicu needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/python-pyjwt/Config.in b/package/python-pyjwt/Config.in index 510875ce2f..f8d4f8a9b8 100644 --- a/package/python-pyjwt/Config.in +++ b/package/python-pyjwt/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYJWT bool "python-pyjwt" + depends on BR2_PACKAGE_PYTHON3 help JSON Web Token implementation in Python. diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash index 62ec3559af..f3bc5d4814 100644 --- a/package/python-pyjwt/python-pyjwt.hash +++ b/package/python-pyjwt/python-pyjwt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyJWT/json -md5 a4712f980c008696e13e09504120b2a0 PyJWT-1.7.1.tar.gz -sha256 8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96 PyJWT-1.7.1.tar.gz +md5 34c235e02746683bfc81a61f9ec4dc85 PyJWT-2.1.0.tar.gz +sha256 fba44e7898bbca160a2b2b501f492824fc8382485d3a6f11ba5d0c1937ce6130 PyJWT-2.1.0.tar.gz # Locally computed sha256 checksums -sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE +sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk index dfc66e5651..5600459c65 100644 --- a/package/python-pyjwt/python-pyjwt.mk +++ b/package/python-pyjwt/python-pyjwt.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_PYJWT_VERSION = 1.7.1 +PYTHON_PYJWT_VERSION = 2.1.0 PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz -PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/2f/38/ff37a24c0243c5f45f5798bd120c0f873eeed073994133c084e1cf13b95c +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/0c/c6/3cdc7cb1289b35186fd7fd61836b6d83632ca0f7eee552516777361667b1 PYTHON_PYJWT_SETUP_TYPE = setuptools PYTHON_PYJWT_LICENSE = MIT PYTHON_PYJWT_LICENSE_FILES = LICENSE +PYTHON_PYJWT_CPE_ID_VENDOR = pyjwt_project +PYTHON_PYJWT_CPE_ID_PRODUCT = pyjwt $(eval $(python-package)) diff --git a/package/python-pylibftdi/Config.in b/package/python-pylibftdi/Config.in index d340974656..ce815a55fd 100644 --- a/package/python-pylibftdi/Config.in +++ b/package/python-pylibftdi/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_PYTHON_PYLIBFTDI bool "python-pylibftdi" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi -> libusb select BR2_PACKAGE_LIBFTDI help This package contains the python language binding libftdi. https://pypi.python.org/pypi/pylibftdi -comment "python-pylibftdi needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "python-pylibftdi needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index d96e21a55c..9135a4d0c4 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -11,4 +11,13 @@ PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = doc/LICENSE +ifeq ($(BR2_PACKAGE_PYTHON),y) +# only needed/valid for python 3.x +define PYTHON_PYMODBUS_RM_PY3_FILES + rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pymodbus/client/asynchronous/asyncio +endef + +PYTHON_PYMODBUS_POST_INSTALL_TARGET_HOOKS += PYTHON_PYMODBUS_RM_PY3_FILES +endif + $(eval $(python-package)) diff --git a/package/python-pynacl/python-pynacl.hash b/package/python-pynacl/python-pynacl.hash index 9aa8a0eefe..b6ee2baf0e 100644 --- a/package/python-pynacl/python-pynacl.hash +++ b/package/python-pynacl/python-pynacl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pynacl/json -md5 3f3b1272287bc2de8efd8a5fa18bf728 PyNaCl-1.3.0.tar.gz -sha256 0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c PyNaCl-1.3.0.tar.gz +md5 8c6c57893327a694c72510fb620e4744 PyNaCl-1.4.0.tar.gz +sha256 54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 PyNaCl-1.4.0.tar.gz # Locally computed sha256 checksums -sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE +sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE diff --git a/package/python-pynacl/python-pynacl.mk b/package/python-pynacl/python-pynacl.mk index 679b3a7795..1e4155992a 100644 --- a/package/python-pynacl/python-pynacl.mk +++ b/package/python-pynacl/python-pynacl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYNACL_VERSION = 1.3.0 +PYTHON_PYNACL_VERSION = 1.4.0 PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz -PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/61/ab/2ac6dea8489fa713e2b4c6c5b549cc962dd4a842b5998d9e80cf8440b7cd +PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/cf/5a/25aeb636baeceab15c8e57e66b8aa930c011ec1c035f284170cacb05025e PYTHON_PYNACL_LICENSE = Apache-2.0 PYTHON_PYNACL_LICENSE_FILES = LICENSE PYTHON_PYNACL_SETUP_TYPE = setuptools diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in index c32e211e17..99ea4e9408 100644 --- a/package/python-pyopenssl/Config.in +++ b/package/python-pyopenssl/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYOPENSSL bool "python-pyopenssl" + depends on BR2_PACKAGE_PYTHON3 # python-cryptography -> python-idna depends on BR2_INSTALL_LIBSTDCPP # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_SIX # runtime @@ -9,4 +10,5 @@ config BR2_PACKAGE_PYTHON_PYOPENSSL https://github.com/pyca/pyopenssl comment "python-pyopenssl needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk index bbbd836a1b..a7ea7edfde 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -9,6 +9,8 @@ PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/0d/1d/6cc4bd4e79f78be6640fab268555a11af48474fac9df187c3361a1d1d2f0 PYTHON_PYOPENSSL_LICENSE = Apache-2.0 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE +PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl +PYTHON_PYOPENSSL_CPE_ID_PRODUCT = pyopenssl PYTHON_PYOPENSSL_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in index 425ffe326b..926ca07ed7 100644 --- a/package/python-pyparsing/Config.in +++ b/package/python-pyparsing/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_PYTHON_PYPARSING module provides a library of classes that client code uses to construct the grammar directly in Python code. - http://pyparsing.wikispaces.com/ + https://github.com/pyparsing/pyparsing/ diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash index d1161e4f8f..2c52ff0843 100644 --- a/package/python-pyparsing/python-pyparsing.hash +++ b/package/python-pyparsing/python-pyparsing.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyparsing/json, sha256 locally computed -md5 46d02cbe0461fe0571d51649e6006ef5 pyparsing-2.4.2.tar.gz -sha256 6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80 pyparsing-2.4.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyparsing/json +md5 f0953e47a0112f7a65aec2305ffdf7b4 pyparsing-2.4.7.tar.gz +sha256 c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 pyparsing-2.4.7.tar.gz # Locally computed sha256 checksums -sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE +sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index f419e00d40..0dacf2371d 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 2.4.2 +PYTHON_PYPARSING_VERSION = 2.4.7 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/7e/24/eaa8d7003aee23eda270099eeec754d7bf4399f75c6a011ef948304f66a2 +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9842bbe0036c7f763d2d6686bcf5eb1808ba3e170afdb282210 PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools diff --git a/package/python-pyparted/Config.in b/package/python-pyparted/Config.in index 6e3bde2030..0ed24f8836 100644 --- a/package/python-pyparted/Config.in +++ b/package/python-pyparted/Config.in @@ -1,14 +1,14 @@ config BR2_PACKAGE_PYTHON_PYPARTED bool "python-pyparted" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_ENABLE_LOCALE # parted depends on BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_USES_UCLIBC # parted select BR2_PACKAGE_PARTED help Python bindings for GNU parted (libparted). https://github.com/rhinstaller/pyparted -comment "pyparted needs a glibc or musl toolchain w/ locale, wchar" - depends on BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR +comment "pyparted needs a toolchain w/ locale, wchar" + depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR diff --git a/package/python-pyparted/python-pyparted.hash b/package/python-pyparted/python-pyparted.hash index 61960f469d..0c3e4a15fd 100644 --- a/package/python-pyparted/python-pyparted.hash +++ b/package/python-pyparted/python-pyparted.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a9ec181bf3c7c0635862413fc86cb0950b5af957541535f530ea86a0f9d14e73 python-pyparted-3.11.0.tar.gz +sha256 d214288ae1a70b5925861ce01b3352378eb6b1419aa3b786f509e9ef2a501c02 python-pyparted-3.11.6.tar.gz sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/python-pyparted/python-pyparted.mk b/package/python-pyparted/python-pyparted.mk index c4783459ab..9d48fd9351 100644 --- a/package/python-pyparted/python-pyparted.mk +++ b/package/python-pyparted/python-pyparted.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYPARTED_VERSION = 3.11.0 +PYTHON_PYPARTED_VERSION = 3.11.6 PYTHON_PYPARTED_SITE = $(call github,rhinstaller,pyparted,v$(PYTHON_PYPARTED_VERSION)) PYTHON_PYPARTED_SETUP_TYPE = distutils PYTHON_PYPARTED_LICENSE = GPL-2.0+ diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 260a93af9c..8f28c90d15 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -39,6 +39,12 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_TEST),y) PYTHON_PYQT5_MODULES += QtTest endif + +# QtSvg needs QtWidgets +ifeq ($(BR2_PACKAGE_QT5SVG),y) +PYTHON_PYQT5_DEPENDENCIES += qt5svg +PYTHON_PYQT5_MODULES += QtSvg +endif endif ifeq ($(BR2_PACKAGE_QT5CONNECTIVITY),y) @@ -65,7 +71,10 @@ endif ifeq ($(BR2_PACKAGE_QT5LOCATION),y) PYTHON_PYQT5_DEPENDENCIES += qt5location -PYTHON_PYQT5_MODULES += QtLocation QtPositioning +PYTHON_PYQT5_MODULES += QtPositioning +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) +PYTHON_PYQT5_MODULES += QtLocation +endif endif ifeq ($(BR2_PACKAGE_QT5MULTIMEDIA),y) @@ -85,11 +94,6 @@ PYTHON_PYQT5_DEPENDENCIES += qt5serialport PYTHON_PYQT5_MODULES += QtSerialPort endif -ifeq ($(BR2_PACKAGE_QT5SVG),y) -PYTHON_PYQT5_DEPENDENCIES += qt5svg -PYTHON_PYQT5_MODULES += QtSvg -endif - ifeq ($(BR2_PACKAGE_QT5WEBCHANNEL),y) PYTHON_PYQT5_DEPENDENCIES += qt5webchannel PYTHON_PYQT5_MODULES += QtWebChannel @@ -131,7 +135,7 @@ PYTHON_PYQT5_QTDETAIL_TYPE = shared # Turn off features that aren't available in current qt configuration PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL) PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL) -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),,PyQt_SSL) +PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL) define PYTHON_PYQT5_QTDETAIL echo $(1) >> $(2)/qtdetail.out diff --git a/package/python-pyro/python-pyro.mk b/package/python-pyro/python-pyro.mk index 06b4f457f2..235575c195 100644 --- a/package/python-pyro/python-pyro.mk +++ b/package/python-pyro/python-pyro.mk @@ -9,6 +9,8 @@ PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz PYTHON_PYRO_SITE = https://pypi.python.org/packages/61/68/0978adae315261b87acd216517c2c7f00780396e4d1426c5412458c6a28f PYTHON_PYRO_LICENSE = MIT PYTHON_PYRO_LICENSE_FILES = LICENSE +PYTHON_PYRO_CPE_ID_VENDOR = pyro_project +PYTHON_PYRO_CPE_ID_PRODUCT = pyro PYTHON_PYRO_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-pysftp/Config.in b/package/python-pysftp/Config.in index 06f883f602..5d5b731f33 100644 --- a/package/python-pysftp/Config.in +++ b/package/python-pysftp/Config.in @@ -1,7 +1,13 @@ config BR2_PACKAGE_PYTHON_PYSFTP bool "python-pysftp" + depends on BR2_PACKAGE_PYTHON3 # python-paramiko -> python-bcrypt + depends on BR2_INSTALL_LIBSTDCPP # python-paramiko select BR2_PACKAGE_PYTHON_PARAMIKO # runtime help A friendly face on SFTP. https://bitbucket.org/dundeemt/pysftp + +comment "python-pysftp needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-pysmb/Config.in b/package/python-pysmb/Config.in index 32a6878fbf..61d7c2a03e 100644 --- a/package/python-pysmb/Config.in +++ b/package/python-pysmb/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PYSMB bool "python-pysmb" depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_PYTHON_PYASN + select BR2_PACKAGE_PYTHON_PYASN1 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-pysmb/python-pysmb.hash b/package/python-pysmb/python-pysmb.hash index 94ff33ea31..03713837fc 100644 --- a/package/python-pysmb/python-pysmb.hash +++ b/package/python-pysmb/python-pysmb.hash @@ -1,5 +1,3 @@ -# md5 from https://pypi.python.org/pypi/pysmb/json -md5 e6f9ce0032db528aae060f7019bd409c pysmb-1.1.19.tar.gz # Locally computed -sha256 fa4e6b4a4f2afbfbd71e9179c491f8c77bc2ad19e0bc866d7c6cbfa9ae272602 pysmb-1.1.19.tar.gz -sha256 2b1a0a56543c1bda07f5583dddaf544442c139d3f46747d4700c7031ef354c14 LICENSE +sha256 af9db2e99eaa01e87b0ebc10f87db7c630cc880c7ae3d9dd06f1e5313e82d5a2 pysmb-1.2.7.tar.gz +sha256 8c487d5c10f024e44a9cf1df21d1fd28a80bd2dfddd9f1dcd109a47d721f497f LICENSE diff --git a/package/python-pysmb/python-pysmb.mk b/package/python-pysmb/python-pysmb.mk index 1b4c18797a..89ff08e958 100644 --- a/package/python-pysmb/python-pysmb.mk +++ b/package/python-pysmb/python-pysmb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYSMB_VERSION = 1.1.19 +PYTHON_PYSMB_VERSION = 1.2.7 PYTHON_PYSMB_SOURCE = pysmb-$(PYTHON_PYSMB_VERSION).tar.gz -PYTHON_PYSMB_SITE = https://pypi.python.org/packages/f9/e7/1fd7faaa946cc6b43ce85bb7a177b75a4718d9c5e291201fec00112b497c +PYTHON_PYSMB_SITE = https://miketeo.net/files/Projects/pysmb PYTHON_PYSMB_LICENSE = Libpng PYTHON_PYSMB_LICENSE_FILES = LICENSE PYTHON_PYSMB_SETUP_TYPE = setuptools diff --git a/package/python-pytablereader/Config.in b/package/python-pytablereader/Config.in index 6d61208bb6..e6b2a4a306 100644 --- a/package/python-pytablereader/Config.in +++ b/package/python-pytablereader/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_PYTABLEREADER bool "python-pytablereader" - depends on BR2_PACKAGE_PYTHON3 # python-pathpy + depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder, python-pathpy select BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 # runtime select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime diff --git a/package/python-pytablewriter/Config.in b/package/python-pytablewriter/Config.in index 9fed52c83f..b95ee35778 100644 --- a/package/python-pytablewriter/Config.in +++ b/package/python-pytablewriter/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_PYTABLEWRITER bool "python-pytablewriter" + depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-mbstrdecoder select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_MSGFY # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime diff --git a/package/python-pytrie/Config.in b/package/python-pytrie/Config.in index 156638476c..722d263d7e 100644 --- a/package/python-pytrie/Config.in +++ b/package/python-pytrie/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYTRIE bool "python-pytrie" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SORTEDCONTAINERS # runtime help A pure Python implementation of the trie data structure. diff --git a/package/python-pytrie/python-pytrie.hash b/package/python-pytrie/python-pytrie.hash index 3bc1f6e9a7..ead479ee1a 100644 --- a/package/python-pytrie/python-pytrie.hash +++ b/package/python-pytrie/python-pytrie.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytrie/json -md5 f7c7184124013abcc18a3e3b638d32ae PyTrie-0.3.1.tar.gz -sha256 3bb7d122a549d8006c9cba2feecac20bceda9f8c0e2a3fa99a5584cfe0dec523 PyTrie-0.3.1.tar.gz -# Locally computed sha256 -sha256 153931d44112319a1e1653752c881fb7ef092f636db31f4c36b252666e95efbd PKG-INFO +md5 0cbe20db2361dcc99bdcba7acacd34e6 PyTrie-0.4.0.tar.gz +sha256 8f4488f402d3465993fb6b6efa09866849ed8cda7903b50647b7d0342b805379 PyTrie-0.4.0.tar.gz +# Locally computed sha256 checksums +sha256 97f85c2ba0d856cf5f7e5db587af7299233db2e502980eb655ace28343541d50 LICENSE diff --git a/package/python-pytrie/python-pytrie.mk b/package/python-pytrie/python-pytrie.mk index b8264fa2be..7e55579d2d 100644 --- a/package/python-pytrie/python-pytrie.mk +++ b/package/python-pytrie/python-pytrie.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_PYTRIE_VERSION = 0.3.1 +PYTHON_PYTRIE_VERSION = 0.4.0 PYTHON_PYTRIE_SOURCE = PyTrie-$(PYTHON_PYTRIE_VERSION).tar.gz PYTHON_PYTRIE_LICENSE = BSD-3-Clause -PYTHON_PYTRIE_LICENSE_FILES = PKG-INFO -PYTHON_PYTRIE_SITE = https://files.pythonhosted.org/packages/e1/eb/ae1f098969c9e9b81e821fb8e916cbf720b900ec1c0f3359e47a427395ec +PYTHON_PYTRIE_LICENSE_FILES = LICENSE +PYTHON_PYTRIE_SITE = https://files.pythonhosted.org/packages/d3/19/15ec77ab9c85f7c36eb590d6ab7dd529f8c8516c0e2219f1a77a99d7ee77 PYTHON_PYTRIE_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch b/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch index 93b9568593..d798f836a5 100644 --- a/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch +++ b/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch @@ -11,37 +11,41 @@ Taken from pyudev issue 117 discussion: https://github.com/pyudev/pyudev/pull/117 Signed-off-by: Yegor Yefremov +[Marcin: adjust to 0.22.0] +Signed-off-by: Marcin Niestroj +[Fabrice: Use %-formatting instead of f-string for python 2] +Signed-off-by: Fabrice Fontaine --- - src/pyudev/_libudev.py | 8 ++++---- + src/pyudev/_ctypeslib/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/src/pyudev/_libudev.py b/src/pyudev/_libudev.py -index a0de8fb..1348d17 100644 ---- a/src/pyudev/_libudev.py -+++ b/src/pyudev/_libudev.py -@@ -30,7 +30,7 @@ - from __future__ import (print_function, division, unicode_literals, - absolute_import) +diff --git a/src/pyudev/_ctypeslib/utils.py b/src/pyudev/_ctypeslib/utils.py +index 9dffb3c..aa9942f 100644 +--- a/src/pyudev/_ctypeslib/utils.py ++++ b/src/pyudev/_ctypeslib/utils.py +@@ -28,7 +28,7 @@ + from __future__ import print_function + from __future__ import unicode_literals --from ctypes import (CDLL, Structure, POINTER, -+from ctypes import (cdll, CDLL, Structure, POINTER, - c_char, c_char_p, c_int, c_uint, c_ulonglong) +-from ctypes import CDLL ++from ctypes import cdll, CDLL from ctypes.util import find_library -@@ -265,10 +265,10 @@ def load_udev_library(): - Raise :exc:`~exceptions.ImportError`, if the udev library was not found. +@@ -50,10 +50,10 @@ def load_ctypes_library(name, signatures, error_checkers): + :rtype: ctypes.CDLL + :raises ImportError: if the library is not found """ -- udev_library_name = find_library('udev') -- if not udev_library_name: +- library_name = find_library(name) +- if not library_name: + try: -+ libudev = cdll.LoadLibrary('libudev.so') ++ lib = cdll.LoadLibrary('lib%s.so' % name) + except OSError: - raise ImportError('No library named udev') -- libudev = CDLL(udev_library_name, use_errno=True) - # context function signature - for namespace, members in SIGNATURES.items(): - for funcname in members: + raise ImportError('No library named %s' % name) +- lib = CDLL(library_name, use_errno=True) + # Add function signatures + for funcname, signature in signatures.items(): + function = getattr(lib, funcname, None) -- -2.1.4 +2.29.1 diff --git a/package/python-pyudev/python-pyudev.hash b/package/python-pyudev/python-pyudev.hash index 94c590731b..def10542fa 100644 --- a/package/python-pyudev/python-pyudev.hash +++ b/package/python-pyudev/python-pyudev.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=07a60f5f7a6028e83725f759a1b9490a -md5 07a60f5f7a6028e83725f759a1b9490a pyudev-0.18.tar.gz -# Locally computed -sha256 83b315f74e29c3a4aa6ea38b6cf73b0bb7e37066d7a5d70972ac418a80aed62a pyudev-0.18.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyudev/json +md5 377eda61186c91e9440f01d76dbb4206 pyudev-0.22.0.tar.gz +sha256 69bb1beb7ac52855b6d1b9fe909eefb0017f38d917cba9939602c6880035b276 pyudev-0.22.0.tar.gz +# Locally computed sha256 checksums sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/python-pyudev/python-pyudev.mk b/package/python-pyudev/python-pyudev.mk index db941ea4d9..42d5c7000b 100644 --- a/package/python-pyudev/python-pyudev.mk +++ b/package/python-pyudev/python-pyudev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUDEV_VERSION = 0.18 +PYTHON_PYUDEV_VERSION = 0.22.0 PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz -PYTHON_PYUDEV_SITE = https://pypi.python.org/packages/source/p/pyudev +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/72/c8/4660d815a79b1d42c409012aaa10ebd6b07a47529b4cb6880f27a24bd646 PYTHON_PYUDEV_LICENSE = LGPL-2.1+ PYTHON_PYUDEV_LICENSE_FILES = COPYING PYTHON_PYUDEV_SETUP_TYPE = setuptools diff --git a/package/python-pyusb/Config.in b/package/python-pyusb/Config.in index 1f97979c71..13080a9fde 100644 --- a/package/python-pyusb/Config.in +++ b/package/python-pyusb/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_PYTHON_PYUSB bool "python-pyusb" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help The PyUSB module provides easy access to the Universal @@ -8,5 +10,6 @@ config BR2_PACKAGE_PYTHON_PYUSB http://sourceforge.net/apps/trac/pyusb/ -comment "python-pyusb needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "python-pyusb needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/python-pyusb/python-pyusb.hash b/package/python-pyusb/python-pyusb.hash index c5006c8184..9c634ef722 100644 --- a/package/python-pyusb/python-pyusb.hash +++ b/package/python-pyusb/python-pyusb.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/pyusb/json -md5 c8a571bfdba778555156af3facaea6fc PyUSB-1.0.0.tar.gz +md5 a9db479f1fb914e91d3106e67a13ae09 pyusb-1.1.1.tar.gz # Locally computed -sha256 5b34ffa74ac34f330bff949c94ee00ec4a9d147234db17ee2eed2a67c0275368 PyUSB-1.0.0.tar.gz -sha256 de177fb928a0eed8d209fddbfa3861379e08b3b41f34ad17a329c2f78199371d LICENSE +sha256 7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38 pyusb-1.1.1.tar.gz +sha256 03e39fdcee9c18f2f9d0c3500a993ddeac050695eb81070ea41347587c76a7fe LICENSE diff --git a/package/python-pyusb/python-pyusb.mk b/package/python-pyusb/python-pyusb.mk index 0afcbe8b8f..dc81efde9e 100644 --- a/package/python-pyusb/python-pyusb.mk +++ b/package/python-pyusb/python-pyusb.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_PYUSB_VERSION = 1.0.0 -PYTHON_PYUSB_SOURCE = PyUSB-$(PYTHON_PYUSB_VERSION).tar.gz -PYTHON_PYUSB_SITE = https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d +PYTHON_PYUSB_VERSION = 1.1.1 +PYTHON_PYUSB_SOURCE = pyusb-$(PYTHON_PYUSB_VERSION).tar.gz +PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/b9/8d/25c4e446a07e918eb39b5af25c4a83a89db95ae44e4ed5a46c3c53b0a4d6 PYTHON_PYUSB_LICENSE = BSD-3-Clause PYTHON_PYUSB_LICENSE_FILES = LICENSE -PYTHON_PYUSB_SETUP_TYPE = distutils -PYTHON_PYUSB_DEPENDENCIES = libusb +PYTHON_PYUSB_SETUP_TYPE = setuptools +PYTHON_PYUSB_DEPENDENCIES = host-python-setuptools-scm libusb $(eval $(python-package)) diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash index 90e1f2199e..82b2f4f880 100644 --- a/package/python-pyyaml/python-pyyaml.hash +++ b/package/python-pyyaml/python-pyyaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyYAML/json -md5 d3590b85917362e837298e733321962b PyYAML-5.3.1.tar.gz -sha256 b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d PyYAML-5.3.1.tar.gz +md5 46e25294c7efec23d4072ed6a7777f46 PyYAML-5.4.1.tar.gz +sha256 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e PyYAML-5.4.1.tar.gz # Locally computed sha256 checksums -sha256 c40112449f254b9753045925248313e9270efa36d226b22d82d4cc6c43c57f29 LICENSE +sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 78506390a4..c9013de8ec 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -4,12 +4,15 @@ # ################################################################################ -PYTHON_PYYAML_VERSION = 5.3.1 +# Please keep in sync package/python3-pyyaml/python3-pyyaml.mk +PYTHON_PYYAML_VERSION = 5.4.1 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz -PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c -PYTHON_PYYAML_SETUP_TYPE = distutils +PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d +PYTHON_PYYAML_SETUP_TYPE = setuptools PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE +PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml +PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml PYTHON_PYYAML_DEPENDENCIES = libyaml HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml diff --git a/package/python-pyzmq/python-pyzmq.hash b/package/python-pyzmq/python-pyzmq.hash index 96e0ab9ffc..ecf6489249 100644 --- a/package/python-pyzmq/python-pyzmq.hash +++ b/package/python-pyzmq/python-pyzmq.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pyzmq/json -md5 d850bbab7c7f558b91c95b19028ff4b8 pyzmq-18.1.1.tar.gz -sha256 8c69a6cbfa94da29a34f6b16193e7c15f5d3220cb772d6d17425ff3faa063a6d pyzmq-18.1.1.tar.gz -# Locally calculated -sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD -sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER +md5 200abc1a75bdcfff7adf61304f46f55e pyzmq-19.0.2.tar.gz +sha256 296540a065c8c21b26d63e3cea2d1d57902373b16e4256afe46422691903a438 pyzmq-19.0.2.tar.gz +# Locally computed sha256 checksums +sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD +sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index 0ba0c8d980..d1f4314a1e 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYZMQ_VERSION = 18.1.1 +PYTHON_PYZMQ_VERSION = 19.0.2 PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz -PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/3c/83/7ecbe9b762829f589fa9734026e0ccb63cb128fe5615ae1698f65df72bfe +PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/05/77/7483975d84fe1fd24cc67881ba7810e0e7b3ee6c2a0e002a5d6703cca49b PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index 02ec3bde5e..57c71dabfa 100644 --- a/package/python-redis/python-redis.hash +++ b/package/python-redis/python-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/redis/json -md5 c2062a26ea12b69e0d39a23451c89998 redis-3.4.1.tar.gz -sha256 0dcfb335921b88a850d461dc255ff4708294943322bd55de6cfd68972490ca1f redis-3.4.1.tar.gz +md5 7a00d4540374f34e152a33faa1fcee5f redis-3.5.3.tar.gz +sha256 0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2 redis-3.5.3.tar.gz # Locally computed sha256 checksums -sha256 790148d8c12f8a38b2707a74be2343316bad126995ff54801a181b8b231ba124 LICENSE +sha256 790148d8c12f8a38b2707a74be2343316bad126995ff54801a181b8b231ba124 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index a93ccfe020..98c1a16599 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 3.4.1 +PYTHON_REDIS_VERSION = 3.5.3 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/ef/2e/2c0f59891db7db087a7eeaa79bc7c7f2c039e71a2b5b0a41391e9d462926 +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/b3/17/1e567ff78c83854e16b98694411fe6e08c3426af866ad11397cddceb80d3 PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE diff --git a/package/python-remi/Config.in b/package/python-remi/Config.in index 553c89c343..e0c5e9bfe1 100644 --- a/package/python-remi/Config.in +++ b/package/python-remi/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_PYTHON_REMI bool "python-remi" + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help Remi is a GUI library for Python applications which transpiles an application's interface into HTML to be rendered in a web diff --git a/package/python-remi/python-remi.hash b/package/python-remi/python-remi.hash index 2355380163..4e1786a952 100644 --- a/package/python-remi/python-remi.hash +++ b/package/python-remi/python-remi.hash @@ -1,3 +1,2 @@ -# Locally computed -sha256 678c9caf1ecffc03c4a3d59931906520545d77e9a8027ff1a1ca90fc580f56e2 python-remi-2019.9.tar.gz -sha256 bc198f9846c1da3a1c1b1fa2b12909b021365d1e7fe9b4039245edfcec3b7f7f LICENSE +# sha256 from https://pypi.org/pypi/remi/json +sha256 c8691f007dc30b91013131b6aded3521c17ef8ec9fdd152a0ad481b8cb793f14 remi-2021.3.2.tar.gz diff --git a/package/python-remi/python-remi.mk b/package/python-remi/python-remi.mk index df0e1df5a4..609e127cf0 100644 --- a/package/python-remi/python-remi.mk +++ b/package/python-remi/python-remi.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_REMI_VERSION = 2019.9 -PYTHON_REMI_SITE = $(call github,dddomodossola,remi,$(PYTHON_REMI_VERSION)) +PYTHON_REMI_VERSION = 2021.3.2 +PYTHON_REMI_SOURCE = remi-$(PYTHON_REMI_VERSION).tar.gz +PYTHON_REMI_SITE = https://files.pythonhosted.org/packages/c0/99/94bd825cf8baee369b959f76c802a51ccc69d4d62ec113e26db4835f710c PYTHON_REMI_LICENSE = Apache-2.0 -PYTHON_REMI_LICENSE_FILES = LICENSE PYTHON_REMI_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-requests-oauthlib/Config.in b/package/python-requests-oauthlib/Config.in index 85283b209c..2510644bd1 100644 --- a/package/python-requests-oauthlib/Config.in +++ b/package/python-requests-oauthlib/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB bool "python-requests-oauthlib" + depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_OAUTHLIB # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime help diff --git a/package/python-requests-oauthlib/python-requests-oauthlib.hash b/package/python-requests-oauthlib/python-requests-oauthlib.hash index 784ad8e692..d33cabfefc 100644 --- a/package/python-requests-oauthlib/python-requests-oauthlib.hash +++ b/package/python-requests-oauthlib/python-requests-oauthlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests-oauthlib/json -md5 c32a54ce04123480132960a290d50792 requests-oauthlib-1.2.0.tar.gz -sha256 bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57 requests-oauthlib-1.2.0.tar.gz +md5 1ebcd55f1b1b9281940b4bc33010e2ba requests-oauthlib-1.3.0.tar.gz +sha256 b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a requests-oauthlib-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 ae01846afad8a8291fe6a08966f3015af9a8ff675d84b981f9793c122f7876e8 LICENSE +sha256 ae01846afad8a8291fe6a08966f3015af9a8ff675d84b981f9793c122f7876e8 LICENSE diff --git a/package/python-requests-oauthlib/python-requests-oauthlib.mk b/package/python-requests-oauthlib/python-requests-oauthlib.mk index 41dca1abdd..9fe5b186b0 100644 --- a/package/python-requests-oauthlib/python-requests-oauthlib.mk +++ b/package/python-requests-oauthlib/python-requests-oauthlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_OAUTHLIB_VERSION = 1.2.0 +PYTHON_REQUESTS_OAUTHLIB_VERSION = 1.3.0 PYTHON_REQUESTS_OAUTHLIB_SOURCE = requests-oauthlib-$(PYTHON_REQUESTS_OAUTHLIB_VERSION).tar.gz -PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/de/a2/f55312dfe2f7a344d0d4044fdfae12ac8a24169dc668bd55f72b27090c32 +PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/23/eb/68fc8fa86e0f5789832f275c8289257d8dc44dbe93fce7ff819112b9df8f PYTHON_REQUESTS_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_REQUESTS_OAUTHLIB_LICENSE = ISC PYTHON_REQUESTS_OAUTHLIB_LICENSE_FILES = LICENSE diff --git a/package/python-requests-toolbelt/Config.in b/package/python-requests-toolbelt/Config.in index ba2b95152e..47141c2c8a 100644 --- a/package/python-requests-toolbelt/Config.in +++ b/package/python-requests-toolbelt/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT bool "python-requests-toolbelt" + depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna select BR2_PACKAGE_PYTHON_REQUESTS # runtime help A utility belt for advanced users of python-requests. diff --git a/package/python-requests/Config.in b/package/python-requests/Config.in index 30158b8d25..c798156613 100644 --- a/package/python-requests/Config.in +++ b/package/python-requests/Config.in @@ -1,14 +1,12 @@ config BR2_PACKAGE_PYTHON_REQUESTS bool "python-requests" + depends on BR2_PACKAGE_PYTHON3 # python-idna select BR2_PACKAGE_PYTHON_CERTIFI # runtime select BR2_PACKAGE_PYTHON_CHARDET # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_URLLIB3 # runtime - select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Requests is an Apache2 Licensed HTTP library, written in Python, for human beings. diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index 42f45d3a44..e07c7bf5cc 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 ee28bee2de76e9198fc41e48f3a7dd47 requests-2.22.0.tar.gz -sha256 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 requests-2.22.0.tar.gz +md5 514d6f7eba77ada0b8c98ec7818828db requests-2.25.1.tar.gz +sha256 27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 requests-2.25.1.tar.gz # Locally computed sha256 checksums -sha256 be41abac2c40f8530307e8d172c590b476f4a488bc6a68f8de57b7cf64786687 LICENSE +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index e64db94523..5d0f545ffb 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,11 +4,14 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.22.0 +# Please keep in sync with package/python3-requests/python3-requests.mk +PYTHON_REQUESTS_VERSION = 2.25.1 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/01/62/ddcf76d1d19885e8579acb1b1df26a852b03472c0e46d2b959a714c90608 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/6b/47/c14abc08432ab22dc18b9892252efaf005ab44066de871e72a38d6af464b PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE +PYTHON_REQUESTS_CPE_ID_VENDOR = python +PYTHON_REQUESTS_CPE_ID_PRODUCT = requests $(eval $(python-package)) diff --git a/package/python-rpi-ws281x/python-rpi-ws281x.hash b/package/python-rpi-ws281x/python-rpi-ws281x.hash index 5333baabb6..06b2d18607 100644 --- a/package/python-rpi-ws281x/python-rpi-ws281x.hash +++ b/package/python-rpi-ws281x/python-rpi-ws281x.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/rpi-ws281x/json -md5 17a714941043621e81f592e6a137dd92 rpi_ws281x-4.2.3.tar.gz -sha256 265a395410cc7199f779c4209ca3970b7211896b86dbaa4731bdc3569d2e595f rpi_ws281x-4.2.3.tar.gz +md5 333dacfc58058d5f485f9af74551c70e rpi_ws281x-4.3.0.tar.gz +sha256 0b9549687ab7117acbc4bac0e92742fd2c8290fd204514d72fed91c06ba2e805 rpi_ws281x-4.3.0.tar.gz # Locally computed sha256 checksums -sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 LICENSE -sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 lib/LICENSE +sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 LICENSE +sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 lib/LICENSE diff --git a/package/python-rpi-ws281x/python-rpi-ws281x.mk b/package/python-rpi-ws281x/python-rpi-ws281x.mk index 899ad3d1e3..b711039615 100644 --- a/package/python-rpi-ws281x/python-rpi-ws281x.mk +++ b/package/python-rpi-ws281x/python-rpi-ws281x.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_RPI_WS281X_VERSION = 4.2.3 +PYTHON_RPI_WS281X_VERSION = 4.3.0 PYTHON_RPI_WS281X_SOURCE = rpi_ws281x-$(PYTHON_RPI_WS281X_VERSION).tar.gz -PYTHON_RPI_WS281X_SITE = https://files.pythonhosted.org/packages/03/6c/46fad1bace9d5917190fd76e1550ec6727010cff6d3e5818b8c3a5405ba3 +PYTHON_RPI_WS281X_SITE = https://files.pythonhosted.org/packages/cd/b3/eb7ac93376952f165577707ec756f40c9537ed53c59fcbc3290c357370e0 PYTHON_RPI_WS281X_SETUP_TYPE = setuptools -PYTHON_RPI_WS281X_LICENSE = MIT +PYTHON_RPI_WS281X_LICENSE = BSD-2-Clause PYTHON_RPI_WS281X_LICENSE_FILES = LICENSE lib/LICENSE $(eval $(python-package)) diff --git a/package/python-scapy/python-scapy.hash b/package/python-scapy/python-scapy.hash index df7eeb8eab..8618e54f4b 100644 --- a/package/python-scapy/python-scapy.hash +++ b/package/python-scapy/python-scapy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/scapy/json -md5 469ae6f5615799a5de3f3b4eb217b18d scapy-2.4.3.tar.gz -sha256 e2f8d11f6a941c14a789ae8b236b27bd634681f1b29b5e893861e284d234f6b0 scapy-2.4.3.tar.gz +md5 01e52ff5d1f04364e17fc2d42872282e scapy-2.4.4.tar.gz +sha256 ecfd7a14cd9c3ef0eb08d28d5bb71d97219edff1454ccbdff229f676b27900ee scapy-2.4.4.tar.gz # Locally computed sha256 checksums -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-scapy/python-scapy.mk b/package/python-scapy/python-scapy.mk index f6cf2a07b3..3083a84412 100644 --- a/package/python-scapy/python-scapy.mk +++ b/package/python-scapy/python-scapy.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_SCAPY_VERSION = 2.4.3 +PYTHON_SCAPY_VERSION = 2.4.4 PYTHON_SCAPY_SOURCE = scapy-$(PYTHON_SCAPY_VERSION).tar.gz -PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/52/e7/464079606a9cf97ad04936c52a5324d14dae36215f9319bf3faa46a7907d +PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/c6/8f/438d4d0bab4c8e22906a7401dd082b4c0f914daf2bbdc7e7e8390d81a5c3 PYTHON_SCAPY_SETUP_TYPE = setuptools PYTHON_SCAPY_LICENSE = GPL-2.0 PYTHON_SCAPY_LICENSE_FILES = LICENSE +PYTHON_SCAPY_CPE_ID_VENDOR = scapy +PYTHON_SCAPY_CPE_ID_PRODUCT = scapy $(eval $(python-package)) diff --git a/package/python-secretstorage/Config.in b/package/python-secretstorage/Config.in index 78a0a2ae15..8ae8c2d598 100644 --- a/package/python-secretstorage/Config.in +++ b/package/python-secretstorage/Config.in @@ -9,4 +9,5 @@ config BR2_PACKAGE_PYTHON_SECRETSTORAGE https://github.com/mitya57/secretstorage comment "python-secretstorage needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-secretstorage/python-secretstorage.hash b/package/python-secretstorage/python-secretstorage.hash index 3f096a3965..a8e535f892 100644 --- a/package/python-secretstorage/python-secretstorage.hash +++ b/package/python-secretstorage/python-secretstorage.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/secretstorage/json -md5 12ea3fc6640e857331eb80ed46a7da20 SecretStorage-3.1.1.tar.gz -sha256 20c797ae48a4419f66f8d28fc221623f11fc45b6828f96bdb1ad9990acb59f92 SecretStorage-3.1.1.tar.gz +md5 c2a8c0e08e5da198fc38c379b98c28f1 SecretStorage-3.1.2.tar.gz +sha256 15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6 SecretStorage-3.1.2.tar.gz # Locally computed sha256 checksums sha256 70f6bfca77633c35efa218328eda5486d7054c2914d61820980e378797520a25 LICENSE diff --git a/package/python-secretstorage/python-secretstorage.mk b/package/python-secretstorage/python-secretstorage.mk index 4a8b6ac903..4c209bf513 100644 --- a/package/python-secretstorage/python-secretstorage.mk +++ b/package/python-secretstorage/python-secretstorage.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SECRETSTORAGE_VERSION = 3.1.1 +PYTHON_SECRETSTORAGE_VERSION = 3.1.2 PYTHON_SECRETSTORAGE_SOURCE = SecretStorage-$(PYTHON_SECRETSTORAGE_VERSION).tar.gz -PYTHON_SECRETSTORAGE_SITE = https://files.pythonhosted.org/packages/a6/89/df343dbc2957a317127e7ff2983230dc5336273be34f2e1911519d85aeb5 +PYTHON_SECRETSTORAGE_SITE = https://files.pythonhosted.org/packages/fd/9f/36197c75d9a09b1ab63f56cb985af6cd858ca3fc41fd9cd890ce69bae5b9 PYTHON_SECRETSTORAGE_SETUP_TYPE = setuptools PYTHON_SECRETSTORAGE_LICENSE = BSD-3-Clause PYTHON_SECRETSTORAGE_LICENSE_FILES = LICENSE diff --git a/package/python-semver/python-semver.hash b/package/python-semver/python-semver.hash index 60aaa6b8c4..5c13764e57 100644 --- a/package/python-semver/python-semver.hash +++ b/package/python-semver/python-semver.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/semver/json -md5 a411b305a3f6714bca126a0b59dc4429 semver-2.9.0.tar.gz -sha256 ed1edeaa0c27f68feb74f09f715077fd07b728446dc2bb7fc470fc0f737873a0 semver-2.9.0.tar.gz +md5 3e11ae9782121e8ffe9f8a8b763a8cb5 semver-2.10.2.tar.gz +sha256 c0a4a9d1e45557297a722ee9bac3de2ec2ea79016b6ffcaca609b0bc62cf4276 semver-2.10.2.tar.gz # Locally computed -sha256 cda490c32e61d3884dc17791fc8078f2a3e564fba98dd18b4dc64eb2720b2b6f LICENSE.txt +sha256 cda490c32e61d3884dc17791fc8078f2a3e564fba98dd18b4dc64eb2720b2b6f LICENSE.txt diff --git a/package/python-semver/python-semver.mk b/package/python-semver/python-semver.mk index 6e1faef126..32ed6b971f 100644 --- a/package/python-semver/python-semver.mk +++ b/package/python-semver/python-semver.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SEMVER_VERSION = 2.9.0 +PYTHON_SEMVER_VERSION = 2.10.2 PYTHON_SEMVER_SOURCE = semver-$(PYTHON_SEMVER_VERSION).tar.gz -PYTHON_SEMVER_SITE = https://files.pythonhosted.org/packages/be/c8/392e3c1c4080202b99e8b3b5d0ab6cbcfc4b25d50031c2c21d130871bf88 +PYTHON_SEMVER_SITE = https://files.pythonhosted.org/packages/aa/e8/cb894f70a52887f001aff5f264f68272c21fa58268495aca17df396c161f PYTHON_SEMVER_SETUP_TYPE = setuptools PYTHON_SEMVER_LICENSE = BSD-3-Clause PYTHON_SEMVER_LICENSE_FILES = LICENSE.txt diff --git a/package/python-sentry-sdk/Config.in b/package/python-sentry-sdk/Config.in index 5bddabe282..e8e88bac18 100644 --- a/package/python-sentry-sdk/Config.in +++ b/package/python-sentry-sdk/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PYTHON_SENTRY_SDK bool "python-sentry-sdk" - select BR2_PACKAGE_PYTHON_URLLIB3 # runtime select BR2_PACKAGE_PYTHON_CERTIFI # runtime + select BR2_PACKAGE_PYTHON_URLLIB3 # runtime help - Python client for Sentry (https://getsentry.com). + Python client for Sentry (https://sentry.io). https://github.com/getsentry/sentry-python diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index e9dc465592..feade89f0a 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 1b22a7cb91e1f9b83acbd61709d5e71d sentry-sdk-0.13.1.tar.gz -sha256 f6e850f304382d87c5c52c01db8c0004d2ced6a0b073df2f2257168cf31b31aa sentry-sdk-0.13.1.tar.gz +md5 5d4abcc416cbd0b9443bf56588b02b55 sentry-sdk-0.17.3.tar.gz +sha256 0af429c221670e602f960fca85ca3f607c85510a91f11e8be8f742a978127f78 sentry-sdk-0.17.3.tar.gz # Locally computed sha256 checksums -sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE +sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index dd47e7c0c3..256aafa62d 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,11 +4,21 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 0.13.1 +PYTHON_SENTRY_SDK_VERSION = 0.17.3 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/e2/5f/1f5881e98746c16464d46ae9d6ccdd6ce3c01c7e13093ea8a7d917642ee7 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/64/7e/f1725d8649ef8f7d58cbec582157c454884238e59fef00b1707d555c7bea PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_PYTHON),y) +# only needed/valid for python 3.x +define PYTHON_SENTRY_SDK_RM_PY3_FILES + rm -f $(addprefix $(TARGET_DIR)/usr/lib/python*/site-packages/sentry_sdk/integrations/,\ + aiohttp.py asgi.py django/asgi.py sanic.py tornado.py) +endef + +PYTHON_SENTRY_SDK_POST_INSTALL_TARGET_HOOKS += PYTHON_SENTRY_SDK_RM_PY3_FILES +endif + $(eval $(python-package)) diff --git a/package/python-serial-asyncio/python-serial-asyncio.hash b/package/python-serial-asyncio/python-serial-asyncio.hash index 268c7d83f5..f5d1d9e485 100644 --- a/package/python-serial-asyncio/python-serial-asyncio.hash +++ b/package/python-serial-asyncio/python-serial-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyserial-asyncio/json -md5 67244fdc11cc31cf0ebf675c271c71d8 pyserial-asyncio-0.4.tar.gz -sha256 c40677a8874d8c24d4423a97498746de776f6dbcd0efbb8fa43dcf011a589aee pyserial-asyncio-0.4.tar.gz +md5 64d15bfb20982b2129b02070321f49f3 pyserial-asyncio-0.5.tar.gz +sha256 1641e5433a866eeaf6464b3ab88b741e7a89dd8cd0f851b3343b15f425138d33 pyserial-asyncio-0.5.tar.gz # Locally computed sha256 checksums -sha256 f8ded3a7460d3b2850b0cf673e986c70e9d997fd0732d8ab3f3c84f1f191087d LICENSE.txt +sha256 ebc84abdbdec7f9fa6962612c110123897db47b79529d5ae41191ef584b88f2c LICENSE.txt diff --git a/package/python-serial-asyncio/python-serial-asyncio.mk b/package/python-serial-asyncio/python-serial-asyncio.mk index 39c3476d9e..bc95f2c44a 100644 --- a/package/python-serial-asyncio/python-serial-asyncio.mk +++ b/package/python-serial-asyncio/python-serial-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SERIAL_ASYNCIO_VERSION = 0.4 +PYTHON_SERIAL_ASYNCIO_VERSION = 0.5 PYTHON_SERIAL_ASYNCIO_SOURCE = pyserial-asyncio-$(PYTHON_SERIAL_ASYNCIO_VERSION).tar.gz -PYTHON_SERIAL_ASYNCIO_SITE = https://files.pythonhosted.org/packages/41/3f/e26f71269cbc0890a527a736d9afc5c0d5838a2c188be680558d635b7dc2 +PYTHON_SERIAL_ASYNCIO_SITE = https://files.pythonhosted.org/packages/e1/97/8dd1bf656796668ed4bd86058c815b130303a00a7b70cf79758e4918814a PYTHON_SERIAL_ASYNCIO_LICENSE = BSD-3-Clause PYTHON_SERIAL_ASYNCIO_LICENSE_FILES = LICENSE.txt PYTHON_SERIAL_ASYNCIO_SETUP_TYPE = setuptools diff --git a/package/python-serial/python-serial.hash b/package/python-serial/python-serial.hash index 96209a9965..d885d3c0c8 100644 --- a/package/python-serial/python-serial.hash +++ b/package/python-serial/python-serial.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyserial/json -md5 ed6183b15519a0ae96675e9c3330c69b pyserial-3.4.tar.gz -sha256 6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627 pyserial-3.4.tar.gz +md5 1cf25a76da59b530dbfc2cf99392dc83 pyserial-3.5.tar.gz +sha256 3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb pyserial-3.5.tar.gz # Locally computed sha256 checksums -sha256 a89d951d157e2c199fbbe7ecf8d41bc3bc93de166db524aa6b9b610dbccc832d LICENSE.txt +sha256 f91cb9813de6a5b142b8f7f2dede630b5134160aedaeaf55f4d6a7e2593ca3f3 LICENSE.txt diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk index d583ac65ab..249ea9d5a3 100644 --- a/package/python-serial/python-serial.mk +++ b/package/python-serial/python-serial.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SERIAL_VERSION = 3.4 +PYTHON_SERIAL_VERSION = 3.5 PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz -PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/cc/74/11b04703ec416717b247d789103277269d567db575d2fd88f25d9767fe3d +PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/1e/7d/ae3f0a63f41e4d2f6cb66a5b57197850f919f59e558159a4dd3a818f5082 PYTHON_SERIAL_LICENSE = BSD-3-Clause PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt PYTHON_SERIAL_SETUP_TYPE = setuptools diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index f1ce5312c8..ab012347dc 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY bool "python-service-identity" - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-pyasn + depends on BR2_PACKAGE_PYTHON3 # python-pyopenssl -> python-cryptography -> python-idna + depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime - select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_PYASN # runtime - select BR2_PACKAGE_PYTHON_PYASN_MODULES # runtime + select BR2_PACKAGE_PYTHON_PYASN1 # runtime + select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime help Service identity verification for pyOpenSSL. @@ -13,4 +13,5 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY https://pypi.python.org/pypi/service_identity comment "python-service-identify needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 82dbf14356..79999fca0d 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 86ec1eb9ec02ba018b097787e98897c5 setuptools_scm-3.5.0.tar.gz -sha256 5bdf21a05792903cafe7ae0c9501182ab52497614fa6b1750d9dbae7b60c1a87 setuptools_scm-3.5.0.tar.gz +md5 c11bf23d80224691a46ee5deb84c42db setuptools_scm-5.0.1.tar.gz +sha256 c85b6b46d0edd40d2301038cdea96bb6adc14d62ef943e75afb08b3e7bcf142a setuptools_scm-5.0.1.tar.gz # sha256 locally computed sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index c6d30e99e7..caca6d4314 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 3.5.0 +PYTHON_SETUPTOOLS_SCM_VERSION = 5.0.1 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/b2/f7/60a645aae001a2e06cf4b8db2fba9d9f36b8fd378f10647e3e218b61b74b +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/af/df/f8aa8a78d4d29e0cffa4512e9bc223ed02f24893fe1837c6cee2749ebd67 PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index cc4a831d2e..769b68c35d 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 89a592d733b31e180a4b6ad760c0685a setuptools-41.4.0.zip -sha256 7eae782ccf36b790c21bde7d86a4f303a441cd77036b25c559a602cf5186ce4d setuptools-41.4.0.zip +md5 32b6cdce670ce462086d246bea181e9d setuptools-44.0.0.zip +sha256 e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008 setuptools-44.0.0.zip sha256 c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 163ba869ca..08a180ce0c 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -6,11 +6,13 @@ # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 41.4.0 +PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/f4/d5/a6c19dcbcbc267aca376558797f036d9bcdff344c9f785fe7d0fe9a5f2a7 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE +PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python +PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 diff --git a/package/python-sh/python-sh.hash b/package/python-sh/python-sh.hash index cc9ba214b8..fffdd20c15 100644 --- a/package/python-sh/python-sh.hash +++ b/package/python-sh/python-sh.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/sh/json -md5 a8351aef25d25f707c17e0a7a6280251 sh-1.12.14.tar.gz +# md5, sha256 from https://pypi.org/pypi/sh/json +md5 7e3dd3a6b49c06db93746994a68cb8cf sh-1.13.1.tar.gz +sha256 97a3d2205e3c6a842d87ebbc9ae93acae5a352b1bc4609b428d0fd5bb9e286a3 sh-1.13.1.tar.gz # Locally computed -sha256 b52bf5833ed01c7b5c5fb73a7f71b3d98d48e9b9b8764236237bdc7ecae850fc sh-1.12.14.tar.gz sha256 d8491c6e236568d04f7c8c07f2f1b8f5d142706dab6ab88f6e0d2dd476b6c706 LICENSE.txt diff --git a/package/python-sh/python-sh.mk b/package/python-sh/python-sh.mk index dfe80d5628..21c0fb3d77 100644 --- a/package/python-sh/python-sh.mk +++ b/package/python-sh/python-sh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SH_VERSION = 1.12.14 +PYTHON_SH_VERSION = 1.13.1 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz -PYTHON_SH_SITE = https://pypi.python.org/packages/7c/71/199d27d3e7e78bf448bcecae0105a1d5b29173ffd2bbadaa95a74c156770 +PYTHON_SH_SITE = https://files.pythonhosted.org/packages/c9/3b/2c9a22bf1c48ced7ff3a11d4a862682c21d825c35f9d025811ad9808d263 PYTHON_SH_SETUP_TYPE = setuptools PYTHON_SH_LICENSE = MIT PYTHON_SH_LICENSE_FILES = LICENSE.txt diff --git a/package/python-simpleaudio/python-simpleaudio.hash b/package/python-simpleaudio/python-simpleaudio.hash index 353fa5e36c..0aac4c8678 100644 --- a/package/python-simpleaudio/python-simpleaudio.hash +++ b/package/python-simpleaudio/python-simpleaudio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simpleaudio/json -md5 92f0a0891a198c000fedce0599b46c7b simpleaudio-1.0.2.tar.gz -sha256 4e0e4c0359f153408e9b8a65342ec0c1d014f36fbe9cdb594e9b6e5348916af8 simpleaudio-1.0.2.tar.gz +md5 8bd62157c286824e289e1f258419b98c simpleaudio-1.0.4.tar.gz +sha256 691c88649243544db717e7edf6a9831df112104e1aefb5f6038a5d071e8cf41d simpleaudio-1.0.4.tar.gz # Locally computed sha256 checksums -sha256 b4340683e83f0f25ea40f992773ceec6c749c4d64ec2c09dfa49d7f5b029adbf LICENSE.txt +sha256 b4340683e83f0f25ea40f992773ceec6c749c4d64ec2c09dfa49d7f5b029adbf LICENSE.txt diff --git a/package/python-simpleaudio/python-simpleaudio.mk b/package/python-simpleaudio/python-simpleaudio.mk index e23d4d026b..5cdb3a82c3 100644 --- a/package/python-simpleaudio/python-simpleaudio.mk +++ b/package/python-simpleaudio/python-simpleaudio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEAUDIO_VERSION = 1.0.2 +PYTHON_SIMPLEAUDIO_VERSION = 1.0.4 PYTHON_SIMPLEAUDIO_SOURCE = simpleaudio-$(PYTHON_SIMPLEAUDIO_VERSION).tar.gz -PYTHON_SIMPLEAUDIO_SITE = https://files.pythonhosted.org/packages/ad/39/ce09ef827887cdfc755427195d7291446c1fb34a16356d1fec920d62269d +PYTHON_SIMPLEAUDIO_SITE = https://files.pythonhosted.org/packages/94/1b/4dc29653733202b68c09d9c6ca085cf67ac54859ee860647ef21ac1ff3dc PYTHON_SIMPLEAUDIO_LICENSE = MIT PYTHON_SIMPLEAUDIO_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEAUDIO_SETUP_TYPE = setuptools diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk index 3e875015a8..cf5bd3a482 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -9,6 +9,8 @@ PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/98/87/a7b98aa9256c8843f92878966dc3d8d914c14aad97e2c5ce4798d5743e07 PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt +PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project +PYTHON_SIMPLEJSON_CPE_ID_PRODUCT = simplejson PYTHON_SIMPLEJSON_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-simplelogging/python-simplelogging.hash b/package/python-simplelogging/python-simplelogging.hash index 86698fe88c..6d80fb93ec 100644 --- a/package/python-simplelogging/python-simplelogging.hash +++ b/package/python-simplelogging/python-simplelogging.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplelogging/json -md5 e3f9da393098d8fd8ebd8349a00692f2 simplelogging-0.10.0.tar.gz -sha256 c070e0d82b68eff6918076a0edbf0a48b2c9a263854bd35f48a12c6adbbe9d80 simplelogging-0.10.0.tar.gz +md5 97b5f2a5cd9cff1b60c727cd03b3ffe1 simplelogging-0.11.0.tar.gz +sha256 23a128b47d3e88213adc51fdd102aae15a398cf459d782eb19534945d23f0bc5 simplelogging-0.11.0.tar.gz # Locally computed sha256 checksums -sha256 bd2a0fe3b3bab7092ffa7f58d46bb05d98f12f107b3a6be947c098f7c2ad1d1a LICENSE +sha256 bd2a0fe3b3bab7092ffa7f58d46bb05d98f12f107b3a6be947c098f7c2ad1d1a LICENSE diff --git a/package/python-simplelogging/python-simplelogging.mk b/package/python-simplelogging/python-simplelogging.mk index 28acc5c952..556628613b 100644 --- a/package/python-simplelogging/python-simplelogging.mk +++ b/package/python-simplelogging/python-simplelogging.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLELOGGING_VERSION = 0.10.0 +PYTHON_SIMPLELOGGING_VERSION = 0.11.0 PYTHON_SIMPLELOGGING_SOURCE = simplelogging-$(PYTHON_SIMPLELOGGING_VERSION).tar.gz -PYTHON_SIMPLELOGGING_SITE = https://files.pythonhosted.org/packages/17/85/3d2431f971e703916c7254e4560ed15451faedf2461eb484da9e1ebc5da6 +PYTHON_SIMPLELOGGING_SITE = https://files.pythonhosted.org/packages/73/d6/4c06aa7f2c3b9fc09429a1196fd357357cc555de5e16c09b2d12e9db1ebb PYTHON_SIMPLELOGGING_SETUP_TYPE = setuptools PYTHON_SIMPLELOGGING_LICENSE = BSD-3-Clause PYTHON_SIMPLELOGGING_LICENSE_FILES = LICENSE diff --git a/package/python-simplesqlite/Config.in b/package/python-simplesqlite/Config.in index c03411b90f..7e5484f494 100644 --- a/package/python-simplesqlite/Config.in +++ b/package/python-simplesqlite/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_PYTHON_SIMPLESQLITE bool "python-simplesqlite" + depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_SQLITESCHEMA # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime diff --git a/package/python-six/python-six.hash b/package/python-six/python-six.hash index 0d1e75fe9e..9945ffd1d7 100644 --- a/package/python-six/python-six.hash +++ b/package/python-six/python-six.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/six/json -md5 21674588a57e649d1a6d977ec3122140 six-1.14.0.tar.gz -sha256 236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a six-1.14.0.tar.gz +md5 9f90a0eaa0ea7747fda01ca79d21ebcb six-1.15.0.tar.gz +sha256 30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 six-1.15.0.tar.gz # Locally computed sha256 checksums -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 LICENSE diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk index 8acc739f2e..7c298d6f89 100644 --- a/package/python-six/python-six.mk +++ b/package/python-six/python-six.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_SIX_VERSION = 1.14.0 +# Please keep in sync with package/python3-six/python3-six.mk +PYTHON_SIX_VERSION = 1.15.0 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz -PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/21/9f/b251f7f8a76dec1d6651be194dfba8fb8d7781d10ab3987190de8391d08e +PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/6b/34/415834bfdafca3c5f451532e8a8d9ba89a21c9743a0c59fbd0205c7f9426 PYTHON_SIX_SETUP_TYPE = setuptools PYTHON_SIX_LICENSE = MIT PYTHON_SIX_LICENSE_FILES = LICENSE diff --git a/package/python-slob/Config.in b/package/python-slob/Config.in index a8b6e45da4..07d04d49a2 100644 --- a/package/python-slob/Config.in +++ b/package/python-slob/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_PYTHON_SLOB bool "python-slob" depends on !BR2_BINFMT_FLAT # python-pyicu -> icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-pyicu -> icu depends on BR2_INSTALL_LIBSTDCPP # python-pyicu -> icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # python-pyicu -> icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-pyicu -> icu depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYICU # runtime # although optional, it is used as default compression @@ -13,7 +14,8 @@ config BR2_PACKAGE_PYTHON_SLOB https://github.com/itkach/slob -comment "python-slob needs a toolchain w/ C++, gcc >= 4.8" +comment "python-slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/python-socketio/python-socketio.mk b/package/python-socketio/python-socketio.mk index ece4f65b78..73dab26f3c 100644 --- a/package/python-socketio/python-socketio.mk +++ b/package/python-socketio/python-socketio.mk @@ -10,4 +10,14 @@ PYTHON_SOCKETIO_SETUP_TYPE = setuptools PYTHON_SOCKETIO_LICENSE = MIT PYTHON_SOCKETIO_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_PYTHON),y) +# only needed/valid for python 3.x +define PYTHON_SOCKETIO_RM_PY3_FILES + rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/socketio/asgi.py \ + $(TARGET_DIR)/usr/lib/python*/site-packages/socketio/asyncio_*.py +endef + +PYTHON_SOCKETIO_POST_INSTALL_TARGET_HOOKS += PYTHON_SOCKETIO_RM_PY3_FILES +endif + $(eval $(python-package)) diff --git a/package/python-sockjs/python-sockjs.hash b/package/python-sockjs/python-sockjs.hash index 55ea9dc644..137b54a89d 100644 --- a/package/python-sockjs/python-sockjs.hash +++ b/package/python-sockjs/python-sockjs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sockjs/json -md5 369417bd103f841f236a8623ea29353c sockjs-0.10.0.tar.gz -sha256 005a820387bb4611b59341eac091b05d4204050dd42e4ea6cfb83607e23e2f06 sockjs-0.10.0.tar.gz +md5 e28c1a82aa84c3994817905090abb169 sockjs-0.11.0.tar.gz +sha256 0347d404ed9ef3196506787ed8018f87ee4e2d0baea49d420cdd53a969bec229 sockjs-0.11.0.tar.gz # Locally computed sha256 checksums -sha256 7be23c071df0314fadeba6077a3830340a5121ad88bfa66b0c095051a766e141 LICENSE.txt +sha256 7be23c071df0314fadeba6077a3830340a5121ad88bfa66b0c095051a766e141 LICENSE.txt diff --git a/package/python-sockjs/python-sockjs.mk b/package/python-sockjs/python-sockjs.mk index e0f58e2b61..0aea63f934 100644 --- a/package/python-sockjs/python-sockjs.mk +++ b/package/python-sockjs/python-sockjs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SOCKJS_VERSION = 0.10.0 +PYTHON_SOCKJS_VERSION = 0.11.0 PYTHON_SOCKJS_SOURCE = sockjs-$(PYTHON_SOCKJS_VERSION).tar.gz -PYTHON_SOCKJS_SITE = https://files.pythonhosted.org/packages/35/0e/6aa4f3283b064b04a0c7f3859c8c2c0b736c05cfb07853b6d94073c1bf63 +PYTHON_SOCKJS_SITE = https://files.pythonhosted.org/packages/88/e9/af7b321f70325fd2af3941aa147efd097156150da635e09efc7ccf70e54d PYTHON_SOCKJS_SETUP_TYPE = setuptools PYTHON_SOCKJS_LICENSE = Apache-2.0 PYTHON_SOCKJS_LICENSE_FILES = LICENSE.txt diff --git a/package/python-sortedcontainers/python-sortedcontainers.hash b/package/python-sortedcontainers/python-sortedcontainers.hash index 311bb77e17..d97687dd19 100644 --- a/package/python-sortedcontainers/python-sortedcontainers.hash +++ b/package/python-sortedcontainers/python-sortedcontainers.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sortedcontainers/json -md5 41a4a1eaf7b85e6b3beb14cfb160bc27 sortedcontainers-2.1.0.tar.gz -sha256 974e9a32f56b17c1bac2aebd9dcf197f3eb9cd30553c5852a3187ad162e1a03a sortedcontainers-2.1.0.tar.gz +md5 660260df593a3769c7b5854f13d574c0 sortedcontainers-2.3.0.tar.gz +sha256 59cc937650cf60d677c16775597c89a960658a09cf7c1a668f86e1e4464b10a1 sortedcontainers-2.3.0.tar.gz # Locally computed sha256 checksums -sha256 7dcf4a5137118a925727b8a1690bc6ea70b156ee6739dbb51fd4d386718d6ce5 LICENSE +sha256 1db7cae7fce6452e2e608e401a0f953e0133e4c2d75db69fb8ae851d2086f5b6 LICENSE diff --git a/package/python-sortedcontainers/python-sortedcontainers.mk b/package/python-sortedcontainers/python-sortedcontainers.mk index 43f662a89f..31cab76fd7 100644 --- a/package/python-sortedcontainers/python-sortedcontainers.mk +++ b/package/python-sortedcontainers/python-sortedcontainers.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SORTEDCONTAINERS_VERSION = 2.1.0 +PYTHON_SORTEDCONTAINERS_VERSION = 2.3.0 PYTHON_SORTEDCONTAINERS_SOURCE = sortedcontainers-$(PYTHON_SORTEDCONTAINERS_VERSION).tar.gz -PYTHON_SORTEDCONTAINERS_SITE = https://files.pythonhosted.org/packages/29/e0/135df2e733790a3d3bcda970fd080617be8cea3bd98f411e76e6847c17ef +PYTHON_SORTEDCONTAINERS_SITE = https://files.pythonhosted.org/packages/14/10/6a9481890bae97da9edd6e737c9c3dec6aea3fc2fa53b0934037b35c89ea PYTHON_SORTEDCONTAINERS_SETUP_TYPE = setuptools PYTHON_SORTEDCONTAINERS_LICENSE = Apache-2.0 PYTHON_SORTEDCONTAINERS_LICENSE_FILES = LICENSE diff --git a/package/python-spidev/python-spidev.hash b/package/python-spidev/python-spidev.hash index d3d2b685ed..13128ee3e5 100644 --- a/package/python-spidev/python-spidev.hash +++ b/package/python-spidev/python-spidev.hash @@ -1,5 +1,5 @@ # sha256 from https://pypi.org/project/spidev -sha256 4314e52f573d95233c907f307558893313a8a606e197e77bb711526b0e179e80 spidev-3.4.tar.gz +sha256 8a7f5c289f161ea2ac4697fa8a10918232c990678dd0053084b3c43b1363910d spidev-3.5.tar.gz # locally computed sha256 153a6f02f41aebe292cf3307f973a80b4fb0c988d8d3e7d126c7a66c20b1cc27 README.md diff --git a/package/python-spidev/python-spidev.mk b/package/python-spidev/python-spidev.mk index 7f9bec7c93..e1065610a7 100644 --- a/package/python-spidev/python-spidev.mk +++ b/package/python-spidev/python-spidev.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_SPIDEV_VERSION = 3.4 +PYTHON_SPIDEV_VERSION = 3.5 PYTHON_SPIDEV_SOURCE = spidev-$(PYTHON_SPIDEV_VERSION).tar.gz -PYTHON_SPIDEV_SITE = https://files.pythonhosted.org/packages/fb/14/4c2e1640f0cb04862c76d9d76ed7c945b0f67876e503ac02f7f675fe86a0 -PYTHON_SPIDEV_SETUP_TYPE = distutils +PYTHON_SPIDEV_SITE = https://files.pythonhosted.org/packages/62/56/de649e7d95f9fcfaf965a6eb937b4a46bc77ef21487c99cde1a7a0546040 +PYTHON_SPIDEV_SETUP_TYPE = setuptools PYTHON_SPIDEV_LICENSE = MIT PYTHON_SPIDEV_LICENSE_FILES = README.md diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 3886e49765..d6829853fc 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -10,5 +10,7 @@ PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/14/0e/487f7fc1e PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE +PYTHON_SQLALCHEMY_CPE_ID_VENDOR = sqlalchemy +PYTHON_SQLALCHEMY_CPE_ID_PRODUCT = sqlalchemy $(eval $(python-package)) diff --git a/package/python-sqliteschema/Config.in b/package/python-sqliteschema/Config.in index b9568adbea..8383647129 100644 --- a/package/python-sqliteschema/Config.in +++ b/package/python-sqliteschema/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_SQLITESCHEMA bool "python-sqliteschema" + depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_SIX # runtime diff --git a/package/python-tabledata/Config.in b/package/python-tabledata/Config.in index bd856d23e4..a73207f9c0 100644 --- a/package/python-tabledata/Config.in +++ b/package/python-tabledata/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_PYTHON_TABLEDATA bool "python-tabledata" + depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-typepy select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_FUTURES if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help diff --git a/package/python-tabledata/python-tabledata.hash b/package/python-tabledata/python-tabledata.hash index 9d8564db30..5c9a538f66 100644 --- a/package/python-tabledata/python-tabledata.hash +++ b/package/python-tabledata/python-tabledata.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tabledata/json -md5 3a97a7bd3f2687a139578a79353a8188 tabledata-0.9.1.tar.gz -sha256 a2c59603ecb56cd2161a72978d56876377ba6a27a3e6d87e1874ba4d5ab02796 tabledata-0.9.1.tar.gz +md5 7d1ab52001d85d19d86f08a5ad8aab58 tabledata-1.1.2.tar.gz +sha256 db893596ab9066e5c4f002ae0fed70657e3b75cceb52dd1de5a0e145e338d830 tabledata-1.1.2.tar.gz # Locally computed sha256 checksums -sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE +sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE diff --git a/package/python-tabledata/python-tabledata.mk b/package/python-tabledata/python-tabledata.mk index c1381928c4..c1503e69cb 100644 --- a/package/python-tabledata/python-tabledata.mk +++ b/package/python-tabledata/python-tabledata.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TABLEDATA_VERSION = 0.9.1 +PYTHON_TABLEDATA_VERSION = 1.1.2 PYTHON_TABLEDATA_SOURCE = tabledata-$(PYTHON_TABLEDATA_VERSION).tar.gz -PYTHON_TABLEDATA_SITE = https://files.pythonhosted.org/packages/7d/20/7178ce0e3e34d5aff07e2280522b7e1bc23d4f2fbb916b765bbb41b22174 +PYTHON_TABLEDATA_SITE = https://files.pythonhosted.org/packages/73/7c/67eec8e92504b8e00e5cc0053a3401bd1441eefc70cecfa4427bfcf76b89 PYTHON_TABLEDATA_SETUP_TYPE = setuptools PYTHON_TABLEDATA_LICENSE = MIT PYTHON_TABLEDATA_LICENSE_FILES = LICENSE diff --git a/package/python-texttable/python-texttable.hash b/package/python-texttable/python-texttable.hash index 367eb8d60f..a769e91772 100644 --- a/package/python-texttable/python-texttable.hash +++ b/package/python-texttable/python-texttable.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/texttable/json -md5 763141f0bdf598cdc5cf780ed4d2eb94 texttable-1.6.2.tar.gz -sha256 eff3703781fbc7750125f50e10f001195174f13825a92a45e9403037d539b4f4 texttable-1.6.2.tar.gz +md5 15faadc07ba44d337cc1675ea6092a02 texttable-1.6.4.tar.gz +sha256 42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9 texttable-1.6.4.tar.gz # Locally computed sha256 checksums -sha256 181d0c3366cc36fd6ae7d023b23a743581003fd42974c8983ea40f7161faeaf3 LICENSE +sha256 4ba7bdab54504a3bc44eb33ecca873a26a63ab902822101a87bb46235da63594 LICENSE diff --git a/package/python-texttable/python-texttable.mk b/package/python-texttable/python-texttable.mk index 3b173a35ee..59df5f6ff5 100644 --- a/package/python-texttable/python-texttable.mk +++ b/package/python-texttable/python-texttable.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEXTTABLE_VERSION = 1.6.2 +PYTHON_TEXTTABLE_VERSION = 1.6.4 PYTHON_TEXTTABLE_SOURCE = texttable-$(PYTHON_TEXTTABLE_VERSION).tar.gz -PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/82/a8/60df592e3a100a1f83928795aca210414d72cebdc6e4e0c95a6d8ac632fe +PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/d5/78/dbc2a5eab57a01fedaf975f2c16f04e76f09336dbeadb9994258aa0a2b1a PYTHON_TEXTTABLE_SETUP_TYPE = setuptools PYTHON_TEXTTABLE_LICENSE = MIT PYTHON_TEXTTABLE_LICENSE_FILES = LICENSE diff --git a/package/python-thrift/Config.in b/package/python-thrift/Config.in index 1ecfda357b..71fef5be81 100644 --- a/package/python-thrift/Config.in +++ b/package/python-thrift/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_THRIFT bool "python-thrift" select BR2_PACKAGE_PYTHON_SIX # runtime help - python-thrift is a Python bindings for the Apache Thrift RPC - system. + Python bindings for the Apache Thrift RPC system. - http://thrift.apache.org/ + https://thrift.apache.org diff --git a/package/python-thrift/python-thrift.hash b/package/python-thrift/python-thrift.hash index 56d99f2a54..1d1d628908 100644 --- a/package/python-thrift/python-thrift.hash +++ b/package/python-thrift/python-thrift.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/thrift/json -md5 36165d5c80e6b101dbe9fcf7ef524d51 thrift-0.11.0.tar.gz -sha256 7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b thrift-0.11.0.tar.gz +md5 c3bc8d9a910d2c9ce26f2ad1f7c96762 thrift-0.13.0.tar.gz +sha256 9af1c86bf73433afc6010ed376a6c6aca2b54099cc0d61895f640870a9ae7d89 thrift-0.13.0.tar.gz # Locally computed sha256 checksums -sha256 6a62a493bd7c741378619ff61c56282d64f3ad033dc8154b67c808311960bb02 setup.py +sha256 c13578ae9d0529d0252e1c7375b917bacf58723dce1fcd40c7ed59183401b468 LICENSE diff --git a/package/python-thrift/python-thrift.mk b/package/python-thrift/python-thrift.mk index 21f2355f63..3a908ca91c 100644 --- a/package/python-thrift/python-thrift.mk +++ b/package/python-thrift/python-thrift.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_THRIFT_VERSION = 0.11.0 +PYTHON_THRIFT_VERSION = 0.13.0 PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz -PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/c6/b4/510617906f8e0c5660e7d96fbc5585113f83ad547a3989b80297ac72a74c -PYTHON_THRIFT_LICENSE = Apache-2.0 -PYTHON_THRIFT_LICENSE_FILES = setup.py +PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/97/1e/3284d19d7be99305eda145b8aa46b0c33244e4a496ec66440dac19f8274d PYTHON_THRIFT_SETUP_TYPE = setuptools +PYTHON_THRIFT_LICENSE = Apache-2.0 +PYTHON_THRIFT_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-tinyrpc/Config.in b/package/python-tinyrpc/Config.in index 3c643c754a..3194b7825a 100644 --- a/package/python-tinyrpc/Config.in +++ b/package/python-tinyrpc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_TINYRPC bool "python-tinyrpc" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime help A small, modular, transport and protocol neutral RPC diff --git a/package/python-toml/python-toml.hash b/package/python-toml/python-toml.hash index f0641ccda8..dd7215e861 100644 --- a/package/python-toml/python-toml.hash +++ b/package/python-toml/python-toml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/toml/json -md5 63fffbe2d632865ec29cd69bfdf36682 toml-0.10.0.tar.gz -sha256 229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c toml-0.10.0.tar.gz +md5 59bce5d8d67e858735ec3f399ec90253 toml-0.10.2.tar.gz +sha256 b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f toml-0.10.2.tar.gz # Locally computed sha256 checksums -sha256 a879cc43c06aca11ada36f71c8db7257449ff4451874a0903f129920c66fcf2d LICENSE +sha256 2d9294823df6c89357c8be4927fce79361d6561e5ee7532d5926e63939aaa536 LICENSE diff --git a/package/python-toml/python-toml.mk b/package/python-toml/python-toml.mk index b4f9070f24..0e95652165 100644 --- a/package/python-toml/python-toml.mk +++ b/package/python-toml/python-toml.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_TOML_VERSION = 0.10.0 +PYTHON_TOML_VERSION = 0.10.2 PYTHON_TOML_SOURCE = toml-$(PYTHON_TOML_VERSION).tar.gz -PYTHON_TOML_SITE = https://files.pythonhosted.org/packages/b9/19/5cbd78eac8b1783671c40e34bb0fa83133a06d340a38b55c645076d40094 +PYTHON_TOML_SITE = https://files.pythonhosted.org/packages/be/ba/1f744cdc819428fc6b5084ec34d9b30660f6f9daaf70eead706e3203ec3c PYTHON_TOML_SETUP_TYPE = setuptools PYTHON_TOML_LICENSE = MIT PYTHON_TOML_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash index 2aec0144e6..e9fbbedf65 100644 --- a/package/python-tornado/python-tornado.hash +++ b/package/python-tornado/python-tornado.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tornado/json -md5 cab4b11480f6d032e46465586192d343 tornado-6.0.3.tar.gz -sha256 c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9 tornado-6.0.3.tar.gz +md5 cf39425f3d7eba9a54287f3e795a2f23 tornado-6.0.4.tar.gz +sha256 0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc tornado-6.0.4.tar.gz # Locally computed sha256 checksums -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index e326fadcb5..c05a7d65d3 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 6.0.3 +PYTHON_TORNADO_VERSION = 6.0.4 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/30/78/2d2823598496127b21423baffaa186b668f73cd91887fcef78b6eade136b +PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/95/84/119a46d494f008969bf0c775cb2c6b3579d3c4cc1bb1b41a022aa93ee242 PYTHON_TORNADO_LICENSE = Apache-2.0 PYTHON_TORNADO_LICENSE_FILES = LICENSE +PYTHON_TORNADO_CPE_ID_VENDOR = tornadoweb +PYTHON_TORNADO_CPE_ID_PRODUCT = tornado PYTHON_TORNADO_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-tqdm/python-tqdm.mk b/package/python-tqdm/python-tqdm.mk index 4ff4696e65..5ceddde14c 100644 --- a/package/python-tqdm/python-tqdm.mk +++ b/package/python-tqdm/python-tqdm.mk @@ -10,5 +10,7 @@ PYTHON_TQDM_SITE = https://files.pythonhosted.org/packages/4c/45/830c5c4bfaba60e PYTHON_TQDM_SETUP_TYPE = setuptools PYTHON_TQDM_LICENSE = MPL-2.0, MIT PYTHON_TQDM_LICENSE_FILES = LICENCE +PYTHON_TQDM_CPE_ID_VENDOR = tqdm_project +PYTHON_TQDM_CPE_ID_PRODUCT = tqdm $(eval $(python-package)) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 23056e72d2..02c26a53f7 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" + depends on BR2_PACKAGE_PYTHON3 # python-idna depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime @@ -17,4 +18,5 @@ config BR2_PACKAGE_PYTHON_TREQ https://github.com/twisted/treq comment "python-treq needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash index a2c0ea33f1..288279cbd8 100644 --- a/package/python-treq/python-treq.hash +++ b/package/python-treq/python-treq.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/treq/json -md5 a8e33a4b3259b45e08e1e0a5960f76f7 treq-18.6.0.tar.gz -sha256 91e09ff6b524cc90aa5e934b909c8d0d1a9d36ebd618b6c38e37b17013e69f48 treq-18.6.0.tar.gz +md5 b75f6c89fd481989a9cfdec8d61a6d84 treq-20.3.0.tar.gz +sha256 a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 treq-20.3.0.tar.gz # Locally computed sha256 checksums sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk index a79e2bac73..320f57b6f2 100644 --- a/package/python-treq/python-treq.mk +++ b/package/python-treq/python-treq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TREQ_VERSION = 18.6.0 +PYTHON_TREQ_VERSION = 20.3.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz -PYTHON_TREQ_SITE = https://pypi.python.org/packages/cb/c5/c83628d7e1a5d62a71eab0a5d1cdcdc53b49ead873f52975457ff2a8ae21 +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/98/09/25064d7224efde9fd51e8865353d516c53306e476eab27ab21fb258cf7d4 PYTHON_TREQ_LICENSE = MIT PYTHON_TREQ_LICENSE_FILES = LICENSE PYTHON_TREQ_SETUP_TYPE = setuptools diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 4e24a3f71a..805a1aa345 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_TWISTED bool "python-twisted" + depends on BR2_PACKAGE_PYTHON3 # python-hyperlink -> python-idna select BR2_PACKAGE_PYTHON_INCREMENTAL select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOMAT # runtime diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 2478972f82..49d97af097 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -10,6 +10,8 @@ PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE +PYTHON_TWISTED_CPE_ID_VENDOR = twistedmatrix +PYTHON_TWISTED_CPE_ID_PRODUCT = twisted PYTHON_TWISTED_DEPENDENCIES = python-incremental host-python-incremental $(eval $(python-package)) diff --git a/package/python-txaio/Config.in b/package/python-txaio/Config.in index 9d4238215e..19a318a902 100644 --- a/package/python-txaio/Config.in +++ b/package/python-txaio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_TXAIO bool "python-txaio" - select BR2_PACKAGE_PYTHON_SIX # runtime + depends on BR2_PACKAGE_PYTHON3 help Compatibility API between asyncio/Twisted/Trollius. diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash index 2c4e37f7b9..15b1f5f2c9 100644 --- a/package/python-txaio/python-txaio.hash +++ b/package/python-txaio/python-txaio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txaio/json -md5 0f584b6c20860363152c1a866cc2d449 txaio-20.3.1.tar.gz -sha256 e7a4a4db3d818975ed16ae1b90f53c6621e0075618709e88291ad5a41924e38f txaio-20.3.1.tar.gz +md5 c998be8d5837218c809266c0fce94687 txaio-20.4.1.tar.gz +sha256 17938f2bca4a9cabce61346758e482ca4e600160cbc28e861493eac74a19539d txaio-20.4.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk index 068c8ca566..2dd028f4f7 100644 --- a/package/python-txaio/python-txaio.mk +++ b/package/python-txaio/python-txaio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXAIO_VERSION = 20.3.1 +PYTHON_TXAIO_VERSION = 20.4.1 PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz -PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/ca/a0/f19a421547b60fbd7ccb48b56c51deac56bffec9b256f9bd7c622572d0a8 +PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/e7/dd/c0c90b080c3fad0ac8e2382eddbe86591d4fa1a5c1aea652de0adf245fc0 PYTHON_TXAIO_LICENSE = MIT PYTHON_TXAIO_LICENSE_FILES = LICENSE PYTHON_TXAIO_SETUP_TYPE = setuptools diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in index f38bbf93f0..c7de322f91 100644 --- a/package/python-txdbus/Config.in +++ b/package/python-txdbus/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_TXDBUS bool "python-txdbus" + depends on BR2_PACKAGE_PYTHON3 # python-twisted -> python-cryptography -> python-idna select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-txdbus/python-txdbus.hash b/package/python-txdbus/python-txdbus.hash index 60740e29d2..5d386272b8 100644 --- a/package/python-txdbus/python-txdbus.hash +++ b/package/python-txdbus/python-txdbus.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/txdbus/json -sha256 eefcffa4efbf82ba11222f17f5989fe1b2b6ef57226ef896c4a7084c990ba217 txdbus-1.1.1.tar.gz -md5 ce8a0e0a17cdbada725e3159802ae75f txdbus-1.1.1.tar.gz +md5 d397357dee78750385f92ca9c6c1f063 txdbus-1.1.2.tar.gz +sha256 8375a5fb68a12054f0def91af800c821fb2232949337756ed975f88d8ea2bc97 txdbus-1.1.2.tar.gz diff --git a/package/python-txdbus/python-txdbus.mk b/package/python-txdbus/python-txdbus.mk index d8e7a7bee9..4e4ddf03cb 100644 --- a/package/python-txdbus/python-txdbus.mk +++ b/package/python-txdbus/python-txdbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXDBUS_VERSION = 1.1.1 +PYTHON_TXDBUS_VERSION = 1.1.2 PYTHON_TXDBUS_SOURCE = txdbus-$(PYTHON_TXDBUS_VERSION).tar.gz -PYTHON_TXDBUS_SITE = https://files.pythonhosted.org/packages/4a/68/dfd06f3f349999cbbb31eade239fe76fbff2d6a905eb7d20449666d1b2ce +PYTHON_TXDBUS_SITE = https://files.pythonhosted.org/packages/d6/ef/43377e975b8d37862fd1166a4998f908651f5e205ddc9bbd7a57c6e5b4b6 PYTHON_TXDBUS_SETUP_TYPE = setuptools PYTHON_TXDBUS_LICENSE = MIT diff --git a/package/python-txtorcon/Config.in b/package/python-txtorcon/Config.in index 4f91e7b048..e8a1a233db 100644 --- a/package/python-txtorcon/Config.in +++ b/package/python-txtorcon/Config.in @@ -1,10 +1,10 @@ config BR2_PACKAGE_PYTHON_TXTORCON bool "python-txtorcon" + depends on BR2_PACKAGE_PYTHON3 # python-idna depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-service-identity select BR2_PACKAGE_PYTHON_AUTOMAT # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime - select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime @@ -16,4 +16,5 @@ config BR2_PACKAGE_PYTHON_TXTORCON https://github.com/meejah/txtorcon comment "python-txtorcon needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk index a01c0b2511..4df400c3e7 100644 --- a/package/python-txtorcon/python-txtorcon.mk +++ b/package/python-txtorcon/python-txtorcon.mk @@ -11,4 +11,13 @@ PYTHON_TXTORCON_SETUP_TYPE = setuptools PYTHON_TXTORCON_LICENSE = MIT PYTHON_TXTORCON_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_PYTHON),y) +# only needed/valid for python 3.x +define PYTHON_TXTORCON_RM_PY3_FILE + rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/txtorcon/controller_py3.py +endef + +PYTHON_TXTORCON_POST_INSTALL_TARGET_HOOKS += PYTHON_TXTORCON_RM_PY3_FILE +endif + $(eval $(python-package)) diff --git a/package/python-typepy/Config.in b/package/python-typepy/Config.in index 6079857070..fd3b983186 100644 --- a/package/python-typepy/Config.in +++ b/package/python-typepy/Config.in @@ -1,11 +1,7 @@ config BR2_PACKAGE_PYTHON_TYPEPY bool "python-typepy" - select BR2_PACKAGE_PYTHON_DATEUTIL # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime - select BR2_PACKAGE_PYTHON_PYTZ # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime help A Python library for variable type checker/validator/converter at a run time. diff --git a/package/python-typepy/python-typepy.hash b/package/python-typepy/python-typepy.hash index 03f7aef2e5..e4d84e9bfc 100644 --- a/package/python-typepy/python-typepy.hash +++ b/package/python-typepy/python-typepy.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/typepy/json -md5 b9abd4d661dabe512e95ca69ddb65d55 typepy-0.0.20.tar.gz -# Locally computed -sha256 a1a5b9438670d4a5d9f882b7499ea85d06dc384577bb7636cb29d903288bca8c typepy-0.0.20.tar.gz +# md5, sha256 from https://pypi.org/pypi/typepy/json +md5 cc9ceef1f04a8ff4b979dc23b96f2e80 typepy-1.1.5.tar.gz +sha256 1bbe790bb8d1b43b4541b235678974d5aee2357e1948cdf17cb4c14cbe4a2a82 typepy-1.1.5.tar.gz +# Locally computed sha256 checksums sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE diff --git a/package/python-typepy/python-typepy.mk b/package/python-typepy/python-typepy.mk index 33d8091998..6d8433e136 100644 --- a/package/python-typepy/python-typepy.mk +++ b/package/python-typepy/python-typepy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPEPY_VERSION = 0.0.20 +PYTHON_TYPEPY_VERSION = 1.1.5 PYTHON_TYPEPY_SOURCE = typepy-$(PYTHON_TYPEPY_VERSION).tar.gz -PYTHON_TYPEPY_SITE = https://pypi.python.org/packages/88/98/c79a19ae571d713fa0b10bc7e0fe611e53c542720b5a9dd2691ca15b3dd8 +PYTHON_TYPEPY_SITE = https://files.pythonhosted.org/packages/08/c8/ebfa4381563f1946a7cd2b03fab14df641c3a9acf8e6ca5f5787dd1f735a PYTHON_TYPEPY_SETUP_TYPE = setuptools PYTHON_TYPEPY_LICENSE = MIT PYTHON_TYPEPY_LICENSE_FILES = LICENSE diff --git a/package/python-typing/python-typing.hash b/package/python-typing/python-typing.hash index 8796a4c2e3..f587eb7bfa 100644 --- a/package/python-typing/python-typing.hash +++ b/package/python-typing/python-typing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/typing/json -md5 0a1ebd4af65b4769e33459004eb20345 typing-3.7.4.1.tar.gz -sha256 91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23 typing-3.7.4.1.tar.gz +md5 d6dd450cfe0c8c6547eef09a0491775d typing-3.10.0.0.tar.gz +sha256 13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130 typing-3.10.0.0.tar.gz # Locally computed sha256 checksums -sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE +sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE diff --git a/package/python-typing/python-typing.mk b/package/python-typing/python-typing.mk index 6894481243..dd1d8f29b5 100644 --- a/package/python-typing/python-typing.mk +++ b/package/python-typing/python-typing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPING_VERSION = 3.7.4.1 +PYTHON_TYPING_VERSION = 3.10.0.0 PYTHON_TYPING_SOURCE = typing-$(PYTHON_TYPING_VERSION).tar.gz -PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/67/b0/b2ea2bd67bfb80ea5d12a5baa1d12bda002cab3b6c9b48f7708cd40c34bf +PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/b0/1b/835d4431805939d2996f8772aca1d2313a57e8860fec0e48e8e7dfe3a477 PYTHON_TYPING_SETUP_TYPE = setuptools PYTHON_TYPING_LICENSE = Python-2.0, others PYTHON_TYPING_LICENSE_FILES = LICENSE diff --git a/package/python-ubjson/python-ubjson.hash b/package/python-ubjson/python-ubjson.hash index a7e954ce5d..baf3ce7bdc 100644 --- a/package/python-ubjson/python-ubjson.hash +++ b/package/python-ubjson/python-ubjson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/py-ubjson/json -md5 26c07be8e4c9f2b0ee7c42a9aca118ed py-ubjson-0.14.0.tar.gz -sha256 f742c87bccc8653329d3f79b8b3f40d44d11d17cce7f6d7025a73c52ebf91c66 py-ubjson-0.14.0.tar.gz +md5 0f9f2b4d68ae8e70c6f624b1cdaca161 py-ubjson-0.16.1.tar.gz +sha256 b9bfb8695a1c7e3632e800fb83c943bf67ed45ddd87cd0344851610c69a5a482 py-ubjson-0.16.1.tar.gz # Locally computed sha256 checksums -sha256 ca182abcb84ad9984c9af2e30cb70c4fe0e1772674355207e8fcdb85e8c5e75f LICENSE +sha256 ca182abcb84ad9984c9af2e30cb70c4fe0e1772674355207e8fcdb85e8c5e75f LICENSE diff --git a/package/python-ubjson/python-ubjson.mk b/package/python-ubjson/python-ubjson.mk index 58bba2ac74..93ab9dc139 100644 --- a/package/python-ubjson/python-ubjson.mk +++ b/package/python-ubjson/python-ubjson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UBJSON_VERSION = 0.14.0 +PYTHON_UBJSON_VERSION = 0.16.1 PYTHON_UBJSON_SOURCE = py-ubjson-$(PYTHON_UBJSON_VERSION).tar.gz -PYTHON_UBJSON_SITE = https://files.pythonhosted.org/packages/10/31/0d8297c33d681aafa3fe900ca072a96d5acb97e79082fbb593e835376c93 +PYTHON_UBJSON_SITE = https://files.pythonhosted.org/packages/1d/c7/28220d37e041fe1df03e857fe48f768dcd30cd151480bf6f00da8713214a PYTHON_UBJSON_LICENSE = Apache-2.0 PYTHON_UBJSON_LICENSE_FILES = LICENSE PYTHON_UBJSON_SETUP_TYPE = setuptools diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 91b9e44622..066bfb7288 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 a7504a9fcb7ed4ffa482fe098c80b6d4 urllib3-1.25.6.tar.gz -sha256 9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86 urllib3-1.25.6.tar.gz +md5 e0051a87a956e618a6bb514a07fa7773 urllib3-1.26.7.tar.gz +sha256 4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece urllib3-1.26.7.tar.gz # Locally computed sha256 checksums -sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt +sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index 8383cbe8e8..a1d22e023a 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.25.6 +PYTHON_URLLIB3_VERSION = 1.26.7 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/ff/44/29655168da441dff66de03952880c6e2d17b252836ff1aa4421fba556424 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/80/be/3ee43b6c5757cabea19e75b8f46eaf05a2f5144107d7db48c7cf3a864f73 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt +PYTHON_URLLIB3_CPE_ID_VENDOR = python +PYTHON_URLLIB3_CPE_ID_PRODUCT = urllib3 PYTHON_URLLIB3_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-uvloop/python-uvloop.hash b/package/python-uvloop/python-uvloop.hash index 436babf915..baed0b3e58 100644 --- a/package/python-uvloop/python-uvloop.hash +++ b/package/python-uvloop/python-uvloop.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/uvloop/json -md5 a2f82abb676756f11f544c6b51caf171 uvloop-0.14.0.tar.gz -sha256 123ac9c0c7dd71464f58f1b4ee0bbd81285d96cdda8bc3519281b8973e3a461e uvloop-0.14.0.tar.gz +md5 c97447b8b386971be5e6f4328563be42 uvloop-0.15.0.tar.gz +sha256 1a503d5b49da6e3dd5607d6e533a5315b1caedbf629901807c65a23a09cad065 uvloop-0.15.0.tar.gz # Locally computed sha256 checksums sha256 2fdc436a67077941295c58647f521fbef8f50e46db0970552fa1a4dd8ae261c6 LICENSE-APACHE sha256 9185f3c77e9f6ef8859a6ba4c94128ac1329876be3e813aad32d7645e51ae409 LICENSE-MIT diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk index 3ee8d299a3..ff98d747b2 100644 --- a/package/python-uvloop/python-uvloop.mk +++ b/package/python-uvloop/python-uvloop.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVLOOP_VERSION = 0.14.0 +PYTHON_UVLOOP_VERSION = 0.15.0 PYTHON_UVLOOP_SOURCE = uvloop-$(PYTHON_UVLOOP_VERSION).tar.gz -PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/84/2e/462e7a25b787d2b40cf6c9864a9e702f358349fc9cfb77e83c38acb73048 +PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/df/fb/0e1b479ac5502f3d4531a2fc3f046312616f1ad020c686da353c2ff3bbc6 PYTHON_UVLOOP_SETUP_TYPE = setuptools PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/python-validators/Config.in b/package/python-validators/Config.in index e700369910..802b1dde5b 100644 --- a/package/python-validators/Config.in +++ b/package/python-validators/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_VALIDATORS bool "python-validators" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime help diff --git a/package/python-validators/python-validators.hash b/package/python-validators/python-validators.hash index 1a3aa79980..2845a2e8c0 100644 --- a/package/python-validators/python-validators.hash +++ b/package/python-validators/python-validators.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/validators/json -md5 ae3932b693452b96f037c919e1d7250f validators-0.14.2.tar.gz -sha256 b192e6bde7d617811d59f50584ed240b580375648cd032d106edeb3164099508 validators-0.14.2.tar.gz +md5 2f0446f2a15aa694be0cfd8728eb4444 validators-0.15.0.tar.gz +sha256 31e8bb01b48b48940a021b8a9576b840f98fa06b91762ef921d02cb96d38727a validators-0.15.0.tar.gz # Locally computed sha256 checksums -sha256 a7fd9d761c7ca1c6508b9baf030f6e21f5752d1caea3e49a270634aa9ef01e6f LICENSE +sha256 a7fd9d761c7ca1c6508b9baf030f6e21f5752d1caea3e49a270634aa9ef01e6f LICENSE diff --git a/package/python-validators/python-validators.mk b/package/python-validators/python-validators.mk index e24ce35fdd..5bed051911 100644 --- a/package/python-validators/python-validators.mk +++ b/package/python-validators/python-validators.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_VALIDATORS_VERSION = 0.14.2 +PYTHON_VALIDATORS_VERSION = 0.15.0 PYTHON_VALIDATORS_SOURCE = validators-$(PYTHON_VALIDATORS_VERSION).tar.gz -PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/4d/56/9b48c918ef118ea12b90f227c4498ed4703b418bdd8fb49479dfcbeae4ef +PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/c4/4a/4f9c892f9a9f08ee5f99c32bbd4297499099c2c5f7eff8c617a57d31a7d8 PYTHON_VALIDATORS_SETUP_TYPE = setuptools -PYTHON_VALIDATORS_LICENSE = BSD +PYTHON_VALIDATORS_LICENSE = MIT PYTHON_VALIDATORS_LICENSE_FILES = LICENSE +PYTHON_VALIDATORS_CPE_ID_VENDOR = validators_project +PYTHON_VALIDATORS_CPE_ID_PRODUCT = validators $(eval $(python-package)) diff --git a/package/python-wcwidth/python-wcwidth.hash b/package/python-wcwidth/python-wcwidth.hash index 07ce8508ac..ed1d2cd61f 100644 --- a/package/python-wcwidth/python-wcwidth.hash +++ b/package/python-wcwidth/python-wcwidth.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/wcwidth/json -md5 b3b6a0a08f0c8a34d1de8cf44150a4ad wcwidth-0.1.7.tar.gz +# md5, sha256 from https://pypi.org/pypi/wcwidth/json +md5 b32584cd6084b4a8c81df13a2a6b4351 wcwidth-0.1.9.tar.gz +sha256 ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1 wcwidth-0.1.9.tar.gz # Locally computed -sha256 3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e wcwidth-0.1.7.tar.gz sha256 0eddcc52cd3ef5d30798b8d43a14d3f0f1dcf0a6e4c1d0f2e177c44ce85bb69c LICENSE.txt diff --git a/package/python-wcwidth/python-wcwidth.mk b/package/python-wcwidth/python-wcwidth.mk index 2dd392a595..ccbd0e99ca 100644 --- a/package/python-wcwidth/python-wcwidth.mk +++ b/package/python-wcwidth/python-wcwidth.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WCWIDTH_VERSION = 0.1.7 +PYTHON_WCWIDTH_VERSION = 0.1.9 PYTHON_WCWIDTH_SOURCE = wcwidth-$(PYTHON_WCWIDTH_VERSION).tar.gz -PYTHON_WCWIDTH_SITE = https://pypi.python.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495 +PYTHON_WCWIDTH_SITE = https://pypi.python.org/packages/25/9d/0acbed6e4a4be4fc99148f275488580968f44ddb5e69b8ceb53fc9df55a0 PYTHON_WCWIDTH_SETUP_TYPE = setuptools PYTHON_WCWIDTH_LICENSE = MIT PYTHON_WCWIDTH_LICENSE_FILES = LICENSE.txt diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in index bc2e6054e6..a0452060ba 100644 --- a/package/python-web2py/Config.in +++ b/package/python-web2py/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_PYTHON_WEB2PY bool "python-web2py" - select BR2_PACKAGE_PYTHON_PYDAL + select BR2_PACKAGE_PYTHON_PYDAL # runtime select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON_YATL # runtime help web2py is a free open source full-stack framework for rapid development of fast, scalable, secure and portable diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index 57ac02c2a9..4ff85668a1 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 8205a7a08595ca1a41919750a8dc4e431258966cb46c8021564b25003cf90863 python-web2py-2.17.2.tar.gz +sha256 e3f05266b4b97650b76bfb85028df5e2194955674c9b98cfc065c72ed5791690 python-web2py-2.20.4.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 8706c87968..26214a8110 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,12 +4,14 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.17.2 -PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,R-$(PYTHON_WEB2PY_VERSION)) +PYTHON_WEB2PY_VERSION = 2.20.4 +PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE +PYTHON_WEB2PY_CPE_ID_VENDOR = web2py +PYTHON_WEB2PY_CPE_ID_PRODUCT = web2py PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \ - python-pydal host-python-pydal + host-python-pydal host-python-yatl PYTHON_WEB2PY_EXCLUSIONS = \ welcome.w2p \ diff --git a/package/python-webob/python-webob.hash b/package/python-webob/python-webob.hash index af3c7a0851..a46c1dbc94 100644 --- a/package/python-webob/python-webob.hash +++ b/package/python-webob/python-webob.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/webob/json -md5 1761f416e8cf53f6fb674149cc223bd1 WebOb-1.8.5.tar.gz -sha256 05aaab7975e0ee8af2026325d656e5ce14a71f1883c52276181821d6d5bf7086 WebOb-1.8.5.tar.gz +md5 10191c69fa5a2c00f3b9abfb8937b415 WebOb-1.8.7.tar.gz +sha256 b64ef5141be559cfade448f044fa45c2260351edcb6a8ef6b7e00c7dcef0c323 WebOb-1.8.7.tar.gz # Locally computed sha256 checksums -sha256 27bc4919e7e9e6b6cda40644517ca74d32203e32fba89ef832aba1ed93e457b3 docs/license.txt +sha256 27bc4919e7e9e6b6cda40644517ca74d32203e32fba89ef832aba1ed93e457b3 docs/license.txt diff --git a/package/python-webob/python-webob.mk b/package/python-webob/python-webob.mk index fd9b2d1b36..11ba104476 100644 --- a/package/python-webob/python-webob.mk +++ b/package/python-webob/python-webob.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBOB_VERSION = 1.8.5 +PYTHON_WEBOB_VERSION = 1.8.7 PYTHON_WEBOB_SOURCE = WebOb-$(PYTHON_WEBOB_VERSION).tar.gz -PYTHON_WEBOB_SITE = https://files.pythonhosted.org/packages/9d/1a/0c89c070ee2829c934cb6c7082287c822e28236a4fcf90063e6be7c35532 +PYTHON_WEBOB_SITE = https://files.pythonhosted.org/packages/c7/45/ee5f034fb4ebe3236fa49e5a4fcbc54444dd22ecf33079cf56f9606d479d PYTHON_WEBOB_SETUP_TYPE = setuptools PYTHON_WEBOB_LICENSE = MIT PYTHON_WEBOB_LICENSE_FILES = docs/license.txt diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash index 968c1ab211..1e745dc1d5 100644 --- a/package/python-websocket-client/python-websocket-client.hash +++ b/package/python-websocket-client/python-websocket-client.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websocket-client/json -md5 8061820da5e1de26a6a1a6996d4eebd5 websocket_client-0.57.0.tar.gz -sha256 d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010 websocket_client-0.57.0.tar.gz +md5 8fc86b13dc97dc032855c6257f9168df websocket_client-0.58.0.tar.gz +sha256 63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f websocket_client-0.58.0.tar.gz # Locally computed sha256 checksums -sha256 a47b06717e8a3cf01d1307141287b1b4fa17fe4bb8785633d2fc6f57cb71d05e LICENSE +sha256 7c6699c75f87b52bdc542db26d6b1b92892577cda46e20eceb79e2790a1c291b LICENSE diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk index 58cb597c22..d2873e3601 100644 --- a/package/python-websocket-client/python-websocket-client.mk +++ b/package/python-websocket-client/python-websocket-client.mk @@ -4,14 +4,11 @@ # ################################################################################ -PYTHON_WEBSOCKET_CLIENT_VERSION = 0.57.0 +PYTHON_WEBSOCKET_CLIENT_VERSION = 0.58.0 PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz -PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/8b/0f/52de51b9b450ed52694208ab952d5af6ebbcbce7f166a48784095d930d8c +PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/4a/df/112c278ba1ead96786d24d973429ce1e1a2c86b9843183d9f8ef8c6330d7 PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools -# Project was under LGPL-2.1+, but was relicensed under -# BSD-3-Clause. The LICENSE file contains the BSD-3-Clause text, but -# the source files still contain a LGPL-2.1+ header. -PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+, BSD-3-Clause +PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+ PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index cc90fe140b..1d6de8a0c7 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 5b23b4953efc4f52b1d0b33af6f7cd2d Werkzeug-0.16.0.tar.gz -sha256 7280924747b5733b246fe23972186c6b348f9ae29724135a6dfc1e53cea433e7 Werkzeug-0.16.0.tar.gz +md5 5d499cfdd30de5d9c946994783772efd Werkzeug-1.0.1.tar.gz +sha256 6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c Werkzeug-1.0.1.tar.gz # Locally computed sha256 checksums -sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst +sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk index fea25f8ee8..fe9b87af1d 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 0.16.0 +PYTHON_WERKZEUG_VERSION = 1.0.1 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/5e/fd/eb19e4f6a806cd6ee34900a687f181001c7a0059ff914752091aba84681f +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/10/27/a33329150147594eff0ea4c33c2036c0eadd933141055be0ff911f7f8d04 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst +PYTHON_WERKZEUG_CPE_ID_VENDOR = palletsprojects +PYTHON_WERKZEUG_CPE_ID_PRODUCT = werkzeug $(eval $(python-package)) diff --git a/package/python-wtforms/Config.in b/package/python-wtforms/Config.in index 96ed96da0a..33a17d3d37 100644 --- a/package/python-wtforms/Config.in +++ b/package/python-wtforms/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_WTFORMS bool "python-wtforms" + select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime help A flexible forms validation and rendering library for Python web development. diff --git a/package/python-wtforms/python-wtforms.hash b/package/python-wtforms/python-wtforms.hash index 34beb08010..ed9bfd1a23 100644 --- a/package/python-wtforms/python-wtforms.hash +++ b/package/python-wtforms/python-wtforms.hash @@ -1,5 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/wtforms/json -md5 41c0008dbe7bd98892c58f7457a46a4a WTForms-2.2.1.tar.gz -sha256 0cdbac3e7f6878086c334aa25dc5a33869a3954e9d1e015130d65a69309b3b61 WTForms-2.2.1.tar.gz +md5 2b6ea167a71c6becf20f0934417fd06c WTForms-2.3.3.tar.gz +sha256 81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c WTForms-2.3.3.tar.gz # Locally computed sha256 checksums -sha256 64cba207423f4478e3262c2e54209f8cd2057d687e200a50e0203db5659947a5 LICENSE.rst +sha256 cf40d60ff34f6b2b68a53d220f8b66567b5ac8dd1119b37b62fd15e9518fe59b LICENSE.rst +sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/package/python-wtforms/python-wtforms.mk b/package/python-wtforms/python-wtforms.mk index 2715320d27..23280a6fe5 100644 --- a/package/python-wtforms/python-wtforms.mk +++ b/package/python-wtforms/python-wtforms.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_WTFORMS_VERSION = 2.2.1 +PYTHON_WTFORMS_VERSION = 2.3.3 PYTHON_WTFORMS_SOURCE = WTForms-$(PYTHON_WTFORMS_VERSION).tar.gz -PYTHON_WTFORMS_SITE = https://files.pythonhosted.org/packages/cd/1d/7221354ebfc32b868740d02e44225c2ce00769b0d3dc370e463e2bc4b446 +PYTHON_WTFORMS_SITE = https://files.pythonhosted.org/packages/dd/3f/f25d26b1c66896e2876124a12cd8be8f606abf4e1890a20f3ca04e4a1555 PYTHON_WTFORMS_SETUP_TYPE = setuptools PYTHON_WTFORMS_LICENSE = BSD-3-Clause -PYTHON_WTFORMS_LICENSE_FILES = LICENSE.rst +PYTHON_WTFORMS_LICENSE_FILES = LICENSE.rst docs/license.rst $(eval $(python-package)) diff --git a/package/python-xlib/python-xlib.hash b/package/python-xlib/python-xlib.hash index e51461fc2b..c6a446b6bf 100644 --- a/package/python-xlib/python-xlib.hash +++ b/package/python-xlib/python-xlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-xlib/json -md5 ded820dc8e943106bd660801ed7a82f7 python-xlib-0.25.tar.bz2 -sha256 204f280b549352af6cbdaff43405186822ae05749518dd9be209bd88a0088f99 python-xlib-0.25.tar.bz2 +md5 3a87f81bff4cb4f8a52881097ba51a49 python-xlib-0.27.tar.bz2 +sha256 a90667c70905c6ef0754c8a09fa61acbc1e1b7ddb946d527831800d7cbfe9348 python-xlib-0.27.tar.bz2 # Locally computed sha256 checksums sha256 06eb1c441443cf15ac84f309003f4c43c62246939d37c75fc3e056c2d34cd300 LICENSE diff --git a/package/python-xlib/python-xlib.mk b/package/python-xlib/python-xlib.mk index 3ffc4e2ee1..ae8ca1653b 100644 --- a/package/python-xlib/python-xlib.mk +++ b/package/python-xlib/python-xlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLIB_VERSION = 0.25 +PYTHON_XLIB_VERSION = 0.27 PYTHON_XLIB_SOURCE = python-xlib-$(PYTHON_XLIB_VERSION).tar.bz2 -PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/3c/d9/51fc07ae57f6a44e62e2ee04bd501d763ac169ff05c838403ec7ae556992 +PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/e8/fa/a61ef33df117de4c57d11b4ba0b624f5352f21aa2e1eda404860155e8855 PYTHON_XLIB_SETUP_TYPE = setuptools PYTHON_XLIB_LICENSE = LGPL-2.1+ PYTHON_XLIB_LICENSE_FILES = LICENSE diff --git a/package/python-yarl/python-yarl.hash b/package/python-yarl/python-yarl.hash index b3910e9aff..783702c74b 100644 --- a/package/python-yarl/python-yarl.hash +++ b/package/python-yarl/python-yarl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/yarl/json -md5 08ba0d6e18f460b44d9e5459f3d217ba yarl-1.4.2.tar.gz -sha256 58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b yarl-1.4.2.tar.gz +md5 3b6f2da3db8c645a9440375fd6a414eb yarl-1.6.3.tar.gz +sha256 8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10 yarl-1.6.3.tar.gz # Locally computed sha256 checksums -sha256 14c0820503ceef15e814a89b037d9efc066870087018294b6ae0f27163872cc5 LICENSE +sha256 14c0820503ceef15e814a89b037d9efc066870087018294b6ae0f27163872cc5 LICENSE diff --git a/package/python-yarl/python-yarl.mk b/package/python-yarl/python-yarl.mk index 1f9b95a9c9..32ec477064 100644 --- a/package/python-yarl/python-yarl.mk +++ b/package/python-yarl/python-yarl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YARL_VERSION = 1.4.2 +PYTHON_YARL_VERSION = 1.6.3 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz -PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/d6/67/6e2507586eb1cfa6d55540845b0cd05b4b77c414f6bca8b00b45483b976e +PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/97/e7/af7219a0fe240e8ef6bb555341a63c43045c21ab0392b4435e754b716fa1 PYTHON_YARL_LICENSE = Apache-2.0 PYTHON_YARL_LICENSE_FILES = LICENSE PYTHON_YARL_SETUP_TYPE = setuptools diff --git a/package/python-zeroconf/python-zeroconf.hash b/package/python-zeroconf/python-zeroconf.hash index a4239b6780..be91b59048 100644 --- a/package/python-zeroconf/python-zeroconf.hash +++ b/package/python-zeroconf/python-zeroconf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zeroconf/json -md5 1094639f8688f2c5b1938029877eb4f2 zeroconf-0.23.0.tar.gz -sha256 e0c333b967c48f8b2e5cc94a1d4d28893023fb06dfd797ee384a94cdd1d0eef5 zeroconf-0.23.0.tar.gz +md5 98e683a247fe9915a5d4845c38b37ff3 zeroconf-0.29.0.tar.gz +sha256 7aefbb658b452b1fd7e51124364f938c6f5e42d6ea893fa2557bea8c06c540af zeroconf-0.29.0.tar.gz # Locally computed sha256 checksums -sha256 bb117c0fbd7f57f64170b690285d7df07c2371b578e3b3cd3aa2e1155ef461a0 COPYING +sha256 bb117c0fbd7f57f64170b690285d7df07c2371b578e3b3cd3aa2e1155ef461a0 COPYING diff --git a/package/python-zeroconf/python-zeroconf.mk b/package/python-zeroconf/python-zeroconf.mk index 55da292b46..67bfa72e03 100644 --- a/package/python-zeroconf/python-zeroconf.mk +++ b/package/python-zeroconf/python-zeroconf.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZEROCONF_VERSION = 0.23.0 +PYTHON_ZEROCONF_VERSION = 0.29.0 PYTHON_ZEROCONF_SOURCE = zeroconf-$(PYTHON_ZEROCONF_VERSION).tar.gz -PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/d7/25/8bbdd4857820e0cdc380c7e0c3543dc01a55247a1d831c712571783e74ec +PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/ca/77/eb6137997adc60811c6c46b28b00abac5c16daf14383f61d8a0180326b38 PYTHON_ZEROCONF_SETUP_TYPE = setuptools PYTHON_ZEROCONF_LICENSE = LGPL-2.1+ PYTHON_ZEROCONF_LICENSE_FILES = COPYING diff --git a/package/python-zope-interface/Config.in b/package/python-zope-interface/Config.in index 4279aa9ef8..17f7aed0d9 100644 --- a/package/python-zope-interface/Config.in +++ b/package/python-zope-interface/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_PYTHON_ZOPE_INTERFACE implementation of the Design By Contract methodology support in Python. - http://docs.zope.org/zope.interface/ + https://zopeinterface.readthedocs.io/ diff --git a/package/python-zope-interface/python-zope-interface.hash b/package/python-zope-interface/python-zope-interface.hash index 2828d85c32..6c2f75303d 100644 --- a/package/python-zope-interface/python-zope-interface.hash +++ b/package/python-zope-interface/python-zope-interface.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zope-interface/json -md5 a3b24f9d079bae5e13dd7a88aa512112 zope.interface-4.6.0.tar.gz -sha256 1b3d0dcabc7c90b470e59e38a9acaa361be43b3a6ea644c0063951964717f0e5 zope.interface-4.6.0.tar.gz +md5 291fd76bd83dda946674af1526b6c2cd zope.interface-5.3.0.tar.gz +sha256 b18a855f8504743e0a2d8b75d008c7720d44e4c76687e13f959e35d9a13eb397 zope.interface-5.3.0.tar.gz # Locally computed sha256 checksums -sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt +sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/package/python-zope-interface/python-zope-interface.mk b/package/python-zope-interface/python-zope-interface.mk index f36aab692b..db0739405d 100644 --- a/package/python-zope-interface/python-zope-interface.mk +++ b/package/python-zope-interface/python-zope-interface.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZOPE_INTERFACE_VERSION = 4.6.0 +PYTHON_ZOPE_INTERFACE_VERSION = 5.3.0 PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz -PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/4e/d0/c9d16bd5b38de44a20c6dc5d5ed80a49626fafcb3db9f9efdc2a19026db6 +PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/b1/f8/aa59109d5345ece4820e8e7a05a97203ef21a0ac2c0460c6c929ea5be889 PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools PYTHON_ZOPE_INTERFACE_LICENSE = ZPL-2.1 PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt diff --git a/package/python/Config.in b/package/python/Config.in index bded00c9e8..ab6950cae8 100644 --- a/package/python/Config.in +++ b/package/python/Config.in @@ -3,7 +3,7 @@ comment "python needs a toolchain w/ wchar, threads, dynamic library" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS config BR2_PACKAGE_PYTHON - bool "python" + bool "python2.7 (deprecated)" depends on BR2_USE_WCHAR # uses fork() depends on BR2_USE_MMU diff --git a/package/python/python.hash b/package/python/python.hash index aa809b9a61..f5e51d9638 100644 --- a/package/python/python.hash +++ b/package/python/python.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-2717/ -md5 b3b6d2c92f42a60667814358ab9f0cfd Python-2.7.17.tar.xz +# From https://www.python.org/downloads/release/python-2718/ +md5 fd6cc8ec0a78c44036f825e739f36e5a Python-2.7.18.tar.xz # Locally calculated -sha256 4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41 Python-2.7.17.tar.xz -sha256 a77d71d6be6f9032e6b6e5d2cf6da68f9eeab9036edfbc043633c8979cd5e82c LICENSE +sha256 b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 Python-2.7.18.tar.xz +sha256 de4d1f2d2ad5ad0cfd1657a106476b31cb5db5ef9d1ff842b237c0c81f0c8a23 LICENSE diff --git a/package/python/python.mk b/package/python/python.mk index f9d5619612..ae99f382f9 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -5,11 +5,12 @@ ################################################################################ PYTHON_VERSION_MAJOR = 2.7 -PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).17 +PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).18 PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION) PYTHON_LICENSE = Python-2.0, others PYTHON_LICENSE_FILES = LICENSE +PYTHON_CPE_ID_VENDOR = python PYTHON_LIBTOOL_PATCH = NO # Python needs itself to be built, so in order to cross-compile @@ -23,6 +24,7 @@ HOST_PYTHON_CONF_OPTS += \ --disable-sqlite3 \ --disable-tk \ --with-expat=system \ + --with-system-ffi \ --disable-curses \ --disable-codecs-cjk \ --disable-nis \ @@ -55,7 +57,7 @@ HOST_PYTHON_MAKE = $(MAKE1) PYTHON_DEPENDENCIES = host-python libffi $(TARGET_NLS_DEPENDENCIES) -HOST_PYTHON_DEPENDENCIES = host-expat host-zlib +HOST_PYTHON_DEPENDENCIES = host-expat host-libffi host-zlib ifeq ($(BR2_PACKAGE_HOST_PYTHON_SSL),y) HOST_PYTHON_DEPENDENCIES += host-openssl @@ -199,6 +201,7 @@ define PYTHON_REMOVE_USELESS_FILES rm -f $(TARGET_DIR)/usr/bin/python2-config rm -f $(TARGET_DIR)/usr/bin/python-config rm -f $(TARGET_DIR)/usr/bin/smtpd.py + rm -f $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/distutils/command/wininst*.exe for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config/ \ -type f -not -name pyconfig.h -a -not -name Makefile` ; do \ rm -f $$i ; \ @@ -260,10 +263,11 @@ endif define PYTHON_CREATE_PYC_FILES $(PYTHON_FIX_TIME) PYTHONPATH="$(PYTHON_PATH)" \ - cd $(TARGET_DIR) && $(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) \ + $(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) \ $(TOPDIR)/support/scripts/pycompile.py \ - $(if $(BR2_REPRODUCIBLE),--force) \ - usr/lib/python$(PYTHON_VERSION_MAJOR) + $(if $(VERBOSE),--verbose) \ + --strip-root $(TARGET_DIR) \ + $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) endef ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY)$(BR2_PACKAGE_PYTHON_PY_PYC),y) diff --git a/package/python3-mako/python3-mako.mk b/package/python3-mako/python3-mako.mk index 6d5c1a185e..fd6b2ed49c 100644 --- a/package/python3-mako/python3-mako.mk +++ b/package/python3-mako/python3-mako.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-mako/python-mako.mk -PYTHON3_MAKO_VERSION = 1.1.1 -PYTHON3_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON3_MAKO_SITE = https://files.pythonhosted.org/packages/28/03/329b21f00243fc2d3815399413845dbbfb0745cff38a29d3597e97f8be58 +PYTHON3_MAKO_VERSION = 1.1.3 +PYTHON3_MAKO_SOURCE = Mako-$(PYTHON3_MAKO_VERSION).tar.gz +PYTHON3_MAKO_SITE = https://files.pythonhosted.org/packages/42/64/fc7c506d14d8b6ed363e7798ffec2dfe4ba21e14dda4cfab99f4430cba3a PYTHON3_MAKO_SETUP_TYPE = setuptools PYTHON3_MAKO_LICENSE = MIT PYTHON3_MAKO_LICENSE_FILES = LICENSE diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index 078cd9b072..34d5993120 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -6,11 +6,13 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 41.4.0 +PYTHON3_SETUPTOOLS_VERSION = 44.0.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).zip -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/f4/d5/a6c19dcbcbc267aca376558797f036d9bcdff344c9f785fe7d0fe9a5f2a7 +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE +PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python +PYTHON3_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools HOST_PYTHON3_SETUPTOOLS_DL_SUBDIR = python-setuptools HOST_PYTHON3_SETUPTOOLS_NEEDS_HOST_PYTHON = python3 diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index 00a6884771..44902725d7 100644 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From 586a67bb448290a98df45e9f61d803952d2aa761 Mon Sep 17 00:00:00 2001 +From 322724e166d7ec0393aec577c12fdf6ef2b61e1d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:21:31 -0800 Subject: [PATCH] Make the build of pyc files conditional @@ -15,10 +15,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 502317aa0c..f9011c132a 100644 +index 77f91e72b1..0c809f3d8a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1455,6 +1455,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1550,6 +1550,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -26,7 +26,7 @@ index 502317aa0c..f9011c132a 100644 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -1482,6 +1483,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1577,6 +1578,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages @@ -35,10 +35,10 @@ index 502317aa0c..f9011c132a 100644 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac -index a189d42c2c..4690cdba9f 100644 +index d60f05251a..1ee5a09588 100644 --- a/configure.ac +++ b/configure.ac -@@ -1085,6 +1085,12 @@ fi +@@ -1121,6 +1121,12 @@ fi AC_MSG_CHECKING(LDLIBRARY) @@ -52,5 +52,5 @@ index a189d42c2c..4690cdba9f 100644 # library that we build, but we do not want to link against it (we # will find it with a -framework option). For this reason there is an -- -2.20.1 +2.25.1 diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index 95db44a4d3..00177814cc 100644 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -1,4 +1,4 @@ -From 3b558cfb1670300afece09b957e1e4b7072bce6b Mon Sep 17 00:00:00 2001 +From 72e20220f3a592b3ab9f440fbe74efa9f9e82d49 Mon Sep 17 00:00:00 2001 From: Vanya Sergeev Date: Wed, 23 Dec 2015 11:30:33 +0100 Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling @@ -10,10 +10,10 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 4690cdba9f..ffeec102b7 100644 +index 1ee5a09588..c2445edc88 100644 --- a/configure.ac +++ b/configure.ac -@@ -4059,7 +4059,7 @@ fi +@@ -4210,7 +4210,7 @@ fi AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) @@ -23,5 +23,5 @@ index 4690cdba9f..ffeec102b7 100644 if test $ipv6 = yes then -- -2.20.1 +2.25.1 diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch index 9bdd9b4897..7cccc588e9 100644 --- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -1,4 +1,4 @@ -From 36c138c15515e80f72a570b61da324e55ae3e80c Mon Sep 17 00:00:00 2001 +From df7c95b4ceecf390b961d843a556c470ac9080b2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:33:22 -0800 Subject: [PATCH] Add infrastructure to disable the build of certain extensions @@ -44,10 +44,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index f9011c132a..e8a6bd5c03 100644 +index 0c809f3d8a..7c3dde8dd4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -205,6 +205,8 @@ FILEMODE= 644 +@@ -216,6 +216,8 @@ FILEMODE= 644 # configure script arguments CONFIG_ARGS= @CONFIG_ARGS@ @@ -56,7 +56,7 @@ index f9011c132a..e8a6bd5c03 100644 # Subdirectories with code SRCDIRS= @SRCDIRS@ -@@ -605,6 +607,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -632,6 +634,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o esac; \ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ @@ -64,7 +64,7 @@ index f9011c132a..e8a6bd5c03 100644 $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -1601,7 +1604,8 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1696,7 +1699,8 @@ libainstall: @DEF_MAKE_RULE@ python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -75,10 +75,10 @@ index f9011c132a..e8a6bd5c03 100644 --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/configure.ac b/configure.ac -index ffeec102b7..7872b4dfee 100644 +index c2445edc88..73d66167de 100644 --- a/configure.ac +++ b/configure.ac -@@ -2952,6 +2952,8 @@ LIBS="$withval $LIBS" +@@ -3081,6 +3081,8 @@ LIBS="$withval $LIBS" PKG_PROG_PKG_CONFIG @@ -88,10 +88,10 @@ index ffeec102b7..7872b4dfee 100644 AC_MSG_CHECKING(for --with-system-expat) AC_ARG_WITH(system_expat, diff --git a/setup.py b/setup.py -index 20d7f35652..d3f2cc1b37 100644 +index 770866bca7..b6c829b3a5 100644 --- a/setup.py +++ b/setup.py -@@ -24,7 +24,10 @@ from distutils.spawn import find_executable +@@ -44,7 +44,10 @@ from distutils.spawn import find_executable TEST_EXTENSIONS = True # This global variable is used to hold the list of modules to be disabled. @@ -104,5 +104,5 @@ index 20d7f35652..d3f2cc1b37 100644 def get_platform(): -- -2.20.1 +2.25.1 diff --git a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch index 0ac5116213..24f369f87f 100644 --- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch +++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From f5ed27c9b9efb4756630e5799be14fefdc3b2702 Mon Sep 17 00:00:00 2001 +From 61af65485f1dade4aa08d0cf2b24082aeda24c51 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:33:14 +0100 Subject: [PATCH] Adjust library/header paths for cross-compilation @@ -21,7 +21,7 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py -index 2d7cdf063f..cba150075c 100644 +index 1a9bd1200f..3cf7d6746e 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -234,7 +234,10 @@ class build_ext(Command): @@ -37,11 +37,11 @@ index 2d7cdf063f..cba150075c 100644 # building python standard extensions self.library_dirs.append('.') diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index b51629eb94..011a437bcd 100644 +index 37feae5df7..e9c3a27856 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -18,10 +18,17 @@ from .errors import DistutilsPlatformError - from .util import get_platform, get_host_platform +@@ -17,10 +17,17 @@ import sys + from .errors import DistutilsPlatformError # These are needed in a couple of spots, so just compute them once. -PREFIX = os.path.normpath(sys.prefix) @@ -63,5 +63,5 @@ index b51629eb94..011a437bcd 100644 # Path to the base directory of the project. On Windows the binary may # live in project/PCbuild/win32 or project/PCbuild/amd64. -- -2.20.1 +2.25.1 diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch index 935e0c3b55..c5abcfd786 100644 --- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch @@ -1,4 +1,4 @@ -From 5bcb991a8de2f1b9bdf44e78894417ed2ee137a5 Mon Sep 17 00:00:00 2001 +From 60d71e37d167ea89445250be436170a6cfee84e7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:00 +0100 Subject: [PATCH] Don't look in /usr/lib/termcap for libraries @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index d3f2cc1b37..5d504d7638 100644 +index b6c829b3a5..ec3ba60607 100644 --- a/setup.py +++ b/setup.py -@@ -955,12 +955,9 @@ class PyBuildExt(build_ext): +@@ -1041,12 +1041,9 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) @@ -27,5 +27,5 @@ index d3f2cc1b37..5d504d7638 100644 libraries=readline_libs)) else: -- -2.20.1 +2.25.1 diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch index ab1e295e70..bb861612b1 100644 --- a/package/python3/0006-Don-t-add-multiarch-paths.patch +++ b/package/python3/0006-Don-t-add-multiarch-paths.patch @@ -1,4 +1,4 @@ -From b878b174e12a5cb2e1943f1f79d94033c1ee80d7 Mon Sep 17 00:00:00 2001 +From f5933b8f973cd11698b52d535a10d0474e49f5a5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:27 +0100 Subject: [PATCH] Don't add multiarch paths @@ -17,10 +17,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 5d504d7638..282a592dc6 100644 +index ec3ba60607..e27620035c 100644 --- a/setup.py +++ b/setup.py -@@ -654,10 +654,10 @@ class PyBuildExt(build_ext): +@@ -734,10 +734,10 @@ class PyBuildExt(build_ext): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') @@ -33,5 +33,5 @@ index 5d504d7638..282a592dc6 100644 def init_inc_lib_dirs(self): -- -2.20.1 +2.25.1 diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch index 1dcf8a017d..856fcaac21 100644 --- a/package/python3/0007-Abort-on-failed-module-build.patch +++ b/package/python3/0007-Abort-on-failed-module-build.patch @@ -1,4 +1,4 @@ -From fceda5bae52571213b6671ce0220d1a85b38f8c7 Mon Sep 17 00:00:00 2001 +From 188c0ebfdb71f5252fa7701013b8d1209f28aef7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:43:24 +0100 Subject: [PATCH] Abort on failed module build @@ -14,10 +14,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index 282a592dc6..8fda3b4d47 100644 +index e27620035c..d3f0e663f2 100644 --- a/setup.py +++ b/setup.py -@@ -444,6 +444,7 @@ class PyBuildExt(build_ext): +@@ -524,6 +524,7 @@ class PyBuildExt(build_ext): print("Failed to build these modules:") print_three_column(failed) print() @@ -26,5 +26,5 @@ index 282a592dc6..8fda3b4d47 100644 if self.failed_on_import: failed = self.failed_on_import[:] -- -2.20.1 +2.25.1 diff --git a/package/python3/0008-Serial-ioctl-workaround.patch b/package/python3/0008-Serial-ioctl-workaround.patch index 9303e188c9..df31cd6220 100644 --- a/package/python3/0008-Serial-ioctl-workaround.patch +++ b/package/python3/0008-Serial-ioctl-workaround.patch @@ -1,4 +1,4 @@ -From 91e8058cf9085795db64f43e2c9548926ea46ab0 Mon Sep 17 00:00:00 2001 +From 9e6211b0d6d4610e5fb7d2c7e1152eb7c64d968b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 Dec 2015 11:44:02 +0100 Subject: [PATCH] Serial ioctl() workaround @@ -15,7 +15,7 @@ Signed-off-by: Baruch Siach 1 file changed, 2 insertions(+) diff --git a/Modules/termios.c b/Modules/termios.c -index aee7f12c57..ba2ff77d06 100644 +index 75e5e52320..eefbddfe69 100644 --- a/Modules/termios.c +++ b/Modules/termios.c @@ -15,7 +15,9 @@ @@ -29,5 +29,5 @@ index aee7f12c57..ba2ff77d06 100644 /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, * MDTR, MRI, and MRTS (apparently used internally by some things -- -2.20.1 +2.25.1 diff --git a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch index 32e3bdfea0..8a77fe3708 100644 --- a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch @@ -1,4 +1,4 @@ -From 3ec9bbf5bd9cced0005c99d7d65997b119abf2f6 Mon Sep 17 00:00:00 2001 +From cb595a591c71e0bf7c63a3706b0be45ac6a642e3 Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 23 Dec 2015 11:44:30 +0100 Subject: [PATCH] Do not adjust the shebang of Python scripts for @@ -31,5 +31,5 @@ index ccc70e6465..d6d54195c1 100644 self.build_dir) updated_files.append(outfile) -- -2.20.1 +2.25.1 diff --git a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch index a8ccba7784..a1f9ab6cd9 100644 --- a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch +++ b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch @@ -1,4 +1,4 @@ -From 7b3839bcf9f79988fb944cd65717839cde166cb8 Mon Sep 17 00:00:00 2001 +From eb51497e4b5799f8ab0277426d3e54414acb9d4b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 13:24:59 +0100 Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match @@ -63,5 +63,5 @@ index 2602fe24c0..a1bc3cd5f7 100644 PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" -- -2.20.1 +2.25.1 diff --git a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch index 1a40b74d21..8b0d4f4c4d 100644 --- a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch +++ b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch @@ -1,4 +1,4 @@ -From a9affe1f3f98342b682848c9b3f862ee194ff625 Mon Sep 17 00:00:00 2001 +From e4ae670e3489544a49dabd1618c32fe73504a7ba Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Wed, 23 Dec 2015 11:45:48 +0100 Subject: [PATCH] Override system locale and set to default when adding gcc @@ -15,23 +15,25 @@ any system library (eg. libz, libssl, etc.) Signed-off-by: Samuel Cabrero Signed-off-by: Thomas Petazzoni +[james.hilliard1@gmail.com: adapt to python 3.9] +Signed-off-by: James Hilliard --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 8fda3b4d47..bb7eb44213 100644 +index d3f0e663f2..926c16f58f 100644 --- a/setup.py +++ b/setup.py -@@ -600,7 +600,7 @@ class PyBuildExt(build_ext): +@@ -680,7 +680,7 @@ class PyBuildExt(build_ext): tmpfile = os.path.join(self.build_temp, 'ccpaths') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) -- ret = os.system('%s -E -v - %s 1>/dev/null' % (cc, tmpfile)) -+ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (cc, tmpfile)) +- ret = run_command('%s -E -v - %s 1>/dev/null' % (cc, tmpfile)) ++ ret = run_command('LC_ALL=C %s -E -v - %s 1>/dev/null' % (cc, tmpfile)) is_gcc = False is_clang = False in_incdirs = False -- -2.20.1 +2.25.1 diff --git a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch index aacb6dca6c..7a885303cb 100644 --- a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch +++ b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch @@ -1,4 +1,4 @@ -From c50b8e7fb9b2e61d4d195a055cd1bbf993cc455f Mon Sep 17 00:00:00 2001 +From e2ea659eac1849db471d3c01a0d0af9d6fca2e9a Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 22 Feb 2017 16:48:49 -0800 Subject: [PATCH] Add importlib fix for PEP 3147 issue @@ -25,10 +25,10 @@ Signed-off-by: Andrey Smirnov 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index b8ac482994..db034f605a 100644 +index 25a3f8c0e0..2cb9a9aa52 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py -@@ -306,8 +306,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): +@@ -373,8 +373,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): a True value is the same as setting 'optimization' to the empty string while a False value is equivalent to setting 'optimization' to '1'. @@ -37,7 +37,7 @@ index b8ac482994..db034f605a 100644 """ if debug_override is not None: _warnings.warn('the debug_override parameter is deprecated; use ' -@@ -319,10 +317,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): +@@ -386,10 +384,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): path = _os.fspath(path) head, tail = _path_split(path) base, sep, rest = tail.rpartition('.') @@ -49,7 +49,7 @@ index b8ac482994..db034f605a 100644 if optimization is None: if sys.flags.optimize == 0: optimization = '' -@@ -359,46 +354,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): +@@ -426,46 +421,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): head.lstrip(path_separators), filename, ) @@ -101,5 +101,5 @@ index b8ac482994..db034f605a 100644 -- -2.20.1 +2.25.1 diff --git a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch index d34a2883ad..8c1b989361 100644 --- a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch +++ b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch @@ -1,4 +1,4 @@ -From 5ee3e5ad62919c431b1f7b5ff91ddf606582df0e Mon Sep 17 00:00:00 2001 +From 0337342d413d13f437fd089de91faee70a8bf3f9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:01:18 -0800 Subject: [PATCH] Add an option to disable installation of test modules @@ -10,16 +10,18 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov +[james.hilliard1@gmail.com: adapt to python 3.9] +Signed-off-by: James Hilliard --- - Makefile.pre.in | 54 ++++++++++++++++++++++++++++++++----------------- + Makefile.pre.in | 56 ++++++++++++++++++++++++++++++++----------------- configure.ac | 5 +++++ - 2 files changed, 41 insertions(+), 18 deletions(-) + 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e8a6bd5c03..3abee36f49 100644 +index 7c3dde8dd4..204f293d53 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1317,8 +1317,28 @@ maninstall: altmaninstall +@@ -1406,8 +1406,29 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -43,16 +45,17 @@ index e8a6bd5c03..3abee36f49 100644 + multiprocessing multiprocessing/dummy \ + unittest \ + venv venv/scripts venv/scripts/common venv/scripts/posix \ -+ curses pydoc_data ++ curses pydoc_data \ ++ zoneinfo + +TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ + tkinter/test/test_ttk test \ test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1376,26 +1396,24 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ - test/test_importlib/zipdata01 \ +@@ -1468,28 +1489,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/test_importlib/zipdata02 \ + test/test_zoneinfo test/test_zoneinfo/data \ test/ziptestdata \ - asyncio \ test/test_asyncio \ @@ -75,13 +78,15 @@ index e8a6bd5c03..3abee36f49 100644 + ctypes/test \ + idlelib/idle_test \ + distutils/tests \ + test/test_peg_generator \ + test/test_importlib test/test_importlib/builtin \ test/test_tools test/test_warnings test/test_warnings/data \ - turtledemo \ - multiprocessing multiprocessing/dummy \ - unittest unittest/test unittest/test/testmock \ - venv venv/scripts venv/scripts/common venv/scripts/posix \ -- curses pydoc_data +- curses pydoc_data \ +- zoneinfo + unittest/test unittest/test/testmock + +ifeq (@TEST_MODULES@,yes) @@ -92,10 +97,10 @@ index e8a6bd5c03..3abee36f49 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index 7872b4dfee..b820d18c7c 100644 +index 73d66167de..92e28d02ee 100644 --- a/configure.ac +++ b/configure.ac -@@ -3213,6 +3213,11 @@ if test "$posix_threads" = "yes"; then +@@ -3358,6 +3358,11 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -108,5 +113,5 @@ index 7872b4dfee..b820d18c7c 100644 # Check for enable-ipv6 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) -- -2.20.1 +2.25.1 diff --git a/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/0014-Add-an-option-to-disable-pydoc.patch index cdcabc0c11..0c928a0bb2 100644 --- a/package/python3/0014-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0014-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From 13a8be57e79f2657c75391bfa524dc1ba4993b02 Mon Sep 17 00:00:00 2001 +From a65e5d3caf8e076d531191164c23c6240461f675 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 3abee36f49..6fa0549a56 100644 +index 204f293d53..63e3df0470 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1289,7 +1289,9 @@ bininstall: altbininstall +@@ -1374,7 +1374,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 @@ -30,16 +30,16 @@ index 3abee36f49..6fa0549a56 100644 -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -1335,7 +1337,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1424,7 +1426,7 @@ LIBSUBDIRS= tkinter site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ -- curses pydoc_data -+ curses +- curses pydoc_data \ ++ curses \ + zoneinfo TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - tkinter/test/test_ttk test \ -@@ -1414,6 +1416,10 @@ ifeq (@TEST_MODULES@,yes) +@@ -1508,6 +1510,10 @@ ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif @@ -51,10 +51,10 @@ index 3abee36f49..6fa0549a56 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index b820d18c7c..f53cc86d89 100644 +index 92e28d02ee..174ed85a7c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3213,6 +3213,12 @@ if test "$posix_threads" = "yes"; then +@@ -3358,6 +3358,12 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -68,10 +68,10 @@ index b820d18c7c..f53cc86d89 100644 AC_ARG_ENABLE(test-modules, diff --git a/setup.py b/setup.py -index bb7eb44213..748c269960 100644 +index 926c16f58f..1fc5fac90c 100644 --- a/setup.py +++ b/setup.py -@@ -2401,6 +2401,12 @@ def main(): +@@ -2565,6 +2565,12 @@ def main(): # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -84,7 +84,7 @@ index bb7eb44213..748c269960 100644 setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2425,8 +2431,7 @@ def main(): +@@ -2589,8 +2595,7 @@ def main(): # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in @@ -95,5 +95,5 @@ index bb7eb44213..748c269960 100644 # --install-platlib -- -2.20.1 +2.25.1 diff --git a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch index 03064612a0..fe94cdfded 100644 --- a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From 868823f15bab031caf05dc5e8ce2eac076bfc82b Mon Sep 17 00:00:00 2001 +From f034b1b0f33a7bd4dde23f0bc1fa8e00e3518c9d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6fa0549a56..3e1f130532 100644 +index 63e3df0470..8b7de12999 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1293,7 +1293,9 @@ ifeq (@PYDOC@,yes) +@@ -1378,7 +1378,9 @@ ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) endif -rm -f $(DESTDIR)$(BINDIR)/2to3 @@ -30,7 +30,7 @@ index 6fa0549a56..3e1f130532 100644 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ -@@ -1328,7 +1330,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1417,7 +1419,6 @@ LIBSUBDIRS= tkinter site-packages \ html json http dbm xmlrpc \ sqlite3 \ logging csv wsgiref urllib \ @@ -38,7 +38,7 @@ index 6fa0549a56..3e1f130532 100644 ctypes ctypes/macholib \ idlelib idlelib/Icons \ distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -1402,9 +1403,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1495,9 +1496,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_email test/test_email/data \ test/test_json \ sqlite3/test \ @@ -48,7 +48,7 @@ index 6fa0549a56..3e1f130532 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1412,6 +1410,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1506,6 +1504,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -63,7 +63,7 @@ index 6fa0549a56..3e1f130532 100644 ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif -@@ -1511,10 +1517,12 @@ ifeq (@PYC_BUILD@,yes) +@@ -1606,10 +1612,12 @@ ifeq (@PYC_BUILD@,yes) -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif @@ -77,10 +77,10 @@ index 6fa0549a56..3e1f130532 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index f53cc86d89..caa8eaf88a 100644 +index 174ed85a7c..f1f5e9a7b0 100644 --- a/configure.ac +++ b/configure.ac -@@ -3225,6 +3225,12 @@ AC_ARG_ENABLE(test-modules, +@@ -3370,6 +3370,12 @@ AC_ARG_ENABLE(test-modules, AS_HELP_STRING([--disable-test-modules], [disable test modules]), [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) @@ -94,10 +94,10 @@ index f53cc86d89..caa8eaf88a 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 748c269960..1669797cad 100644 +index 1fc5fac90c..4063d7ffa5 100644 --- a/setup.py +++ b/setup.py -@@ -2402,10 +2402,11 @@ def main(): +@@ -2566,10 +2566,11 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -112,5 +112,5 @@ index 748c269960..1669797cad 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.20.1 +2.25.1 diff --git a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch index 4f5e0dbd86..d6c9bccd45 100644 --- a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch +++ b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch @@ -1,4 +1,4 @@ -From 1a1d13a973d9dcbd6660bfef40cf35c7638f779b Mon Sep 17 00:00:00 2001 +From dd2722dec08eb9c72c36313e93661eeca3ad64d8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:20:45 -0800 Subject: [PATCH] Add option to disable the sqlite3 module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 3e1f130532..cf9add0bc7 100644 +index 8b7de12999..d826d8ac4b 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1328,7 +1328,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1417,7 +1417,6 @@ LIBSUBDIRS= tkinter site-packages \ email email/mime \ ensurepip ensurepip/_bundled \ html json http dbm xmlrpc \ @@ -24,7 +24,7 @@ index 3e1f130532..cf9add0bc7 100644 logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ -@@ -1402,7 +1401,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1495,7 +1494,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_asyncio \ test/test_email test/test_email/data \ test/test_json \ @@ -32,7 +32,7 @@ index 3e1f130532..cf9add0bc7 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1418,6 +1416,11 @@ TESTSUBDIRS += lib2to3/tests \ +@@ -1512,6 +1510,11 @@ TESTSUBDIRS += lib2to3/tests \ lib2to3/tests/data/fixers/myfixes endif @@ -45,10 +45,10 @@ index 3e1f130532..cf9add0bc7 100644 LIBSUBDIRS += $(TESTSUBDIRS) endif diff --git a/configure.ac b/configure.ac -index caa8eaf88a..79a8255f44 100644 +index f1f5e9a7b0..8b5c65974c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3213,6 +3213,15 @@ if test "$posix_threads" = "yes"; then +@@ -3358,6 +3358,15 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -65,5 +65,5 @@ index caa8eaf88a..79a8255f44 100644 AC_ARG_ENABLE(pydoc, -- -2.20.1 +2.25.1 diff --git a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch index b248ecd40c..b798eb56a5 100644 --- a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch @@ -1,4 +1,4 @@ -From c54cb57b3bd80fa2819f6409d5d2b98d82fbfcb2 Mon Sep 17 00:00:00 2001 +From ad6b66b34f71ff6b60b3be5f6fd3e781cdeecd59 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:23:42 -0800 Subject: [PATCH] Add an option to disable the tk module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index cf9add0bc7..5d78419fd4 100644 +index d826d8ac4b..dc84384680 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1322,7 +1322,7 @@ maninstall: altmaninstall +@@ -1411,7 +1411,7 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -25,9 +25,9 @@ index cf9add0bc7..5d78419fd4 100644 asyncio \ collections concurrent concurrent/futures encodings \ email email/mime \ -@@ -1339,8 +1339,7 @@ LIBSUBDIRS= tkinter site-packages \ - venv venv/scripts venv/scripts/common venv/scripts/posix \ - curses +@@ -1429,8 +1429,7 @@ LIBSUBDIRS= tkinter site-packages \ + curses \ + zoneinfo -TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - tkinter/test/test_ttk test \ @@ -35,7 +35,7 @@ index cf9add0bc7..5d78419fd4 100644 test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1408,6 +1407,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1502,6 +1501,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -49,10 +49,10 @@ index cf9add0bc7..5d78419fd4 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 79a8255f44..b5922451cc 100644 +index 8b5c65974c..4c72dae960 100644 --- a/configure.ac +++ b/configure.ac -@@ -3222,6 +3222,15 @@ if test "$SQLITE3" = "no" ; then +@@ -3367,6 +3367,15 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -69,5 +69,5 @@ index 79a8255f44..b5922451cc 100644 AC_ARG_ENABLE(pydoc, -- -2.20.1 +2.25.1 diff --git a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch index d442f7b807..93dfac26ec 100644 --- a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch +++ b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch @@ -1,4 +1,4 @@ -From 332373ca25f2dbe5473330666ec49143506a4dc0 Mon Sep 17 00:00:00 2001 +From 962deb43f5f340a8472d432ae8e6d61186f9040e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:31:51 -0800 Subject: [PATCH] Add an option to disable the curses module @@ -8,25 +8,23 @@ Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov --- - Makefile.pre.in | 7 +++++-- + Makefile.pre.in | 5 ++++- configure.ac | 9 +++++++++ - 2 files changed, 14 insertions(+), 2 deletions(-) + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5d78419fd4..660c292765 100644 +index dc84384680..2a82f3308f 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1336,8 +1336,7 @@ LIBSUBDIRS= site-packages \ - turtledemo \ +@@ -1426,7 +1426,6 @@ LIBSUBDIRS= site-packages \ multiprocessing multiprocessing/dummy \ unittest \ -- venv venv/scripts venv/scripts/common venv/scripts/posix \ -- curses -+ venv venv/scripts venv/scripts/common venv/scripts/posix + venv venv/scripts venv/scripts/common venv/scripts/posix \ +- curses \ + zoneinfo TESTSUBDIRS= test \ - test/audiodata \ -@@ -1413,6 +1412,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ +@@ -1507,6 +1506,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk endif @@ -38,10 +36,10 @@ index 5d78419fd4..660c292765 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index b5922451cc..ea422a86a9 100644 +index 4c72dae960..acd98381a3 100644 --- a/configure.ac +++ b/configure.ac -@@ -3231,6 +3231,15 @@ if test "$TK" = "no"; then +@@ -3376,6 +3376,15 @@ if test "$TK" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" fi @@ -58,5 +56,5 @@ index b5922451cc..ea422a86a9 100644 AC_ARG_ENABLE(pydoc, -- -2.20.1 +2.25.1 diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0019-Add-an-option-to-disable-expat.patch index 3015d1e107..e7349058c8 100644 --- a/package/python3/0019-Add-an-option-to-disable-expat.patch +++ b/package/python3/0019-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From d88f2d3430bbbe285ae3de5fbc1bde34da7f0478 Mon Sep 17 00:00:00 2001 +From 7e0e7dc25f50acd6922493ae620ee5cbf107a79a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -20,10 +20,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 660c292765..f49abf8395 100644 +index 2a82f3308f..e678c8817e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1331,7 +1331,7 @@ LIBSUBDIRS= site-packages \ +@@ -1420,7 +1420,7 @@ LIBSUBDIRS= site-packages \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ @@ -32,7 +32,7 @@ index 660c292765..f49abf8395 100644 importlib \ turtledemo \ multiprocessing multiprocessing/dummy \ -@@ -1416,6 +1416,10 @@ ifeq (@CURSES@,yes) +@@ -1510,6 +1510,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -44,16 +44,16 @@ index 660c292765..f49abf8395 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index ea422a86a9..3c1e2c088d 100644 +index acd98381a3..9ef0ecd42f 100644 --- a/configure.ac +++ b/configure.ac -@@ -2955,13 +2955,21 @@ PKG_PROG_PKG_CONFIG +@@ -3084,13 +3084,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library -AC_MSG_CHECKING(for --with-system-expat) -AC_ARG_WITH(system_expat, -- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]), +- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)]), +AC_MSG_CHECKING(for --with-expat) +AC_ARG_WITH(expat, + AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), @@ -75,10 +75,10 @@ index ea422a86a9..3c1e2c088d 100644 # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) diff --git a/setup.py b/setup.py -index 1669797cad..d2727c0da5 100644 +index 4063d7ffa5..211a160f29 100644 --- a/setup.py +++ b/setup.py -@@ -1576,7 +1576,7 @@ class PyBuildExt(build_ext): +@@ -1666,7 +1666,7 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # @@ -88,5 +88,5 @@ index 1669797cad..d2727c0da5 100644 define_macros = [] extra_compile_args = [] -- -2.20.1 +2.25.1 diff --git a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch index dfe8614a5d..4e22543096 100644 --- a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch +++ b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch @@ -1,4 +1,4 @@ -From 347f359b484c8e34b49f71132701252b966d93aa Mon Sep 17 00:00:00 2001 +From 2c0d31bb91fc7f94283c3ab632925fbbe24e94d6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:49:55 +0100 Subject: [PATCH] Add an option to disable CJK codecs @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 3c1e2c088d..30a92f9c2e 100644 +index 9ef0ecd42f..18e6fd70a0 100644 --- a/configure.ac +++ b/configure.ac -@@ -3230,6 +3230,12 @@ if test "$SQLITE3" = "no" ; then +@@ -3375,6 +3375,12 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -26,5 +26,5 @@ index 3c1e2c088d..30a92f9c2e 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/package/python3/0021-Add-an-option-to-disable-NIS.patch b/package/python3/0021-Add-an-option-to-disable-NIS.patch index 35bfe5aed9..9cd54df180 100644 --- a/package/python3/0021-Add-an-option-to-disable-NIS.patch +++ b/package/python3/0021-Add-an-option-to-disable-NIS.patch @@ -1,4 +1,4 @@ -From ff9bebed083c5d20fe31f94b868f6f1a8c6cc744 Mon Sep 17 00:00:00 2001 +From 2041d0c8dba87991edaf088b16e37b5189a3466d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:11 +0100 Subject: [PATCH] Add an option to disable NIS @@ -12,10 +12,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 30a92f9c2e..20f326db46 100644 +index 18e6fd70a0..46d2a8131e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3236,6 +3236,12 @@ AC_ARG_ENABLE(codecs-cjk, +@@ -3381,6 +3381,12 @@ AC_ARG_ENABLE(codecs-cjk, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" fi]) @@ -29,5 +29,5 @@ index 30a92f9c2e..20f326db46 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch index a8ec0e499f..2ddf606a70 100644 --- a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch +++ b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch @@ -1,4 +1,4 @@ -From 47f9caca90e6c8c18736e5dfd0acf47aae27eefb Mon Sep 17 00:00:00 2001 +From dd82a401ff6ba4ba116bf4d520e981a1808ed443 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:27 +0100 Subject: [PATCH] Add an option to disable unicodedata @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 20f326db46..99bbc37b07 100644 +index 46d2a8131e..5844e3b73f 100644 --- a/configure.ac +++ b/configure.ac -@@ -3242,6 +3242,12 @@ AC_ARG_ENABLE(nis, +@@ -3387,6 +3387,12 @@ AC_ARG_ENABLE(nis, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" fi]) @@ -26,5 +26,5 @@ index 20f326db46..99bbc37b07 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/package/python3/0023-Add-an-option-to-disable-IDLE.patch index bb23879e34..0e35eea699 100644 --- a/package/python3/0023-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0023-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From c3ad1d6fc8f1fa56ee0522389227454710bf7877 Mon Sep 17 00:00:00 2001 +From f1b15834045d0641c43014b970721df066fa71f7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -16,10 +16,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index f49abf8395..bc777e6504 100644 +index e678c8817e..1148bd8708 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1287,7 +1287,9 @@ bininstall: altbininstall +@@ -1372,7 +1372,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 @@ -29,7 +29,7 @@ index f49abf8395..bc777e6504 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1330,7 +1332,6 @@ LIBSUBDIRS= site-packages \ +@@ -1419,7 +1421,6 @@ LIBSUBDIRS= site-packages \ html json http dbm xmlrpc \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ @@ -37,7 +37,7 @@ index f49abf8395..bc777e6504 100644 distutils distutils/command \ importlib \ turtledemo \ -@@ -1420,6 +1421,10 @@ ifeq (@EXPAT@,yes) +@@ -1514,6 +1515,10 @@ ifeq (@EXPAT@,yes) LIBSUBDIRS += $(XMLLIBSUBDIRS) endif @@ -49,10 +49,10 @@ index f49abf8395..bc777e6504 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 99bbc37b07..8c9706582e 100644 +index 5844e3b73f..7bd4623ccd 100644 --- a/configure.ac +++ b/configure.ac -@@ -3284,6 +3284,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -3429,6 +3429,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -66,10 +66,10 @@ index 99bbc37b07..8c9706582e 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index d2727c0da5..9f09b3d985 100644 +index 211a160f29..c4ee989ba3 100644 --- a/setup.py +++ b/setup.py -@@ -2402,11 +2402,13 @@ def main(): +@@ -2566,11 +2566,13 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -85,5 +85,5 @@ index d2727c0da5..9f09b3d985 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.20.1 +2.25.1 diff --git a/package/python3/0024-Add-an-option-to-disable-decimal.patch b/package/python3/0024-Add-an-option-to-disable-decimal.patch index 7d96f5c416..b5a12f7f38 100644 --- a/package/python3/0024-Add-an-option-to-disable-decimal.patch +++ b/package/python3/0024-Add-an-option-to-disable-decimal.patch @@ -1,4 +1,4 @@ -From c82efeabd2f9b89ff2ecd5261eceeeb3af022ae8 Mon Sep 17 00:00:00 2001 +From d5fe81cbd51da2a84ed89d1e4c80d921d4efce26 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:31 +0100 Subject: [PATCH] Add an option to disable decimal @@ -11,22 +11,24 @@ the libmpdec builtin the Python sources, or no libmpdec at all. Signed-off-by: Thomas Petazzoni [aduskett@gmail.com: Update for python 3.7.0] Signed-off-by: Adam Duskett +[james.hilliard1@gmail.com: adapt to python 3.9] +Signed-off-by: James Hilliard --- configure.ac | 17 ++++++++++++----- setup.py | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 8c9706582e..e6255babb6 100644 +index 7bd4623ccd..e513ef6a20 100644 --- a/configure.ac +++ b/configure.ac -@@ -3006,13 +3006,20 @@ fi +@@ -3135,13 +3135,20 @@ fi AC_SUBST(LIBFFI_INCLUDEDIR) # Check for use of the system libmpdec library -AC_MSG_CHECKING(for --with-system-libmpdec) -AC_ARG_WITH(system_libmpdec, -- AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library]), +- AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library, see Doc/library/decimal.rst (default is no)]), +AC_MSG_CHECKING(for --with-libmpdec) +AC_ARG_WITH(libmpdec, + AS_HELP_STRING([--with-libmpdec], [select which libmpdec version to use: system, builtin, none]), @@ -44,13 +46,13 @@ index 8c9706582e..e6255babb6 100644 +fi +AC_SUBST(MPDEC) - # Check for support for loadable sqlite extensions - AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) + # Check whether _decimal should use a coroutine-local or thread-local context + AC_MSG_CHECKING(for --with-decimal-contextvar) diff --git a/setup.py b/setup.py -index 9f09b3d985..a7f2e23d87 100644 +index c4ee989ba3..3d0c74bb7f 100644 --- a/setup.py +++ b/setup.py -@@ -2076,7 +2076,7 @@ class PyBuildExt(build_ext): +@@ -2195,7 +2195,7 @@ class PyBuildExt(build_ext): # Stefan Krah's _decimal module extra_compile_args = [] undef_macros = [] @@ -60,5 +62,5 @@ index 9f09b3d985..a7f2e23d87 100644 libraries = [':libmpdec.so.2'] sources = ['_decimal/_decimal.c'] -- -2.20.1 +2.25.1 diff --git a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch index 56f56adfcb..0f68a08356 100644 --- a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -1,4 +1,4 @@ -From c68234aba844cb1034fdcfb50aef03da454723f9 Mon Sep 17 00:00:00 2001 +From 9bedc56d2a4b8856162650a11c1fcb6ec38f160b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:58 +0100 Subject: [PATCH] Add an option to disable the ossaudiodev module @@ -9,12 +9,12 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index e6255babb6..5809233aac 100644 +index e513ef6a20..c07505e89e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3021,6 +3021,12 @@ else - fi - AC_SUBST(MPDEC) +@@ -3165,6 +3165,12 @@ fi + + AC_MSG_RESULT($with_decimal_contextvar) +AC_ARG_ENABLE(ossaudiodev, + AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]), @@ -26,5 +26,5 @@ index e6255babb6..5809233aac 100644 AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) AC_ARG_ENABLE(loadable-sqlite-extensions, -- -2.20.1 +2.25.1 diff --git a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch index ced3fa93e7..44d1d3d6b3 100644 --- a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch +++ b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch @@ -1,4 +1,4 @@ -From 8faf197969bf531279d5c59a5bb2bc3a21acc378 Mon Sep 17 00:00:00 2001 +From 90ed5c692b8b5596ca0b3ae1436276c8181251d8 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 22 Feb 2017 17:55:59 -0800 Subject: [PATCH] Add an option to disable openssl support. @@ -9,10 +9,10 @@ Signed-off-by: Nicolas Cavallari 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 5809233aac..6b09bafda4 100644 +index c07505e89e..612e32faf5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3261,6 +3261,12 @@ AC_ARG_ENABLE(unicodedata, +@@ -3406,6 +3406,12 @@ AC_ARG_ENABLE(unicodedata, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" fi]) @@ -26,5 +26,5 @@ index 5809233aac..6b09bafda4 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch index e70c9984e4..1597a2a560 100644 --- a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch +++ b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch @@ -1,4 +1,4 @@ -From 6e3923f90497ba7230b62fdd3f2dca1cb79852bf Mon Sep 17 00:00:00 2001 +From 049e7a51e1ffd0d28d6608c707ab4b54e816d338 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:29:05 +0100 Subject: [PATCH] Add an option to disable the readline module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 6b09bafda4..b64518eed5 100644 +index 612e32faf5..2a6aaeff60 100644 --- a/configure.ac +++ b/configure.ac -@@ -3267,6 +3267,12 @@ AC_ARG_ENABLE(openssl, +@@ -3412,6 +3412,12 @@ AC_ARG_ENABLE(openssl, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" fi]) @@ -26,5 +26,5 @@ index 6b09bafda4..b64518eed5 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch index 004b3d1c8f..a1d2ef3255 100644 --- a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -1,4 +1,4 @@ -From e6f44f93db96ed7f3b2baa0e09ea32a32c78c638 Mon Sep 17 00:00:00 2001 +From 146730a04dfe98e3d7971ebf5410801ceae88e11 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:31:11 +0100 Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac -index b64518eed5..d07e371c57 100644 +index 2a6aaeff60..21479bbd7d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3273,6 +3273,24 @@ AC_ARG_ENABLE(readline, +@@ -3418,6 +3418,24 @@ AC_ARG_ENABLE(readline, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" fi]) @@ -38,5 +38,5 @@ index b64518eed5..d07e371c57 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch index f69b887c9b..4478b40162 100644 --- a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch +++ b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch @@ -1,4 +1,4 @@ -From e3221e3b714374e1e53dc11c9556733bd2807c2c Mon Sep 17 00:00:00 2001 +From 106d9378c61e7fa9cad0a63ba068668d54cd11b8 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 6 Oct 2017 09:54:15 -0500 Subject: [PATCH] python-config.sh: don't reassign ${prefix} @@ -49,5 +49,5 @@ index a1bc3cd5f7..164d2d3603 100644 SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -- -2.20.1 +2.25.1 diff --git a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch index d39befaf1c..1bf5fc6db4 100644 --- a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch +++ b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch @@ -1,4 +1,4 @@ -From 28008e1e4f0349241d22aace3c54f7e9425c6c1f Mon Sep 17 00:00:00 2001 +From d7b90b157eddefbd0ed59e35c90b083c0c03b644 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 20 Jul 2018 10:17:39 -0400 Subject: [PATCH] Fix cross compiling the uuid module @@ -20,10 +20,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index a7f2e23d87..b0274a3f67 100644 +index 3d0c74bb7f..c7be85f352 100644 --- a/setup.py +++ b/setup.py -@@ -1674,7 +1674,8 @@ class PyBuildExt(build_ext): +@@ -1764,7 +1764,8 @@ class PyBuildExt(build_ext): def detect_uuid(self): # Build the _uuid module if possible @@ -34,5 +34,5 @@ index a7f2e23d87..b0274a3f67 100644 if self.compiler.find_library_file(self.lib_dirs, 'uuid'): uuid_libs = ['uuid'] -- -2.20.1 +2.25.1 diff --git a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/package/python3/0031-Add-an-option-to-disable-uuid-module.patch index a777475c9e..92b24b211d 100644 --- a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch +++ b/package/python3/0031-Add-an-option-to-disable-uuid-module.patch @@ -1,4 +1,4 @@ -From 74007603df0921450f14e8626df36140426cc300 Mon Sep 17 00:00:00 2001 +From 3bb693408eda77dda145ec5fecee56ea73031e9f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Aug 2018 10:54:56 +0200 Subject: [PATCH] Add an option to disable uuid module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index d07e371c57..55ab6c3c26 100644 +index 21479bbd7d..615c16aced 100644 --- a/configure.ac +++ b/configure.ac -@@ -3309,6 +3309,15 @@ if test "$CURSES" = "no"; then +@@ -3454,6 +3454,15 @@ if test "$CURSES" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" fi @@ -29,5 +29,5 @@ index d07e371c57..55ab6c3c26 100644 AC_ARG_ENABLE(pydoc, -- -2.20.1 +2.25.1 diff --git a/package/python3/0032-fix-building-on-older-distributions.patch b/package/python3/0032-fix-building-on-older-distributions.patch index 69998a36dd..fb59e593f4 100644 --- a/package/python3/0032-fix-building-on-older-distributions.patch +++ b/package/python3/0032-fix-building-on-older-distributions.patch @@ -1,4 +1,4 @@ -From 3ddda00652f809a3bd8b4e3f7b0a3a4270b280a6 Mon Sep 17 00:00:00 2001 +From 94c62f96ca61f1a28124c837d7ec5ed0b9ae8786 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 16 Aug 2018 14:52:37 -0700 Subject: [PATCH] fix building on older distributions @@ -34,5 +34,5 @@ index 224585c69b..ef458c0c63 100644 os.unlink(new_path) -- -2.20.1 +2.25.1 diff --git a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index 5a5a104dc5..f70990b254 100644 --- a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -1,4 +1,4 @@ -From 5932fedd9d1d43a230fa353df434f253e9d2b5a0 Mon Sep 17 00:00:00 2001 +From edc0757c56090364e0a95aabfa9f645a16a27569 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Aug 2019 15:53:16 +0200 Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for @@ -29,10 +29,10 @@ Signed-off-by: Peter Korsgaard 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 55ab6c3c26..4a6d0662ac 100644 +index 615c16aced..241298e6cf 100644 --- a/configure.ac +++ b/configure.ac -@@ -700,7 +700,9 @@ then +@@ -727,7 +727,9 @@ then fi @@ -44,5 +44,5 @@ index 55ab6c3c26..4a6d0662ac 100644 AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) -- -2.20.1 +2.25.1 diff --git a/package/python3/Config.in b/package/python3/Config.in index 0c5018f0b3..efc4dbb3d4 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -41,6 +41,17 @@ menu "core python3 modules" comment "The following modules are unusual or require extra libraries" +config BR2_PACKAGE_PYTHON3_2TO3 + bool "2to3 module" + help + code translation from python 2 to 3 + +config BR2_PACKAGE_PYTHON3_BERKELEYDB + bool "berkeleydb" + select BR2_PACKAGE_BERKELEYDB + help + berkeleydb module for Python3 + config BR2_PACKAGE_PYTHON3_BZIP2 bool "bz2 module" select BR2_PACKAGE_BZIP2 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index cb7c6b2f25..444dbd982a 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-382/ -md5 e9d6ebc92183a177b8e8a58cad5b8d67 Python-3.8.2.tar.xz +# From https://www.python.org/downloads/release/python-397/ +md5 fddb060b483bc01850a3f412eea1d954 Python-3.9.7.tar.xz # Locally computed -sha256 2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df Python-3.8.2.tar.xz -sha256 de4d1f2d2ad5ad0cfd1657a106476b31cb5db5ef9d1ff842b237c0c81f0c8a23 LICENSE +sha256 f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57 Python-3.9.7.tar.xz +sha256 599826df92bfdcd2702eac691072498bb096c55af04ee984cf90f70ed77b5a70 LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index d12237300d..3e88bc0ff4 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -4,12 +4,14 @@ # ################################################################################ -PYTHON3_VERSION_MAJOR = 3.8 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 +PYTHON3_VERSION_MAJOR = 3.9 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).7 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others PYTHON3_LICENSE_FILES = LICENSE +PYTHON3_CPE_ID_VENDOR = python +PYTHON3_CPE_ID_PRODUCT = python # This host Python is installed in $(HOST_DIR), as it is needed when # cross-compiling third-party Python modules. @@ -39,7 +41,7 @@ HOST_PYTHON3_CONF_ENV += \ PYTHON3_DEPENDENCIES = host-python3 libffi -HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi +HOST_PYTHON3_DEPENDENCIES = host-autoconf-archive host-expat host-zlib host-libffi ifeq ($(BR2_PACKAGE_HOST_PYTHON3_SSL),y) HOST_PYTHON3_DEPENDENCIES += host-openssl @@ -49,6 +51,18 @@ endif PYTHON3_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_PYTHON3_2TO3),y) +PYTHON3_CONF_OPTS += --enable-lib2to3 +else +PYTHON3_CONF_OPTS += --disable-lib2to3 +endif + +ifeq ($(BR2_PACKAGE_PYTHON3_BERKELEYDB),y) +PYTHON3_DEPENDENCIES += berkeleydb +else +PYTHON3_CONF_OPTS += --disable-berkeleydb +endif + ifeq ($(BR2_PACKAGE_PYTHON3_READLINE),y) PYTHON3_DEPENDENCIES += readline else @@ -146,13 +160,16 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) PYTHON3_CONF_ENV += ac_cv_func_wcsftime=no endif +ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) +PYTHON3_DEPENDENCIES += gettext +endif + PYTHON3_CONF_OPTS += \ --without-ensurepip \ --without-cxx-main \ --with-system-ffi \ --disable-pydoc \ --disable-test-modules \ - --disable-lib2to3 \ --disable-tk \ --disable-nis \ --disable-idle3 \ @@ -208,6 +225,7 @@ define PYTHON3_REMOVE_USELESS_FILES rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config rm -f $(TARGET_DIR)/usr/bin/python3-config rm -f $(TARGET_DIR)/usr/bin/smtpd.py.3 + rm -f $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/distutils/command/wininst*.exe for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)m-*/ \ -type f -not -name Makefile` ; do \ rm -f $$i ; \ @@ -230,6 +248,7 @@ endef PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_ENSURE_LIBPYTHON_STRIPPED PYTHON3_AUTORECONF = YES +PYTHON3_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive define PYTHON3_INSTALL_SYMLINK ln -fs python3 $(TARGET_DIR)/usr/bin/python @@ -273,10 +292,11 @@ endif define PYTHON3_CREATE_PYC_FILES $(PYTHON3_FIX_TIME) PYTHONPATH="$(PYTHON3_PATH)" \ - cd $(TARGET_DIR) && $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) \ + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) \ $(TOPDIR)/support/scripts/pycompile.py \ - $(if $(BR2_REPRODUCIBLE),--force) \ - usr/lib/python$(PYTHON3_VERSION_MAJOR) + $(if $(VERBOSE),--verbose) \ + --strip-root $(TARGET_DIR) \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) endef ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY)$(BR2_PACKAGE_PYTHON3_PY_PYC),y) diff --git a/package/qdecoder/qdecoder.hash b/package/qdecoder/qdecoder.hash index 0c95d2c27b..e3fb837597 100644 --- a/package/qdecoder/qdecoder.hash +++ b/package/qdecoder/qdecoder.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 01d4852b9343757abe98bbdb9d4bf0dc142ccb602ec921906ddde32c16164376 qdecoder-12.0.7.tar.gz -sha256 17e647523e5c5c75fd02861dcf3ea91a146d918ab303460ee58135c9dd70904e COPYING +sha256 3911576ad8766697a9c8c767458edc953ae686eb53cd31d21e38edd7831ed9aa qdecoder-12.0.8.tar.gz +sha256 17e647523e5c5c75fd02861dcf3ea91a146d918ab303460ee58135c9dd70904e COPYING diff --git a/package/qdecoder/qdecoder.mk b/package/qdecoder/qdecoder.mk index ab95885c32..12784fc451 100644 --- a/package/qdecoder/qdecoder.mk +++ b/package/qdecoder/qdecoder.mk @@ -4,7 +4,7 @@ # ################################################################################ -QDECODER_VERSION = 12.0.7 +QDECODER_VERSION = 12.0.8 QDECODER_SITE = $(call github,wolkykim,qdecoder,v$(QDECODER_VERSION)) QDECODER_LICENSE = BSD-2 QDECODER_LICENSE_FILES = COPYING diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 33d4cccd7b..391fd5faaf 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -58,6 +58,7 @@ comment "Networking options" config BR2_PACKAGE_QEMU_SLIRP bool "Enable user mode networking (SLIRP)" + select BR2_PACKAGE_SLIRP help Enable user mode network stack, which is the default networking backend. It requires no administrator privileges diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index ea9281c5fb..2dcf5631e5 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -3,7 +3,6 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_arm default y if BR2_armeb default y if BR2_aarch64 - default y if BR2_csky default y if BR2_i386 default y if BR2_m68k default y if BR2_microblazeel @@ -11,10 +10,12 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_mips default y if BR2_mipsel default y if BR2_nios2 + default y if BR2_or1k default y if BR2_powerpc default y if BR2_powerpc64 default y if BR2_powerpc64le default y if BR2_riscv + default y if BR2_s390x default y if BR2_sh default y if BR2_sparc default y if BR2_sparc64 @@ -81,13 +82,18 @@ config BR2_PACKAGE_HOST_QEMU_VDE2 config BR2_PACKAGE_HOST_QEMU_VIRTFS bool "Virtual filesystem support" + depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE help Enables support for virtual filesystem in Qemu allowing shared filesystem between Qemu and its emulated target. config BR2_PACKAGE_HOST_QEMU_USB bool "USB passthrough support" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help Enables USB passthrough support from guest to host. +comment "USB passthrough support needs a toolchain w/ host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 + endif diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index dae11cb3fe..5e873791b8 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,7 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0 qemu-4.2.0.tar.xz -sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB - -# Locally computed -sha256 61091767ffd16002e77f005155d096208094e69dee35e6d5ddcaa6c8a13b5e26 qemu-b517e1dc3125a57555d67a8deed9eac7b42288e2.tar.gz +sha256 87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9 qemu-6.0.0.tar.xz +sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 712491a208..69949cfd7b 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,23 +4,23 @@ # ################################################################################ -ifeq ($(BR2_csky),y) -QEMU_VERSION = b517e1dc3125a57555d67a8deed9eac7b42288e2 -QEMU_SITE = $(call github,c-sky,qemu,$(QEMU_VERSION)) -else -QEMU_VERSION = 4.2.0 +QEMU_VERSION = 6.0.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org -endif 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; # the non-(L)GPL license texts are specified in the affected # individual source files. +QEMU_CPE_ID_VENDOR = qemu #------------------------------------------------------------- + +# The build system is now partly based on Meson. +# However, building is still done with configure and make as in previous versions of QEMU. + # Target-qemu -QEMU_DEPENDENCIES = host-pkgconf libglib2 zlib pixman host-python3 +QEMU_DEPENDENCIES = host-meson host-pkgconf libglib2 zlib pixman host-python3 # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -56,8 +56,16 @@ endif endif -# There is no "--enable-slirp" -ifeq ($(BR2_PACKAGE_QEMU_SLIRP),) +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +QEMU_OPTS += --disable-vhost-user +else +QEMU_OPTS += --enable-vhost-user +endif + +ifeq ($(BR2_PACKAGE_QEMU_SLIRP),y) +QEMU_OPTS += --enable-slirp=system +QEMU_DEPENDENCIES += slirp +else QEMU_OPTS += --disable-slirp endif @@ -82,6 +90,13 @@ else QEMU_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_LIBFUSE3),y) +QEMU_OPTS += --enable-fuse --enable-fuse-lseek +QEMU_DEPENDENCIES += libfuse3 +else +QEMU_OPTS += --disable-fuse --disable-fuse-lseek +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) QEMU_OPTS += --enable-seccomp QEMU_DEPENDENCIES += libseccomp @@ -103,6 +118,27 @@ else QEMU_OPTS += --disable-libusb endif +ifeq ($(BR2_PACKAGE_LIBVNCSERVER),y) +QEMU_OPTS += \ + --enable-vnc \ + --disable-vnc-sasl +QEMU_DEPENDENCIES += libvncserver +ifeq ($(BR2_PACKAGE_LIBPNG),y) +QEMU_OPTS += --enable-vnc-png +QEMU_DEPENDENCIES += libpng +else +QEMU_OPTS += --disable-vnc-png +endif +ifeq ($(BR2_PACKAGE_JPEG),y) +QEMU_OPTS += --enable-vnc-jpeg +QEMU_DEPENDENCIES += jpeg +else +QEMU_OPTS += --disable-vnc-jpeg +endif +else +QEMU_OPTS += --disable-vnc +endif + ifeq ($(BR2_PACKAGE_NETTLE),y) QEMU_OPTS += --enable-nettle QEMU_DEPENDENCIES += nettle @@ -117,6 +153,20 @@ else QEMU_OPTS += --disable-numa endif +ifeq ($(BR2_PACKAGE_SPICE),y) +QEMU_OPTS += --enable-spice +QEMU_DEPENDENCIES += spice +else +QEMU_OPTS += --disable-spice +endif + +ifeq ($(BR2_PACKAGE_USBREDIR),y) +QEMU_OPTS += --enable-usb-redir +QEMU_DEPENDENCIES += usbredir +else +QEMU_OPTS += --disable-usb-redir +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS @@ -131,26 +181,25 @@ define QEMU_CONFIGURE_CMDS --prefix=/usr \ --cross-prefix=$(TARGET_CROSS) \ --audio-drv-list= \ - --python=$(HOST_DIR)/bin/python3 \ + --meson=$(HOST_DIR)/bin/meson \ + --ninja=$(HOST_DIR)/bin/ninja \ --enable-kvm \ --enable-attr \ --enable-vhost-net \ --disable-bsd-user \ + --disable-containers \ --disable-xen \ - --disable-vnc \ --disable-virtfs \ --disable-brlapi \ --disable-curses \ --disable-curl \ - --disable-bluez \ --disable-vde \ --disable-linux-aio \ + --disable-linux-io-uring \ --disable-cap-ng \ --disable-docs \ - --disable-spice \ --disable-rbd \ --disable-libiscsi \ - --disable-usb-redir \ --disable-strip \ --disable-sparse \ --disable-mpath \ @@ -162,8 +211,11 @@ define QEMU_CONFIGURE_CMDS --disable-vhost-crypto \ --disable-libxml2 \ --disable-capstone \ - --disable-git-update \ + --with-git-submodules=ignore \ --disable-opengl \ + --disable-vhost-user-blk-server \ + --disable-virtiofsd \ + --disable-tests \ $(QEMU_OPTS) endef @@ -182,7 +234,7 @@ $(eval $(generic-package)) #------------------------------------------------------------- # Host-qemu -HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman host-python3 +HOST_QEMU_DEPENDENCIES = host-meson host-pkgconf host-zlib host-libglib2 host-pixman host-python3 # BR ARCH qemu # ------- ---- @@ -199,6 +251,7 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman host-p # mips64 mips64 # mips64el mips64el # nios2 nios2 +# or1k or1k # powerpc ppc # powerpc64 ppc64 # powerpc64le ppc64 (system) / ppc64le (usermode) @@ -237,13 +290,6 @@ endif ifeq ($(HOST_QEMU_ARCH),sh4aeb) HOST_QEMU_ARCH = sh4eb endif -ifeq ($(HOST_QEMU_ARCH),csky) -ifeq ($(BR2_ck610),y) -HOST_QEMU_ARCH = cskyv1 -else -HOST_QEMU_ARCH = cskyv2 -endif -endif HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH) HOST_QEMU_CFLAGS = $(HOST_CFLAGS) @@ -275,11 +321,12 @@ HOST_QEMU_OPTS += --enable-vde HOST_QEMU_DEPENDENCIES += host-vde2 endif +# virtfs-proxy-helper is the only user of libcap-ng. ifeq ($(BR2_PACKAGE_HOST_QEMU_VIRTFS),y) -HOST_QEMU_OPTS += --enable-virtfs -HOST_QEMU_DEPENDENCIES += host-libcap +HOST_QEMU_OPTS += --enable-virtfs --enable-cap-ng +HOST_QEMU_DEPENDENCIES += host-libcap-ng else -HOST_QEMU_OPTS += --disable-virtfs +HOST_QEMU_OPTS += --disable-virtfs --disable-cap-ng endif ifeq ($(BR2_PACKAGE_HOST_QEMU_USB),y) @@ -302,13 +349,21 @@ define HOST_QEMU_CONFIGURE_CMDS --host-cc="$(HOSTCC)" \ --extra-cflags="$(HOST_QEMU_CFLAGS)" \ --extra-ldflags="$(HOST_LDFLAGS)" \ - --python=$(HOST_DIR)/bin/python3 \ + --meson=$(HOST_DIR)/bin/meson \ + --ninja=$(HOST_DIR)/bin/ninja \ --disable-bzip2 \ + --disable-containers \ + --disable-curl \ + --disable-docs \ --disable-libssh \ + --disable-linux-io-uring \ --disable-sdl \ + --disable-vhost-user-blk-server \ + --disable-virtiofsd \ --disable-vnc-jpeg \ --disable-vnc-png \ --disable-vnc-sasl \ + --disable-tests \ $(HOST_QEMU_OPTS) endef diff --git a/package/qhull/Config.in b/package/qhull/Config.in index 0a4b60ffbe..cfd67b0d38 100644 --- a/package/qhull/Config.in +++ b/package/qhull/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QHULL bool "qhull" depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 # needs gcc >= 4.4 help Qhull computes the convex hull, Delaunay triangulation, @@ -15,5 +14,6 @@ config BR2_PACKAGE_QHULL http://www.qhull.org -comment "qhull needs a toolchain w/ C++, dynamic library, gcc >= 4.4" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 +comment "qhull needs a toolchain w/ C++, gcc >= 4.4" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 diff --git a/package/qhull/qhull.hash b/package/qhull/qhull.hash index b97c25a3f7..f7d8c9e729 100644 --- a/package/qhull/qhull.hash +++ b/package/qhull/qhull.hash @@ -1,5 +1,5 @@ -# From http://www.qhull.org/download/qhull-2019.1.md5sum -md5 53c04f9c89b491b17b10c7ea1eaa4cc8 qhull-2019-src-7.3.2.tgz +# From http://www.qhull.org/download/qhull-2020-src-8.0.2-tgz.md5sum +md5 ed767244864488d5e9a22dfa788663a9 qhull-2020-src-8.0.2-tgz # Locally computed -sha256 2b7990558c363076261564f61b74db4d0d73b71869755108a469038c07dc43fb qhull-2019-src-7.3.2.tgz -sha256 34db0c0c4f931861d720555c9cd7a2e228d1290ba29af0f2ee80c41bb2038afb COPYING.txt +sha256 b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e qhull-2020-src-8.0.2.tgz +sha256 106d55c931fd6a84822e5345d900273d059f1c27310d02567ccb313c5d18c55d COPYING.txt diff --git a/package/qhull/qhull.mk b/package/qhull/qhull.mk index fcf517634b..c11bed0373 100644 --- a/package/qhull/qhull.mk +++ b/package/qhull/qhull.mk @@ -4,11 +4,22 @@ # ################################################################################ -QHULL_VERSION = 7.3.2 +QHULL_VERSION = 8.0.2 QHULL_SITE = http://www.qhull.org/download -QHULL_SOURCE = qhull-2019-src-$(QHULL_VERSION).tgz +QHULL_SOURCE = qhull-2020-src-$(QHULL_VERSION).tgz QHULL_INSTALL_STAGING = YES QHULL_LICENSE = BSD-Style QHULL_LICENSE_FILES = COPYING.txt +# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable +# although BUILD_STATIC_LIBS=ON is default, make it explicit, +# cmake and static/shared libs is confusing enough already. +ifeq ($(BR2_STATIC_LIBS),y) +QHULL_CONF_OPTS += -DBUILD_STATIC_LIBS=ON +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +QHULL_CONF_OPTS += -DBUILD_STATIC_LIBS=ON +else ifeq ($(BR2_SHARED_LIBS),y) +QHULL_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF +endif + $(eval $(cmake-package)) diff --git a/package/qlibc/qlibc.hash b/package/qlibc/qlibc.hash index 616194f8d9..6abb16b274 100644 --- a/package/qlibc/qlibc.hash +++ b/package/qlibc/qlibc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 93512e2203aaadda7aa62039b29500d9236b878e16f070328c58dc9d23da94d7 qlibc-2.4.4.tar.gz -sha256 7c9d03656af4c0acf0a35e29459086498dd64080eac6d2945bc1c064aaf18132 LICENSE +sha256 e195c97453c260acea4421146ba992d9a4d89732eac345b3765c43cc3326d2ad qlibc-2.4.5.tar.gz +sha256 7c9d03656af4c0acf0a35e29459086498dd64080eac6d2945bc1c064aaf18132 LICENSE diff --git a/package/qlibc/qlibc.mk b/package/qlibc/qlibc.mk index 1b234f7e47..6cce8201bd 100644 --- a/package/qlibc/qlibc.mk +++ b/package/qlibc/qlibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -QLIBC_VERSION = 2.4.4 +QLIBC_VERSION = 2.4.5 QLIBC_SITE = $(call github,wolkykim,qlibc,v$(QLIBC_VERSION)) QLIBC_LICENSE = BSD-2-Clause QLIBC_LICENSE_FILES = LICENSE diff --git a/package/qpdf/qpdf.mk b/package/qpdf/qpdf.mk index ac703d716e..c96bf6bf2e 100644 --- a/package/qpdf/qpdf.mk +++ b/package/qpdf/qpdf.mk @@ -9,9 +9,13 @@ QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION) QPDF_INSTALL_STAGING = YES QPDF_LICENSE = Apache-2.0 or Artistic-2.0 QPDF_LICENSE_FILES = LICENSE.txt Artistic-2.0 +QPDF_CPE_ID_VENDOR = qpdf_project QPDF_DEPENDENCIES = host-pkgconf zlib jpeg -QPDF_CONF_OPTS = --without-random +QPDF_CONF_OPTS = --with-random=/dev/urandom + +# 0002-Fix-some-pipelines-to-be-safe-if-downstream-write-fails.patch +QPDF_IGNORE_CVES += CVE-2021-36978 ifeq ($(BR2_PACKAGE_GNUTLS),y) QPDF_CONF_OPTS += --enable-crypto-gnutls diff --git a/package/qpid-proton/qpid-proton.hash b/package/qpid-proton/qpid-proton.hash index 1ee72eef7a..bead3c1807 100644 --- a/package/qpid-proton/qpid-proton.hash +++ b/package/qpid-proton/qpid-proton.hash @@ -1,4 +1,5 @@ -# Hash from: http://www.apache.org/dist/qpid/proton/0.9.1/qpid-proton-0.9.1.tar.gz.sha -sha1 98008d90acd0d47cbd7ac1572a2bb50b452338ed qpid-proton-0.9.1.tar.gz +# Hash from: https://www.apache.org/dist/qpid/proton/0.35.0/qpid-proton-0.35.0.tar.gz.sha512 +sha512 1031e3d45854107a516699e1d18269c6acb22549b2709c1fc1cd25eb870096de109077445f1b400edf231bb21a476a268e2d6674e986fc50e92a281549085543 qpid-proton-0.35.0.tar.gz + # Locally computed -sha256 9fade5e12873678456137b36cfa4a5983c3793836d41c011f2c2abb02ca36a66 LICENSE +sha256 52310e65489d30afeefc8589479fc02862a875349c19edd165658a915009da82 LICENSE.txt diff --git a/package/qpid-proton/qpid-proton.mk b/package/qpid-proton/qpid-proton.mk index c501e48c86..103cf9fd31 100644 --- a/package/qpid-proton/qpid-proton.mk +++ b/package/qpid-proton/qpid-proton.mk @@ -4,32 +4,56 @@ # ################################################################################ -QPID_PROTON_VERSION = 0.9.1 -QPID_PROTON_SITE = http://apache.panu.it/qpid/proton/$(QPID_PROTON_VERSION) -QPID_PROTON_STRIP_COMPONENTS = 2 +QPID_PROTON_VERSION = 0.35.0 +QPID_PROTON_SITE = \ + https://downloads.apache.org/qpid/proton/$(QPID_PROTON_VERSION) QPID_PROTON_LICENSE = Apache-2.0 -QPID_PROTON_LICENSE_FILES = LICENSE +QPID_PROTON_LICENSE_FILES = LICENSE.txt +QPID_PROTON_CPE_ID_VENDOR = apache +QPID_PROTON_CPE_ID_PRODUCT = qpid_proton QPID_PROTON_INSTALL_STAGING = YES QPID_PROTON_DEPENDENCIES = \ - host-python \ + host-python3 \ util-linux \ + $(if $(BR2_PACKAGE_LIBUV),libuv) \ $(if $(BR2_PACKAGE_OPENSSL),openssl) -# Language bindings are enabled when host-swig tool is present in HOST_DIR. +# python and ruby language bindings are enabled when host-swig tool is present +# in HOST_DIR. +# go language binding is enabled when host-go is present # For now, disable all of them. QPID_PROTON_CONF_OPTS = \ - -DBUILD_JAVA=OFF \ - -DBUILD_JAVASCRIPT=OFF \ - -DBUILD_PERL=OFF \ - -DBUILD_PHP=OFF \ + -DBUILD_GO=OFF \ -DBUILD_PYTHON=OFF \ -DBUILD_RUBY=OFF \ + -DENABLE_FUZZ_TESTING=OFF \ -DENABLE_VALGRIND=OFF \ -DENABLE_WARNING_ERROR=OFF \ - -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python2 + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 + +# epoll proactor unconditionally uses pthread and cpp (C++) bindings +# unconditionally use proactor +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +QPID_PROTON_CONF_OPTS += -DBUILD_CPP=ON +else +QPID_PROTON_CONF_OPTS += -DBUILD_CPP=OFF +endif +else +QPID_PROTON_CONF_OPTS += \ + -DBUILD_CPP=OFF \ + -DPROACTOR=none +endif + +ifeq ($(BR2_PACKAGE_JSONCPP),y) +QPID_PROTON_DEPENDENCIES += jsoncpp +QPID_PROTON_CONF_OPTS += -DENABLE_JSONCPP=ON +else +QPID_PROTON_CONF_OPTS += -DENABLE_JSONCPP=OFF +endif define QPID_PROTON_REMOVE_USELESS_FILES - rm -fr $(TARGET_DIR)/usr/share/proton-*/ + rm -fr $(TARGET_DIR)/usr/share/proton/ endef QPID_PROTON_POST_INSTALL_TARGET_HOOKS += QPID_PROTON_REMOVE_USELESS_FILES diff --git a/package/qt-webkit-kiosk/Config.in b/package/qt-webkit-kiosk/Config.in index 46688a227b..80f8e7c464 100644 --- a/package/qt-webkit-kiosk/Config.in +++ b/package/qt-webkit-kiosk/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK depends on BR2_PACKAGE_QT5 depends on !BR2_STATIC_LIBS # qt5webkit depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5webkit -> icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5webkit -> icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # qt5webkit -> icu depends on !BR2_BINFMT_FLAT # qt5webkit -> icu depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit select BR2_PACKAGE_OPENSSL @@ -25,8 +26,9 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS endif -comment "qt-webkit-kiosk needs a toolchain w/ dynamic library, gcc >= 4.8" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 +comment "qt-webkit-kiosk needs a toolchain w/ dynamic library, gcc >= 4.9, host gcc >= 4.9" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_BINFMT_FLAT depends on !BR2_MIPS_SOFT_FLOAT diff --git a/package/qt-webkit-kiosk/qt-webkit-kiosk.hash b/package/qt-webkit-kiosk/qt-webkit-kiosk.hash index 1e56b4eba7..8e983f8e21 100644 --- a/package/qt-webkit-kiosk/qt-webkit-kiosk.hash +++ b/package/qt-webkit-kiosk/qt-webkit-kiosk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 07fbc3f5053f55e4ef6566a15b42b74895314b48a0dfd46f0984f96f0fbb3e02 qt-webkit-kiosk-a7720e50f2bd70aad99e0b465f5c4a57aca48127.tar.gz +sha256 5c3992cc35260d165f9a16094bd224529f012f799e0bc21317a39480cedb1fd2 qt-webkit-kiosk-a7720e50f2bd70aad99e0b465f5c4a57aca48127-br1.tar.gz sha256 de59ec6c939f4c4def79c0a996b3bd5626895fcbd1ae108e7bddb1dac8218381 doc/lgpl.html diff --git a/package/qt5/Config.in b/package/qt5/Config.in index b59c38aa7c..6714c6271d 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -11,19 +11,20 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE # ARM needs BLX, so v5t+ depends on !BR2_ARM_CPU_ARMV4 -comment "Qt5 needs a toolchain w/ gcc >= 4.8, wchar, NPTL, C++, dynamic library" +comment "Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library" depends on !BR2_ARM_CPU_ARMV4 depends on !BR2_arc depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_HOST_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 menuconfig BR2_PACKAGE_QT5 bool "Qt5" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_HOST_GCC_AT_LEAST_5 # Full C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11, GCC_BUG_57694 depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ # no built-in double-conversion support depends on !BR2_arc @@ -38,17 +39,22 @@ menuconfig BR2_PACKAGE_QT5 if BR2_PACKAGE_QT5 source "package/qt5/qt53d/Config.in" source "package/qt5/qt5base/Config.in" -source "package/qt5/qt5canvas3d/Config.in" source "package/qt5/qt5charts/Config.in" +source "package/qt5/qt5coap/Config.in" source "package/qt5/qt5connectivity/Config.in" source "package/qt5/qt5declarative/Config.in" source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" +source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5lottie/Config.in" +source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5quickcontrols2/Config.in" +source "package/qt5/qt5quicktimeline/Config.in" +source "package/qt5/qt5remoteobjects/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5scxml/Config.in" source "package/qt5/qt5sensors/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 7805b575f5..db6ccd2b42 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -4,12 +4,26 @@ # ################################################################################ -QT5_VERSION_MAJOR = 5.12 -QT5_VERSION = $(QT5_VERSION_MAJOR).7 +QT5_VERSION_MAJOR = 5.15 +QT5_VERSION = $(QT5_VERSION_MAJOR).2 QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk)) +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install pathes +define QT5_INSTALL_QT_CONF + sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ + $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf +endef + +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define QT5_QT_CONF_FIXUP + $(QT5_INSTALL_QT_CONF) +endef +endif + # Variable for other Qt applications to use QT5_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in index 78602a7287..5126078d09 100644 --- a/package/qt5/qt53d/Config.in +++ b/package/qt5/qt53d/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_QT53D bool "qt53d" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 54dbda367d..43b2132cc7 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,7 +1,7 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qt3d-everywhere-src-5.12.7.tar.xz.sha256 -sha256 2030de3dc93fd4062f677f61938229af9cd7aa4c3d2932cdda2ccb663d681126 qt3d-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 +sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPLv3 +sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPLv3 diff --git a/package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch b/package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch index c91d812695..a772eb978e 100644 --- a/package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch +++ b/package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch @@ -1,4 +1,4 @@ -From 014958d2d17045dd63d93cb3061d1e40b15725b7 Mon Sep 17 00:00:00 2001 +From a02b5e3bb41026ca6031d01942a093e9ce54edf3 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 21 Aug 2018 21:11:40 +0200 Subject: [PATCH] double-conversion: enable for microblaze @@ -6,24 +6,24 @@ Subject: [PATCH] double-conversion: enable for microblaze Signed-off-by: Peter Seiderer [Rebased for Qt5.12.0] Signed-off-by: Peter Seiderer +[Rebased for Qt5.14.0] +Signed-off-by: Peter Seiderer --- - .../double-conversion/include/double-conversion/utils.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + src/3rdparty/double-conversion/include/double-conversion/utils.h | 1 + + 1 file changed, 1 insertion(+) diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 7622fe6162..d29de95094 100644 +index 70e697ca..2bb8e389 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/utils.h +++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -94,7 +94,8 @@ int main(int argc, char** argv) { - defined(_MIPS_ARCH_MIPS32R2) || \ +@@ -102,6 +102,7 @@ int main(int argc, char** argv) { defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || defined(__EMSCRIPTEN__) || \ -- defined(__or1k__) -+ defined(__or1k__) || \ -+ defined(__microblaze__) + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ ++ defined(__microblaze__) || \ + defined(__EMSCRIPTEN__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(__mc68000__) || \ - defined(__pnacl__) || defined(__native_client__) -- -2.19.2 +2.23.0 diff --git a/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch b/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch index 769a34da24..e2ead9bd2c 100644 --- a/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch +++ b/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch @@ -1,27 +1,29 @@ -From cfac9a39658906b06f28208ee1d129f042760416 Mon Sep 17 00:00:00 2001 +From f423f160b984c47d831b10447af046bfbd6a3ba1 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 10 Mar 2020 09:01:31 +0100 Subject: [PATCH] double-conversion: enable for xtensa [Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa] Signed-off-by: Peter Seiderer +[Rebased for qtbase-everywhere-src-5.14.0] +Signed-off-by: Peter Seiderer --- .../double-conversion/include/double-conversion/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 55ca5bf5..95b08a4e 100644 +index 89ab1a31..001ce55f 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/utils.h +++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -96,7 +96,7 @@ int main(int argc, char** argv) { +@@ -103,7 +103,7 @@ int main(int argc, char** argv) { defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || defined(__EMSCRIPTEN__) || \ - defined(__or1k__) || \ -- defined(__microblaze__) -+ defined(__microblaze__) || defined(__XTENSA__) + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ +- defined(__microblaze__) || \ ++ defined(__microblaze__) || defined(__XTENSA__) || \ + defined(__EMSCRIPTEN__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(__mc68000__) || \ - defined(__pnacl__) || defined(__native_client__) -- -2.25.1 +2.26.0 diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 60a611e292..e93b2dec38 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_QT5BASE select BR2_PACKAGE_ZLIB select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_PCRE2_16 + select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL help Qt is a cross-platform application and UI framework for developers using C++. @@ -192,6 +193,7 @@ config BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XCB_UTIL_IMAGE select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL select BR2_PACKAGE_XCB_UTIL_WM select BR2_PACKAGE_LIBXKBCOMMON @@ -262,6 +264,11 @@ config BR2_PACKAGE_QT5BASE_PNG endif +config BR2_PACKAGE_QT5BASE_SYSLOG + bool "syslog support" + help + Logs to the standard UNIX logging mechanism. + config BR2_PACKAGE_QT5BASE_DBUS bool "DBus module" depends on BR2_TOOLCHAIN_HAS_THREADS @@ -273,15 +280,17 @@ config BR2_PACKAGE_QT5BASE_DBUS config BR2_PACKAGE_QT5BASE_ICU bool "Enable ICU support" depends on !BR2_BINFMT_FLAT # icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu select BR2_PACKAGE_ICU help This option enables ICU support in Qt5. This is for example needed for Qt5Webkit. -comment "icu support needs a toolchain w/ gcc >= 4.8" +comment "icu support needs a toolchain w/ gcc >= 4.9, host gcc >= 4.9" depends on !BR2_BINFMT_FLAT - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 config BR2_PACKAGE_QT5BASE_TSLIB bool "Enable Tslib support" diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 0697464cb9..a824890e3c 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,11 +1,10 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtbase-everywhere-src-5.12.7.tar.xz.sha256 -sha256 b18939cb25d90aef8721fb12ec34c3632d3490ced958e41f6c7a52064643665d qtbase-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 +sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 1f4fa3d202198f5d836993748eac9d91157e2cec7fb8426f56000a02a677cdc5 header.BSD -sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 97315496b9..9da3de468a 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -18,14 +18,17 @@ QT5BASE_INSTALL_STAGING = YES # want to use the Buildroot packaged zlib # * -system-pcre because pcre is mandatory to build Qt, and we # want to use the one packaged in Buildroot +# * -no-feature-relocatable to work around path mismatch +# while searching qml files and buildroot BR2_ROOTFS_MERGED_USR +# feature enabled QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ - -no-cups \ -no-iconv \ -system-zlib \ -system-pcre \ -no-pch \ - -shared + -shared \ + -no-feature-relocatable # starting from version 5.9.0, -optimize-debug is enabled by default # for debug builds and it overrides -O* with -Og which is not what we @@ -73,14 +76,17 @@ QT5BASE_DEPENDENCIES += mesa3d else ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y) QT5BASE_CONFIGURE_OPTS += -gbm QT5BASE_DEPENDENCIES += gcnano-binaries -else ifeq ($(BR2_PACKAGE_TI_SGX_LIBGBM),y) +else ifeq ($(BR2_PACKAGE_TI_SGX_UM),y) QT5BASE_CONFIGURE_OPTS += -gbm -QT5BASE_DEPENDENCIES += ti-sgx-libgbm +QT5BASE_DEPENDENCIES += ti-sgx-um +else ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) +QT5BASE_CONFIGURE_OPTS += -gbm +QT5BASE_DEPENDENCIES += imx-gpu-viv else QT5BASE_CONFIGURE_OPTS += -no-gbm endif -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) QT5BASE_CONFIGURE_OPTS += -debug else QT5BASE_CONFIGURE_OPTS += -release @@ -91,7 +97,6 @@ QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5BASE_LICENSE += , BSD-3-Clause (examples) -QT5BASE_LICENSE_FILES += header.BSD endif QT5BASE_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT5BASE_CONFIG_FILE)) @@ -104,6 +109,13 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) QT5BASE_DEPENDENCIES += udev endif +ifeq ($(BR2_PACKAGE_CUPS), y) +QT5BASE_DEPENDENCIES += cups +QT5BASE_CONFIGURE_OPTS += -cups +else +QT5BASE_CONFIGURE_OPTS += -no-cups +endif + # Qt5 SQL Plugins ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y) @@ -164,6 +176,7 @@ QT5BASE_DEPENDENCIES += \ xcb-util-wm \ xcb-util-image \ xcb-util-keysyms \ + xcb-util-renderutil \ xlib_libX11 \ libxkbcommon ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) @@ -240,6 +253,12 @@ else QT5BASE_CONFIGURE_OPTS += -no-journald endif +ifeq ($(BR2_PACKAGE_QT5BASE_SYSLOG),y) +QT5BASE_CONFIGURE_OPTS += -syslog +else +QT5BASE_CONFIGURE_OPTS += -no-syslog +endif + ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv @@ -258,7 +277,7 @@ QT5BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) # Qt 5.8 needs atomics, which on various architectures are in -latomic define QT5BASE_CONFIGURE_ARCH_CONFIG - printf 'LIBS += -latomic\n' >$(QT5BASE_ARCH_CONFIG_FILE) + printf '!host_build { \n LIBS += -latomic\n }' >$(QT5BASE_ARCH_CONFIG_FILE) endef endif @@ -304,13 +323,6 @@ define QT5BASE_CONFIGURE_CMDS ) endef -# The file "qt.conf" can be used to override the hard-coded paths that are -# compiled into the Qt library. We need it to make "qmake" relocatable. -define QT5BASE_INSTALL_QT_CONF - sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ - $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf -endef - -QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5BASE_INSTALL_QT_CONF +QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF $(eval $(qmake-package)) diff --git a/package/qt5/qt5charts/Config.in b/package/qt5/qt5charts/Config.in index db199922db..a72da65e30 100644 --- a/package/qt5/qt5charts/Config.in +++ b/package/qt5/qt5charts/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5CHARTS bool "qt5charts" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS help diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index 10a92bd55f..b52be714b7 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtcharts-everywhere-src-5.12.7.tar.xz.sha256 -sha256 434065526d0b1d8921e96cc1827b1a3579e073b930fe536455c4c1da2f15cf5f qtcharts-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 +sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in index 182fe3ea9c..51e8978f1f 100644 --- a/package/qt5/qt5connectivity/Config.in +++ b/package/qt5/qt5connectivity/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5CONNECTIVITY bool "qt5connectivity" depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ5_UTILS - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_DBUS help diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 9af3a57c12..3edc2d666a 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtconnectivity-everywhere-src-5.12.7.tar.xz.sha256 -sha256 647148b9b1a0d3e54f788b66797b81bb87434faf6fb12ac481f9165eda0d071a qtconnectivity-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 +sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch b/package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch index 1c0f6eccc5..b6de49e169 100644 --- a/package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch +++ b/package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch @@ -1,4 +1,4 @@ -From 2a5711651bee9d021733da19126a71aeda45e646 Mon Sep 17 00:00:00 2001 +From dfa9555010535003eac69788597f53d3ff44168f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Nov 2018 23:33:10 +0100 Subject: [PATCH] qsgtexture: fix debug build with uclibc @@ -23,17 +23,19 @@ Fixes: Signed-off-by: Fabrice Fontaine [Upstream status: https://github.com/qt/qtdeclarative/pull/4] +[Rebased for Qt5.14.0] +Signed-off-by: Peter Seiderer --- - src/quick/scenegraph/util/qsgtexture.cpp | 2 +- + src/quick/scenegraph/coreapi/qsgtexture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp -index fea92a512..a26191006 100644 ---- a/src/quick/scenegraph/util/qsgtexture.cpp -+++ b/src/quick/scenegraph/util/qsgtexture.cpp -@@ -53,7 +53,7 @@ - #endif +diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp +index dfbe4d3f..6a7bc79b 100644 +--- a/src/quick/scenegraph/coreapi/qsgtexture.cpp ++++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp +@@ -46,7 +46,7 @@ #include + #include -#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) && !defined(__UCLIBC__) @@ -41,5 +43,5 @@ index fea92a512..a26191006 100644 #endif -- -2.14.1 +2.23.0 diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 476cf33f39..3ba9224c22 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5DECLARATIVE bool "qt5declarative" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 85e99082f3..ab83b71814 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtdeclarative-everywhere-src-5.12.7.tar.xz.sha256 -sha256 5cdc05a035f240ab73b6b37dd3831c1350cd80e5799da47929974085f6eae9bd qtdeclarative-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 +sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5enginio/qt5enginio.hash b/package/qt5/qt5enginio/qt5enginio.hash index 424c4776e0..8849620905 100644 --- a/package/qt5/qt5enginio/qt5enginio.hash +++ b/package/qt5/qt5enginio/qt5enginio.hash @@ -2,8 +2,8 @@ sha256 d907060b355512ceb7a8c3f6980e3979c20d54320b6804303b6c5e8ed42d3912 qtenginio-opensource-src-1.6.3.tar.xz # Hashes for license files: -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 +sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index ae800fe07a..9d7a837b8b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtgraphicaleffects-everywhere-src-5.12.7.tar.xz.sha256 -sha256 02f0328420c623da8f9ae949fec01e99ba84213dd2ad559cb00c204502bbcace qtgraphicaleffects-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 +sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5imageformats/Config.in b/package/qt5/qt5imageformats/Config.in index 44c85c9b38..991f22f514 100644 --- a/package/qt5/qt5imageformats/Config.in +++ b/package/qt5/qt5imageformats/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5IMAGEFORMATS bool "qt5imageformats" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 3358b6d79c..b4281e712d 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtimageformats-everywhere-src-5.12.7.tar.xz.sha256 -sha256 9bd19ee24fb85f249d01c78e637c95377dd738feb61da0deeee6b770fa62f70b qtimageformats-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 +sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index 7c39979eff..c68deb1006 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 3c94df0079..0bb293305c 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtlocation-everywhere-src-5.12.7.tar.xz.sha256 -sha256 d1e905b80befda3c9aaad92ea984e6dbf722568b5c91e8d15b027bc5bc22781f qtlocation-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 +sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in index 79d6022141..dd46575d93 100644 --- a/package/qt5/qt5multimedia/Config.in +++ b/package/qt5/qt5multimedia/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5MULTIMEDIA bool "qt5multimedia" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE_OPENGL diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index a4df5af5dc..b70a4ecf51 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,10 +1,10 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtmultimedia-everywhere-src-5.12.7.tar.xz.sha256 -sha256 28bdaa81371f922223775ae5171c4d589a2c07f255abbe5ccf130ecbbdb4db1d qtmultimedia-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 +sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 c1d75c15db4409bcbb182180d582f410a263dc9a631cd546b256e95f1da42165 examples/multimedia/spectrum/3rdparty/fftreal/license.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 c1d75c15db4409bcbb182180d582f410a263dc9a631cd546b256e95f1da42165 examples/multimedia/spectrum/3rdparty/fftreal/license.txt diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index a0f8dab10b..1fa0d6430a 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols-everywhere-src-5.12.7.tar.xz.sha256 -sha256 1038bbc76bba53f9634f40cd9c8ebf0ed8ae82e791f727b228bd81bdcf1859e5 qtquickcontrols-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 +sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 689a7e5284..f66a1186ee 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,7 +1,7 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols2-everywhere-src-5.12.7.tar.xz.sha256 -sha256 3a9526e5ad01edbfb796a6631983c391ea1b7e22ae6e07840048156a9e92a237 qtquickcontrols2-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 +sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 -sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 +sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5script/Config.in b/package/qt5/qt5script/Config.in index 034b7d2fcb..1926813e9f 100644 --- a/package/qt5/qt5script/Config.in +++ b/package/qt5/qt5script/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5SCRIPT bool "qt5script" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 8d87cd6f60..783598047b 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,10 +1,10 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtscript-everywhere-src-5.12.7.tar.xz.sha256 -sha256 ca1dbc66d4125a678638dd0c9c030b72fdfc4ec2c229b9316a8bc80a86104019 qtscript-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 +sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB -sha256 43b007cd3ac7b7ea5284b13e9580334028e6f42e859059605d57558f39374197 src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB +sha256 43b007cd3ac7b7ea5284b13e9580334028e6f42e859059605d57558f39374197 src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING diff --git a/package/qt5/qt5scxml/Config.in b/package/qt5/qt5scxml/Config.in index 5510821d24..24fb2d9c2a 100644 --- a/package/qt5/qt5scxml/Config.in +++ b/package/qt5/qt5scxml/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5SCXML bool "qt5scxml" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5DECLARATIVE help Qt is a cross-platform application and UI framework for diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 83ba0da838..6f816548e6 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,8 +1,7 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtscxml-everywhere-src-5.12.7.tar.xz.sha256 -sha256 afa950bc95f881c90eea564511f3e9918d53fddf0823afb641d20dc6f794fbb6 qtscxml-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 +sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz # Hashes for license files: - -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 diff --git a/package/qt5/qt5sensors/Config.in b/package/qt5/qt5sensors/Config.in index 4846a3f95f..5e8ee65324 100644 --- a/package/qt5/qt5sensors/Config.in +++ b/package/qt5/qt5sensors/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5SENSORS bool "qt5sensors" - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index dba376d9a6..179c9833e0 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtsensors-everywhere-src-5.12.7.tar.xz.sha256 -sha256 2b9aea9f4e2f681b4067f2b9d97c5073c135e41d26601c71f18f199bc980e740 qtsensors-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 +sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5serialbus/Config.in b/package/qt5/qt5serialbus/Config.in index 2882d50644..bcfec29b49 100644 --- a/package/qt5/qt5serialbus/Config.in +++ b/package/qt5/qt5serialbus/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5SERIALBUS bool "qt5serialbus" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5SERIALPORT help Qt is a cross-platform application and UI framework for diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index fa3ccc1475..4f05049b99 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtserialbus-everywhere-src-5.12.7.tar.xz.sha256 -sha256 82201edf971e957d849b041ab2914f7497226939c62884ec2906b37576987eae qtserialbus-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 +sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5serialport/Config.in b/package/qt5/qt5serialport/Config.in index 3538c52556..16c2eaa619 100644 --- a/package/qt5/qt5serialport/Config.in +++ b/package/qt5/qt5serialport/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5SERIALPORT bool "qt5serialport" - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 43136542d8..37bc8401f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtserialport-everywhere-src-5.12.7.tar.xz.sha256 -sha256 224c282ebed750f46b72dfe18260c3d26fbb74e928dec64bd8c51e7beed8721f qtserialport-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 +sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5svg/Config.in b/package/qt5/qt5svg/Config.in index bc80b62674..e9284913a0 100644 --- a/package/qt5/qt5svg/Config.in +++ b/package/qt5/qt5svg/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5SVG bool "qt5svg" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index d3128a60bc..7773a940bb 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtsvg-everywhere-src-5.12.7.tar.xz.sha256 -sha256 4bf60916d4e398d9609f1b3a17fc7345a0e13c7c1cc407298df20da4c7c67bb8 qtsvg-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 +sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index d6b2b50932..e52d8e6df7 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qttools-everywhere-src-5.12.7.tar.xz.sha256 -sha256 860a97114d518f83c0a9ab3742071da16bb018e6eb387179d5764a8dcca03948 qttools-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 +sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 668f971bea..82f132378e 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz.sha256 -sha256 aaa52aaff923df22de8472d71843dadb80f3f6fe0312122e64ffe5436db40daa qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 +sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt -sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE -sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE -sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt +sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE +sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE +sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 1ffa22cadf..b17dbdd10d 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwayland-everywhere-src-5.12.7.tar.xz.sha256 -sha256 fc1ab8e25461580e37090e4f82422411dee71a3de48a54be1f4b6569e00f66c5 qtwayland-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 +sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webchannel/Config.in b/package/qt5/qt5webchannel/Config.in index e3d840584f..436e3abb2b 100644 --- a/package/qt5/qt5webchannel/Config.in +++ b/package/qt5/qt5webchannel/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5WEBCHANNEL bool "qt5webchannel" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5WEBSOCKETS help Qt is a cross-platform application and UI framework for diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index d45f293821..47c7da3365 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebchannel-everywhere-src-5.12.7.tar.xz.sha256 -sha256 b0ae72e5957aa4b281a37d2e169fcf91f92382bc36bd0cf09c80b2bb961bce75 qtwebchannel-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 +sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index a05205c7ad..4e923c7f31 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -10,10 +10,11 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT # qt5base-icu depends on BR2_USE_MMU # libglib2, qt5base-dbus -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.8, threads, wchar" +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.9, host gcc >= 4.9, threads, wchar" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR comment "qt5webengine needs an OpenGL and EGL-capable backend" @@ -24,7 +25,8 @@ config BR2_PACKAGE_QT5WEBENGINE bool "qt5webengine" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # qt5base-icu depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs @@ -39,6 +41,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBNSS select BR2_PACKAGE_LIBVPX + select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_OPUS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX @@ -52,6 +55,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_QT5DECLARATIVE_QUICK select BR2_PACKAGE_QT5QUICKCONTROLS select BR2_PACKAGE_QT5QUICKCONTROLS2 + select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5BASE_EXAMPLES select BR2_PACKAGE_QT5WEBCHANNEL select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc index b7a195569b..a5fdfdc1f1 100644 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ b/package/qt5/qt5webengine/chromium-latest.inc @@ -4,7 +4,8 @@ # -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ # sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ + src/3rdparty/chromium/base/third_party/cityhash/COPYING \ + src/3rdparty/chromium/base/third_party/double_conversion/LICENSE \ src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ src/3rdparty/chromium/base/third_party/icu/LICENSE \ src/3rdparty/chromium/base/third_party/libevent/LICENSE \ @@ -20,41 +21,46 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/mojo/public/LICENSE \ src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ src/3rdparty/chromium/net/third_party/nss/LICENSE \ + src/3rdparty/chromium/net/third_party/quiche/src/LICENSE \ + src/3rdparty/chromium/net/third_party/uri_template/LICENSE \ src/3rdparty/chromium/ppapi/LICENSE \ src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ - src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE \ src/3rdparty/chromium/third_party/angle/LICENSE \ src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE \ - src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md \ + src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ + src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ + src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt \ + src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ + src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ + src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ + src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE \ src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ src/3rdparty/chromium/third_party/axe-core/LICENSE \ src/3rdparty/chromium/third_party/bazel/LICENSE \ src/3rdparty/chromium/third_party/blanketjs/LICENSE \ + src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2_worker/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/scripts/closure/COPYING \ + src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ - src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/COPYING \ - src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/LICENSE \ src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ @@ -66,157 +72,662 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/brotli/LICENSE \ src/3rdparty/chromium/third_party/bspatch/LICENSE \ src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ + src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE \ + src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin \ + src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE \ + src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE \ + src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/catapult/tracing/LICENSE \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE \ src/3rdparty/chromium/third_party/ced/LICENSE \ src/3rdparty/chromium/third_party/ced/src/LICENSE \ src/3rdparty/chromium/third_party/chaijs/LICENSE \ src/3rdparty/chromium/third_party/checkstyle/LICENSE \ src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/chromevox/LICENSE \ - src/3rdparty/chromium/third_party/chromevox/third_party/closure-library/LICENSE \ - src/3rdparty/chromium/third_party/chromevox/third_party/sre/LICENSE \ src/3rdparty/chromium/third_party/cld_3/LICENSE \ src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ + src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ + src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ src/3rdparty/chromium/third_party/d3/src/LICENSE \ + src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING \ + src/3rdparty/chromium/third_party/dav1d/LICENSE \ + src/3rdparty/chromium/third_party/dawn/LICENSE \ src/3rdparty/chromium/third_party/decklink/LICENSE \ src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/devtools-node-modules/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv-keywords/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-escapes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-styles/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-uniq/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/arrify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/chalk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/strip-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/balanced-match/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/ansi-styles/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/supports-color/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/circular-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-cursor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/co/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/del/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/escape-string-regexp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esprima/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esquery/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/estraverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-levenshtein/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/figures/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globals/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globby/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-flag/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-fullwidth-code-point/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-path-inside/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-resolvable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mimic-fn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ms/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/onetime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/os-tmpdir/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-absolute/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-inside/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pluralize/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/process-nextick-args/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/require-uncached/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/resolve-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/restore-cursor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-command/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/signal-exit/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/slice-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/node_modules/ansi-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-json-comments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/supports-color/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/yallist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ + src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/errorprone/LICENSE \ + src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE \ + src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE \ + src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE \ src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/expat/files/COPYING \ - src/3rdparty/chromium/third_party/feed/LICENSE \ + src/3rdparty/chromium/third_party/expat/src/expat/COPYING \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ @@ -226,34 +737,32 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/fips181/COPYING \ src/3rdparty/chromium/third_party/flac/COPYING.FDL \ src/3rdparty/chromium/third_party/flac/COPYING.GPL \ src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ + src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE \ src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/flot/LICENSE.txt \ src/3rdparty/chromium/third_party/fontconfig/LICENSE \ src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/gestures/gestures/LICENSE \ - src/3rdparty/chromium/third_party/gestures/LICENSE \ + src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE \ src/3rdparty/chromium/third_party/gif_player/LICENSE \ + src/3rdparty/chromium/third_party/glfw/src/LICENSE.md \ src/3rdparty/chromium/third_party/glslang/LICENSE \ + src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt \ src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ src/3rdparty/chromium/third_party/googletest/src/LICENSE \ src/3rdparty/chromium/third_party/google-truth/LICENSE \ - src/3rdparty/chromium/third_party/gson/LICENSE \ src/3rdparty/chromium/third_party/guava/LICENSE \ src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/haha/LICENSE \ src/3rdparty/chromium/third_party/hamcrest/LICENSE \ src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-ucdn/COPYING \ + src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ src/3rdparty/chromium/third_party/hunspell/COPYING \ src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ @@ -264,24 +773,32 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/icu/license.html \ src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ src/3rdparty/chromium/third_party/ijar/LICENSE \ + src/3rdparty/chromium/third_party/ink/LICENSE \ src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/intellij/LICENSE \ src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/javax_inject/LICENSE \ + src/3rdparty/chromium/third_party/jacoco/LICENSE \ + src/3rdparty/chromium/third_party/javalang/LICENSE \ + src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE \ src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jmake/LICENSE \ src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ + src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE \ src/3rdparty/chromium/third_party/jstemplate/COPYING \ src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/leakcanary/LICENSE \ src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/libevdev/LICENSE \ - src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE \ + src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ + src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ + src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ + src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE \ + src/3rdparty/chromium/third_party/libgav1/src/LICENSE \ + src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md \ + src/3rdparty/chromium/third_party/libipp/LICENSE \ src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg/LICENSE \ src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ src/3rdparty/chromium/third_party/libovr/LICENSE \ src/3rdparty/chromium/third_party/libpng/LICENSE \ @@ -304,31 +821,33 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ src/3rdparty/chromium/third_party/libxslt/src/Copyright \ src/3rdparty/chromium/third_party/libyuv/LICENSE \ + src/3rdparty/chromium/third_party/lottie/LICENSE \ src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/mach_override/LICENSE \ + src/3rdparty/chromium/third_party/mako/LICENSE \ src/3rdparty/chromium/third_party/markupsafe/LICENSE \ src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/mesa/LICENSE \ - src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ - src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ - src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ + src/3rdparty/chromium/third_party/mesa_headers/LICENSE \ src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ + src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE \ src/3rdparty/chromium/third_party/minigbm/LICENSE \ src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ + src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE \ src/3rdparty/chromium/third_party/minizip/src/LICENSE \ src/3rdparty/chromium/third_party/mocha/LICENSE \ src/3rdparty/chromium/third_party/mockito/LICENSE \ src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/molokocacao/LICENSE \ src/3rdparty/chromium/third_party/motemplate/LICENSE \ src/3rdparty/chromium/third_party/mozilla/LICENSE \ + src/3rdparty/chromium/third_party/nasm/LICENSE \ src/3rdparty/chromium/third_party/netty4/LICENSE \ src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ src/3rdparty/chromium/third_party/node/LICENSE \ src/3rdparty/chromium/third_party/objenesis/LICENSE \ src/3rdparty/chromium/third_party/ocmock/License.txt \ + src/3rdparty/chromium/third_party/one_euro_filter/LICENSE \ src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ + src/3rdparty/chromium/third_party/openscreen/src/LICENSE \ + src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ src/3rdparty/chromium/third_party/openvr/src/LICENSE \ src/3rdparty/chromium/third_party/opus/src/COPYING \ src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ @@ -336,25 +855,34 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ src/3rdparty/chromium/third_party/pdfium/LICENSE \ src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ + src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE \ src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + src/3rdparty/chromium/third_party/perfetto/LICENSE \ src/3rdparty/chromium/third_party/pexpect/LICENSE \ + src/3rdparty/chromium/third_party/pffft/LICENSE \ src/3rdparty/chromium/third_party/ply/LICENSE \ src/3rdparty/chromium/third_party/ply/license.patch \ + src/3rdparty/chromium/third_party/polymer/LICENSE.polymer \ src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ + src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE \ + src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE \ src/3rdparty/chromium/third_party/proguard/LICENSE \ src/3rdparty/chromium/third_party/protobuf/LICENSE \ src/3rdparty/chromium/third_party/pycoverage/LICENSE \ src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ src/3rdparty/chromium/third_party/pystache/LICENSE \ src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ + src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE \ src/3rdparty/chromium/third_party/qcms/src/COPYING \ src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ + src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ + src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ src/3rdparty/chromium/third_party/qunit/LICENSE \ src/3rdparty/chromium/third_party/r8/LICENSE \ src/3rdparty/chromium/third_party/re2/LICENSE \ @@ -366,42 +894,45 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ + src/3rdparty/chromium/third_party/schema_org/LICENSE \ src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ src/3rdparty/chromium/third_party/sinonjs/LICENSE \ + src/3rdparty/chromium/third_party/six/LICENSE \ + src/3rdparty/chromium/third_party/six/src/LICENSE \ + src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE \ + src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE \ src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE \ + src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ + src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ + src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE \ src/3rdparty/chromium/third_party/smhasher/LICENSE \ src/3rdparty/chromium/third_party/snappy/src/COPYING \ + src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE \ + src/3rdparty/chromium/third_party/spirv-headers/LICENSE \ + src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE \ src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ + src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/patched/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/patched/LICENSE.md \ src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md \ + src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE \ src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt \ - src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT \ - src/3rdparty/chromium/third_party/tcmalloc/gperftools-2.0/vendor/COPYING \ src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ src/3rdparty/chromium/third_party/test_fonts/LICENSE \ src/3rdparty/chromium/third_party/tlslite/LICENSE \ + src/3rdparty/chromium/third_party/turbine/LICENSE \ src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ src/3rdparty/chromium/third_party/unrar/LICENSE \ src/3rdparty/chromium/third_party/unrar/src/license.txt \ @@ -409,30 +940,46 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/usrsctp/LICENSE \ src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE \ src/3rdparty/chromium/third_party/wds/LICENSE \ src/3rdparty/chromium/third_party/wds/src/COPYING \ src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ src/3rdparty/chromium/third_party/webdriver/COPYING \ src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ + src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt \ + src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ src/3rdparty/chromium/third_party/webrtc/LICENSE \ src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ + src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE \ + src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ + src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ + src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ + src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + src/3rdparty/chromium/third_party/weston/LICENSE \ + src/3rdparty/chromium/third_party/weston/src/COPYING \ + src/3rdparty/chromium/third_party/weston/src/data/COPYING \ + src/3rdparty/chromium/third_party/widevine/LICENSE \ src/3rdparty/chromium/third_party/woff2/LICENSE \ + src/3rdparty/chromium/third_party/wuffs/LICENSE \ + src/3rdparty/chromium/third_party/wuffs/src/LICENSE \ src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/yara/src/COPYING \ src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/gyp/LICENSE \ + src/3rdparty/chromium/tools/grit/third_party/six/LICENSE \ src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/tools/symsrc/COPYING-pefile \ src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ src/3rdparty/chromium/v8/LICENSE \ @@ -440,12 +987,14 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/v8/LICENSE.strongtalk \ src/3rdparty/chromium/v8/LICENSE.v8 \ src/3rdparty/chromium/v8/LICENSE.valgrind \ + src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE \ src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/v8/third_party/antlr4/LICENSE.txt \ src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ + src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE \ + src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE \ src/3rdparty/gn/base/third_party/icu/LICENSE \ src/3rdparty/gn/LICENSE \ - src/3rdparty/ninja/COPYING + src/3rdparty/ninja/COPYING \ diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 8308ef4920..6a631c0feb 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,458 +1,1007 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebengine-everywhere-src-5.12.7.tar.xz.sha256 -sha256 83b754dca3dafeb21be6c7cb5ea99f11f5dbe9055bc1680f5bd7159224bb46fa qtwebengine-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz.sha256 +sha256 c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 qtwebengine-everywhere-src-5.15.2.tar.xz # Locally calculated -sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 +sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 # Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 d04360743ae3338bb08ab2106b51e24309e3ca4b1c6b1186139531ade351b7e3 src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 d3e2f59e1d71176dfdb555ece6a41f7a5aa0f52ff21211010ace314f57695f6b src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 29028ec63522121b5545046e0c4d3ccc1e01fc8d9aaa3272554f74829cdacf84 src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2/lighthouse/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2_worker/lighthouse/LICENSE -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm_modes/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/formatter_worker/acorn/LICENSE -sha256 1490793b8913f0fa78af7bf2e70076f54272748e278f065c50794529eaed8e74 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/blink/renderer/devtools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/devtools/scripts/closure/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/LICENSE -sha256 4165ae4c9c71da3e655a9acee8ee3368bba20f0702f4dcc994da315132ab90de src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 63478682e84e8c98f4c46308995f1f521a6886976e25421827d2a2be03581328 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 201d494a3f42450a28df2f0919a147e9a5296e841df5d415172a0ca8b558d0a8 src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 5a12a0c01bfcdbc90b550c9cd8bfc3e90e6be9c9bbfdb58bfb5daaf6817eb78f src/3rdparty/chromium/third_party/chromevox/LICENSE -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/third_party/chromevox/third_party/closure-library/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/chromevox/third_party/sre/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 10054db83ace18e5a455749d0d247857ec50508cecda79a5abe66fe4778d7721 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-node-modules/LICENSE -sha256 a19859c623cc60b717560cafb5fe64244735022c1200b65a649a3c2eef912fb4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/LICENSE -sha256 491b4012bfc95982e66859c59641be20f4fd2c9b3bc2b6a7f26b6166e462dda1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/node_modules/acorn/LICENSE -sha256 e2ddad70d6b6bcfec887c32d7143a77ccbdb58e38d9c43f5b7f30f715b874b80 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn/LICENSE -sha256 a25dce9c94c3ad622574cffbefd4b8845b418aa65df966d97e3204ad276ed240 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv-keywords/LICENSE -sha256 4969b0ff94c4f2ad3f1613d95b3966cb4c3147d8b893654aced81029241de176 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-escapes/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-styles/LICENSE -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-union/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-uniq/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/arrify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/chalk/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/strip-ansi/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/balanced-match/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/ansi-styles/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/supports-color/LICENSE -sha256 7d043a9e52b7e1e3acab9ca3377e30ca72d25d39ad6e6c5a22b407fe39c6d703 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chardet/LICENSE -sha256 aa7c48d39d3bb837efa4fce39f971fa6ae8e5cb148724af8867a7a4a7121ad6a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/circular-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-cursor/LICENSE -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-width/LICENSE -sha256 29f4d474804f60aae177d7fed67d0d613d00006640cc9cf80077eef03fb9a2cc src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/co/LICENSE -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-name/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-stream/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/core-util-is/LICENSE -sha256 b1344bd78ebcbf8a359225ec444d038a653c6a5f9ecf405a50d4a5c11fbf27d1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cross-spawn/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/debug/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/deep-is/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/del/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE.esprima -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/escape-string-regexp/LICENSE -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint/LICENSE -sha256 8be44da6cc59e890c406d6d05c3ce1850f29bb2e0da2a2d686d593e5ad3ecf59 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint-scope/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esprima/LICENSE -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esquery/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/estraverse/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esutils/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/external-editor/LICENSE -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-levenshtein/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/figures/LICENSE -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/file-entry-cache/LICENSE -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/flat-cache/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/functional-red-black-tree/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globals/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globby/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/graceful-fs/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-ansi/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-flag/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/iconv-lite/LICENSE -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inherits/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/isexe/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-fullwidth-code-point/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-path-inside/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-promise/LICENSE -sha256 4ceea53e36c7ff67a946e9905e50b41f350ef7b107c59afec9b91cbe97fbcaea src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-resolvable/LICENSE -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 e8d64ff1e54883c69759db53d10adfaa8e09b6ef628788885fe8068bc1fdb1b7 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-yaml/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/levn/LICENSE -sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lodash/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lru-cache/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mimic-fn/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mkdirp/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ms/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mute-stream/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/object-assign/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/onetime/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/optionator/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/os-tmpdir/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-absolute/LICENSE -sha256 0e356f8c0a756758ce04a143b1871585402b6bcf8f8e6a26873beb9992242e7a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-inside/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pify/LICENSE -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie/LICENSE -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie-promise/LICENSE -sha256 5822e0d816e53e3537b306a4132cb7a70881897cf51bf483282148a602979076 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pluralize/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/prelude-ls/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/process-nextick-args/LICENSE -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pseudomap/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/readable-stream/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/require-uncached/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/resolve-from/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/restore-cursor/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/rimraf/LICENSE -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/run-async/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/safe-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/semver/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-command/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-regex/LICENSE -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/signal-exit/LICENSE -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/slice-ansi/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/sprintf-js/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string_decoder/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string-width/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/node_modules/ansi-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-json-comments/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/supports-color/LICENSE -sha256 ef088ddea300fe4ea038bc47db929e320033b66981cf12a20b517d6b66a2fa3e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/table/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/text-table/LICENSE -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE.MIT -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/tmp/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/typedarray/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/util-deprecate/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/which/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wordwrap/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wrappy/LICENSE -sha256 daca23d50b0f54d36d6da1b16c82dfea6461e2ae20de0e869957e44cc6d34781 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/write/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/yallist/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/errorprone/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/files/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/feed/LICENSE -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 5d0c892ea452c3828f1e311637cde4e3a04eb6431554308b3fcdac8c1b330168 src/3rdparty/chromium/third_party/fips181/COPYING -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c src/3rdparty/chromium/third_party/flot/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 9f5db2544e04e3e0fb39ea277b9bb6f8efcc8bb84f6264630978ce4708495535 src/3rdparty/chromium/third_party/gestures/gestures/LICENSE -sha256 4bd9e329f9b268bd0dec2df0560a03382fe426adf83daa7b314d2f46b9b22c9a src/3rdparty/chromium/third_party/gestures/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/gson/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 9f45b3cf29b76b5bf4ad467938b0e61a720eec6ef6c219c566f7c262b0cc7854 src/3rdparty/chromium/third_party/haha/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 ec20cbe051200fc846caf4dc253cf660e874a2d9e4f3a682e08354b567fae409 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-ucdn/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 4eac19453ddf356478db3be6b101a6d872d0046cdc8222df1ff5c997dd4b9fbe src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/intellij/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/javax_inject/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 923e74e5ae41345038da0a56dfdc983356917fbbb139176e654d1b33100b723f src/3rdparty/chromium/third_party/jmake/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/leakcanary/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 fb3ab1e1621c6c469499a6ba1e926c027f32af3063c0456282f89382591cc46a src/3rdparty/chromium/third_party/libevdev/LICENSE -sha256 721cb11de618fcf9bbb7d25a389207bf2227357e6694bc326ab32a6699f9b951 src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 19af539b1ec692ea9ccf71b6ea97d602bcf7187eab27b0ea806aea1cd10b0b13 src/3rdparty/chromium/third_party/libjpeg/LICENSE -sha256 fffd497be5f4ae0a10b8258e191125fb58b90250ecbf3c79398d79604dd00b7d src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 913b3eb6f19defc77c00e2bebbbce464326331b0b59eb6d1d1b23d68a8c27f6b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 7973776647df23457a9910075547e3f345fbc5e0e41147b4586d714582dfdd76 src/3rdparty/chromium/third_party/mach_override/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 c93465d6a75e6ade8785edb4ec125ece083ab0910ed0417b4ff346792ba0f851 src/3rdparty/chromium/third_party/mesa/LICENSE -sha256 e8800bd573e8f844a5b87cf43cc4d55767314b4e95a6092cf26ce9c6ed00b877 src/3rdparty/chromium/third_party/mesa/src/docs/COPYING -sha256 1efd6dec259877be94db3dbd005c93a5c94a73a492bd85eede6e14885e480e0e src/3rdparty/chromium/third_party/mesa/src/docs/license.html -sha256 704179825bb7c4600acbff3d1fcd95f1eb61b2c4a11b66bb150d7cefea8f6371 src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 e075583a46bca13a3f25af4181e2a0064f442c1f55c4312275cbcf05b892d3f4 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 5f593432ef4e7ecefa6326042babb8a03d8d6ce502b4f0b78b105e18d19f8052 src/3rdparty/chromium/third_party/molokocacao/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 1599cc232dbd003e6691c7f4e360f2068f84ebaef6510a26ab919c3a7fec27fd src/3rdparty/chromium/third_party/openmax_dl/LICENSE -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 b578cdd2345840ada550bd12519533812320d5f1d21cf4c1c7e1b1b0a31c98b7 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 685b3b09870f1361f8db2d3f37acdb765d5da1722a18b182765da4b79a8f63ff src/3rdparty/chromium/third_party/ply/license.patch -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 af67c58de2e18677a0b8cb5fffbe2232aabb8eb2930e8cd684769cef3d74a262 src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 e88ae39d2e7c9ae8f5470bb23fdd7ce55fe58aca06f3d4399182f5bb0ffcf1dd src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/COPYING.txt -sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 19096ed2f05a693b92433405a6bf1018044b31ed5fa8883ab865cf2cd166f6e9 src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/LICENSE -sha256 3e3a91ec5c3fa243ad1f5a25cedee0abafd9824d061378cd3c81c541b044bf09 src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/patched/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/patched/LICENSE.md -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 a63ee63574ed21e930765c4418a4fa2fa571b72c47cd023ee588dbf8b21fb4ee src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT -sha256 a012d664e4e01df52a65b2eeafdfb8aeb856fec0e6c372265d01b0109c3f5e2a src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT -sha256 0a731c5e376f4b604b9fd099d4797d64a5c0bc6e3770baf17b55988cb7737e2e src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT -sha256 a63ee63574ed21e930765c4418a4fa2fa571b72c47cd023ee588dbf8b21fb4ee src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT -sha256 9c9a05118ed1b6d96781a2e52335f7d4ec3dd6e7139340a8aa95fbf7eb4f199a src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT -sha256 b2d24d77041fbf66b93519758cd80671425c55614b2f65262046fdbe8c3247a8 src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt -sha256 c55ce1e876843853a8a2e5c936df6dc8dd3d185f83d85e6d113143b8c24f542e src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/gperftools-2.0/vendor/COPYING -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 846f295f64194ebcf615d6e35e445990645583764b52295177fc09a69051df1f src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 3ee0b54b13060355b0f5d0d1476536d25ad10552211098cc4086a46fb8c61f42 src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 efdabc1c1f655528b8c3a59b03668d446746d87273fab76f8af800b6e8891bd2 src/3rdparty/chromium/third_party/yara/src/COPYING -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 70eb89e4cb460d1b27173348c9f9fca5cf67c09d722ddaa07c5d0fcd6262a97e src/3rdparty/chromium/tools/gyp/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 4fde1ca31ffe4e16a76098f56170166c61a5493d3bafcc6a5903d3cb60aa7560 src/3rdparty/chromium/tools/symsrc/COPYING-pefile -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 5426333ff30d2ba9127bfe11ba51ca98be02d704ddac48afd19de47dc7748ee6 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 b1b379fcaf3219593a4c433feb1b35c780bed23fafaae440b1ae2771a9521e3a src/3rdparty/chromium/v8/third_party/antlr4/LICENSE.txt -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING +# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE +sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE +sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE +sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE +sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt +sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE +sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE +sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING +sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md +sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE +sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown +sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE +sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE +sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE +sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE +sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE +sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE +sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE +sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE +sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE +sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license +sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE +sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE +sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE +sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE +sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE +sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE +sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license +sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE +sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE +sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license +sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE +sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE +sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD +sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map +sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE +sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE +sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE +sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE +sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license +sha256 d778ae0088806b771424967d88efb68f3adb3705c31c3b7c0a052fe2eebd5268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license +sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license +sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 30792070c6ec188caccbadc5ee32c3e33fdc5e9044c2f08cb1d01213e5a01084 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license +sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE +sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE +sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license +sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license +sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE +sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE +sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md +sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md +sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt +sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE +sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE +sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE +sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE +sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE +sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE +sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt +sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE +sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE +sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE +sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libgav1/src/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE +sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt +sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md +sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f src/3rdparty/chromium/third_party/schema_org/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/src/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md +sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING +sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/turbine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE +sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt +sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc src/3rdparty/chromium/third_party/weston/LICENSE +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 src/3rdparty/chromium/third_party/weston/src/COPYING +sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 src/3rdparty/chromium/third_party/weston/src/data/COPYING +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE +sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 +sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 4abcf45964..64c9c96cc2 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -7,7 +7,7 @@ QT5WEBENGINE_VERSION = $(QT5_VERSION) QT5WEBENGINE_SITE = $(QT5_SITE) QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz -QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx opus webp \ +QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ qt5declarative qt5webchannel host-bison host-flex host-gperf \ host-pkgconf host-python QT5WEBENGINE_INSTALL_STAGING = YES @@ -18,6 +18,10 @@ QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +QT5WEBENGINE_DEPENDENCIES += qt5svg +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash index 736dbef5e9..ea64f6f14e 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash @@ -1,7 +1,7 @@ # Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz -# Locally computed +# Hashes for license files: sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 sha256 04505ee290cbe7b29b3766e00ff81987e84658f620cb43bd6e7bb52ee4234e1b LICENSE.LGPLv3 sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index e071dff208..65f08d1c5e 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -3,13 +3,13 @@ config BR2_PACKAGE_QT5WEBKIT depends on !BR2_STATIC_LIBS depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on BR2_INSTALL_LIBSTDCPP # leveldb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu depends on BR2_TOOLCHAIN_HAS_THREADS # leveldb depends on !BR2_BINFMT_FLAT # icu # assumes a FPU is available on MIPS depends on !BR2_MIPS_SOFT_FLOAT select BR2_PACKAGE_LEVELDB - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_SQLITE @@ -31,8 +31,9 @@ config BR2_PACKAGE_QT5WEBKIT http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html -comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.8" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 +comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.9, host gcc >= 4.9" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_BINFMT_FLAT depends on !BR2_MIPS_SOFT_FLOAT diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash index 3068ad920d..312d58272a 100644 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ b/package/qt5/qt5webkit/qt5webkit.hash @@ -2,6 +2,6 @@ sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz # Hashes for license files: -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 Source/WebCore/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1 -sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 Source/WebCore/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1 +sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 diff --git a/package/qt5/qt5websockets/Config.in b/package/qt5/qt5websockets/Config.in index 0cfde91c8b..678fb6fa04 100644 --- a/package/qt5/qt5websockets/Config.in +++ b/package/qt5/qt5websockets/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5WEBSOCKETS bool "qt5websockets" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_NETWORK help Qt is a cross-platform application and UI framework for diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 230aab232c..29a9ebe439 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebsockets-everywhere-src-5.12.7.tar.xz.sha256 -sha256 6fd13c2558f532a32f20d977b44c0146107a0e93861df84978e4fd72af283b17 qtwebsockets-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 +sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index 7bbb23556b..c1cee9cf85 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebview-everywhere-src-5.12.7.tar.xz.sha256 -sha256 d3f82d2ceab59dc4dee3b6f54f4b70869c199d63f4534b299d900cdacc9b7be7 qtwebview-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 +sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 06cdb9c87b..08e6753f21 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtx11extras-everywhere-src-5.12.7.tar.xz.sha256 -sha256 23895f4b1e84f3783526b9e17680df38c587601d4dfa6ff1b81ace432c480b96 qtx11extras-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 +sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5xmlpatterns/Config.in b/package/qt5/qt5xmlpatterns/Config.in index dd8b54eba1..2f3eb24f23 100644 --- a/package/qt5/qt5xmlpatterns/Config.in +++ b/package/qt5/qt5xmlpatterns/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5XMLPATTERNS bool "qt5xmlpatterns" - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 5e61928ea7..682e114a7f 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtxmlpatterns-everywhere-src-5.12.7.tar.xz.sha256 -sha256 9002014129a1f2a44700df333a7776e23bdfd689e7a619c3540fd9f6819b417b qtxmlpatterns-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 +sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index 0b352aa367..97297baff8 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -10,6 +10,8 @@ QUAGGA_INSTALL_STAGING = YES QUAGGA_DEPENDENCIES = host-gawk host-pkgconf QUAGGA_LICENSE = GPL-2.0+ QUAGGA_LICENSE_FILES = COPYING +QUAGGA_CPE_ID_VENDOR = quagga +QUAGGA_SELINUX_MODULES = zebra # We need to override the sysconf and localstate directories so that # quagga can create files as the quagga user without extra diff --git a/package/quazip/quazip.hash b/package/quazip/quazip.hash index e0a8206c52..5eff5cfb3d 100644 --- a/package/quazip/quazip.hash +++ b/package/quazip/quazip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4fda4d4248e08015b5090d0369ef9e68bdc4475aa12494f7c0f6d79e43270d14 quazip-0.8.1.tar.gz -sha256 d2a653b46b87963f29a7f1523e7c39bafdbb3592dfa01725e61a523387148e72 COPYING +sha256 54edce9c11371762bd4f0003c2937b5d8806a2752dd9c0fd9085e90792612ad0 quazip-1.1.tar.gz +sha256 3aab586a5bdc8ffbbf033c7106550fd3e849fd8888e33cbc9bfd30a433c4b1cb COPYING diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index 53042f6c4c..44645ec9b9 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUAZIP_VERSION = 0.8.1 +QUAZIP_VERSION = 1.1 QUAZIP_SITE = $(call github,stachenov,quazip,v$(QUAZIP_VERSION)) QUAZIP_INSTALL_STAGING = YES QUAZIP_DEPENDENCIES = \ @@ -13,20 +13,4 @@ QUAZIP_DEPENDENCIES = \ QUAZIP_LICENSE = LGPL-2.1 QUAZIP_LICENSE_FILES = COPYING -define QUAZIP_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr) -endef - -define QUAZIP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QUAZIP_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR) -endef - -define QUAZIP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR) -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/package/quota/quota.hash b/package/quota/quota.hash index d9f42e51c7..354a3e2de4 100644 --- a/package/quota/quota.hash +++ b/package/quota/quota.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.05/ (click on info button) -md5 1c1dbd2cd3d680ccac661239b067e147 quota-4.05.tar.gz -sha1 d23711f3b204e0a86b8378c32545c95fb149168d quota-4.05.tar.gz +# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.06/ (click on info button) +md5 aef94648438832b684978d46fdf75110 quota-4.06.tar.gz +sha1 98288699cc14da42f762301c2b6731ec7c777681 quota-4.06.tar.gz # Locally calculated -sha256 ef3b5b5d1014ed1344b46c1826145e20cbef8db967b522403c9a060761cf7ab9 quota-4.05.tar.gz -sha256 35b2d9797b83bce16076da9c3273f264f50b8d02f492ee32cd4c51ba6897bceb COPYING +sha256 2f3e03039f378d4f0d97acdb49daf581dcaad64d2e1ddf129495fd579fbd268d quota-4.06.tar.gz +sha256 32a5fd41e7a257f7f0373988ea8d45cebdbf376060703c242c11c000751b1203 COPYING diff --git a/package/quota/quota.mk b/package/quota/quota.mk index f4bf9e5c58..0c751d4436 100644 --- a/package/quota/quota.mk +++ b/package/quota/quota.mk @@ -4,14 +4,14 @@ # ################################################################################ -QUOTA_VERSION = 4.05 +QUOTA_VERSION = 4.06 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils QUOTA_LICENSE = GPL-2.0+ QUOTA_LICENSE_FILES = COPYING -# We're patching configure.ac -QUOTA_AUTORECONF = YES -QUOTA_GETTEXTIZE = YES +QUOTA_CPE_ID_VENDOR = jan_kara +QUOTA_CPE_ID_PRODUCT = linux_diskquota +QUOTA_SELINUX_MODULES = quota QUOTA_CONF_ENV = LIBS="$(TARGET_NLS_LIBS)" QUOTA_CONF_OPTS = --disable-pie diff --git a/package/qwt/Config.in b/package/qwt/Config.in index 2e9cec19d7..736ccc2a5e 100644 --- a/package/qwt/Config.in +++ b/package/qwt/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QWT bool "qwt" depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS # printsupport select BR2_PACKAGE_QT5BASE_CONCURRENT diff --git a/package/qwt/qwt.hash b/package/qwt/qwt.hash index 95e910e5e4..d4fd210cbd 100644 --- a/package/qwt/qwt.hash +++ b/package/qwt/qwt.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/qwt/files/qwt/6.1.4/ -sha1 a1028cb0a33322920266fb183869023b8ed30394 qwt-6.1.4.tar.bz2 -md5 4fb1852f694420e3ab9c583526edecc5 qwt-6.1.4.tar.bz2 +# From https://sourceforge.net/projects/qwt/files/qwt/6.1.6 +md5 cc71be5d6c33c2fc19ae8082ccdd3e83 qwt-6.1.6.tar.bz2 +sha1 b1f17a86c9b1b0790a0c0067ef69fb6277efac79 qwt-6.1.6.tar.bz2 # Locally computed -sha256 1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9 qwt-6.1.4.tar.bz2 -sha256 d8737db330e1eeb439962e11654ab7f1aece3561d9415454a8c538643824ede6 COPYING +sha256 99460d31c115ee4117b0175d885f47c2c590d784206f09815dc058fbe5ede1f6 qwt-6.1.6.tar.bz2 +sha256 d8737db330e1eeb439962e11654ab7f1aece3561d9415454a8c538643824ede6 COPYING diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index f09304d0e4..9f0b78655f 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QWT_VERSION = 6.1.4 +QWT_VERSION = 6.1.6 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION) QWT_INSTALL_STAGING = YES diff --git a/package/rabbitmq-c/rabbitmq-c.hash b/package/rabbitmq-c/rabbitmq-c.hash index eb57626518..dc1406d3d5 100644 --- a/package/rabbitmq-c/rabbitmq-c.hash +++ b/package/rabbitmq-c/rabbitmq-c.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0 rabbitmq-c-0.10.0.tar.gz -sha256 94a12c906acb31a66c2c8a6c1b6e46cab52bc5694c5ada2a06d86b05d3d3f422 LICENSE-MIT +sha256 437d45e0e35c18cf3e59bcfe5dfe37566547eb121e69fca64b98f5d2c1c2d424 rabbitmq-c-0.11.0.tar.gz +sha256 94a12c906acb31a66c2c8a6c1b6e46cab52bc5694c5ada2a06d86b05d3d3f422 LICENSE-MIT diff --git a/package/rabbitmq-c/rabbitmq-c.mk b/package/rabbitmq-c/rabbitmq-c.mk index e059ff706c..18ecaa3098 100644 --- a/package/rabbitmq-c/rabbitmq-c.mk +++ b/package/rabbitmq-c/rabbitmq-c.mk @@ -4,20 +4,16 @@ # ################################################################################ -RABBITMQ_C_VERSION = 0.10.0 +RABBITMQ_C_VERSION = 0.11.0 RABBITMQ_C_SITE = $(call github,alanxz,rabbitmq-c,v$(RABBITMQ_C_VERSION)) RABBITMQ_C_LICENSE = MIT RABBITMQ_C_LICENSE_FILES = LICENSE-MIT +RABBITMQ_C_CPE_ID_VENDOR = rabbitmq-c_project RABBITMQ_C_INSTALL_STAGING = YES RABBITMQ_C_CONF_OPTS = \ -DBUILD_API_DOCS=OFF \ -DBUILD_TOOLS_DOCS=OFF -# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to -# disable a try_run() call in the FindThreads tests, which caused a -# build failure when cross-compiling. -RABBITMQ_C_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - # BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable ifeq ($(BR2_SHARED_STATIC_LIBS),y) RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON diff --git a/package/rabbitmq-server/S50rabbitmq-server b/package/rabbitmq-server/S50rabbitmq-server index faf248ded2..35f7844860 100644 --- a/package/rabbitmq-server/S50rabbitmq-server +++ b/package/rabbitmq-server/S50rabbitmq-server @@ -5,10 +5,12 @@ INSTALLUSER=rabbitmq RUNDIR=/var/run/rabbitmq +LOGDIR=/var/log/rabbitmq case "$1" in start) install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" || exit 1 + install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$LOGDIR" || exit 1 printf "Starting rabbitmq-server: " su -c "/usr/sbin/rabbitmq-server -detached" - "$INSTALLUSER" 2>/dev/null [ $? = 0 ] && echo "OK" || echo "FAIL" diff --git a/package/rabbitmq-server/rabbitmq-server.hash b/package/rabbitmq-server/rabbitmq-server.hash index 3c552820c1..693ab208ec 100644 --- a/package/rabbitmq-server/rabbitmq-server.hash +++ b/package/rabbitmq-server/rabbitmq-server.hash @@ -1,18 +1,25 @@ # Locally computed -sha256 395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e rabbitmq-server-3.6.6.tar.xz -sha256 f3a296f863a2729506bf0e9f1b3f219e63ede4906a88790fdd4d696f825b70ba LICENSE-MPL-RabbitMQ -sha256 2d6485b111c3ef40900d5accb40388fbf99d4b018274b3617e1c92b86d95c985 LICENSE +sha256 8c6729b985cb21bab13363b1c806cfa15845b046be9e641ab1496bd5a1eaf19d rabbitmq-server-3.8.2.tar.xz +sha256 a96b7ed2e7def9c86d84d9ca0e79e4a55fc8e6e202ac89caa4f9791ccb9cf2a3 LICENSE +sha256 acd82bfce369b066e7e612197206da4fa38b8614486658775d0b6f66ac30114a LICENSE-APACHE2 +sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE-APACHE2-excanvas sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE-APACHE2-ExplorerCanvas -sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE-APL2-Rebar sha256 b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841 LICENSE-APL2-Stomp-Websocket -sha256 cdc8c5132e24712732282867575b23b951f277fe9641d72e730a264e8d8add2f LICENSE-BSD-base64js -sha256 2c7784c174b3eff8507a8cb815c721800882f6d53860c2f2ecf34c8ce2d510f1 LICENSE-BSD-glMatrix -sha256 a97b529abfed8dea9f644e1d3294a14beba6aaf3a8e2f0db6a347e01ceb623cd LICENSE-EPL-OTP +sha256 3c69f8327beaaa45d2f3d7831edf211d0f37d1d9c7754267478320697e1882e9 LICENSE-BSD-base64js +sha256 af7b5cdf5e16446c64d6e755b2a6386e38c56500ae27587edcd94c96d330ee35 LICENSE-BSD-recon +sha256 7615ea96ccddc822655cb48a9d2a5cac2f176fca7fe28131af934ce21f48cbc8 LICENSE-erlcloud +sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234 LICENSE-httpc_aws +sha256 c0e940d13f488849c27963e7d87f3fc27a2f5843cfd49148029a558251014689 LICENSE-ISC-cowboy +sha256 af399cded8f343407fb68eeb51755676e9700c65c380f073376afd8d20f428a1 LICENSE-MIT-EJS sha256 b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1 LICENSE-MIT-EJS10 -sha256 e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c LICENSE-MIT-Flot -sha256 f10e24a690fa6f8a2154dd0b8623e0431c6c049482f139d0980664de612a7d5b LICENSE-MIT-jQuery164 +sha256 0f26e121a7a1dab675bd8474cdc517428863036a668260033467c7278f488cd4 LICENSE-MIT-Erlware-Commons +sha256 52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c LICENSE-MIT-Flot +sha256 8cb9a8ff8cafd6a085fd4f086e797b719c334a621df19354dc286591003da3f5 LICENSE-MIT-jQuery +sha256 44f25d51c90aa55dd4b3ba7f3d6e9a594073fcbefe651e16e74cabd48005b476 LICENSE-MIT-jQuery164 sha256 fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692 LICENSE-MIT-Mochi -sha256 363a3b367503176fad7fd794168193ff9add85c3d28b73af804b67ff11c59115 LICENSE-MIT-Mochiweb +sha256 b80081a5bb527dbe6b79f18a40f44b4ba6303e4856cadd249672c97b90e6dd7c LICENSE-MIT-Sammy sha256 cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed LICENSE-MIT-Sammy060 -sha256 c29e506dd734930964382e52e98f60ab7a46c2be639165a3a25083272c8fc29f LICENSE-MIT-SockJS -sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE-MPL2 +sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd LICENSE-MPL +sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd LICENSE-MPL-RabbitMQ +sha256 66a3107d5ad6a058aab753eaac2047ccb2ed0e39465dd0fe5844da3e300d5172 LICENSE-MPL2 +sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234 LICENSE-rabbitmq_aws diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk index f9c28e6677..33c3359429 100644 --- a/package/rabbitmq-server/rabbitmq-server.mk +++ b/package/rabbitmq-server/rabbitmq-server.mk @@ -4,20 +4,39 @@ # ################################################################################ -RABBITMQ_SERVER_VERSION = 3.6.6 -RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION) +RABBITMQ_SERVER_VERSION = 3.8.2 +RABBITMQ_SERVER_SITE = https://github.com/rabbitmq/rabbitmq-server/releases/download/v$(RABBITMQ_SERVER_VERSION) RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz -RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPL-2.0 -RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \ - LICENSE LICENSE-APACHE2-ExplorerCanvas \ - LICENSE-APL2-Rebar LICENSE-APL2-Stomp-Websocket \ - LICENSE-BSD-base64js LICENSE-BSD-glMatrix \ - LICENSE-EPL-OTP LICENSE-MIT-EJS10 \ - LICENSE-MIT-Flot LICENSE-MIT-jQuery164 \ - LICENSE-MIT-Mochi LICENSE-MIT-Mochiweb \ - LICENSE-MIT-Sammy060 LICENSE-MIT-SockJS \ - LICENSE-MPL2 -RABBITMQ_SERVER_DEPENDENCIES = host-libxslt host-zip erlang libxslt +RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-3-Clause, BSD-2-Clause, MIT, MPL-2.0, ISC +RABBITMQ_SERVER_LICENSE_FILES = \ + LICENSE \ + LICENSE-APACHE2 \ + LICENSE-APACHE2-excanvas \ + LICENSE-APACHE2-ExplorerCanvas \ + LICENSE-APL2-Stomp-Websocket \ + LICENSE-BSD-base64js \ + LICENSE-BSD-recon \ + LICENSE-erlcloud \ + LICENSE-httpc_aws \ + LICENSE-ISC-cowboy \ + LICENSE-MIT-EJS \ + LICENSE-MIT-EJS10 \ + LICENSE-MIT-Erlware-Commons \ + LICENSE-MIT-Flot \ + LICENSE-MIT-jQuery \ + LICENSE-MIT-jQuery164 \ + LICENSE-MIT-Mochi \ + LICENSE-MIT-Sammy \ + LICENSE-MIT-Sammy060 \ + LICENSE-MPL \ + LICENSE-MPL-RabbitMQ \ + LICENSE-MPL2 \ + LICENSE-rabbitmq_aws +RABBITMQ_SERVER_CPE_ID_VENDOR = pivotal_software +RABBITMQ_SERVER_CPE_ID_PRODUCT = rabbitmq +RABBITMQ_SERVER_SELINUX_MODULES = rabbitmq + +RABBITMQ_SERVER_DEPENDENCIES = host-elixir host-libxslt host-zip erlang libxslt RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults define RABBITMQ_SERVER_BUILD_CMDS diff --git a/package/rabbitmq-server/rabbitmq-server.service b/package/rabbitmq-server/rabbitmq-server.service index 268b4bdcd2..f69b33d455 100644 --- a/package/rabbitmq-server/rabbitmq-server.service +++ b/package/rabbitmq-server/rabbitmq-server.service @@ -8,6 +8,7 @@ User=rabbitmq Group=rabbitmq Environment=HOME=/var/lib/rabbitmq WorkingDirectory=/var/lib/rabbitmq +LogsDirectory=/var/log/rabbitmq ExecStart=/usr/sbin/rabbitmq-server ExecStop=/usr/sbin/rabbitmqctl stop diff --git a/package/racehound/Config.in b/package/racehound/Config.in index 2d1ccb8381..d13f90adb4 100644 --- a/package/racehound/Config.in +++ b/package/racehound/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_RACEHOUND depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils # only x86/x86_64 supported depends on BR2_i386 || BR2_x86_64 @@ -29,7 +30,8 @@ comment "racehound needs an Linux kernel >= 3.14 to be built" depends on !BR2_LINUX_KERNEL depends on BR2_i386 || BR2_x86_64 -comment "racehound needs a uClibc or glibc toolchain w/ C++, wchar, dynamic library" +comment "racehound needs a uClibc or glibc toolchain w/ C++, wchar, dynamic library, threads" depends on BR2_i386 || BR2_x86_64 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/radvd/radvd.hash b/package/radvd/radvd.hash index 9ade027d27..a624db24ba 100644 --- a/package/radvd/radvd.hash +++ b/package/radvd/radvd.hash @@ -1,3 +1,3 @@ -# From http://www.litech.org/radvd/dist/radvd-2.18.tar.gz.sha256 -sha256 4f573e36b96ba92d03b5abbbd5f059b9c8994967812c77852f44049ac5a448fd radvd-2.18.tar.gz -sha256 40a6db00cf0b97f031eaa6c6e87157788f40ced1b88e3ea6d78779bd2a39dc80 COPYRIGHT +# From http://www.litech.org/radvd/dist/radvd-2.19.tar.gz.sha512 +sha512 caa621fd77e34ff6858d60a41b0ee02aff967ac14f2b84c402359744f4bece5c1563419860431c328adc0385e9893ed1f2421d652247a3aa0dfc0aaad1e01233 radvd-2.19.tar.gz +sha256 40a6db00cf0b97f031eaa6c6e87157788f40ced1b88e3ea6d78779bd2a39dc80 COPYRIGHT diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk index ba0c78bd1e..7a3b0a36ac 100644 --- a/package/radvd/radvd.mk +++ b/package/radvd/radvd.mk @@ -4,7 +4,7 @@ # ################################################################################ -RADVD_VERSION = 2.18 +RADVD_VERSION = 2.19 RADVD_SITE = http://www.litech.org/radvd/dist RADVD_DEPENDENCIES = host-bison host-flex host-pkgconf # We need to ignore , because radvd already includes @@ -12,10 +12,15 @@ RADVD_DEPENDENCIES = host-bison host-flex host-pkgconf RADVD_CONF_ENV = \ ac_cv_prog_cc_c99='-std=gnu99' \ ac_cv_header_linux_if_arp_h=no -# For 0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch -RADVD_AUTORECONF = YES RADVD_LICENSE = BSD-4-Clause-like RADVD_LICENSE_FILES = COPYRIGHT +RADVD_SELINUX_MODULES = radvd + +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y) +RADVD_CONF_OPTS += --with-stack-protector +else +RADVD_CONF_OPTS += --without-stack-protector +endif # We don't provide /etc/radvd.conf, so disable the service by default. define RADVD_INSTALL_INIT_SYSTEMD diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk index 9f1c82ce40..d3bcef7df1 100644 --- a/package/rapidjson/rapidjson.mk +++ b/package/rapidjson/rapidjson.mk @@ -8,6 +8,7 @@ RAPIDJSON_VERSION = 1.1.0 RAPIDJSON_SITE = $(call github,miloyip,rapidjson,v$(RAPIDJSON_VERSION)) RAPIDJSON_LICENSE = MIT RAPIDJSON_LICENSE_FILES = license.txt +RAPIDJSON_CPE_ID_VENDOR = tencent # rapidjson is a header-only C++ library RAPIDJSON_INSTALL_TARGET = NO diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 4c7135fc64..6d21fad58e 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -10,11 +10,16 @@ RAPTOR_SITE = http://download.librdf.org/source RAPTOR_DEPENDENCIES = libxml2 libxslt RAPTOR_LICENSE = GPL-2.0+ or LGPL-2.1+ or Apache-2.0+ RAPTOR_LICENSE_FILES = LICENSE.txt +RAPTOR_CPE_ID_VENDOR = librdf +RAPTOR_CPE_ID_PRODUCT = raptor_rdf_syntax_library RAPTOR_INSTALL_STAGING = YES # Flag is added to make sure the patch is applied for the configure.ac of raptor. RAPTOR_AUTORECONF = YES +# 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch +RAPTOR_IGNORE_CVES += CVE-2017-18926 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config diff --git a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch index cdab6070c2..d482b0b9d4 100644 --- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch +++ b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch @@ -1,4 +1,4 @@ -From 5b015e67af27679f4ca8f7f5f2f71020ec054b0c Mon Sep 17 00:00:00 2001 +From 38b730c00f45abf324caf687b5b00662ff4252c2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Dec 2016 23:09:44 +0100 Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS @@ -8,21 +8,23 @@ rpiboot. Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 Signed-off-by: Thomas Petazzoni +[Rebased on 9324fd7] +Signed-off-by: Peter Seiderer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 3e7d1e4..d9a7220 100755 +index 822e714..875e717 100755 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ - rpiboot: main.c -- $(CC) -g -o $@ $< -lusb-1.0 -+ $(CC) -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) + rpiboot: main.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h +- $(CC) -Wall -Wextra -g -o $@ $< -lusb-1.0 ++ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) - install: rpiboot - cp rpiboot /usr/bin + %.h: %.bin ./bin2c + ./bin2c $< $@ -- -2.7.4 +2.31.1 diff --git a/package/raspberrypi-usbboot/Config.in.host b/package/raspberrypi-usbboot/Config.in.host index dce2fccd54..e5772e3aa1 100644 --- a/package/raspberrypi-usbboot/Config.in.host +++ b/package/raspberrypi-usbboot/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT bool "host raspberrypi-usbboot" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help This package builds and install the "rpiboot" tool for the host machine. This tool allows to boot the Broadcom BCM @@ -10,3 +11,7 @@ config BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT built into the Compute module). https://github.com/raspberrypi/usbboot + +comment "host raspberrypi-usbboot needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm || BR2_aarch64 + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index 94860a9dab..3f66b12ff1 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,2 +1,5 @@ # Locally calculated -sha256 a8893f8a10522bd58866eb34e7f0d7731c43200d585f122681f428cdef76e676 raspberrypi-usbboot-f4e3f0f9a3c64d846ba53ec3367e33a4f9a7d051.tar.gz +sha256 e4a07df05c23e0eba100d4013367e7823e3b8bc72da7b79b031bd346616c6ae5 raspberrypi-usbboot-9324fd7034b9d3606aed8a27da74d6d57e066e7e.tar.gz + +# License files +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 7018617906..5d7b433c64 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,8 +4,10 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = f4e3f0f9a3c64d846ba53ec3367e33a4f9a7d051 +RASPBERRYPI_USBBOOT_VERSION = 9324fd7034b9d3606aed8a27da74d6d57e066e7e RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) +RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 +RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE HOST_RASPBERRYPI_USBBOOT_DEPENDENCIES = host-libusb @@ -14,8 +16,7 @@ define HOST_RASPBERRYPI_USBBOOT_BUILD_CMDS endef define HOST_RASPBERRYPI_USBBOOT_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ - DESTDIR=$(HOST_DIR) install + $(INSTALL) -D -m 0755 $(@D)/rpiboot $(HOST_DIR)/bin/rpiboot endef $(eval $(host-generic-package)) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 54760347c7..a025257845 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,4 +1,4 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v1.2/rauc-1.2.tar.xz.asc -sha256 224683fc1fac50ccb89128aa786445cd8e26bb25deafd4410e0807187376e661 rauc-1.2.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +# https://github.com/rauc/rauc/releases/download/v1.5.1/rauc-1.5.1.tar.xz.asc +sha256 d4ea009ce702bcb083d942398ccfedec959c6bbb7adc0fd77ae9314ce11d9d91 rauc-1.5.1.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 5a208e07ae..4fb3ddde3e 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,11 +4,12 @@ # ################################################################################ -RAUC_VERSION = 1.2 +RAUC_VERSION = 1.5.1 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 RAUC_LICENSE_FILES = COPYING +RAUC_CPE_ID_VENDOR = pengutronix RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 dbus ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) @@ -31,7 +32,7 @@ RAUC_DEPENDENCIES += systemd endif define RAUC_INSTALL_INIT_SYSTEMD - mkdir $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d printf '[Install]\nWantedBy=multi-user.target\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf endef @@ -46,7 +47,8 @@ HOST_RAUC_CONF_OPTS += \ --disable-network \ --disable-json \ --disable-service \ - --without-dbuspolicydir + --without-dbuspolicydir \ + --with-systemdunitdir=no $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk index 672d85b5c5..5a1739a46e 100644 --- a/package/rdesktop/rdesktop.mk +++ b/package/rdesktop/rdesktop.mk @@ -24,6 +24,7 @@ RDESKTOP_DEPENDENCIES = \ RDESKTOP_CONF_OPTS = --disable-credssp RDESKTOP_LICENSE = GPL-3.0+ RDESKTOP_LICENSE_FILES = COPYING +RDESKTOP_CPE_ID_VENDOR = rdesktop ifeq ($(BR2_PACKAGE_PCSC_LITE),y) RDESKTOP_DEPENDENCIES += pcsc-lite diff --git a/package/readline/Config.in b/package/readline/Config.in index 1cb0672cf1..fd21cfeaf8 100644 --- a/package/readline/Config.in +++ b/package/readline/Config.in @@ -6,4 +6,22 @@ config BR2_PACKAGE_READLINE by applications that allow users to edit command lines as they are typed in. - https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html + https://tiswww.case.edu/php/chet/readline/rltop.html + +config BR2_PACKAGE_READLINE_BRACKETED_PASTE + bool "Enable bracketed paste" + depends on BR2_PACKAGE_READLINE + help + Enable the "bracketed paste" feature in libreadline. + + Bracketed paste is helpful for interactive sessions when + one wants to prevent pasted text from being interpreted + as typed-in commands. However, it also causes control + characters to show up in the raw output of a (telnet) + session. This can cause issues and throw off pattern + matching if the session output is being captured for + automated processing. + + For further information on this feature and whether you + may want it, see: + https://cirw.in/blog/bracketed-paste diff --git a/package/readline/readline.hash b/package/readline/readline.hash index 560154c2f7..63172f1121 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461 readline-8.0.tar.gz +sha256 f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02 readline-8.1.tar.gz # Hash for license file -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index f5d7d5bf9e..06a96b67a8 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 8.0 +READLINE_VERSION = 8.1 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf @@ -14,6 +14,13 @@ READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \ READLINE_CONF_OPTS = --disable-install-examples READLINE_LICENSE = GPL-3.0+ READLINE_LICENSE_FILES = COPYING +READLINE_CPE_ID_VENDOR = gnu + +ifeq ($(BR2_PACKAGE_READLINE_BRACKETED_PASTE),y) +READLINE_CONF_OPTS += --enable-bracketed-paste-default +else +READLINE_CONF_OPTS += --disable-bracketed-paste-default +endif define READLINE_INSTALL_INPUTRC $(INSTALL) -D -m 644 package/readline/inputrc $(TARGET_DIR)/etc/inputrc diff --git a/package/reaver/Config.in b/package/reaver/Config.in index 0fd8ab7c6e..c286fa8d34 100644 --- a/package/reaver/Config.in +++ b/package/reaver/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_REAVER bool "reaver" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBPCAP help Reaver is a tool to audit networks against brute WPS pins @@ -7,3 +8,6 @@ config BR2_PACKAGE_REAVER https://code.google.com/archive/p/reaver-wps/wikis/README.wiki https://github.com/t6x/reaver-wps-fork-t6x + +comment "reaver needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/reaver/reaver.hash b/package/reaver/reaver.hash index fad81fe326..780e6ac86d 100644 --- a/package/reaver/reaver.hash +++ b/package/reaver/reaver.hash @@ -1,3 +1,3 @@ # locally computed -sha256 e6761d2d4ef9cb2b45fe0a60d6b94048ce4442e4ac209904fe89506ff1e94c44 reaver-1.6.5.tar.gz -sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE +sha256 73189782b208d12b8dddc4f29d32e1f72b1f3609e573c9ea9510deebec394583 reaver-1.6.6.tar.gz +sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE diff --git a/package/reaver/reaver.mk b/package/reaver/reaver.mk index 093ac935af..2b5f82960b 100644 --- a/package/reaver/reaver.mk +++ b/package/reaver/reaver.mk @@ -6,7 +6,7 @@ # Older repos for this project will not cross-compile easily # while this one works right away -REAVER_VERSION = 1.6.5 +REAVER_VERSION = 1.6.6 REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,v$(REAVER_VERSION)) REAVER_LICENSE = GPL-2.0+ REAVER_LICENSE_FILES = docs/LICENSE diff --git a/package/redis/0001-uclibc.patch b/package/redis/0001-uclibc.patch index 3329a60edc..197f43e7a7 100644 --- a/package/redis/0001-uclibc.patch +++ b/package/redis/0001-uclibc.patch @@ -10,6 +10,8 @@ Signed-off-by: Daniel Price Signed-off-by: Martin Bark [Titouan: adapt to 5.0.4] Signed-off-by: Titouan Christophe +[Fabrice: update for 6.0.9] +Signed-off-by: Fabrice Fontaine ========================================================================= diff -ur old/src/config.h new/src/config.h @@ -21,6 +23,6 @@ diff -ur old/src/config.h new/src/config.h /* Test for backtrace() */ -#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || \ +#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__) && !defined(__UCLIBC__)) || \ - defined(__FreeBSD__) || (defined(__OpenBSD__) && defined(USE_BACKTRACE))\ + defined(__FreeBSD__) || ((defined(__OpenBSD__) || defined(__NetBSD__)) && defined(USE_BACKTRACE))\ || defined(__DragonFly__) #define HAVE_BACKTRACE 1 diff --git a/package/redis/Config.in b/package/redis/Config.in index 2450ccdf7f..a2239b4a54 100644 --- a/package/redis/Config.in +++ b/package/redis/Config.in @@ -2,16 +2,21 @@ config BR2_PACKAGE_REDIS bool "redis" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Atomic keyword depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() help - Redis is an open source, advanced key-value store. It is - often referred to as a data structure server since keys can - contain strings, hashes, lists, sets and sorted sets. + Redis is an open source (BSD licensed), in-memory data + structure store, used as a database, cache and message + broker. It supports data structures such as strings, + hashes, lists, sets, sorted sets with range queries, + bitmaps, hyperloglogs, geospatial indexes with radius + queries and streams. http://www.redis.io -comment "redis needs a toolchain w/ dynamic library, threads" +comment "redis needs a toolchain w/ gcc>=4.9, dynamic library, nptl" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/redis/redis.hash b/package/redis/redis.hash index ee15b75e08..74a9392a63 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ -# From https://github.com/antirez/redis-hashes/blob/master/README -sha256 f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7 redis-5.0.8.tar.gz +# From https://github.com/redis/redis-hashes/blob/master/README +sha256 5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab redis-6.2.6.tar.gz # Locally calculated -sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING +sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index d3954d87ca..f3c030d68c 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,10 +4,12 @@ # ################################################################################ -REDIS_VERSION = 5.0.8 +REDIS_VERSION = 6.2.6 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING +REDIS_CPE_ID_VENDOR = redislabs +REDIS_SELINUX_MODULES = redis define REDIS_USERS redis -1 redis -1 * /var/lib/redis /bin/false - Redis Server @@ -30,6 +32,20 @@ endif REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \ PREFIX=$(TARGET_DIR)/usr MALLOC=libc +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +REDIS_DEPENDENCIES += systemd +REDIS_BUILDOPTS += USE_SYSTEMD=yes +else +REDIS_BUILDOPTS += USE_SYSTEMD=no +endif + +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +REDIS_DEPENDENCIES += libopenssl +REDIS_BUILDOPTS += BUILD_TLS=yes +else +REDIS_BUILDOPTS += BUILD_TLS=no +endif + define REDIS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) endef diff --git a/package/redis/redis.service b/package/redis/redis.service index 0a8162b8ab..2cc82a1980 100644 --- a/package/redis/redis.service +++ b/package/redis/redis.service @@ -1,13 +1,15 @@ [Unit] -Description=Advanced key-value store +Description=Redis data structure server +Documentation=https://redis.io/documentation After=network.target [Service] -Type=simple +Type=notify User=redis Group=redis -ExecStart=/usr/bin/redis-server /etc/redis.conf -ExecStop=/usr/bin/redis-cli shutdown +ExecStart=/usr/bin/redis-server --supervised systemd --daemonize no +TimeoutStartSec=5 +TimeoutStopSec=5 CapabilityBoundingSet= PrivateTmp=true PrivateDevices=true diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index b50b2f09ff..c529b85e1d 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -28,6 +28,41 @@ config BR2_PACKAGE_REFPOLICY if BR2_PACKAGE_REFPOLICY +choice + prompt "Refpolicy version" + default BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION + +config BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION + bool "Upstream version" + help + Use the refpolicy as provided by Buildroot. + +config BR2_PACKAGE_REFPOLICY_CUSTOM_GIT + bool "Custom git repository" + help + Allows to get the refpolicy from a custom git repository. + + The custom refpolicy must define the full policy explicitly, + and must be a fork of the original refpolicy, to have the + same build system. When this is selected, only the custom + policy definition are taken into account and all the modules + of the policy are built into the binary policy. + +endchoice + +if BR2_PACKAGE_REFPOLICY_CUSTOM_GIT + +config BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL + string "URL of custom repository" + +config BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION + string "Custom repository version" + help + Revision to use in the typical format used by Git. + E.g. a sha id, tag, branch... + +endif + choice prompt "SELinux default state" default BR2_PACKAGE_REFPOLICY_POLICY_STATE_PERMISSIVE @@ -54,6 +89,28 @@ config BR2_PACKAGE_REFPOLICY_POLICY_STATE default "enforcing" if BR2_PACKAGE_REFPOLICY_POLICY_STATE_ENFORCING default "disabled" if BR2_PACKAGE_REFPOLICY_POLICY_STATE_DISABLED +if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION + +config BR2_REFPOLICY_EXTRA_MODULES_DIRS + string "Extra modules directories" + help + Specify a space-separated list of directories containing + SELinux modules that will be built into the SELinux + policy. The modules will be automatically enabled in the + policy. + + Each of those directories must contain the SELinux policy + .fc, .if and .te files directly at the top-level, with no + sub-directories. Also, you cannot have several modules with + the same name in different directories. + +config BR2_REFPOLICY_EXTRA_MODULES + string "Extra modules to enable" + help + List of extra SELinux modules to enable in the refpolicy. + +endif + endif comment "refpolicy needs a toolchain w/ threads" diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash index 0c77b626cc..6c33a4d974 100644 --- a/package/refpolicy/refpolicy.hash +++ b/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ # From https://github.com/SELinuxProject/refpolicy/releases -sha256 67bd1213e9d014ada15512028bb7f35ef6610c2d209cc5117b8577474aa6147f refpolicy-2.20190609.tar.bz2 +sha256 48cbf2c63ff9003bef05e03c8d3cdddb4e8f63fef2a072ae51c987301f0b874d refpolicy-2.20210203.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index 1a5fefff06..7782a5be54 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -4,11 +4,9 @@ # ################################################################################ -REFPOLICY_VERSION = 2.20190609 -REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 -REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609 REFPOLICY_LICENSE = GPL-2.0 REFPOLICY_LICENSE_FILES = COPYING +REFPOLICY_CPE_ID_VENDOR = selinuxproject REFPOLICY_INSTALL_STAGING = YES REFPOLICY_DEPENDENCIES = \ host-m4 \ @@ -16,11 +14,24 @@ REFPOLICY_DEPENDENCIES = \ host-policycoreutils \ host-python3 \ host-setools \ - host-gawk + host-gawk \ + host-libxml2 + +ifeq ($(BR2_PACKAGE_REFPOLICY_CUSTOM_GIT),y) +REFPOLICY_VERSION = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION)) +REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) +REFPOLICY_SITE_METHOD = git +BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) +else +REFPOLICY_VERSION = 2.20210203 +REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 +REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203 +endif # Cannot use multiple threads to build the reference policy REFPOLICY_MAKE = \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ + XMLLINT=$(LIBXML2_HOST_BINARY) \ TEST_TOOLCHAIN=$(HOST_DIR) \ $(TARGET_MAKE_ENV) \ $(MAKE1) @@ -29,15 +40,82 @@ REFPOLICY_POLICY_VERSION = $(BR2_PACKAGE_LIBSEPOL_POLICY_VERSION) REFPOLICY_POLICY_STATE = \ $(call qstrip,$(BR2_PACKAGE_REFPOLICY_POLICY_STATE)) +ifeq ($(BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION),y) + +# Allow to provide out-of-tree SELinux modules in addition to the ones +# in the refpolicy. +REFPOLICY_EXTRA_MODULES_DIRS = \ + $(strip \ + $(call qstrip,$(BR2_REFPOLICY_EXTRA_MODULES_DIRS)) \ + $(PACKAGES_SELINUX_EXTRA_MODULES_DIRS)) +$(foreach dir,$(REFPOLICY_EXTRA_MODULES_DIRS),\ + $(if $(wildcard $(dir)),,\ + $(error BR2_REFPOLICY_EXTRA_MODULES_DIRS contains nonexistent directory $(dir)))) + +REFPOLICY_MODULES = \ + application \ + authlogin \ + getty \ + init \ + libraries \ + locallogin \ + logging \ + miscfiles \ + modutils \ + mount \ + selinuxutil \ + storage \ + sysadm \ + sysnetwork \ + unconfined \ + userdomain \ + $(PACKAGES_SELINUX_MODULES) \ + $(call qstrip,$(BR2_REFPOLICY_EXTRA_MODULES)) \ + $(foreach d,$(REFPOLICY_EXTRA_MODULES_DIRS),\ + $(basename $(notdir $(wildcard $(d)/*.te)))) + +define REFPOLICY_COPY_EXTRA_MODULES + mkdir -p $(@D)/policy/modules/buildroot + rsync -au $(addsuffix /*,$(REFPOLICY_EXTRA_MODULES_DIRS)) \ + $(@D)/policy/modules/buildroot/ + if [ ! -f $(@D)/policy/modules/buildroot/metadata.xml ]; then \ + echo "Buildroot extra modules" > \ + $(@D)/policy/modules/buildroot/metadata.xml; \ + fi +endef + +# In the context of a monolithic policy enabling a piece of the policy as +# 'base' or 'module' is equivalent, so we enable them as 'base'. +define REFPOLICY_CONFIGURE_MODULES + $(SED) "s/ = module/ = no/g" $(@D)/policy/modules.conf + $(foreach m,$(sort $(REFPOLICY_MODULES)), + $(SED) "/^$(m) =/c\$(m) = base" $(@D)/policy/modules.conf + ) +endef + +endif # BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION = y + +ifeq ($(BR2_INIT_SYSTEMD),y) +define REFPOLICY_CONFIGURE_SYSTEMD + $(SED) "/SYSTEMD/c\SYSTEMD = y" $(@D)/build.conf +endef +endif + define REFPOLICY_CONFIGURE_CMDS $(SED) "/OUTPUT_POLICY/c\OUTPUT_POLICY = $(REFPOLICY_POLICY_VERSION)" \ $(@D)/build.conf $(SED) "/MONOLITHIC/c\MONOLITHIC = y" $(@D)/build.conf $(SED) "/NAME/c\NAME = targeted" $(@D)/build.conf + $(REFPOLICY_CONFIGURE_SYSTEMD) + $(if $(REFPOLICY_EXTRA_MODULES_DIRS), \ + $(REFPOLICY_COPY_EXTRA_MODULES) + ) + $(REFPOLICY_MAKE) -C $(@D) bare conf + $(REFPOLICY_CONFIGURE_MODULES) endef define REFPOLICY_BUILD_CMDS - $(REFPOLICY_MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) bare conf + $(REFPOLICY_MAKE) -C $(@D) policy endef define REFPOLICY_INSTALL_STAGING_CMDS diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index 7a82bda370..1869100188 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 cbf9820583e641ee0462fa7bc89e6024676af281e025703e17b2d019b1a25a4f restorecond-2.9.tar.gz +sha256 471c17e64aa6d7226e861d4d0125d15fdf9b38892c542be32bd83d999e5e75f5 restorecond-3.2.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index c519b5de2b..d08e0a722e 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,8 +4,8 @@ # ################################################################################ -RESTORECOND_VERSION = 2.9 -RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +RESTORECOND_VERSION = 3.2 +RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION) RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = COPYING diff --git a/package/rhash/Config.in b/package/rhash/Config.in index 2ddcb00feb..35ccb3833e 100644 --- a/package/rhash/Config.in +++ b/package/rhash/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RHASH bool "rhash" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help LibRHash is a professional, portable, thread-safe C library for computing a wide variety of hash sums, such as CRC32, diff --git a/package/rhash/rhash.hash b/package/rhash/rhash.hash index 9a29b988a6..e0555af3c2 100644 --- a/package/rhash/rhash.hash +++ b/package/rhash/rhash.hash @@ -1,6 +1,5 @@ -# From https://sourceforge.net/projects/rhash/files/rhash/1.3.5/ -md5 f586644019c10c83c6b6835de4b99e74 rhash-1.3.5-src.tar.gz -sha1 990c9a0135afe48dee4ce1dbf83578e44735f302 rhash-1.3.5-src.tar.gz +# From https://sourceforge.net/projects/rhash/files/rhash/1.4.2/ +sha1 fdb0b0c16f3ba3eba734b3adf9f2fc4c427ff987 rhash-1.4.2-src.tar.gz # Locally calculated -sha256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e rhash-1.3.5-src.tar.gz -sha256 8cf876d3406a2eed6c17ae804c8958bd78d3a0f63c30d6e2e789ab575e9fde40 COPYING +sha256 600d00f5f91ef04194d50903d3c79412099328c42f28ff43a0bdb777b00bec62 rhash-1.4.2-src.tar.gz +sha256 953e55838353335148c90b5a38a4894292680b1d4c37228ffddddbf18ce54bf5 COPYING diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 28fffe4528..d19c355cbb 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -4,26 +4,37 @@ # ################################################################################ -RHASH_VERSION = 1.3.5 +RHASH_VERSION = 1.4.2 RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION) -RHASH_LICENSE = MIT +RHASH_LICENSE = 0BSD RHASH_LICENSE_FILES = COPYING +RHASH_CPE_ID_VENDOR = rhash_project RHASH_INSTALL_STAGING = YES RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) -RHASH_ADDCFLAGS = $(if $(BR2_SYSTEM_ENABLE_NLS),-DUSE_GETTEXT) -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) -RHASH_DEPENDENCIES += openssl -RHASH_ADDCFLAGS += -DOPENSSL_RUNTIME -rdynamic -RHASH_ADDLDFLAGS += -ldl +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +RHASH_CONF_OPTS += --disable-gettext +else +RHASH_CONF_OPTS += --enable-gettext endif -RHASH_MAKE_OPTS = \ - ADDCFLAGS="$(RHASH_ADDCFLAGS)" \ - ADDLDFLAGS="$(RHASH_ADDLDFLAGS)" \ - PREFIX="/usr" +ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +RHASH_CONF_OPTS += --enable-openssl +RHASH_DEPENDENCIES += openssl +else +RHASH_CONF_OPTS += --disable-openssl +endif + +define RHASH_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure \ + --prefix=/usr \ + --cc=$(TARGET_CC) \ + --target=$(GNU_TARGET_NAME) \ + $(RHASH_CONF_OPTS) \ + ) +endef ifeq ($(BR2_SHARED_LIBS),y) RHASH_BUILD_TARGETS = lib-shared build-shared @@ -44,13 +55,13 @@ endef define RHASH_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/librhash \ DESTDIR="$(STAGING_DIR)" $(RHASH_MAKE_OPTS) $(RHASH_INSTALL_TARGETS) \ - install-headers + install-lib-headers endef ifeq ($(BR2_PACKAGE_RHASH_BIN),y) define RHASH_INSTALL_TARGET_RHASH_BIN $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR="$(TARGET_DIR)" $(RHASH_MAKE_OPTS) install-shared + DESTDIR="$(TARGET_DIR)" $(RHASH_MAKE_OPTS) build-install-binary endef endif diff --git a/package/ripgrep/Config.in b/package/ripgrep/Config.in index 5446ad046c..0ea2902b34 100644 --- a/package/ripgrep/Config.in +++ b/package/ripgrep/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_RIPGREP bool "ripgrep" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - select BR2_PACKAGE_HOST_CARGO + select BR2_PACKAGE_HOST_RUSTC help ripgrep is a line-oriented search tool that recursively searches your current directory diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 0bb7017a96..8d0185595d 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -8,18 +8,30 @@ RIPGREP_VERSION = 0.8.1 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT +RIPGREP_CPE_ID_VENDOR = ripgrep_project -RIPGREP_DEPENDENCIES = host-cargo -RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo -RIPGREP_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release) +# CVE only impacts ripgrep on Windows +RIPGREP_IGNORE_CVES += CVE-2021-3013 -RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_MODE) +RIPGREP_DEPENDENCIES = host-rustc +RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo \ + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_TARGET_APPLIES_TO_HOST="false" + +RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_BIN_SUBDIR) RIPGREP_CARGO_OPTS = \ - --$(RIPGREP_CARGO_MODE) \ + -Z target-applies-to-host \ --target=$(RUSTC_TARGET_NAME) \ --manifest-path=$(@D)/Cargo.toml +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) +RIPGREP_CARGO_BIN_SUBDIR = debug +else +RIPGREP_CARGO_OPTS += --release +RIPGREP_CARGO_BIN_SUBDIR = release +endif + define RIPGREP_BUILD_CMDS $(TARGET_MAKE_ENV) $(RIPGREP_CARGO_ENV) \ cargo build $(RIPGREP_CARGO_OPTS) diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in index 25b41f40d6..0dd269c818 100644 --- a/package/rng-tools/Config.in +++ b/package/rng-tools/Config.in @@ -3,8 +3,6 @@ config BR2_PACKAGE_RNG_TOOLS # pthread_setaffinity_np depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_JITTERENTROPY_LIBRARY - select BR2_PACKAGE_LIBSYSFS select BR2_PACKAGE_OPENSSL help Daemon to use hardware random number generators. @@ -13,6 +11,17 @@ config BR2_PACKAGE_RNG_TOOLS if BR2_PACKAGE_RNG_TOOLS +config BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY + bool "Jitterentropy Library support" + default y + select BR2_PACKAGE_JITTERENTROPY_LIBRARY + help + Enable Jitterentropy Library support. + + The Jitter RNG provides a noise source using the CPU + execution timing jitter. It does not depend on any + system resource other than a high-resolution time stamp. + config BR2_PACKAGE_RNG_TOOLS_NISTBEACON bool "NIST Entropy Beacon support" select BR2_PACKAGE_JANSSON diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index 3202a88d67..6806a99fc6 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2e462821aaa7d6dc24646aa0d2239d97cb8b07b3e60715159a9edcaa9189f8ef rng-tools-6.10.tar.gz +sha256 4dd86f6ae37d917a8489f44070d39d7feddcc622429b95efd7aa85a1f3cfdf81 rng-tools-6.14.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 3baddb98ee..8db97569d4 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,11 +4,14 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.10 +RNG_TOOLS_VERSION = 6.14 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING -RNG_TOOLS_DEPENDENCIES = libsysfs jitterentropy-library host-pkgconf openssl +RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project +RNG_TOOLS_SELINUX_MODULES = rngd + +RNG_TOOLS_DEPENDENCIES = host-pkgconf openssl # From git RNG_TOOLS_AUTORECONF = YES @@ -28,6 +31,13 @@ else RNG_TOOLS_CONF_OPTS += --without-rtlsdr endif +ifeq ($(BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY),y) +RNG_TOOLS_DEPENDENCIES += jitterentropy-library +RNG_TOOLS_CONF_OPTS += --enable-jitterentropy +else +RNG_TOOLS_CONF_OPTS += --disable-jitterentropy +endif + ifeq ($(BR2_PACKAGE_RNG_TOOLS_NISTBEACON),y) RNG_TOOLS_DEPENDENCIES += jansson libcurl libxml2 RNG_TOOLS_CONF_OPTS += --with-nistbeacon diff --git a/package/rocksdb/Config.in b/package/rocksdb/Config.in index c55170c1d2..a706384aec 100644 --- a/package/rocksdb/Config.in +++ b/package/rocksdb/Config.in @@ -1,5 +1,13 @@ +config BR2_PACKAGE_ROCKSDB_ARCH_SUPPORTS + bool + # see utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_powerpc64 || BR2_powerpc64le + config BR2_PACKAGE_ROCKSDB bool "rocksdb" + depends on BR2_PACKAGE_ROCKSDB_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS @@ -18,9 +26,11 @@ config BR2_PACKAGE_ROCKSDB http://rocksdb.org comment "rocksdb needs a toolchain w/ C++, threads, wchar, gcc >= 4.8" + depends on BR2_PACKAGE_ROCKSDB_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 comment "rocksdb needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_ROCKSDB_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/rocksdb/rocksdb.hash b/package/rocksdb/rocksdb.hash index 2e4071298e..935b498c55 100644 --- a/package/rocksdb/rocksdb.hash +++ b/package/rocksdb/rocksdb.hash @@ -1,8 +1,8 @@ # Locally computed: -sha256 feab859ee355fbe7beffd7085904b63f560417f450f83cc34310e6dadff936f6 rocksdb-6.6.4.tar.gz +sha256 c6502c7aae641b7e20fafa6c2b92273d935d2b7b2707135ebd9a67b092169dca rocksdb-6.20.3.tar.gz # Hash for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.Apache -sha256 b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485 LICENSE.leveldb -sha256 112d88749baec5ddecba47057216465e91e22352aac7677c50bd237a27614083 README.md +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.Apache +sha256 b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485 LICENSE.leveldb +sha256 e62e4f73402cf6a16969673f0b7eb46bc91782e50a2afe400dd0157547bc09f0 README.md diff --git a/package/rocksdb/rocksdb.mk b/package/rocksdb/rocksdb.mk index 31a9f98b55..c355d0012d 100644 --- a/package/rocksdb/rocksdb.mk +++ b/package/rocksdb/rocksdb.mk @@ -4,13 +4,15 @@ # ################################################################################ -ROCKSDB_VERSION = 6.6.4 +ROCKSDB_VERSION = 6.20.3 ROCKSDB_SITE = $(call github,facebook,rocksdb,v$(ROCKSDB_VERSION)) ROCKSDB_LICENSE = GPL-2.0 or Apache-2.0 ROCKSDB_LICENSE_FILES = COPYING LICENSE.Apache LICENSE.leveldb README.md ROCKSDB_INSTALL_STAGING = YES -ROCKSDB_MAKE_OPTS = PORTABLE=1 +ROCKSDB_MAKE_OPTS = \ + PORTABLE=1 \ + PREFIX=/usr # Internal error, aborting at dwarf2cfi.c:2802 in connect_traces # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 @@ -67,6 +69,12 @@ else ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_ZSTD=1 endif +ifeq ($(BR2_GCC_ENABLE_LTO),y) +ROCKSDB_MAKE_OPTS += USE_LTO=1 +else +ROCKSDB_MAKE_OPTS += USE_LTO=0 +endif + ifeq ($(BR2_STATIC_LIBS),y) ROCKSDB_BUILD_TARGETS += static_lib ROCKSDB_INSTALL_TARGETS += install-static @@ -88,12 +96,12 @@ endef define ROCKSDB_INSTALL_STAGING_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ROCKSDB_MAKE_OPTS) -C $(@D) \ - INSTALL_PATH=$(STAGING_DIR) $(ROCKSDB_INSTALL_TARGETS) + DESTDIR=$(STAGING_DIR) $(ROCKSDB_INSTALL_TARGETS) endef define ROCKSDB_INSTALL_TARGET_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ROCKSDB_MAKE_OPTS) -C $(@D) \ - INSTALL_PATH=$(TARGET_DIR) $(ROCKSDB_INSTALL_TARGETS) + DESTDIR=$(TARGET_DIR) $(ROCKSDB_INSTALL_TARGETS) endef $(eval $(generic-package)) diff --git a/package/rp-pppoe/rp-pppoe.hash b/package/rp-pppoe/rp-pppoe.hash index 3f7af60558..806bab1b0f 100644 --- a/package/rp-pppoe/rp-pppoe.hash +++ b/package/rp-pppoe/rp-pppoe.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2 rp-pppoe-3.12.tar.gz +sha256 7825232f64ab4d618ef074d62d145ae43d6edc91b9a718c6130a4742bac40e2a rp-pppoe-3.14.tar.gz # Locally computed sha256 464006ba771074f4022db14f58a29a0b447b6fdde9529cf0331be396b6279162 doc/LICENSE diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk index 4214df929f..ce85da11e4 100644 --- a/package/rp-pppoe/rp-pppoe.mk +++ b/package/rp-pppoe/rp-pppoe.mk @@ -4,10 +4,12 @@ # ################################################################################ -RP_PPPOE_VERSION = 3.12 -RP_PPPOE_SITE = http://www.roaringpenguin.com/files/download +RP_PPPOE_VERSION = 3.14 +RP_PPPOE_SITE = https://dianne.skoll.ca/projects/rp-pppoe/download RP_PPPOE_LICENSE = GPL-2.0 RP_PPPOE_LICENSE_FILES = doc/LICENSE +RP_PPPOE_CPE_ID_VENDOR = rp-pppoe_project + RP_PPPOE_DEPENDENCIES = pppd RP_PPPOE_SUBDIR = src RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff diff --git a/package/rpcbind/0001-Remove-yellow-pages-support.patch b/package/rpcbind/0001-Remove-yellow-pages-support.patch index 314e32e9c8..694f1ac9de 100644 --- a/package/rpcbind/0001-Remove-yellow-pages-support.patch +++ b/package/rpcbind/0001-Remove-yellow-pages-support.patch @@ -8,25 +8,17 @@ available. As most Buildroot users are most likely never going to need such feature, get rid of it. Signed-off-by: Thomas Petazzoni +[ rebased for 1.2.6 ] +Signed-off-by: Petr Vorel --- - src/security.c | 18 ------------------ - 1 file changed, 18 deletions(-) + src/security.c | 15 --------------- + 1 file changed, 15 deletions(-) diff --git a/src/security.c b/src/security.c -index 0c9453f..abc81bb 100644 +index 38967dd..0a70635 100644 --- a/src/security.c +++ b/src/security.c -@@ -24,9 +24,6 @@ - #include - #include - #include --#include --#include --#include - #else - # define MOUNTPROC_MNT 1 - # define MOUNTPROC_UMNT 3 -@@ -325,24 +322,9 @@ check_callit(SVCXPRT *xprt, struct r_rmtcall_args *args, int versnum /*__unused* +@@ -318,24 +318,9 @@ check_callit(SVCXPRT *xprt, struct r_rmtcall_args *args, int versnum /*__unused* args->rmt_proc != MOUNTPROC_UMNT) break; goto deny; @@ -52,5 +44,5 @@ index 0c9453f..abc81bb 100644 break; } -- -2.4.5 +2.31.1 diff --git a/package/rpcbind/rpcbind.hash b/package/rpcbind/rpcbind.hash index 1960b86c13..6ab7d89265 100644 --- a/package/rpcbind/rpcbind.hash +++ b/package/rpcbind/rpcbind.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2ce360683963b35c19c43f0ee2c7f18aa5b81ef41c3fdbd15ffcb00b8bffda7a rpcbind-1.2.5.tar.bz2 +sha256 5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de rpcbind-1.2.6.tar.bz2 sha256 2b9477d2f4ab277b29702958f0058546edc120aae4b5fb8b8d1a9652104e1ba3 COPYING diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk index cce84cfa88..2eee116755 100644 --- a/package/rpcbind/rpcbind.mk +++ b/package/rpcbind/rpcbind.mk @@ -4,11 +4,13 @@ # ################################################################################ -RPCBIND_VERSION = 1.2.5 +RPCBIND_VERSION = 1.2.6 RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION) RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2 RPCBIND_LICENSE = BSD-3-Clause RPCBIND_LICENSE_FILES = COPYING +RPCBIND_CPE_ID_VENDOR = rpcbind_project +RPCBIND_SELINUX_MODULES = rpcbind RPCBIND_CONF_ENV += \ CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" @@ -16,19 +18,13 @@ RPCBIND_DEPENDENCIES += libtirpc host-pkgconf RPCBIND_CONF_OPTS += --with-rpcuser=root ifeq ($(BR2_INIT_SYSTEMD),y) -RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system +RPCBIND_CONF_OPTS += --enable-warmstarts \ + --with-systemdsystemunitdir=/usr/lib/systemd/system RPCBIND_DEPENDENCIES += systemd else RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no endif -define RPCBIND_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 0644 -D package/rpcbind/rpcbind.service \ - $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.service - $(INSTALL) -m 0644 -D package/rpcbind/rpcbind.socket \ - $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.socket -endef - define RPCBIND_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/rpcbind/S30rpcbind \ $(TARGET_DIR)/etc/init.d/S30rpcbind diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash index 6e88552544..2520c91cff 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-bt-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz +sha256 ae665baa465a09dddf7f4bdec67e108a74b2a3787550cc9ee53c2bea9651f327 rpi-bt-firmware-4c47758bed7cd547dff3618a1739dcf64b5a52a7.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk index 785f007cc3..f63564de99 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 +RPI_BT_FIRMWARE_VERSION = 4c47758bed7cd547dff3618a1739dcf64b5a52a7 RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index 7cebc5e7ca..f5a25c5680 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -62,11 +62,12 @@ endchoice config BR2_PACKAGE_RPI_FIRMWARE_BOOT string - default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT + default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI + default "4" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI - default "x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 + default "4x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI - default "cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 + default "4cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS bool "Install Device Tree Blobs (DTBs)" @@ -85,6 +86,8 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS default y depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS \ || BR2_LINUX_KERNEL_DTS_SUPPORT + select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT \ + if BR2_LINUX_KERNEL_DTS_SUPPORT help Say 'y' here if you need to load one or more of the DTB overlays, to support HATs (Hardware Attached on Top, add-on diff --git a/package/rpi-firmware/config.txt b/package/rpi-firmware/config.txt index 58cc966a87..4a92a4dd95 100644 --- a/package/rpi-firmware/config.txt +++ b/package/rpi-firmware/config.txt @@ -4,6 +4,11 @@ # See http://buildroot.org/manual.html#rootfs-custom # and http://elinux.org/RPiconfig for a description of config.txt syntax +# We always use the same names, the real used variant is selected by +# BR2_PACKAGE_RPI_FIRMWARE_{DEFAULT,X,CD} choice +start_file=start.elf +fixup_file=fixup.dat + kernel=zImage # To use an external initramfs file diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index dc059e615e..7127b2d824 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0596505f529677906fed30e6c3c1d2387a5d287f668a719484e2f9d8a3059176 rpi-firmware-5574077183389cd4c65077ba18b59144ed6ccd6d.tar.gz +sha256 5eaff5da660d6ecd74bb2c927d7a1ba84b5e5c5582f02e65aec058af2ffe50f4 rpi-firmware-33e09977ff3b02967d191801e3361224455acb9d.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 6ad67ab0e5..181650fa08 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 5574077183389cd4c65077ba18b59144ed6ccd6d +RPI_FIRMWARE_VERSION = 33e09977ff3b02967d191801e3361224455acb9d RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom @@ -41,24 +41,19 @@ define RPI_FIRMWARE_INSTALL_TARGET_CMDS endef endif # INSTALL_VCDBG -ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4),y) +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI),y) # bootcode.bin is not used on rpi4, because it has been replaced by boot code in the onboard EEPROM -define RPI_FIRMWARE_INSTALL_BOOT - $(INSTALL) -D -m 0644 $(@D)/boot/start4$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start4.elf - $(INSTALL) -D -m 0644 $(@D)/boot/fixup4$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup4.dat -endef -else -define RPI_FIRMWARE_INSTALL_BOOT +define RPI_FIRMWARE_INSTALL_BOOTCODE_BIN $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin - $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf - $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat endef endif define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt - $(RPI_FIRMWARE_INSTALL_BOOT) + $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf + $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat + $(RPI_FIRMWARE_INSTALL_BOOTCODE_BIN) $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) endef diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index 4a10536e74..4a0a8cb9d0 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f81fe28c636178645fb406cc87f543efa828ca896df856536f7b1b4ab54dfe0e rpi-userland-6fb59736b1ae80fc62cddfe3309c800f72e1c07e.tar.gz +sha256 d67def03931215f41b741aed5a3a1bc2bd62fa33f5cc14692e9a4d65f2e0ea27 rpi-userland-97bc8180ad682b004ea224d1db7b8e108eda4397.tar.gz sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index efb02f719f..4f249d7bb8 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = 6fb59736b1ae80fc62cddfe3309c800f72e1c07e +RPI_USERLAND_VERSION = 97bc8180ad682b004ea224d1db7b8e108eda4397 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash index b8931d2c45..4db3e15c80 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 ae665baa465a09dddf7f4bdec67e108a74b2a3787550cc9ee53c2bea9651f327 rpi-wifi-firmware-4c47758bed7cd547dff3618a1739dcf64b5a52a7.tar.gz +sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk index 6be02509fe..a643c4df9c 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 +RPI_WIFI_FIRMWARE_VERSION = 4c47758bed7cd547dff3618a1739dcf64b5a52a7 RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx diff --git a/package/rpm/Config.in b/package/rpm/Config.in index fc702c3097..ac979fdbad 100644 --- a/package/rpm/Config.in +++ b/package/rpm/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_RPM depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_BEECRYPT if !BR2_PACKAGE_LIBGCRYPT && !BR2_PACKAGE_LIBNSS && !BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_BERKELEYDB select BR2_PACKAGE_FILE select BR2_PACKAGE_POPT select BR2_PACKAGE_ZLIB diff --git a/package/rpm/rpm.hash b/package/rpm/rpm.hash index cdb20e3b8f..9389f8290f 100644 --- a/package/rpm/rpm.hash +++ b/package/rpm/rpm.hash @@ -1,5 +1,5 @@ -# From https://rpm.org/wiki/Releases/4.15.1.html -sha256 ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230 rpm-4.15.1.tar.bz2 +# From https://rpm.org/wiki/Releases/4.16.1.3.html +sha256 513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d rpm-4.16.1.3.tar.bz2 # Hash for license file -sha256 d56f4f1f290f6920cb053aef0dbcd0b853cda289e2568b364ddbfce220a6f3e0 COPYING +sha256 171d94d9f1641316bff7f157a903237dc69cdb5fca405fed8c832c76ed8370f9 COPYING diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index d29c3febaa..0d8c14a09e 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -4,13 +4,12 @@ # ################################################################################ -RPM_VERSION_MAJOR = 4.15 -RPM_VERSION = $(RPM_VERSION_MAJOR).1 +RPM_VERSION_MAJOR = 4.16 +RPM_VERSION = $(RPM_VERSION_MAJOR).1.3 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x RPM_DEPENDENCIES = \ host-pkgconf \ - berkeleydb \ $(if $(BR2_PACKAGE_BZIP2),bzip2) \ $(if $(BR2_PACKAGE_ELFUTILS),elfutils) \ file \ @@ -20,9 +19,11 @@ RPM_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only) RPM_LICENSE_FILES = COPYING -# We're patching configure.ac -RPM_AUTORECONF = YES +RPM_CPE_ID_VENDOR = rpm +# Don't set --{dis,en}-openmp as upstream wants to abort the build if +# --enable-openmp is provided and OpenMP is < 4.5: +# https://github.com/rpm-software-management/rpm/pull/1433 RPM_CONF_OPTS = \ --disable-python \ --disable-rpath \ @@ -38,6 +39,13 @@ else RPM_CONF_OPTS += --without-acl endif +ifeq ($(BR2_PACKAGE_BERKELEYDB),y) +RPM_DEPENDENCIES += berkeleydb +RPM_CONF_OPTS += --enable-bdb +else +RPM_CONF_OPTS += --disable-bdb +endif + ifeq ($(BR2_PACKAGE_DBUS),y) RPM_DEPENDENCIES += dbus RPM_CONF_OPTS += --enable-plugins @@ -88,6 +96,13 @@ else RPM_CONF_OPTS += --without-selinux endif +ifeq ($(BR2_PACKAGE_SQLITE),y) +RPM_DEPENDENCIES += sqlite +RPM_CONF_OPTS += --enable-sqlite +else +RPM_CONF_OPTS += --disable-sqlite +endif + ifeq ($(BR2_PACKAGE_ZSTD),y) RPM_DEPENDENCIES += zstd RPM_CONF_OPTS += --enable-zstd @@ -95,12 +110,6 @@ else RPM_CONF_OPTS += --disable-zstd endif -ifeq ($(BR2_TOOLCHAIN_HAS_OPENMP),y) -RPM_CONF_OPTS += --enable-openmp -else -RPM_CONF_OPTS += --disable-openmp -endif - # ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`). RPM_CONF_ENV = \ ac_cv_prog_cc_c99='-std=gnu99' \ diff --git a/package/rsh-redone/Config.in b/package/rsh-redone/Config.in index 1335c85739..53ff2bea7f 100644 --- a/package/rsh-redone/Config.in +++ b/package/rsh-redone/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_RSH_REDONE_RLOGIND bool "rlogind" depends on !BR2_STATIC_LIBS depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam + depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU # linux-pam select BR2_PACKAGE_LINUX_PAM @@ -32,12 +32,11 @@ config BR2_PACKAGE_RSH_REDONE_RSHD bool "rshd" depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # linux-pam select BR2_PACKAGE_LINUX_PAM -comment "rshd needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "rshd needs a toolchain w/ wchar, locale, dynamic library" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS endif diff --git a/package/rsh-redone/rsh-redone.mk b/package/rsh-redone/rsh-redone.mk index f63da648ce..5ac12811b9 100644 --- a/package/rsh-redone/rsh-redone.mk +++ b/package/rsh-redone/rsh-redone.mk @@ -21,7 +21,7 @@ RSH_REDONE_MAKE_FLAGS = \ BIN="$(RSH_REDONE_BINS-y)" SBIN="$(RSH_REDONE_SBINS-y)" ifneq ($(BR2_PACKAGE_RSH_REDONE_RSHD)$(BR2_PACKAGE_RSH_REDONE_RLOGIND),) -RSH_REDONE_DEPENDENCIES = linux-pam +RSH_REDONE_DEPENDENCIES += linux-pam endif define RSH_REDONE_BUILD_CMDS diff --git a/package/rsync/rsync.hash b/package/rsync/rsync.hash index 2da62a18f1..92f6156ba8 100644 --- a/package/rsync/rsync.hash +++ b/package/rsync/rsync.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/rsync/src/rsync-3.1.3.tar.gz.asc -sha256 55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0 rsync-3.1.3.tar.gz +# https://download.samba.org/pub/rsync/src/rsync-3.2.3.tar.gz.asc +sha256 becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e rsync-3.2.3.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 0d33aa97d302cb9df27f99dfa28d58001c2479a02317956f1a7a890f3937a976 COPYING diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 52875e428a..5b51ca1df7 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -4,14 +4,25 @@ # ################################################################################ -RSYNC_VERSION = 3.1.3 +RSYNC_VERSION = 3.2.3 RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src -RSYNC_LICENSE = GPL-3.0+ +RSYNC_LICENSE = GPL-3.0+ with exceptions RSYNC_LICENSE_FILES = COPYING +RSYNC_CPE_ID_VENDOR = samba +RSYNC_SELINUX_MODULES = rsync RSYNC_DEPENDENCIES = zlib popt RSYNC_CONF_OPTS = \ --with-included-zlib=no \ - --with-included-popt=no + --with-included-popt=no \ + --disable-simd \ + --disable-openssl \ + --disable-xxhash \ + --disable-zstd \ + --disable-lz4 \ + --disable-asm + +# 0001-rsync-ssl-Verify-the-hostname-in-the-certificate-when-using-openssl.patch +RSYNC_IGNORE_CVES += CVE-2020-14387 ifeq ($(BR2_PACKAGE_ACL),y) RSYNC_DEPENDENCIES += acl diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 22372a92a7..f404098439 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,7 +1,7 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 e1f4776b1c62ad7220f4d624a89a96b0c3d4738006899356eaaef0f1f91ee104 rsyslog-8.1911.0.tar.gz +sha256 19b232f765c4ba7a35b91ef1f5f9af775f6ff78ef56bb7737a2ce79ccbb32b98 rsyslog-8.2010.0.tar.gz # Locally calculated -sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING -sha256 8743ad560dea1229d4f46cd603e10874db41a27f3c74f64e958ef123f3943fab COPYING.ASL20 -sha256 4038442ca5bde8ffd243cfc235cb4455e7d618d47558ea3d8284733f71d904ed COPYING.LESSER +sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING +sha256 8743ad560dea1229d4f46cd603e10874db41a27f3c74f64e958ef123f3943fab COPYING.ASL20 +sha256 4038442ca5bde8ffd243cfc235cb4455e7d618d47558ea3d8284733f71d904ed COPYING.LESSER diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index c4446c210d..6cf53ccb82 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,16 +4,27 @@ # ################################################################################ -RSYSLOG_VERSION = 8.1911.0 +RSYSLOG_VERSION = 8.2010.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 +RSYSLOG_CPE_ID_VENDOR = rsyslog +# rsyslog uses weak permissions for generating log files. +# Ignoring this CVE as Buildroot normally doesn't have local users and a build +# could customize the rsyslog.conf to be more restrictive ($FileCreateMode 0640) +RSYSLOG_IGNORE_CVES += CVE-2015-3243 RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99' RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \ mmanon mmaudit mmfields mmjsonparse mmpstrucdata mmsequence mmutf8fix \ mail omprog omruleset omstdout omuxsock \ pmaixforwardedfrom pmciscoios pmcisconames pmlastmsg pmsnare + +ifeq ($(BR2_PACKAGE_LIBRELP),y) +RSYSLOG_DEPENDENCIES += librelp +RSYSLOG_PLUGINS += relp +endif + RSYSLOG_CONF_OPTS = --disable-generate-man-pages \ $(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x)) @@ -26,6 +37,13 @@ RSYSLOG_CONF_OPTS += --disable-elasticsearch \ --disable-omhttpfs \ --disable-mmkubernetes +ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) +RSYSLOG_DEPENDENCIES += civetweb +RSYSLOG_CONF_OPTS += --enable-imhttp +else +RSYSLOG_CONF_OPTS += --disable-imhttp +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) RSYSLOG_DEPENDENCIES += gnutls RSYSLOG_CONF_OPTS += --enable-gnutls @@ -45,6 +63,13 @@ else RSYSLOG_CONF_OPTS += --disable-libgcrypt endif +ifeq ($(BR2_PACKAGE_LIBPCAP),y) +RSYSLOG_DEPENDENCIES += libpcap +RSYSLOG_CONF_OPTS += --enable-impcap +else +RSYSLOG_CONF_OPTS += --disable-impcap +endif + ifeq ($(BR2_PACKAGE_MYSQL),y) RSYSLOG_DEPENDENCIES += mysql RSYSLOG_CONF_OPTS += --enable-mysql @@ -80,6 +105,11 @@ RSYSLOG_CONF_OPTS += \ --disable-omjournal endif +define RSYSLOG_INSTALL_INIT_SYSTEMD + $(INSTALL) -m 0755 -D package/rsyslog/rsyslog.service \ + $(TARGET_DIR)/usr/lib/systemd/system/rsyslog.service +endef + define RSYSLOG_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/rsyslog/S01rsyslogd \ $(TARGET_DIR)/etc/init.d/S01rsyslogd diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in index 23e911b9fd..477fa288d7 100644 --- a/package/rt-tests/Config.in +++ b/package/rt-tests/Config.in @@ -2,9 +2,10 @@ config BR2_PACKAGE_RT_TESTS bool "rt-tests" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # deadline scheduler syscall - depends on BR2_USE_MMU # fork() + depends on BR2_USE_MMU # fork(), numactl depends on !BR2_STATIC_LIBS # dlopen depends on !BR2_TOOLCHAIN_USES_MUSL # cyclictest + select BR2_PACKAGE_NUMACTL help Set of utilities for testing the real-time behaviour of a Linux system. @@ -21,7 +22,7 @@ config BR2_PACKAGE_RT_TESTS case with uClibc toolchains, since the thread implementation is configurable). - http://rt.wiki.kernel.org + https://wiki.linuxfoundation.org/realtime/documentation/howto/tools/rt-tests comment "rt-tests may not work on MIPS with an external uClibc toolchain" depends on BR2_PACKAGE_RT_TESTS diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash index 7da6ed2c30..f56500c26e 100644 --- a/package/rt-tests/rt-tests.hash +++ b/package/rt-tests/rt-tests.hash @@ -1,3 +1,4 @@ +# From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc +sha256 3740ad97b164a1cd77d9ee32bba23a4a0b2495a76468bcf40ff60b55c2a3a709 rt-tests-1.10.tar.xz # locally computed hash -sha256 bcb94448324116f29c248b14a6051c7ab72a0135234e714685a2a3a3e7d531f8 rt-tests-1.6.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index abc32f4fb2..0d959bda31 100644 --- a/package/rt-tests/rt-tests.mk +++ b/package/rt-tests/rt-tests.mk @@ -6,13 +6,12 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 1.6 +RT_TESTS_VERSION = 1.10 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_PYTHON3),y) -RT_TESTS_DEPENDENCIES = python3 -endif +RT_TESTS_DEPENDENCIES = numactl +RT_TESTS_CPE_ID_VENDOR = kernel define RT_TESTS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ diff --git a/package/rtc-tools/rtc-tools.hash b/package/rtc-tools/rtc-tools.hash index 81be1afe4e..a14dcb3e6e 100644 --- a/package/rtc-tools/rtc-tools.hash +++ b/package/rtc-tools/rtc-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 152d8455bae5ad672e99bb91dfbed5b8b4bd8b0325146d1cf1c4d80b6e0d8a16 rtc-tools-33ef4aa1c92b0c92a351284d93d1ac5570de9cc7.tar.gz -sha256 7ae50a5344af14d6231aff6814632a220b3127da4099aea2c6070fd79c407c1a COPYING +sha256 8614e140b04da3dbb787760bdb0fe2ac5fe8907f5d3e9a74c6713e3d17fc3650 rtc-tools-33ef4aa1c92b0c92a351284d93d1ac5570de9cc7-br1.tar.gz +sha256 7ae50a5344af14d6231aff6814632a220b3127da4099aea2c6070fd79c407c1a COPYING diff --git a/package/rtl8188eu/rtl8188eu.hash b/package/rtl8188eu/rtl8188eu.hash index 88c128aa35..37767f5d16 100644 --- a/package/rtl8188eu/rtl8188eu.hash +++ b/package/rtl8188eu/rtl8188eu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cc872aa0991c044d35abfcc81543bad950c6aae487e37d5a09d1cbf8c4cb3058 rtl8188eu-4b0ecca485b9f11f58670b69aa9f90ecad7da02f.tar.gz +sha256 b2b06c842bccd730d68a26b1c1b5a24f18373401e907147bf5e775fa42a36bbb rtl8188eu-60cb0b5a3cfc95e3f2e6fc294a28d987096b0559.tar.gz sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/package/rtl8188eu/rtl8188eu.mk b/package/rtl8188eu/rtl8188eu.mk index f292bba134..b2066080f3 100644 --- a/package/rtl8188eu/rtl8188eu.mk +++ b/package/rtl8188eu/rtl8188eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8188EU_VERSION = 4b0ecca485b9f11f58670b69aa9f90ecad7da02f +RTL8188EU_VERSION = 60cb0b5a3cfc95e3f2e6fc294a28d987096b0559 RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob) RTL8188EU_LICENSE_FILES = COPYING diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index f1524a6fcc..f42799b48e 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f3f8bcc1e75f095350f12c36f7b8af88eebf3913d4bc921083489f1758cb5068 rtl8189fs-54bd6808e38f213126e7d6447ae9d80c656179f3.tar.gz +sha256 7d425e18ebc427b3df5ff31185b4dc29c6bfd54f8e167f57c2254cea341a26c6 rtl8189fs-62c31d577c385316bb99107f60e63169dacc37db.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 39122bc786..4112b135ad 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = 54bd6808e38f213126e7d6447ae9d80c656179f3 +RTL8189FS_VERSION = 62c31d577c385316bb99107f60e63169dacc37db RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index ef4eddaa63..04bc776a07 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 da04cffc306d9738abdc67d234b8948db6ca97ed77760c68d99d18817839a513 rtl8723bu-b922079a090dcaad58179d478442ff97f18521c9.tar.gz +sha256 4c7314dccebda1e55ec8dcf0d5ca8915c2490d17a9f56923f25e6e0e945c10cc rtl8723bu-9ce1c38439f4f574bb7adaf33949835c25536a28.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index 942b13bbf6..c35fad5832 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = b922079a090dcaad58179d478442ff97f18521c9 +RTL8723BU_VERSION = 9ce1c38439f4f574bb7adaf33949835c25536a28 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) diff --git a/package/rtmpdump/rtmpdump.hash b/package/rtmpdump/rtmpdump.hash index 6e85a58419..54dbbc35d7 100644 --- a/package/rtmpdump/rtmpdump.hash +++ b/package/rtmpdump/rtmpdump.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b98fceba5155c5a1ee3f26550ea94144c72d8b8c5a050c213bb55dab330ad6ff rtmpdump-c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -sha256 03fe7ca91cc28e99b4003d5b3bd4ce3b084d4c475fdf9975cf0e7fdf4dc739cd librtmp/COPYING +sha256 e362202d94b92632b17abc7ef909afc56de06a2cb40e308edfad901d799bbd9c rtmpdump-c5f04a58fc2aeea6296ca7c44ee4734c18401aa3-br1.tar.gz +sha256 03fe7ca91cc28e99b4003d5b3bd4ce3b084d4c475fdf9975cf0e7fdf4dc739cd librtmp/COPYING diff --git a/package/rtmpdump/rtmpdump.mk b/package/rtmpdump/rtmpdump.mk index bc68b7a836..db79a796dc 100644 --- a/package/rtmpdump/rtmpdump.mk +++ b/package/rtmpdump/rtmpdump.mk @@ -11,6 +11,7 @@ RTMPDUMP_INSTALL_STAGING = YES # care about librtmp, it's LGPL-2.1+ RTMPDUMP_LICENSE = LGPL-2.1+ RTMPDUMP_LICENSE_FILES = librtmp/COPYING +RTMPDUMP_CPE_ID_VENDOR = rtmpdump_project RTMPDUMP_DEPENDENCIES = zlib ifeq ($(BR2_PACKAGE_GNUTLS),y) diff --git a/package/rtty/rtty.hash b/package/rtty/rtty.hash index feaac4762d..b2e9db2436 100644 --- a/package/rtty/rtty.hash +++ b/package/rtty/rtty.hash @@ -1,2 +1,2 @@ -sha256 e10ee2048a29e18e6b21c77cb9cf7772eb95646e69567f8b40e85b816d93a3fa rtty-7.1.3.tar.gz +sha256 9bc5d30dfa9bd664a62711b6229f47505b83adb364907f24e3a404aad52a4802 rtty-7.4.0.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index 0b787a6353..4ec220394c 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTTY_VERSION = 7.1.3 +RTTY_VERSION = 7.4.0 RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index d0aac63872..e3510cc97e 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,6 +1,6 @@ -# https://www.ruby-lang.org/en/news/2019/10/02/ruby-2-4-9-released/ -sha256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 ruby-2.4.9.tar.xz +# https://www.ruby-lang.org/en/news/2021/07/07/ruby-3-0-2-released/ +sha512 0f702e2d8ca1342a9d4284dbdd234a3588e057b92566353aa7c21835cf09a3932864b2acf459a976960a1704e9befa562155d36b98b7cda8bd99526e10a374c4 ruby-3.0.2.tar.xz # License files, Locally calculated -sha256 609292a6d848ab223073944fc2d844449391a5ba2055a8b5baf1726bc13b39cb LEGAL -sha256 f5eb1b2956d5f7a67b2e5722a3749bc2fe86f9c580f2e3f5a08519cf073b5864 COPYING -sha256 a5e3042dacb53eebda91f3b1caefbfec8307711df8c4ed1ed20e4e97c43307a4 BSDL +sha256 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e LEGAL +sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING +sha256 36a9a6e7347214bbba599a412617204e65bff065dcbe5c46f5cb454c80de9eb0 BSDL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 0ac1164332..b02744f0e5 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -4,9 +4,9 @@ # ################################################################################ -RUBY_VERSION_MAJOR = 2.4 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).9 -RUBY_VERSION_EXT = 2.4.0 +RUBY_VERSION_MAJOR = 3.0 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 +RUBY_VERSION_EXT = 3.0.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz RUBY_DEPENDENCIES = host-pkgconf host-ruby @@ -19,15 +19,13 @@ HOST_RUBY_CONF_OPTS = \ --without-gmp RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others RUBY_LICENSE_FILES = LEGAL COPYING BSDL +RUBY_CPE_ID_VENDOR = ruby-lang +# 0001-fix-default-coroutine-selection.patch +RUBY_AUTORECONF = YES -RUBY_CFLAGS = $(TARGET_CFLAGS) -# With some SuperH toolchains (like Sourcery CodeBench 2012.09), ruby fails to -# build with 'pcrel too far'. This seems to be caused by the -Os option we pass -# by default. To fix the problem, use standard -O2 optimization instead. -ifeq ($(BR2_sh),y) -RUBY_CFLAGS += -O2 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +RUBY_CONF_ENV += LIBS=-latomic endif -RUBY_CONF_ENV = CFLAGS="$(RUBY_CFLAGS)" ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) # On uClibc, finite, isinf and isnan are not directly implemented as @@ -79,12 +77,13 @@ else RUBY_CONF_OPTS += --without-gmp endif -# workaround for amazing build failure, see -# http://lists.busybox.net/pipermail/buildroot/2014-December/114273.html -define RUBY_REMOVE_VERCONF_H - rm -f $(@D)/verconf.h -endef -RUBY_POST_CONFIGURE_HOOKS += RUBY_REMOVE_VERCONF_H +RUBY_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_83143),y) +RUBY_CFLAGS += -freorder-blocks-algorithm=simple +endif + +RUBY_CONF_OPTS += CFLAGS="$(RUBY_CFLAGS)" # Remove rubygems and friends, as they need extensions that aren't # built and a target compiler. diff --git a/package/runc/Config.in b/package/runc/Config.in index f181ee334f..66203896a8 100644 --- a/package/runc/Config.in +++ b/package/runc/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_RUNC comment "runc needs a glibc or musl toolchain w/ threads" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \ BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAN_USES_UCLIBC + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/runc/runc.hash b/package/runc/runc.hash index b895f6fccb..365beac21d 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6b44985023347fb9c5a2cc6f761df8c41cc2c84a7a68a6e6acf834dff6653a9a runc-1.0.0-rc10.tar.gz +sha256 6c3cca4bbeb5d9b2f5e3c0c401c9d27bc8a5d2a0db8a2f6a06efd03ad3c38a33 runc-1.0.2.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 4c2f84ab16..e77ef8111e 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,17 +4,20 @@ # ################################################################################ -RUNC_VERSION = 1.0.0-rc10 +RUNC_VERSION = 1.0.2 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE +RUNC_CPE_ID_VENDOR = linuxfoundation -RUNC_WORKSPACE = Godeps/_workspace - -RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) - +RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION) RUNC_TAGS = cgo static_build +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +RUNC_DEPENDENCIES += libapparmor +RUNC_TAGS += apparmor +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) RUNC_TAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 96d81a347c..bdb1f07fcc 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,48 +1,102 @@ -# From https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 90b6414eddbce4a245cdcaea8353d3a637ef565d2bd119e25a6c2bf3e38cdf63 rustc-1.33.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 57c5ced1a826d34f26e50adf041528dd0000f2a59e8be32d2359386843382ce1 rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 3e3449dada8306b3ff91f23c7803c7312a47e93af140f757b29b74f1e226a505 rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 ddb372a43fb2ba9949e78643df43d6ae447b70cefd440ccdd6b9f6c2ff929ea7 rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 1142d5064d8cbfab16ab71130e5a84804a1ebdfeb10173e6238adc0d757937b6 rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8492b5c91a9ea7ee7e22881382c1b9ad8bb9a4147aff0dfee09940b34783e3d5 rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 e945dd37ab9b143dbcbcdbeaba63b8de47411a4ff815d2e178f745e183078127 rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 abf6b7050c1cdef092ecfde5128067434bb7989def19cfe95c06bfd71de07ba0 rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 9cad816c989c991ffd342d03956b54209d7d32743ebb9b0624b2d36d5bbd525f rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 c7ac98e7a7c3757b5bb8bde596455d50a8787236e290bc1f49e2d59d486ae564 rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 4ec3cade12e2e527f81d0b315e6a37152bf73938aab4a9216aef7d06ef913eb6 rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 0ab78e0cb710f35d108abce90bbf426947fed6222d2f6c04c9eba4ca00adea06 rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 4bc32bf4660a9fc5cd2af9e09f1bfb668b335442097fed6f3892b50950e97d3c rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 984d3ca2a47db04345a2bddd657761f66d209ef95a02097ad4bd549f45a0dc9f rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 6f20343ed73faf5fdfc423bec38a9bb1910a0a962af6f2dddd7184407543ed0e rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 9c3baf8ec849978b0206262fc402ac9d24fdb2a8ae7b5d785b09022dbdbc20e8 rust-1.54.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 9fb4a22b74120b81a4d896326b02d121d5f996b3288580c346ea55a52d8946a9 rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 a1a77737d218087eb7d3613adcde2c9e383d758cdf128646a0ee63396145270b rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 9a7ff8e4cd160f6a58c3b5c7e679b7acdc427c2440ecc70a31a5dc71bbecd0c8 rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 c87dc1681756c9c275eba690c6a05bcdd2ac3bd04a70ae039869dc85fff18b69 rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 74c9f120ad8a443798ebec74302b5166a0880b13b1d8c43dde0c8ba70d9e4b2d rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 2a19d96cf9e863448b21ff989550da54080312ce99272128cc0eb3b1fe5c73cc rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 481192a6906c44501f910a35fc49ed9b1b271925c4569a52f45d9efbc2058ae2 rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 2716f587d0da1dd26fc64251303f5705230f5b86e47e9af35e11622d01ceb963 rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 b1f25af230f3b6fd930452024bd0cc9f4599bfb15f09f802cdb756effa516bbf rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 86549aca1b65188cedf3f1c8fce5af3d7f817450418367049d4bbe8c69ba1da0 rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 7823b95fc3fcd7cc47ba767e2e917c9efbafed2d5ad0b74e7c087600bd72e54f rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 f9a650a3970dbc321e8979dd87ed02fd8f9d03901c3fb1a87724f3c214eb6e57 rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 19a80cfaf18c15eaa1c112312c0cb0ccfd14179407118b35735cdcfc1cc4c60f rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 7c747dea305f5d4b1c6a23d064fbb41e24bb56f2917867020bb57cb064878dc4 rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.asc +sha256 b52dd3d4ae465037ed2987e23457d30e1a75fd16c2c421613ec52c250947a5f8 rust-std-1.54.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 e88269a37ebfbff52fcd07746c53fc0bfa2570531f10f226800d5783ce735e3f rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.asc +sha256 947054afa4d6e37c64e484c704b5f09043783b83aafbf7a00e6959442b1fc14f rust-std-1.54.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 59c0bd07976f9e18e05e328e2f0acd9e99b736ea0330a03b313842e5c5816e13 rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.asc +sha256 02611ec7a6d510572803b4bd9948f0790e9f0ae8e3047ff7fa465300346e3b74 rust-std-1.54.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 dba582de46b7f97ba85b2d75662482df67214e71e0b9cea3c9c153c9d371a00f rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 2e94aedf59369d81524dfe8027e6e4fb0fe338d2ee7869bd96e5cef24974cf0e rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 d1d32bc202b026470ec2c37826fef92bd91f46b08ed1e2620a50eadba03d7095 rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 25d0c06fb445e16d7aac3b5370b43e72600a2aee41fa06605f64a3b8a8ed0e4b rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 626b4255d31c35fa77669471c15ec63b0e88726115538e598a6ef6e814d83bae rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 0f4aaec3ef60ad3c017a39925a1627cc79cd5be00cc8ea7759a470c24b0b66e7 rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 116b2cd682cc5902f91a1ffbe2eb649262d871cd3c47e539afeb723513ae15eb rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 f0329a9d6c96eeb1db5cb7969dbadbab58768b8bff48a1ffc89103031945126e rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 c08b7df82a30acacb3afcdad34b3384e77a9f35ce6bef10d43f29f129fab35e1 rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 8b9ac3e1947036d6f2a3939edd279631fc1b0a260507343a8b3e9ecd448fe738 rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 6ce101e3c5b1bae6006c61a18dcb5685fe0ff57ea8c00a36e6bf95f748abe5f6 rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 a22e19859b3c5032daac1633637546a986c51bdfa3ad0db6e394e6cc461f466b rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 c2de24eb3e524c0fdd1e8116f578c103035da1ece1e4c06efab67999180eefe8 rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz # Locally generated -sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT +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 a374215e20..bc8a485ac5 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -4,23 +4,20 @@ # ################################################################################ -RUST_BIN_VERSION = 1.33.0 +RUST_BIN_VERSION = 1.54.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT HOST_RUST_BIN_PROVIDES = host-rustc -HOST_RUST_BIN_SOURCE = rustc-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz - -HOST_RUST_BIN_EXTRA_DOWNLOADS = \ - rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz +HOST_RUST_BIN_SOURCE = rust-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) HOST_RUST_BIN_EXTRA_DOWNLOADS += rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME).tar.xz endif -HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME)/rust-std-$(RUSTC_HOST_NAME) +HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUSTC_HOST_NAME) define HOST_RUST_BIN_LIBSTD_EXTRACT mkdir -p $(@D)/std @@ -30,36 +27,36 @@ define HOST_RUST_BIN_LIBSTD_EXTRACT ) mkdir -p $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib cd $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib; \ - ln -sf ../../../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib/* . + ln -sf ../../../../../$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib/* . endef HOST_RUST_BIN_POST_EXTRACT_HOOKS += HOST_RUST_BIN_LIBSTD_EXTRACT -HOST_RUST_BIN_INSTALL_OPTS = \ +HOST_RUST_BIN_INSTALL_COMMON_OPTS = \ --prefix=$(HOST_DIR) \ --disable-ldconfig +HOST_RUST_BIN_INSTALL_OPTS = \ + $(HOST_RUST_BIN_INSTALL_COMMON_OPTS) \ + --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) + define HOST_RUST_BIN_INSTALL_RUSTC (cd $(@D); \ ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) endef -define HOST_RUST_BIN_INSTALL_LIBSTD_HOST - (cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME); \ - ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) -endef - ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) define HOST_RUST_BIN_INSTALL_LIBSTD_TARGET (cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME); \ - ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) + ./install.sh $(HOST_RUST_BIN_INSTALL_COMMON_OPTS)) endef endif define HOST_RUST_BIN_INSTALL_CMDS $(HOST_RUST_BIN_INSTALL_RUSTC) - $(HOST_RUST_BIN_INSTALL_LIBSTD_HOST) $(HOST_RUST_BIN_INSTALL_LIBSTD_TARGET) endef +HOST_RUST_BIN_POST_INSTALL_HOOKS += HOST_RUST_INSTALL_CARGO_CONFIG + $(eval $(host-generic-package)) diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 62e2e1855c..30a348e982 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.asc -sha256 f4b1a72f1a29b23dcc9d7be5f60878f0434560513273906aa93dcd5c0de39b71 rustc-1.33.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.asc +sha256 a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4 rustc-1.54.0-src.tar.xz # Locally generated -sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT +sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE +sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 5d14fc6682..26ee2a9362 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.33.0 +RUST_VERSION = 1.54.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT @@ -15,11 +15,17 @@ HOST_RUST_PROVIDES = host-rustc HOST_RUST_DEPENDENCIES = \ toolchain \ host-rust-bin \ - host-cargo-bin \ host-openssl \ - host-python \ $(BR2_CMAKE_HOST_DEPENDENCY) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +HOST_RUST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR) +HOST_RUST_DEPENDENCIES += host-python3 +else +HOST_RUST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR) +HOST_RUST_DEPENDENCIES += host-python +endif + HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) # Some vendor crates contain Cargo.toml.orig files. The associated @@ -42,31 +48,35 @@ define HOST_RUST_CONFIGURE_CMDS ( \ echo '[build]'; \ echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \ - echo 'cargo = "$(HOST_CARGO_BIN_DIR)/cargo/bin/cargo"'; \ + echo 'cargo = "$(HOST_RUST_BIN_DIR)/cargo/bin/cargo"'; \ echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \ - echo 'python = "$(HOST_DIR)/bin/python2"'; \ + echo 'python = "$(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION)"'; \ echo 'submodules = false'; \ echo 'vendor = true'; \ + echo 'extended = true'; \ + echo 'tools = ["cargo"]'; \ echo 'compiler-docs = false'; \ echo 'docs = false'; \ echo 'verbose = $(HOST_RUST_VERBOSITY)'; \ echo '[install]'; \ echo 'prefix = "$(HOST_DIR)"'; \ + echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ echo '[rust]'; \ echo 'channel = "stable"'; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ - echo $(HOST_RUST_JEMALLOC_CONF); \ + echo '[llvm]'; \ + echo 'ninja = false'; \ ) > $(@D)/config.toml endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py build + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py build endef define HOST_RUST_INSTALL_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py install + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py dist + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py install endef $(eval $(host-generic-package)) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index d595efbc6f..90ea56f626 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -3,21 +3,101 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS bool default y if BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" +# The pre-built Rust standard library is only available for a number +# of architectures/C libraries combinations, with different levels of +# support: Tier 1 platforms, Tier 2 platforms with host tools, Tier 2 +# platforms, Tier 3 platforms. Below, we support Tier 1, Tier 2 with +# host tools and Tier 2 platforms. + +# The below entries match Tier 1 platforms as described at +# https://doc.rust-lang.org/nightly/rustc/platform-support.html. +config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS + bool + # aarch64-unknown-linux-gnu + default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_GLIBC + # i686-unknown-linux-gnu + default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC + # x86_64-unknown-linux-gnu + default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_GLIBC + +# The below entries match Tier 2 platforms with host tools as +# described at +# https://doc.rust-lang.org/nightly/rustc/platform-support.html. +config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS + bool + # aarch64-unknown-linux-musl + default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_MUSL + # arm-unknown-linux-gnueabi + default y if BR2_ARM_CPU_ARMV6 && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_GLIBC + # arm-unknown-linux-gnueabihf + default y if BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_GLIBC + # armv7-unknown-linux-gnueabihf + default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_GLIBC + # mips-unknown-linux-gnu + default y if BR2_mips && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6 + # mips64-unknown-linux-gnuabi64 + default y if BR2_mips64 && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 + # mipsel-unknown-linux-gnu + default y if BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6 + # mips64el-unknown-linux-gnuabi64 + default y if BR2_mips64el && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 + # powerpc-unknown-linux-gnu + default y if BR2_powerpc && BR2_TOOLCHAIN_USES_GLIBC + # powerpc64-unknown-linux-gnu + default y if BR2_powerpc64 && BR2_TOOLCHAIN_USES_GLIBC + # powerpc64le-unknown-linux-gnu + default y if BR2_powerpc64le && BR2_TOOLCHAIN_USES_GLIBC + # riscv64gc-unknown-linux-gnu + # "g" stands for imafd, and we also need "c". + default y if BR2_riscv && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ + BR2_RISCV_ISA_RVA && BR2_RISCV_ISA_RVF && \ + BR2_RISCV_ISA_RVD && BR2_RISCV_ISA_RVC && \ + BR2_TOOLCHAIN_USES_GLIBC + # x86_64-unknown-linux-musl + default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_MUSL + +# The below entries match Tier 2 platforms without host tools as +# described at +# https://doc.rust-lang.org/nightly/rustc/platform-support.html. +config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS + bool + # arm-unknown-linux-musleabi + default y if BR2_ARM_CPU_ARMV6 && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_MUSL + # arm-unknown-linux-musleabihf + default y if BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL + # armv5te-unknown-linux-gnueabi + default y if BR2_ARM_CPU_ARMV5 && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_GLIBC + # armv5te-unknown-linux-musleabi + default y if BR2_ARM_CPU_ARMV5 && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_MUSL + # armv7-unknown-linux-gnueabi + default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_GLIBC + # armv7-unknown-linux-musleabi + default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_MUSL + # armv7-unknown-linux-musleabihf + default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL + # i586-unknown-linux-gnu + default y if BR2_i586 && BR2_TOOLCHAIN_USES_GLIBC + # i586-unknown-linux-musl + default y if BR2_i586 && BR2_TOOLCHAIN_USES_MUSL + # i686-unknown-linux-musl + default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL + # mips-unknown-linux-musl + default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 + # mips64-unknown-linux-muslabi64 + default y if BR2_mips64 && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 + # mips64el-unknown-linux-muslabi64 + default y if BR2_mips64el && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 + # mipsel-unknown-linux-musl + default y if BR2_mipsel && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 + # sparc64-unknown-linux-gnu + default y if BR2_sparc64 && BR2_TOOLCHAIN_USES_GLIBC + # All target rust packages should depend on this option config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS bool - # The pre-built Rust standard library is only available for the - # following architectures/ABIs, and is built against glibc. - default y if BR2_i386 - default y if BR2_x86_64 - default y if BR2_aarch64 - default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 \ - && !(BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI) - default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - default y if (BR2_mips || BR2_mipsel) && !BR2_MIPS_CPU_MIPS32R6 - default y if (BR2_mips64 || BR2_mips64el) && !BR2_MIPS_CPU_MIPS64R6 \ - && BR2_MIPS_NABI64 - depends on BR2_TOOLCHAIN_USES_GLIBC + default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS + default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS + default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS config BR2_PACKAGE_HOST_RUSTC_ARCH @@ -49,6 +129,9 @@ choice config BR2_PACKAGE_HOST_RUST bool "host rust" + # RUSTC_TARGET_NAME must be set for building host-rust + # otherwise config.toml is broken. + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # triggers ICE on trunc_int_for_mode, at explow.c:56 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_aarch64 help diff --git a/package/rustc/rustc.mk b/package/rustc/rustc.mk index 6eea9b4fc5..52860b7eff 100644 --- a/package/rustc/rustc.mk +++ b/package/rustc/rustc.mk @@ -8,7 +8,7 @@ RUSTC_ARCH = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ARCH)) RUSTC_ABI = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ABI)) ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) -RUSTC_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-gnu$(RUSTC_ABI) +RUSTC_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-$(LIBC)$(RUSTC_ABI) endif ifeq ($(HOSTARCH),x86) @@ -20,3 +20,15 @@ endif RUSTC_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu $(eval $(host-virtual-package)) + +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) +define RUSTC_INSTALL_CARGO_CONFIG + mkdir -p $(HOST_DIR)/share/cargo + sed -e 's/@RUSTC_TARGET_NAME@/$(RUSTC_TARGET_NAME)/' \ + -e 's/@CROSS_PREFIX@/$(notdir $(TARGET_CROSS))/' \ + package/rustc/cargo-config.in \ + > $(HOST_DIR)/share/cargo/config +endef +# check-package disable TypoInPackageVariable - TOOLCHAIN intended +TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += RUSTC_INSTALL_CARGO_CONFIG +endif diff --git a/package/s6-dns/s6-dns.hash b/package/s6-dns/s6-dns.hash index 5ee12ae275..c63e96e129 100644 --- a/package/s6-dns/s6-dns.hash +++ b/package/s6-dns/s6-dns.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 415e3e8a8baaa39b3eac57eef8b3023d63bcdb33d9f9b03bcb298fd940589132 s6-dns-2.3.1.1.tar.gz -sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING +sha256 0c1d50e5d7bc65cbf59b6f37fbd7f6f5645694224bb8c4dc1943d7921bc74f63 s6-dns-2.3.5.1.tar.gz +sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING diff --git a/package/s6-dns/s6-dns.mk b/package/s6-dns/s6-dns.mk index 7384f07244..dfde2c29f1 100644 --- a/package/s6-dns/s6-dns.mk +++ b/package/s6-dns/s6-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_DNS_VERSION = 2.3.1.1 +S6_DNS_VERSION = 2.3.5.1 S6_DNS_SITE = http://skarnet.org/software/s6-dns S6_DNS_LICENSE = ISC S6_DNS_LICENSE_FILES = COPYING @@ -12,11 +12,11 @@ S6_DNS_INSTALL_STAGING = YES S6_DNS_DEPENDENCIES = skalibs S6_DNS_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ + --prefix=/ \ + --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/include \ + --with-dynlib=$(STAGING_DIR)/lib \ + --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ $(SHARED_STATIC_LIBS_OPTS) diff --git a/package/s6-linux-init/s6-linux-init.hash b/package/s6-linux-init/s6-linux-init.hash index bc2f7072ca..23f02d5359 100644 --- a/package/s6-linux-init/s6-linux-init.hash +++ b/package/s6-linux-init/s6-linux-init.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 216af5589c2bc5dbdea6b6c94d55575c12e31f57b2e0fde5c534a840aeed02fb s6-linux-init-1.0.3.1.tar.gz -sha256 487e89990a571700bcdf7c0cbbde2859446f79e85e8b59791adab98fff6b1889 COPYING +sha256 29e368516b1a3c61a6d1f8680645cc122a2e02127debec91738f170a3b93b8c5 s6-linux-init-1.0.6.3.tar.gz +sha256 4a5e44a69d649f0c37b29d7f6e5df1bb292b09898247be07f0c97814dac4b15d COPYING diff --git a/package/s6-linux-init/s6-linux-init.mk b/package/s6-linux-init/s6-linux-init.mk index 71c727de02..95595368de 100644 --- a/package/s6-linux-init/s6-linux-init.mk +++ b/package/s6-linux-init/s6-linux-init.mk @@ -4,20 +4,20 @@ # ################################################################################ -S6_LINUX_INIT_VERSION = 1.0.3.1 +S6_LINUX_INIT_VERSION = 1.0.6.3 S6_LINUX_INIT_SITE = http://skarnet.org/software/s6-linux-init S6_LINUX_INIT_LICENSE = ISC S6_LINUX_INIT_LICENSE_FILES = COPYING S6_LINUX_INIT_DEPENDENCIES = s6 s6-linux-utils s6-portable-utils S6_LINUX_INIT_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/execline \ - --with-lib=$(STAGING_DIR)/usr/lib/s6 \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ + --prefix=/ \ + --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/include \ + --with-dynlib=$(STAGING_DIR)/lib \ + --with-lib=$(STAGING_DIR)/lib/execline \ + --with-lib=$(STAGING_DIR)/lib/s6 \ + --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ $(SHARED_STATIC_LIBS_OPTS) diff --git a/package/s6-linux-utils/s6-linux-utils.hash b/package/s6-linux-utils/s6-linux-utils.hash index 638b6b8160..27e7eb7b7a 100644 --- a/package/s6-linux-utils/s6-linux-utils.hash +++ b/package/s6-linux-utils/s6-linux-utils.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 25f61961f3247b9a833536ebd1e19f3b024fa095fce30f93d82fdfd4e015dc02 s6-linux-utils-2.5.1.1.tar.gz -sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING +sha256 c300dbf36b533083f82c6827830c55ce34bfc6cd493c782f207d199669a345ba s6-linux-utils-2.5.1.5.tar.gz +sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING diff --git a/package/s6-linux-utils/s6-linux-utils.mk b/package/s6-linux-utils/s6-linux-utils.mk index 926ec523a1..995ff1b855 100644 --- a/package/s6-linux-utils/s6-linux-utils.mk +++ b/package/s6-linux-utils/s6-linux-utils.mk @@ -4,18 +4,18 @@ # ################################################################################ -S6_LINUX_UTILS_VERSION = 2.5.1.1 +S6_LINUX_UTILS_VERSION = 2.5.1.5 S6_LINUX_UTILS_SITE = http://skarnet.org/software/s6-linux-utils S6_LINUX_UTILS_LICENSE = ISC S6_LINUX_UTILS_LICENSE_FILES = COPYING S6_LINUX_UTILS_DEPENDENCIES = skalibs S6_LINUX_UTILS_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ + --prefix=/ \ + --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/include \ + --with-dynlib=$(STAGING_DIR)/lib \ + --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ $(SHARED_STATIC_LIBS_OPTS) diff --git a/package/s6-networking/s6-networking.hash b/package/s6-networking/s6-networking.hash index 41ceda0c05..9e333866d3 100644 --- a/package/s6-networking/s6-networking.hash +++ b/package/s6-networking/s6-networking.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 9d411b5f742529be8e14da0a21635fcc304a4d7ac05fe0e45cf2355e5e3cf188 s6-networking-2.3.1.1.tar.gz -sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING +sha256 a3fbca789dc5c82b3055fdbd2f55110902198f3136447617ce8f8b79fa8aa554 s6-networking-2.4.1.1.tar.gz +sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING diff --git a/package/s6-networking/s6-networking.mk b/package/s6-networking/s6-networking.mk index c23445b967..03807f0652 100644 --- a/package/s6-networking/s6-networking.mk +++ b/package/s6-networking/s6-networking.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_NETWORKING_VERSION = 2.3.1.1 +S6_NETWORKING_VERSION = 2.4.1.1 S6_NETWORKING_SITE = http://skarnet.org/software/s6-networking S6_NETWORKING_LICENSE = ISC S6_NETWORKING_LICENSE_FILES = COPYING @@ -12,20 +12,23 @@ S6_NETWORKING_INSTALL_STAGING = YES S6_NETWORKING_DEPENDENCIES = s6-dns s6 S6_NETWORKING_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/execline \ - --with-lib=$(STAGING_DIR)/usr/lib/s6 \ - --with-lib=$(STAGING_DIR)/usr/lib/s6-dns \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ + --prefix=/ \ + --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/include \ + --with-dynlib=$(STAGING_DIR)/lib \ + --with-lib=$(STAGING_DIR)/lib/execline \ + --with-lib=$(STAGING_DIR)/lib/s6 \ + --with-lib=$(STAGING_DIR)/lib/s6-dns \ + --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ $(SHARED_STATIC_LIBS_OPTS) ifeq ($(BR2_PACKAGE_LIBRESSL),y) S6_NETWORKING_CONF_OPTS += --enable-ssl=libressl S6_NETWORKING_DEPENDENCIES += libressl +else ifeq ($(BR2_PACKAGE_BEARSSL),y) +S6_NETWORKING_CONF_OPTS += --enable-ssl=bearssl +S6_NETWORKING_DEPENDENCIES += bearssl endif define S6_NETWORKING_CONFIGURE_CMDS diff --git a/package/s6-portable-utils/s6-portable-utils.hash b/package/s6-portable-utils/s6-portable-utils.hash index 83823b3438..dd9f7df4bd 100644 --- a/package/s6-portable-utils/s6-portable-utils.hash +++ b/package/s6-portable-utils/s6-portable-utils.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 1e473224350c6ebedd7adf162b68303e2e0a32ca2e99d7afee7573d9e78f931c s6-portable-utils-2.2.2.1.tar.gz -sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING +sha256 6627a2d3ea263539e83512a36f10a587fa0dd5e899bc3612187e9e3b9faf769c s6-portable-utils-2.2.3.2.tar.gz +sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING diff --git a/package/s6-portable-utils/s6-portable-utils.mk b/package/s6-portable-utils/s6-portable-utils.mk index 8b60bf43e3..fb910320ea 100644 --- a/package/s6-portable-utils/s6-portable-utils.mk +++ b/package/s6-portable-utils/s6-portable-utils.mk @@ -4,18 +4,18 @@ # ################################################################################ -S6_PORTABLE_UTILS_VERSION = 2.2.2.1 +S6_PORTABLE_UTILS_VERSION = 2.2.3.2 S6_PORTABLE_UTILS_SITE = http://skarnet.org/software/s6-portable-utils S6_PORTABLE_UTILS_LICENSE = ISC S6_PORTABLE_UTILS_LICENSE_FILES = COPYING S6_PORTABLE_UTILS_DEPENDENCIES = skalibs S6_PORTABLE_UTILS_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ + --prefix=/ \ + --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/include \ + --with-dynlib=$(STAGING_DIR)/lib \ + --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ $(SHARED_STATIC_LIBS_OPTS) diff --git a/package/s6-rc/s6-rc.hash b/package/s6-rc/s6-rc.hash index 918dc0fd2e..8978d68ba6 100644 --- a/package/s6-rc/s6-rc.hash +++ b/package/s6-rc/s6-rc.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 257e2c428336c2b57cd17b65382bc55592759acc65e053e23ad646444f28af52 s6-rc-0.5.1.1.tar.gz -sha256 487e89990a571700bcdf7c0cbbde2859446f79e85e8b59791adab98fff6b1889 COPYING +sha256 2a8d1cd455c05c8502b34517cfe79841aa46d08ad969076b37a15d3910617f89 s6-rc-0.5.2.2.tar.gz +sha256 4a5e44a69d649f0c37b29d7f6e5df1bb292b09898247be07f0c97814dac4b15d COPYING diff --git a/package/s6-rc/s6-rc.mk b/package/s6-rc/s6-rc.mk index 3044341371..05d7989735 100644 --- a/package/s6-rc/s6-rc.mk +++ b/package/s6-rc/s6-rc.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_RC_VERSION = 0.5.1.1 +S6_RC_VERSION = 0.5.2.2 S6_RC_SITE = http://skarnet.org/software/s6-rc S6_RC_LICENSE = ISC S6_RC_LICENSE_FILES = COPYING @@ -12,13 +12,13 @@ S6_RC_INSTALL_STAGING = YES S6_RC_DEPENDENCIES = s6 S6_RC_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/execline \ - --with-lib=$(STAGING_DIR)/usr/lib/s6 \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ + --prefix=/ \ + --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/include \ + --with-dynlib=$(STAGING_DIR)/lib \ + --with-lib=$(STAGING_DIR)/lib/execline \ + --with-lib=$(STAGING_DIR)/lib/s6 \ + --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ $(SHARED_STATIC_LIBS_OPTS) diff --git a/package/s6/s6.hash b/package/s6/s6.hash index 9b355351ea..a829700d97 100644 --- a/package/s6/s6.hash +++ b/package/s6/s6.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 e0cdbaf26e3ba1c41ecc0a8d1f45fb78194f96109b55cabeb849528b7e966c57 s6-2.9.0.1.tar.gz -sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING +sha256 1d21373151704150df0e8ed199f097f6ee5d2befb9a68aca4f20f3862e5d8757 s6-2.10.0.3.tar.gz +sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING diff --git a/package/s6/s6.mk b/package/s6/s6.mk index ec1407381e..ead82d7eaf 100644 --- a/package/s6/s6.mk +++ b/package/s6/s6.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_VERSION = 2.9.0.1 +S6_VERSION = 2.10.0.3 S6_SITE = http://skarnet.org/software/s6 S6_LICENSE = ISC S6_LICENSE_FILES = COPYING @@ -12,12 +12,12 @@ S6_INSTALL_STAGING = YES S6_DEPENDENCIES = execline S6_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/execline \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ + --prefix=/ \ + --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/include \ + --with-dynlib=$(STAGING_DIR)/lib \ + --with-lib=$(STAGING_DIR)/lib/execline \ + --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ $(SHARED_STATIC_LIBS_OPTS) diff --git a/package/sam-ba/Config.in.host b/package/sam-ba/Config.in.host index 6093865e4c..2236b5f48a 100644 --- a/package/sam-ba/Config.in.host +++ b/package/sam-ba/Config.in.host @@ -1,6 +1,6 @@ config BR2_PACKAGE_HOST_SAM_BA bool "host sam-ba" - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_HOSTARCH = "x86_64" select BR2_HOSTARCH_NEEDS_IA32_LIBS help Atmel SAM-BA software provides an open set of tools for diff --git a/package/sam-ba/sam-ba.hash b/package/sam-ba/sam-ba.hash index ae1fb5eece..1bc14f3fd7 100644 --- a/package/sam-ba/sam-ba.hash +++ b/package/sam-ba/sam-ba.hash @@ -1,5 +1,3 @@ # sha256 locally computed -sha256 40d5e66b77261d83780fe2b38633b8d9f5c9a26718c2b9de1d5877e853e35e96 sam-ba_cdc_linux.zip -sha256 f9cac240acadbfd8f4f1c0d65132f85427384697bd6337da6444c531138d56ee doc/license.txt -sha256 255564ff8953ea95c11a4ab1d56f1edf332298faad209ca80daf745c7ed95124 tcl_lib/boards.tcl -sha256 74ae62858139cb4e18acc3448483be80ea6b36fdb87260b665f43762ca354ede applets/sam4c/libraries/libchip_sam4c/include/sam4c/sam4c32e-1.h +sha256 dc32c49688bbfab5aa687042caae5f611fe3d9e722098a561f8f5d2fbc57249d sam-ba_3.3.1-linux_x86_64.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.txt diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk index 49505589d0..3082d49192 100644 --- a/package/sam-ba/sam-ba.mk +++ b/package/sam-ba/sam-ba.mk @@ -4,36 +4,22 @@ # ################################################################################ -SAM_BA_SITE = http://ww1.microchip.com/downloads/en/DeviceDoc -SAM_BA_VERSION = 2.18 -SAM_BA_SOURCE = sam-ba_cdc_linux.zip -SAM_BA_LICENSE = SAM-BA license (sam-ba executable), \ - BSD-2-Clause like, BSD-4-Clause (TCL and applets code) -SAM_BA_LICENSE_FILES = doc/license.txt tcl_lib/boards.tcl \ - applets/sam4c/libraries/libchip_sam4c/include/sam4c/sam4c32e-1.h - -define HOST_SAM_BA_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(HOST_SAM_BA_DL_DIR)/$(SAM_BA_SOURCE) - mv $(BUILD_DIR)/sam-ba_cdc_linux/* $(@D) - rmdir $(BUILD_DIR)/sam-ba_cdc_linux/ -endef +SAM_BA_VERSION = 3.3.1 +SAM_BA_SITE = https://github.com/atmelcorp/sam-ba/releases/download/v$(SAM_BA_VERSION) +SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION)-linux_x86_64.tar.gz +SAM_BA_LICENSE = GPLv2 +SAM_BA_LICENSE_FILES = LICENSE.txt # Since it's a prebuilt application and it does not conform to the # usual Unix hierarchy, we install it in $(HOST_DIR)/opt/sam-ba and # then create a symbolic link from $(HOST_DIR)/bin to the # application binary, for easier usage. -ifeq ($(HOSTARCH),x86_64) -SAM_BA_BIN_NAME = sam-ba_64 -else -SAM_BA_BIN_NAME = sam-ba -endif - define HOST_SAM_BA_INSTALL_CMDS mkdir -p $(HOST_DIR)/opt/sam-ba/ cp -a $(@D)/* $(HOST_DIR)/opt/sam-ba/ mkdir -p $(HOST_DIR)/bin/ - ln -sf ../opt/sam-ba/$(SAM_BA_BIN_NAME) $(HOST_DIR)/bin/sam-ba + ln -sf ../opt/sam-ba/sam-ba $(HOST_DIR)/bin/sam-ba endef $(eval $(host-generic-package)) diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch index a303fa6669..79216860dd 100644 --- a/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ b/package/samba4/0001-libreplace-disable-libbsd-support.patch @@ -9,7 +9,7 @@ This causes redefinition conflicts for link(2) when both standard unistd.h and bsd/unistd.h get included. Signed-off-by: Gustavo Zacarias -[Bernd: rebased for versions 4.7.3, 4.8.0 & 4.8.5] +[Bernd: rebased for versions 4.7.3, 4.8.0, 4.8.5 & 4.11.13] Signed-off-by: Bernd Kuhls --- lib/replace/wscript | 15 --------------- @@ -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 -@@ -381,21 +381,6 @@ def configure(conf): +@@ -406,21 +406,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 563b274d57..b8636958ee 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 @@ -33,6 +33,7 @@ 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] --- wscript_configure_embedded_heimdal | 11 +++++++++++ wscript_configure_system_heimdal | 11 ----------- @@ -59,7 +60,7 @@ 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 -@@ -36,14 +36,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): +@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): conf.define('USING_SYSTEM_%s' % name.upper(), 1) return True @@ -74,7 +75,7 @@ index 0ff6dad2f55..f77c177442f 100644 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"): -@@ -88,7 +88,4 @@ +@@ -96,7 +96,4 @@ #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): # conf.define('USING_SYSTEM_TOMMATH', 1) diff --git a/package/samba4/Config.in b/package/samba4/Config.in index a34eaa8088..e114a7e13f 100644 --- a/package/samba4/Config.in +++ b/package/samba4/Config.in @@ -32,6 +32,9 @@ config BR2_PACKAGE_SAMBA4_AD_DC bool "AD DC" depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_PYTHON_DNSPYTHON + select BR2_PACKAGE_PYTHON_MARKDOWN + select BR2_PACKAGE_SAMBA4_ADS help Enable Active Directory Domain Controller functionality. diff --git a/package/samba4/samba4-cache.txt b/package/samba4/samba4-cache.txt index e3a3720fc8..75d0343dc9 100644 --- a/package/samba4/samba4-cache.txt +++ b/package/samba4/samba4-cache.txt @@ -40,3 +40,6 @@ Checking value of SIGRTMIN: "34" Checking errno of iconv for illegal multibyte sequence: "0" checking for clnt_create(): OK Checking for a 64-bit host to support lmdb: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29 +Checking value of GNUTLS_MAC_AES_CMAC_128: 203 +Checking whether fcntl supports flags to send direct I/O availability signals: OK diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 8948c41ea6..a571ba79f4 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.11.7.tar.asc -sha256 79b6f9ebc357373f885153e2d5d26dc6def9f4511ee4bcbe8a8e2622acc42143 samba-4.11.7.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +# https://download.samba.org/pub/samba/stable/samba-4.14.9.tar.asc +sha256 7fb11818ef7f9bb817a3b21019358b1469aec98799057cc9e55933563361c409 samba-4.14.9.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 582b30bcd5..83eb2dacda 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,14 +4,18 @@ # ################################################################################ -SAMBA4_VERSION = 4.11.7 +SAMBA4_VERSION = 4.14.9 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES SAMBA4_LICENSE = GPL-3.0+ SAMBA4_LICENSE_FILES = COPYING +SAMBA4_CPE_ID_VENDOR = samba +SAMBA4_CPE_ID_PRODUCT = samba +SAMBA4_SELINUX_MODULES = samba SAMBA4_DEPENDENCIES = \ - host-e2fsprogs host-heimdal host-nfs-utils host-python3 \ + host-e2fsprogs host-flex host-heimdal host-nfs-utils \ + host-perl host-perl-parse-yapp host-python3 \ cmocka e2fsprogs gnutls popt zlib \ $(if $(BR2_PACKAGE_LIBAIO),libaio) \ $(if $(BR2_PACKAGE_LIBCAP),libcap) \ @@ -56,6 +60,9 @@ endif ifeq ($(BR2_PACKAGE_DBUS),y) SAMBA4_DEPENDENCIES += dbus +SAMBA4_SHARED_MODULES += vfs_snapper +else +SAMBA4_SHARED_MODULES += !vfs_snapper endif ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_AVAHI_DAEMON),yy) @@ -97,11 +104,13 @@ SAMBA4_POST_INSTALL_TARGET_HOOKS += SAMBA4_REMOVE_CTDB_TESTS define SAMBA4_CONFIGURE_CMDS $(INSTALL) -m 0644 package/samba4/samba4-cache.txt $(@D)/cache.txt; + echo 'Checking whether fcntl supports setting/geting hints: $(if $(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13),OK,NO)' >>$(@D)/cache.txt; echo 'Checking uname machine type: $(BR2_ARCH)' >>$(@D)/cache.txt; (cd $(@D); \ $(SAMBA4_PYTHON) \ python_LDFLAGS="" \ python_LIBDIR="" \ + PERL="$(HOST_DIR)/bin/perl" \ $(TARGET_CONFIGURE_OPTS) \ $(SAMBA4_CONF_ENV) \ ./buildtools/bin/waf configure \ @@ -123,6 +132,7 @@ define SAMBA4_CONFIGURE_CMDS --disable-glusterfs \ --with-cluster-support \ --bundled-libraries='!asn1_compile,!compile_et' \ + --with-shared-modules=$(subst $(space),$(comma),$(strip $(SAMBA4_SHARED_MODULES))) \ $(SAMBA4_CONF_OPTS) \ ) endef @@ -140,16 +150,26 @@ define SAMBA4_INSTALL_TARGET_CMDS endef ifeq ($(BR2_PACKAGE_SAMBA4_AD_DC),y) -SAMBA4_DEPENDENCIES += jansson +# host-python-dnspython and host-python-markdown are not strictly +# needed on the host, but on the target. however, samba's configure +# tests for their availability on the host. +SAMBA4_DEPENDENCIES += \ + jansson \ + host-python-dnspython \ + host-python-markdown \ + python-dnspython \ + python-markdown else SAMBA4_CONF_OPTS += --without-ad-dc --without-json endif ifeq ($(BR2_PACKAGE_SAMBA4_ADS),y) -SAMBA4_CONF_OPTS += --with-ads --with-ldap --with-shared-modules=idmap_ad +SAMBA4_CONF_OPTS += --with-ads --with-ldap SAMBA4_DEPENDENCIES += openldap +SAMBA4_SHARED_MODULES += idmap_ad else SAMBA4_CONF_OPTS += --without-ads --without-ldap +SAMBA4_SHARED_MODULES += !idmap_ad endif ifeq ($(BR2_PACKAGE_SAMBA4_SMBTORTURE),) diff --git a/package/sane-backends/sane-backends.hash b/package/sane-backends/sane-backends.hash index 09652c993f..e382aacef2 100644 --- a/package/sane-backends/sane-backends.hash +++ b/package/sane-backends/sane-backends.hash @@ -1,5 +1,5 @@ -# From https://gitlab.com/sane-project/backends/tags/RELEASE_1_0_27 -sha256 293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9 sane-backends-1.0.27.tar.gz +# From https://gitlab.com/sane-project/backends/uploads/a705aadf854ca0dc8bf66df937308861/sane-backends-1.0.32.sha256.txt +sha256 3a28c237c0a72767086202379f6dc92dbb63ec08dfbab22312cba80e238bb114 sane-backends-1.0.32.tar.gz # Hash for license file -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk index 52e03da518..a8f7466f70 100644 --- a/package/sane-backends/sane-backends.mk +++ b/package/sane-backends/sane-backends.mk @@ -4,12 +4,13 @@ # ################################################################################ -SANE_BACKENDS_VERSION = 1.0.27 +SANE_BACKENDS_VERSION = 1.0.32 SANE_BACKENDS_SITE = \ - https://gitlab.com/sane-project/backends/uploads/a3ba9fff29253a94e84074917bff581a + https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f SANE_BACKENDS_CONFIG_SCRIPTS = sane-config SANE_BACKENDS_LICENSE = GPL-2.0+ SANE_BACKENDS_LICENSE_FILES = COPYING +SANE_BACKENDS_CPE_ID_VENDOR = sane-backends_project SANE_BACKENDS_INSTALL_STAGING = YES SANE_BACKENDS_CONF_OPTS = \ @@ -43,7 +44,7 @@ endif ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBGLIB2),yyy) SANE_BACKENDS_DEPENDENCIES += avahi -SANE_BACKENDS_CONF_OPTS += --enable-avahi +SANE_BACKENDS_CONF_OPTS += --with-avahi endif ifeq ($(BR2_PACKAGE_NETSNMP),y) @@ -53,6 +54,27 @@ else SANE_BACKENDS_CONF_OPTS += --without-snmp endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +SANE_BACKENDS_DEPENDENCIES += libcurl +SANE_BACKENDS_CONF_OPTS += --with-libcurl +else +SANE_BACKENDS_CONF_OPTS += --without-libcurl +endif + +ifeq ($(BR2_PACKAGE_POPPLER)$(BR2_PACKAGE_CAIRO)$(BR2_PACKAGE_LIBGLIB2),yyy) +SANE_BACKENDS_DEPENDENCIES += poppler libglib2 +SANE_BACKENDS_CONF_OPTS += --with-poppler-glib +else +SANE_BACKENDS_CONF_OPTS += --without-poppler-glib +endif + +ifeq ($(BR2_PACKAGE_LIBXML2),y) +SANE_BACKENDS_DEPENDENCIES += libxml2 +SANE_BACKENDS_CONF_OPTS += --with-usb-record-replay +else +SANE_BACKENDS_CONF_OPTS += --without-usb-record-replay +endif + define SANE_BACKENDS_DISABLE_DOCS $(SED) 's/ doc//' $(@D)/Makefile endef diff --git a/package/sbc/sbc.hash b/package/sbc/sbc.hash index d703f23437..beb3b232a8 100644 --- a/package/sbc/sbc.hash +++ b/package/sbc/sbc.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256 518bf46e6bb3dc808a95e1eabad26fdebe8a099c1e781c27ed7fca6c2f4a54c9 sbc-1.4.tar.xz +sha256 0cbad69823a99e8421fe0700e8cf9eeb8fa0c1ad28e8dbc2182b3353507931d2 sbc-1.5.tar.xz # sha256 locally computed -sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING -sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING +sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/sbc/sbc.mk b/package/sbc/sbc.mk index 73e4aceb85..af5cf291a3 100644 --- a/package/sbc/sbc.mk +++ b/package/sbc/sbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -SBC_VERSION = 1.4 +SBC_VERSION = 1.5 SBC_SOURCE = sbc-$(SBC_VERSION).tar.xz SBC_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth SBC_INSTALL_STAGING = YES diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index a42abd70b7..d46ba85fbc 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -3,7 +3,6 @@ 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 @@ -27,14 +26,6 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE help http::sconesite module for Sconeserver -config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE - bool "http::sconesite::image" - depends on BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE - depends on BR2_USE_MMU # imagemagick - select BR2_PACKAGE_IMAGEMAGICK - help - http::sconesite::image module for Sconeserver - config BR2_PACKAGE_SCONESERVER_MYSQL bool "mysql" depends on BR2_USE_MMU # mysql @@ -79,13 +70,6 @@ comment "location support needs a toolchain w/ theads, dynamic library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBRARY -config BR2_PACKAGE_SCONESERVER_LETTUCE - bool "lettuce" - help - Sconeserver module for Lettuce embedded automation platform - - http://www.sconemad.com/lettuce/ - config BR2_PACKAGE_SCONESERVER_MATHS bool "maths" select BR2_PACKAGE_MPFR @@ -97,16 +81,6 @@ config BR2_PACKAGE_SCONESERVER_TESTBUILDER help Testbuilder module for Sconeserver -config BR2_PACKAGE_SCONESERVER_UI - bool "ui" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - help - UI module for Sconeserver - -comment "ui module requires X.org" - depends on !BR2_PACKAGE_XORG7 - endif # BR2_PACKAGE_SCONESERVER comment "sconeserver needs a toolchain with dynamic library, C++, NPTL" diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 9d4713afea..17407c29f5 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -10,11 +10,20 @@ SCONESERVER_LICENSE = GPL-2.0+ SCONESERVER_LICENSE_FILES = COPYING # fetching from Git, we need to generate the configure script SCONESERVER_AUTORECONF = YES -SCONESERVER_DEPENDENCIES = host-pkgconf pcre zlib +SCONESERVER_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_PCRE),pcre) \ + zlib +# disable image as it fails to build with ImageMagick # disable markdown module because its git submodule cmark # https://github.com/sconemad/sconeserver/tree/master/markdown # has no cross-compile support provided by the sconeserver build system -SCONESERVER_CONF_OPTS += --with-ip --with-local --with-ip6 --without-markdown +SCONESERVER_CONF_OPTS += \ + --with-ip \ + --with-local \ + --with-ip6 \ + --without-image \ + --without-markdown # Sconeserver configure script fails to find the libxml2 headers. ifeq ($(BR2_PACKAGE_LIBXML2),y) @@ -42,15 +51,6 @@ else SCONESERVER_CONF_OPTS += --without-sconesite endif -ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y) -SCONESERVER_DEPENDENCIES += imagemagick -SCONESERVER_CONF_OPTS += \ - --with-sconesite-image \ - --with-Magick++-config="$(STAGING_DIR)/usr/bin/Magick++-config" -else -SCONESERVER_CONF_OPTS += --without-sconesite-image --with-Magick++-config=no -endif - ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) SCONESERVER_DEPENDENCIES += mysql SCONESERVER_CONF_OPTS += \ @@ -82,12 +82,6 @@ else SCONESERVER_CONF_OPTS += --without-location endif -ifeq ($(BR2_PACKAGE_SCONESERVER_LETTUCE),y) -SCONESERVER_CONF_OPTS += --with-lettuce -else -SCONESERVER_CONF_OPTS += --without-lettuce -endif - ifeq ($(BR2_PACKAGE_SCONESERVER_MATHS),y) SCONESERVER_DEPENDENCIES += mpfr SCONESERVER_CONF_OPTS += --with-maths @@ -101,11 +95,4 @@ else SCONESERVER_CONF_OPTS += --without-testbuilder endif -ifeq ($(BR2_PACKAGE_SCONESERVER_UI),y) -SCONESERVER_DEPENDENCIES += xlib_libX11 -SCONESERVER_CONF_OPTS += --with-ui -else -SCONESERVER_CONF_OPTS += --without-ui -endif - $(eval $(autotools-package)) diff --git a/package/screen/screen.mk b/package/screen/screen.mk index c1705f742d..f75f92cb47 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -8,12 +8,16 @@ SCREEN_VERSION = 4.8.0 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING +SCREEN_CPE_ID_VENDOR = gnu SCREEN_DEPENDENCIES = ncurses SCREEN_AUTORECONF = YES SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" SCREEN_CONF_OPTS = --enable-colors256 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin +# 0008_CVE-2021-26937.patch +SCREEN_IGNORE_CVES += CVE-2021-26937 + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) SCREEN_DEPENDENCIES += linux-pam SCREEN_CONF_OPTS += --enable-pam diff --git a/package/scrypt/scrypt.hash b/package/scrypt/scrypt.hash index c73ff515bc..4004b89737 100644 --- a/package/scrypt/scrypt.hash +++ b/package/scrypt/scrypt.hash @@ -1,4 +1,4 @@ -# From http://www.tarsnap.com/scrypt/scrypt-sigs-1.3.0.asc -sha256 263034edd4d1e117d4051d9a9260c74dedb0efaf4491c5152b738978b3f32748 scrypt-1.3.0.tgz +# From http://www.tarsnap.com/scrypt/scrypt-sigs-1.3.1.asc +sha256 df2f23197c9589963267f85f9c5307ecf2b35a98b83a551bf1b1fb7a4d06d4c2 scrypt-1.3.1.tgz # Locally computed -sha256 adc1942c42da6e3370223a27ff4a6835924d2b41e509f9bee58a5e6ca1bbddae COPYRIGHT +sha256 1fb4da0e9000287414066a238f378528d5652f89b72b4a1d6b89fdd20031b22d COPYRIGHT diff --git a/package/scrypt/scrypt.mk b/package/scrypt/scrypt.mk index 820664f6c1..fb305faf41 100644 --- a/package/scrypt/scrypt.mk +++ b/package/scrypt/scrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCRYPT_VERSION = 1.3.0 +SCRYPT_VERSION = 1.3.1 SCRYPT_SOURCE = scrypt-$(SCRYPT_VERSION).tgz SCRYPT_SITE = http://www.tarsnap.com/scrypt SCRYPT_LICENSE = BSD-2-Clause diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 06564d610a..7389cd3edb 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -9,6 +9,8 @@ SDL_SOURCE = SDL-$(SDL_VERSION).tar.gz SDL_SITE = http://www.libsdl.org/release SDL_LICENSE = LGPL-2.1+ SDL_LICENSE_FILES = COPYING +SDL_CPE_ID_VENDOR = libsdl +SDL_CPE_ID_PRODUCT = simple_directmedia_layer SDL_INSTALL_STAGING = YES # we're patching configure.in, but package cannot autoreconf with our version of diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in index f29b3c7c38..07de75a4d5 100644 --- a/package/sdl2/Config.in +++ b/package/sdl2/Config.in @@ -32,10 +32,15 @@ comment "X11 video driver needs X.org" config BR2_PACKAGE_SDL2_KMSDRM bool "KMS/DRM video driver" depends on BR2_PACKAGE_LIBDRM + # requires libgbm from mesa3d + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL comment "KMS/DRM video driver needs libdrm" depends on !BR2_PACKAGE_LIBDRM +comment "KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d" + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + config BR2_PACKAGE_SDL2_OPENGL bool "OpenGL (GLX)" depends on BR2_PACKAGE_HAS_LIBGL diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index b72ae4bfcc..6b818fb002 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.0.12.tar.gz.sig -sha256 349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863 SDL2-2.0.12.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.14.tar.gz.sig +sha256 d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc SDL2-2.0.14.tar.gz # Locally calculated sha256 ae4df3759a726538607b84c00ab8f8a5567d9f38ad5397486eb9b5c5f626caef COPYING.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 501bb4699d..4bb683c00d 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,11 +4,13 @@ # ################################################################################ -SDL2_VERSION = 2.0.12 +SDL2_VERSION = 2.0.14 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib SDL2_LICENSE_FILES = COPYING.txt +SDL2_CPE_ID_VENDOR = libsdl +SDL2_CPE_ID_PRODUCT = simple_directmedia_layer SDL2_INSTALL_STAGING = YES SDL2_CONFIG_SCRIPTS = sdl2-config @@ -20,6 +22,26 @@ SDL2_CONF_OPTS += \ --disable-pulseaudio \ --disable-video-wayland +# We're patching configure.ac but autoreconf breaks the build +# The script only uses autoconf, not automake or libtool +SDL2_DEPENDENCIES += host-autoconf +define SDL2_RUN_AUTOGEN + cd $(@D) && PATH=$(BR_PATH) ./autogen.sh +endef +SDL2_PRE_CONFIGURE_HOOKS += SDL2_RUN_AUTOGEN + +# We are using autotools build system for sdl2, so the sdl2-config.cmake +# include path are not resolved like for sdl2-config script. +# Change the absolute /usr path to resolve relatively to the sdl2-config.cmake location. +# https://bugzilla.libsdl.org/show_bug.cgi?id=4597 +define SDL2_FIX_SDL2_CONFIG_CMAKE + $(SED) '2iget_filename_component(PACKAGE_PREFIX_DIR "$${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)\n' \ + $(STAGING_DIR)/usr/lib/cmake/SDL2/sdl2-config.cmake + $(SED) 's%"/usr"%$${PACKAGE_PREFIX_DIR}%' \ + $(STAGING_DIR)/usr/lib/cmake/SDL2/sdl2-config.cmake +endef +SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_FIX_SDL2_CONFIG_CMAKE + # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static @@ -30,6 +52,18 @@ else SDL2_CONF_OPTS += --disable-libudev endif +ifeq ($(BR2_X86_CPU_HAS_SSE),y) +SDL2_CONF_OPTS += --enable-sse +else +SDL2_CONF_OPTS += --disable-sse +endif + +ifeq ($(BR2_X86_CPU_HAS_3DNOW),y) +SDL2_CONF_OPTS += --enable-3dnow +else +SDL2_CONF_OPTS += --disable-3dnow +endif + ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb @@ -118,13 +152,6 @@ else SDL2_CONF_OPTS += --disable-video-opengles endif -ifeq ($(BR2_PACKAGE_TSLIB),y) -SDL2_DEPENDENCIES += tslib -SDL2_CONF_OPTS += --enable-input-tslib -else -SDL2_CONF_OPTS += --disable-input-tslib -endif - ifeq ($(BR2_PACKAGE_ALSA_LIB),y) SDL2_DEPENDENCIES += alsa-lib SDL2_CONF_OPTS += --enable-alsa @@ -133,7 +160,7 @@ SDL2_CONF_OPTS += --disable-alsa endif ifeq ($(BR2_PACKAGE_SDL2_KMSDRM),y) -SDL2_DEPENDENCIES += libdrm +SDL2_DEPENDENCIES += libdrm mesa3d SDL2_CONF_OPTS += --enable-video-kmsdrm else SDL2_CONF_OPTS += --disable-video-kmsdrm diff --git a/package/sdl2_image/sdl2_image.mk b/package/sdl2_image/sdl2_image.mk index 68572b3f9f..13de7b1268 100644 --- a/package/sdl2_image/sdl2_image.mk +++ b/package/sdl2_image/sdl2_image.mk @@ -10,6 +10,8 @@ SDL2_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release SDL2_IMAGE_INSTALL_STAGING = YES SDL2_IMAGE_LICENSE = Zlib SDL2_IMAGE_LICENSE_FILES = COPYING.txt +SDL2_IMAGE_CPE_ID_VENDOR = libsdl +SDL2_IMAGE_CPE_ID_PRODUCT = sdl_image # Unconditionally enable support for image formats that don't require # any dependency. diff --git a/package/sdl_image/sdl_image.hash b/package/sdl_image/sdl_image.hash index 90e3040a17..a0a2709f65 100644 --- a/package/sdl_image/sdl_image.hash +++ b/package/sdl_image/sdl_image.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699 SDL_image-1.2.12.tar.gz +sha256 abaf55f6c3bbd7c7271b523767f360317f1fbb2a79e74c38c0523a123970ac89 sdl_image-5d792dde2f764daf15dc48521774a3354330db69.tar.gz sha256 653649692218d56e5807bdc5b72f51aa6067bc44d30b757e18c03b32bcaf98da COPYING diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk index ee0712cc27..dafb64dfb0 100644 --- a/package/sdl_image/sdl_image.mk +++ b/package/sdl_image/sdl_image.mk @@ -4,18 +4,26 @@ # ################################################################################ -SDL_IMAGE_VERSION = 1.2.12 -SDL_IMAGE_SOURCE = SDL_image-$(SDL_IMAGE_VERSION).tar.gz -SDL_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release +# The latest officially released version of SDL_image is 1.2.12, released in 2012. +# Since then, there have been many bugfixes, including security fixes. +# +# This commit points to the SDL-1.2 branch from 14 Mar 2021. +SDL_IMAGE_VERSION = 5d792dde2f764daf15dc48521774a3354330db69 +SDL_IMAGE_SITE = $(call github,libsdl-org,SDL_image,$(SDL_IMAGE_VERSION)) SDL_IMAGE_INSTALL_STAGING = YES SDL_IMAGE_LICENSE = Zlib SDL_IMAGE_LICENSE_FILES = COPYING +SDL_IMAGE_CPE_ID_VENDOR = libsdl SDL_IMAGE_CONF_OPTS = \ --with-sdl-prefix=$(STAGING_DIR)/usr \ --with-sdl-exec-prefix=$(STAGING_DIR)/usr \ --disable-sdltest \ --disable-static \ + --disable-jpg-shared \ + --disable-png-shared \ + --disable-tif-shared \ + --disable-webp-shared \ --enable-bmp=$(if $(BR2_PACKAGE_SDL_IMAGE_BMP),yes,no) \ --enable-gif=$(if $(BR2_PACKAGE_SDL_IMAGE_GIF),yes,no) \ --enable-jpg=$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),yes,no) \ @@ -43,7 +51,8 @@ HOST_SDL_IMAGE_CONF_OPTS = \ --disable-static \ --disable-jpg-shared \ --disable-png-shared \ - --disable-tif-shared + --disable-tif-shared \ + --disable-webp-shared HOST_SDL_IMAGE_DEPENDENCIES = host-libjpeg host-libpng host-sdl diff --git a/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch b/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch index e0e85710d9..073460018f 100644 --- a/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch +++ b/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch @@ -6,7 +6,7 @@ Subject: [PATCH 1/1] Add 'Libs.private' field to pkg-config file In order to support static linking, SDL_mixer.pc should include a 'Libs.private' field listing all the libraries that SDL_mixer requires. -This patch adds such a field and also modifies configure.in so that +This patch adds such a field and also modifies configure.ac so that EXTRA_LDFLAGS (which is now also used as the value of 'Libs.private') no longer includes SDL_LIBS. This is done so as to prevent libraries required by SDL from being listed twice when 'pkg-config --libs --static @@ -20,14 +20,14 @@ Signed-off-by: Rodrigo Rebello --- Makefile.in | 2 +- SDL_mixer.pc.in | 1 + - configure.in | 1 - + configure.ac | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 3d10565..ce4efd4 100644 +index 027a99b..18015a2 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -63,7 +63,7 @@ $(objects): +@@ -61,7 +61,7 @@ $(objects): .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) @@ -35,7 +35,7 @@ index 3d10565..ce4efd4 100644 + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(SDL_LIBS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) - $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) + $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET) diff --git a/SDL_mixer.pc.in b/SDL_mixer.pc.in index 1c4965d..d793521 100644 --- a/SDL_mixer.pc.in @@ -47,11 +47,11 @@ index 1c4965d..d793521 100644 +Libs.private: @EXTRA_LDFLAGS@ Cflags: -I${includedir}/SDL -diff --git a/configure.in b/configure.in -index 2272b29..442eca6 100644 ---- a/configure.in -+++ b/configure.in -@@ -202,7 +202,6 @@ AM_PATH_SDL($SDL_VERSION, +diff --git a/configure.ac b/configure.ac +index 01a3d83..3ad3b4f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -200,7 +200,6 @@ AM_PATH_SDL($SDL_VERSION, AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) ) EXTRA_CFLAGS="$EXTRA_CFLAGS $SDL_CFLAGS" @@ -60,5 +60,4 @@ index 2272b29..442eca6 100644 dnl Check for math library AC_CHECK_LIB(m, pow, [LIBM="-lm"]) -- -2.1.4 - +2.27.0 diff --git a/package/sdl_mixer/Config.in b/package/sdl_mixer/Config.in index 42dfe63c0a..a886b7c1ac 100644 --- a/package/sdl_mixer/Config.in +++ b/package/sdl_mixer/Config.in @@ -9,3 +9,13 @@ config BR2_PACKAGE_SDL_MIXER SMPEG MP3 libraries. http://www.libsdl.org/projects/SDL_mixer/ + +if BR2_PACKAGE_SDL_MIXER + +config BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY + bool "MIDI support with built-in Timidity synth" + help + Support MIDI audio using the built-in synth based on Timidity. + You will need MIDI instruments installed in the filesystem. + +endif diff --git a/package/sdl_mixer/sdl_mixer.hash b/package/sdl_mixer/sdl_mixer.hash index 5d7e7836cd..5791708950 100644 --- a/package/sdl_mixer/sdl_mixer.hash +++ b/package/sdl_mixer/sdl_mixer.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a SDL_mixer-1.2.12.tar.gz -sha256 bc4c3bc32b311044d81c32b5e5402a6bc971a3b235850bb63445ec14bb6fe59e COPYING +sha256 b3c0f36500b23a6f5832d472f3e07b74f1d3f6bd00bf6700bc5e99babc9ba2ab sdl_mixer-d1725fcb7c4e987aeb7ecdc94cb8b6375b702170.tar.gz +sha256 bc4c3bc32b311044d81c32b5e5402a6bc971a3b235850bb63445ec14bb6fe59e COPYING diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk index 73eb821ff3..049ce15d1f 100644 --- a/package/sdl_mixer/sdl_mixer.mk +++ b/package/sdl_mixer/sdl_mixer.mk @@ -4,9 +4,12 @@ # ################################################################################ -SDL_MIXER_VERSION = 1.2.12 -SDL_MIXER_SOURCE = SDL_mixer-$(SDL_MIXER_VERSION).tar.gz -SDL_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release +# The latest officially released version of SDL_mixer is 1.2.12, released in 2012. +# Since then, there have been many bugfixes on master. +# +# This commit points to the SDL-1.2 branch from 15 Mar 2021. +SDL_MIXER_VERSION = d1725fcb7c4e987aeb7ecdc94cb8b6375b702170 +SDL_MIXER_SITE = $(call github,libsdl-org,SDL_mixer,$(SDL_MIXER_VERSION)) SDL_MIXER_LICENSE = Zlib SDL_MIXER_LICENSE_FILES = COPYING @@ -20,13 +23,30 @@ SDL_MIXER_DEPENDENCIES = sdl SDL_MIXER_AUTORECONF = YES SDL_MIXER_CONF_OPTS = \ - --without-x \ --with-sdl-prefix=$(STAGING_DIR)/usr \ - --disable-music-midi \ --disable-music-mod \ --disable-music-mp3 \ --disable-music-flac # configure script fails when cross compiling +ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y) +SDL_MIXER_DEPENDENCIES += fluidsynth +SDL_MIXER_CONF_OPTS += \ + --enable-music-midi \ + --enable-music-fluidsynth-midi +SDL_MIXER_HAS_MIDI = YES +endif + +ifeq ($(BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY),y) +SDL_MIXER_CONF_OPTS += \ + --enable-music-midi \ + --enable-music-timidity-midi +SDL_MIXER_HAS_MIDI = YES +endif + +ifneq ($(SDL_MIXER_HAS_MIDI),YES) +SDL_MIXER_CONF_OPTS += --disable-music-midi +endif + ifeq ($(BR2_PACKAGE_LIBMAD),y) SDL_MIXER_CONF_OPTS += --enable-music-mp3-mad-gpl SDL_MIXER_DEPENDENCIES += libmad diff --git a/package/sdl_net/sdl_net.hash b/package/sdl_net/sdl_net.hash index 4f2e1ae76a..e2b64336ee 100644 --- a/package/sdl_net/sdl_net.hash +++ b/package/sdl_net/sdl_net.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4 SDL_net-1.2.8.tar.gz +sha256 7549dbc91813c37986300e7f34e63a068b42fd91abb41cabcaca63b4c7404ea5 SDL_net-620b0ba7dd84a0fdbd4cc8ef1b2be1cc10f90ae3.tar.gz sha256 e542f822a6cd82deccf82cf0f50192917b0158d725a6bc6348ab1ccdd890ecbe COPYING diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk index c7e409a183..5f014af19d 100644 --- a/package/sdl_net/sdl_net.mk +++ b/package/sdl_net/sdl_net.mk @@ -4,8 +4,12 @@ # ################################################################################ -SDL_NET_VERSION = 1.2.8 -SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release +# The latest officially released version of SDL_image is 1.2.8, released in 2012. +# Since then, there have been several bugfixes. +# +# This commit points to the SDL-1.2 branch from 18 Feb 2021. +SDL_NET_VERSION = 620b0ba7dd84a0fdbd4cc8ef1b2be1cc10f90ae3 +SDL_NET_SITE = $(call github,libsdl-org,SDL_net,$(SDL_NET_VERSION)) SDL_NET_SOURCE = SDL_net-$(SDL_NET_VERSION).tar.gz SDL_NET_LICENSE = Zlib SDL_NET_LICENSE_FILES = COPYING diff --git a/package/sdl_ttf/sdl_ttf.hash b/package/sdl_ttf/sdl_ttf.hash index 86a15d6dd4..7c5a532660 100644 --- a/package/sdl_ttf/sdl_ttf.hash +++ b/package/sdl_ttf/sdl_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7 SDL_ttf-2.0.11.tar.gz +sha256 c24e3b48f5ffa5afb3256d23700506fad72117ac2834147c2e46ee94c3cb12b5 sdl_ttf-70b2940cc75e92aab02a67d2f827caf2836a2c74.tar.gz sha256 b609721d3d4ac67facaf86f068c8b311b6c5f6cef89b6d84268aa38b7867ab7b COPYING diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk index 1d94c6c5cf..254000443c 100644 --- a/package/sdl_ttf/sdl_ttf.mk +++ b/package/sdl_ttf/sdl_ttf.mk @@ -4,9 +4,10 @@ # ################################################################################ -SDL_TTF_VERSION = 2.0.11 -SDL_TTF_SOURCE = SDL_ttf-$(SDL_TTF_VERSION).tar.gz -SDL_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release +# There is unlikely to be a new SDL_ttf release for the foreseeable future: +# https://bugzilla.libsdl.org/show_bug.cgi?id=5344#c1 +SDL_TTF_VERSION = 70b2940cc75e92aab02a67d2f827caf2836a2c74 +SDL_TTF_SITE = $(call github,libsdl-org,SDL_ttf,$(SDL_TTF_VERSION)) SDL_TTF_LICENSE = Zlib SDL_TTF_LICENSE_FILES = COPYING diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 6bb3220553..64fb2035b0 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -9,6 +9,7 @@ SED_SOURCE = sed-$(SED_VERSION).tar.xz SED_SITE = $(BR2_GNU_MIRROR)/sed SED_LICENSE = GPL-3.0 SED_LICENSE_FILES = COPYING +SED_CPE_ID_VENDOR = gnu SED_CONF_OPTS = \ --bindir=/bin \ diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in index 5b6cbc80e3..0f1c281777 100644 --- a/package/selinux-python/Config.in +++ b/package/selinux-python/Config.in @@ -1,10 +1,11 @@ config BR2_PACKAGE_SELINUX_PYTHON bool "selinux-python" + depends on !BR2_PACKAGE_PYTHON depends on BR2_USE_MMU depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3 help A set of SELinux tools written in python that help with managing a system with SELinux enabled. If no packages are @@ -37,6 +38,10 @@ config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN endif +comment "selinux-python needs python3" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_PYTHON + comment "selinux-python packages needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 8cbac37016..00c28b722c 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 3650b5393b0d1790cac66db00e34f059aa91c23cfe3c2559676594e295d75fde selinux-python-2.9.tar.gz +sha256 770855ea8120ef23007fdb9db94b1ed6e8cd77917b584ed8877bbee9c16e74fb selinux-python-3.2.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 978bee7c88..61ec7eb595 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,25 +4,17 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 2.9 -SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +SELINUX_PYTHON_VERSION = 3.2 +SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = COPYING +SELINUX_PYTHON_DEPENDENCIES = python3 SELINUX_PYTHON_MAKE_OPTS += \ $(TARGET_CONFIGURE_OPTS) \ ARCH="$(BR2_ARCH)" \ - LIBDIR="$(STAGING_DIR)/usr/lib" - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -SELINUX_PYTHON_DEPENDENCIES += python3 -SELINUX_PYTHON_MAKE_OPTS += \ + LIBDIR="$(STAGING_DIR)/usr/lib" \ PYTHONLIBDIR="usr/lib/python$(PYTHON3_VERSION_MAJOR)" -else -SELINUX_PYTHON_DEPENDENCIES += python -SELINUX_PYTHON_MAKE_OPTS += \ - PYTHONLIBDIR="usr/lib/python$(PYTHON_VERSION_MAJOR)" -endif ifeq ($(BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW),y) SELINUX_PYTHON_DEPENDENCIES += checkpolicy diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index 386b442618..595183924d 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 8083679ee634570f6e9a18632f2c2862b9134fa308b689b2e1952a369ae5d907 semodule-utils-2.9.tar.gz +sha256 be155654883c8dc4d05493e04a3eb9e56d28803009f1fdd721d42c68b878f757 semodule-utils-3.2.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index 7102dbc5e0..426dbdb7b6 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,8 +4,8 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 2.9 -SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +SEMODULE_UTILS_VERSION = 3.2 +SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SEMODULE_UTILS_VERSION) SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = COPYING SEMODULE_UTILS_DEPENDENCIES = libsepol diff --git a/package/ser2net/ser2net.hash b/package/ser2net/ser2net.hash index 9a61564b0e..c6f0bb12a3 100644 --- a/package/ser2net/ser2net.hash +++ b/package/ser2net/ser2net.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 1a42e9605342fd3d6fa41b48be7f564a ser2net-4.1.2.tar.gz -sha1 2a40a94e37d89ca795b3a8f692583c78259383c1 ser2net-4.1.2.tar.gz +md5 8209d3dc88a6e16b4f62adbc367e510a ser2net-4.3.3.tar.gz +sha1 d735a3f6daaa8334e0ef5d8d1a81f88b61dafb8f ser2net-4.3.3.tar.gz # Locally computed: -sha256 9bdc33476834bbbdcbfbb77ff8f1b1952fe2e7e19dde7e6f7932cea0cec958c7 ser2net-4.1.2.tar.gz -sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING +sha256 f5be52033a690bd0dd711209a64ebaec024ee4542b1357350aad8489dc2bf720 ser2net-4.3.3.tar.gz +sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk index 08f1fe0c8b..0650ba5b99 100644 --- a/package/ser2net/ser2net.mk +++ b/package/ser2net/ser2net.mk @@ -4,8 +4,8 @@ # ################################################################################ -SER2NET_VERSION = 4.1.2 -SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net +SER2NET_VERSION = 4.3.3 +SER2NET_SITE = https://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPL-2.0+ SER2NET_LICENSE_FILES = COPYING SER2NET_DEPENDENCIES = gensio libyaml diff --git a/package/setools/Config.in b/package/setools/Config.in index 56a85b01c8..3ab7f55948 100644 --- a/package/setools/Config.in +++ b/package/setools/Config.in @@ -4,8 +4,7 @@ config BR2_PACKAGE_SETOOLS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR depends on BR2_USE_MMU - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_NETWORKX # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS select BR2_PACKAGE_LIBSELINUX @@ -18,9 +17,13 @@ config BR2_PACKAGE_SETOOLS * seinfoflow - information flow analysis for SELinux * sesearch - Search rules (allow, type_transition, etc.) - https://github.com/TresysTechnology/setools + https://github.com/SELinuxProject/setools/ -comment "setools needs a toolchain w/ threads, C++, wchar, dynamic library" +comment "setools needs a toolchain w/ threads, wchar, dynamic library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP + !BR2_USE_WCHAR + +comment "setools needs python3" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_PYTHON3 diff --git a/package/setools/setools.hash b/package/setools/setools.hash index 8729297064..74428a177c 100644 --- a/package/setools/setools.hash +++ b/package/setools/setools.hash @@ -1,7 +1,5 @@ -# From https://github.com/TresysTechnology/setools3/wiki/Download -md5 d68d0d4e4da0f01da0f208782ff04b91 setools-4.1.1.tar.bz2 # Locally computed -sha256 46a927ea2b163cbe1d35cc35da43e45853e13720c7e02d4cf75a498783c19610 setools-4.1.1.tar.gz +sha256 202eac5f857475937bee8136cff278aa2b4a4b94a0dec63fbbbe18c9eb644a4e setools-4.4.0.tar.gz sha256 2f7547e10f76a382c24c053595f38a5cc6dda9347f508f254ca490e0046a9624 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 63ca3651e8..8e1c0d2cc6 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -4,27 +4,21 @@ # ################################################################################ -SETOOLS_VERSION = 4.1.1 -SETOOLS_SITE = $(call github,TresysTechnology,setools,$(SETOOLS_VERSION)) -SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-swig +SETOOLS_VERSION = 4.4.0 +SETOOLS_SITE = $(call github,SELinuxProject,setools,$(SETOOLS_VERSION)) +SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-python-cython host-swig SETOOLS_INSTALL_STAGING = YES SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL +SETOOLS_CPE_ID_VENDOR = selinuxproject SETOOLS_SETUP_TYPE = setuptools -HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol host-python-networkx - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -SETOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) -else -SETOOLS_PYLIBVER = python$(PYTHON_VERSION_MAJOR) -SETOOLS_DEPENDENCIES += python-enum34 -HOST_SETOOLS_DEPENDENCIES += host-python-enum34 -endif +HOST_SETOOLS_DEPENDENCIES = host-python3-cython host-libselinux host-libsepol host-python-networkx +HOST_SETOOLS_NEEDS_HOST_PYTHON = python3 define SETOOLS_FIX_SETUP # By default, setup.py will look for libsepol.a in the host machines # /usr/lib directory. This needs to be changed to the staging directory. - $(SED) "s@base_lib_dirs =.*@base_lib_dirs = ['$(STAGING_DIR)/usr/lib']@g" \ + $(SED) "s@lib_dirs =.*@lib_dirs = ['$(STAGING_DIR)/usr/lib']@g" \ $(@D)/setup.py endef SETOOLS_POST_PATCH_HOOKS += SETOOLS_FIX_SETUP @@ -32,7 +26,7 @@ SETOOLS_POST_PATCH_HOOKS += SETOOLS_FIX_SETUP define HOST_SETOOLS_FIX_SETUP # By default, setup.py will look for libsepol.a in the host machines # /usr/lib directory. This needs to be changed to the host directory. - $(SED) "s@base_lib_dirs =.*@base_lib_dirs = ['$(HOST_DIR)/lib']@g" \ + $(SED) "s@lib_dirs =.*@lib_dirs = ['$(HOST_DIR)/lib']@g" \ $(@D)/setup.py endef HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP @@ -43,7 +37,7 @@ HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP ifeq ($(BR2_PACKAGE_PYTHON_PYQT5),) define SETOOLS_REMOVE_QT_SCRIPTS $(RM) $(TARGET_DIR)/usr/bin/apol - $(RM) -r $(TARGET_DIR)/lib/$(SETOOLS_PYLIBVER)/site-packages/setoolsgui/ + $(RM) -r $(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/setoolsgui/ endef SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_QT_SCRIPTS endif diff --git a/package/setserial/setserial.hash b/package/setserial/setserial.hash index ce3b369f56..991d2860a9 100644 --- a/package/setserial/setserial.hash +++ b/package/setserial/setserial.hash @@ -1,3 +1,5 @@ # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/setserial/setserial_2.17-45.3.dsc -sha256 7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a setserial_2.17.orig.tar.gz -sha256 33db87e8a86cf12b7c97efca9e056865e71358e8cfeb3931118b2647ce1eecc6 setserial_2.17-45.3.diff.gz +sha256 7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a setserial_2.17.orig.tar.gz +sha256 33db87e8a86cf12b7c97efca9e056865e71358e8cfeb3931118b2647ce1eecc6 setserial_2.17-45.3.diff.gz +# Locally computed +sha256 1d7e810ed28daf370def626dfd4c502f2f77d2b678f1ac72e2ba675dd6f9af0d debian/copyright diff --git a/package/sg3_utils/sg3_utils.hash b/package/sg3_utils/sg3_utils.hash index 14b94947d4..d6c7f03abb 100644 --- a/package/sg3_utils/sg3_utils.hash +++ b/package/sg3_utils/sg3_utils.hash @@ -1,6 +1,6 @@ # Locally calculated from download (no sig, hash) -sha256 ca94ac106510742cd8ff5ead4a7e5c89d410653291401daf4632d2bef2a35b05 sg3_utils-1.44.tar.xz +sha256 c7dab547dc37381fa50e482d9da680fe64b88cfe0e3d79b61e478de14f58b2ee sg3_utils-1.45.tar.xz # Hash for license files -sha256 d516b8b337a77e3d4c65dffe708ca7fb25b1cb4ec77ec362cf11ed659b9250bc COPYING -sha256 31f6d59679e0fb21c9358f22484e6e3c53e20ef08c0950fd38a4a867cb55edc9 BSD_LICENSE +sha256 d516b8b337a77e3d4c65dffe708ca7fb25b1cb4ec77ec362cf11ed659b9250bc COPYING +sha256 8ddd1d82f2be2f5cbd5b5c3b5c2ee94a90d2ca7112958448da74dd78384fd96a BSD_LICENSE diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk index 7070d6f83d..11b3691ffc 100644 --- a/package/sg3_utils/sg3_utils.mk +++ b/package/sg3_utils/sg3_utils.mk @@ -4,13 +4,13 @@ # ################################################################################ -SG3_UTILS_VERSION = 1.44 +SG3_UTILS_VERSION = 1.45 SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz SG3_UTILS_SITE = http://sg.danny.cz/sg/p -SG3_UTILS_LICENSE = BSD-3-Clause (library) +SG3_UTILS_LICENSE = BSD-2-Clause (library) # Some utils progs are GPL-2.0+ licensed while others are BSD-3-Clause ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y) -SG3_UTILS_LICENSE += , GPL-2.0+ (programs), BSD-3-Clause (programs) +SG3_UTILS_LICENSE += , GPL-2.0+ (programs), BSD-2-Clause (programs) endif SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE @@ -20,6 +20,11 @@ SG3_UTILS_AUTORECONF = YES # install the libsgutils2 library SG3_UTILS_INSTALL_STAGING = YES +# Uses __atomic_fetch_add_4 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +SG3_UTILS_CONF_ENV += LIBS="-latomic" +endif + ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),) define SG3_UTILS_REMOVE_PROGS for prog in \ diff --git a/package/shadowsocks-libev/shadowsocks-libev.hash b/package/shadowsocks-libev/shadowsocks-libev.hash index 76928ebb48..4f1d6d2fa5 100644 --- a/package/shadowsocks-libev/shadowsocks-libev.hash +++ b/package/shadowsocks-libev/shadowsocks-libev.hash @@ -1,7 +1,7 @@ # Locally computed -sha256 677356a5ed6b5ae9e32a898061db2587158ff27e245db03f4bde9b006ef12dc9 shadowsocks-libev-3.3.3.tar.gz +sha256 cfc8eded35360f4b67e18dc447b0c00cddb29cc57a3cec48b135e5fb87433488 shadowsocks-libev-3.3.5.tar.gz # License files, locally calculated -sha256 736883f97d44dbec288bb82819f18f4f86d02ae3192f6a9abefa00db76bace41 COPYING -sha256 c41a4bc2c4c43e4daa3051e77e31b2d5c8500498afaeac6d831d55a4bb8de3fb libbloom/LICENSE -sha256 4fa2ada54f8c0410ec243265378242ffe862386d5ac517f8dd30a1911d25ae93 libcork/COPYING +sha256 736883f97d44dbec288bb82819f18f4f86d02ae3192f6a9abefa00db76bace41 COPYING +sha256 c41a4bc2c4c43e4daa3051e77e31b2d5c8500498afaeac6d831d55a4bb8de3fb libbloom/LICENSE +sha256 4fa2ada54f8c0410ec243265378242ffe862386d5ac517f8dd30a1911d25ae93 libcork/COPYING diff --git a/package/shadowsocks-libev/shadowsocks-libev.mk b/package/shadowsocks-libev/shadowsocks-libev.mk index 4b0b963eef..c76983ce5e 100644 --- a/package/shadowsocks-libev/shadowsocks-libev.mk +++ b/package/shadowsocks-libev/shadowsocks-libev.mk @@ -4,12 +4,15 @@ # ################################################################################ -SHADOWSOCKS_LIBEV_VERSION = 3.3.3 +SHADOWSOCKS_LIBEV_VERSION = 3.3.5 SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION) SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause (libbloom), BSD-3-Clause (libcork, libipset) SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING +SHADOWSOCKS_LIBEV_CPE_ID_VENDOR = shadowsocks SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES +# We're patching configure.ac +SHADOWSOCKS_LIBEV_AUTORECONF = YES SHADOWSOCKS_LIBEV_CONF_OPTS = \ --with-pcre=$(STAGING_DIR)/usr \ --disable-ssp diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash index b072fad045..ebc81dedc1 100644 --- a/package/shairport-sync/shairport-sync.hash +++ b/package/shairport-sync/shairport-sync.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9757dd7f19c0bc28cb06a6753305c3ed89da2d271d069b36d1b12173309c1459 shairport-sync-3.3.5.tar.gz +sha256 c92f9a2d86dd1138673abc66e0010c94412ad6a46da8f36c3d538f4fa6b9faca shairport-sync-3.3.8.tar.gz sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 880a058909..ba8b44a621 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 3.3.5 +SHAIRPORT_SYNC_VERSION = 3.3.8 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause @@ -28,14 +28,16 @@ SHAIRPORT_SYNC_CONF_ENV += LIBS="$(SHAIRPORT_SYNC_CONF_LIBS)" # libavahi-client. ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) SHAIRPORT_SYNC_DEPENDENCIES += avahi -SHAIRPORT_SYNC_CONF_OPTS += --with-avahi +SHAIRPORT_SYNC_CONF_OPTS += --with-avahi --without-tinysvcmdns else -SHAIRPORT_SYNC_CONF_OPTS += --with-tinysvcmdns +SHAIRPORT_SYNC_CONF_OPTS += --without-avahi --with-tinysvcmdns endif ifeq ($(BR2_PACKAGE_LIBDAEMON),y) SHAIRPORT_SYNC_DEPENDENCIES += libdaemon SHAIRPORT_SYNC_CONF_OPTS += --with-libdaemon +else +SHAIRPORT_SYNC_CONF_OPTS += --without-libdaemon endif # OpenSSL or mbedTLS @@ -54,21 +56,29 @@ endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION),y) SHAIRPORT_SYNC_DEPENDENCIES += libsndfile SHAIRPORT_SYNC_CONF_OPTS += --with-convolution +else +SHAIRPORT_SYNC_CONF_OPTS += --without-convolution endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y) SHAIRPORT_SYNC_DEPENDENCIES += libglib2 SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface +else +SHAIRPORT_SYNC_CONF_OPTS += --without-dbus-interface --without-mpris-interface endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR),y) SHAIRPORT_SYNC_DEPENDENCIES += libsoxr SHAIRPORT_SYNC_CONF_OPTS += --with-soxr +else +SHAIRPORT_SYNC_CONF_OPTS += --without-soxr endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_MQTT),y) SHAIRPORT_SYNC_DEPENDENCIES += avahi dbus mosquitto SHAIRPORT_SYNC_CONF_OPTS += --with-mqtt-client +else +SHAIRPORT_SYNC_CONF_OPTS += --without-mqtt-client endif define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS diff --git a/package/shellinabox/shellinabox.mk b/package/shellinabox/shellinabox.mk index 4c93fdccef..58c1668112 100644 --- a/package/shellinabox/shellinabox.mk +++ b/package/shellinabox/shellinabox.mk @@ -8,6 +8,7 @@ SHELLINABOX_VERSION = 2.20 SHELLINABOX_SITE = $(call github,shellinabox,shellinabox,v$(SHELLINABOX_VERSION)) SHELLINABOX_LICENSE = GPL-2.0 with OpenSSL exception SHELLINABOX_LICENSE_FILES = COPYING GPL-2 +SHELLINABOX_CPE_ID_VENDOR = shellinabox_project # 0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch SHELLINABOX_IGNORE_CVES += CVE-2018-16789 diff --git a/package/sigrok-cli/sigrok-cli.hash b/package/sigrok-cli/sigrok-cli.hash index 63a3dd80aa..3231bf82cf 100644 --- a/package/sigrok-cli/sigrok-cli.hash +++ b/package/sigrok-cli/sigrok-cli.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5669d968c2de3dfc6adfda76e83789b6ba76368407c832438cef5e7099a65e1c sigrok-cli-0.7.0.tar.gz +sha256 f52413429f47d457c333db0fd068416ab7a3f9e35ca76de8624dc5ac6fb07797 sigrok-cli-0.7.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/sigrok-cli/sigrok-cli.mk b/package/sigrok-cli/sigrok-cli.mk index 1e017d69b8..3d1e187882 100644 --- a/package/sigrok-cli/sigrok-cli.mk +++ b/package/sigrok-cli/sigrok-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -SIGROK_CLI_VERSION = 0.7.0 +SIGROK_CLI_VERSION = 0.7.1 SIGROK_CLI_SITE = http://sigrok.org/download/source/sigrok-cli SIGROK_CLI_LICENSE = GPL-3.0+ SIGROK_CLI_LICENSE_FILES = COPYING diff --git a/package/sispmctl/Config.in b/package/sispmctl/Config.in index 6066dc051b..b08116e844 100644 --- a/package/sispmctl/Config.in +++ b/package/sispmctl/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SISPMCTL bool "sispmctl" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_WCHAR depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBUSB @@ -13,6 +14,7 @@ config BR2_PACKAGE_SISPMCTL http://sispmctl.sourceforge.net/ -comment "sispmctl needs a toolchain w/ threads, wchar" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "sispmctl needs a toolchain w/ threads, wchar, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU diff --git a/package/sispmctl/sispmctl.hash b/package/sispmctl/sispmctl.hash index 941eb3dfda..e22efcfbed 100644 --- a/package/sispmctl/sispmctl.hash +++ b/package/sispmctl/sispmctl.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 300adc32ab35a4f9260705f8f57ccd83c3c6601fc493dbe7d259335938819aaf sispmctl-4.2.tar.gz +sha256 6a9ec7125e8c01bb45d4a3b56f07fb41fc437020c8dcd8c0f29ebb98dc55a647 sispmctl-4.9.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sispmctl/sispmctl.mk b/package/sispmctl/sispmctl.mk index ed0c8c2958..b6e156c66a 100644 --- a/package/sispmctl/sispmctl.mk +++ b/package/sispmctl/sispmctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -SISPMCTL_VERSION = 4.2 +SISPMCTL_VERSION = 4.9 SISPMCTL_SITE = http://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION) SISPMCTL_LICENSE = GPL-2.0+ SISPMCTL_LICENSE_FILES = COPYING diff --git a/package/skalibs/skalibs.hash b/package/skalibs/skalibs.hash index bb5a60212f..48e4028edc 100644 --- a/package/skalibs/skalibs.hash +++ b/package/skalibs/skalibs.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 d3b204afc462b9659e0c16f6df1c796e7612534f537eec053529f67ddcd086a5 skalibs-2.9.1.0.tar.gz -sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING +sha256 b780b0ae650dda0c3ec5f8975174998af2d24c2a2e2be669b1bab46e73b1464d skalibs-2.10.0.3.tar.gz +sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING diff --git a/package/skalibs/skalibs.mk b/package/skalibs/skalibs.mk index 8b995f7961..77db57de96 100644 --- a/package/skalibs/skalibs.mk +++ b/package/skalibs/skalibs.mk @@ -4,14 +4,14 @@ # ################################################################################ -SKALIBS_VERSION = 2.9.1.0 +SKALIBS_VERSION = 2.10.0.3 SKALIBS_SITE = http://skarnet.org/software/skalibs SKALIBS_LICENSE = ISC SKALIBS_LICENSE_FILES = COPYING SKALIBS_INSTALL_STAGING = YES SKALIBS_CONF_OPTS = \ - --prefix=/usr \ + --prefix=/ \ --with-default-path=/sbin:/usr/sbin:/bin:/usr/bin \ --with-sysdep-devurandom=yes \ $(SHARED_STATIC_LIBS_OPTS) diff --git a/package/slirp/Config.in b/package/slirp/Config.in index 51dea9700f..38fd5277af 100644 --- a/package/slirp/Config.in +++ b/package/slirp/Config.in @@ -1,16 +1,14 @@ config BR2_PACKAGE_SLIRP bool "slirp" + depends on BR2_USE_MMU # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + select BR2_PACKAGE_LIBGLIB2 help - The Spice project aims to provide a complete open source - solution for interaction with virtualized desktop devices. - The Spice project deals with both the virtualized devices - and the front-end. Interaction between front-end and - back-end is done using VD-Interfaces. + libslirp is a user-mode networking library used by virtual + machines, containers or various tools. - This package implements the slirp-part for Spice. Slirp - emulates a PPP or SLIP connection over a normal terminal. - - http://www.spice-space.org/ + https://gitlab.freedesktop.org/slirp/libslirp/ NOTE: This package has some history of a unique kind: @@ -21,5 +19,10 @@ config BR2_PACKAGE_SLIRP - during that period, QEMU (Fabrice BELLARD) forked the code and included it in QEMU - and it was imported from this breed by the Spice project - around May 2009 - - which is what we use here + around May 2009 which archived it in 2012 + - So we switched to + https://gitlab.freedesktop.org/slirp/libslirp + +comment "slirp needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index 7cfead65e2..43d2c520e9 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -4,18 +4,14 @@ # ################################################################################ -# There's no tarball releases of slirp, so we use the git repo -# Also, there's no tag, so we use a random SHA1 (master's HEAD -# of today) -SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550 -SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp -SLIRP_LICENSE = BSD-4-Clause, BSD-2-Clause -# Note: The license file 'COPYRIGHT' is missing from the sources, -# although some files refer to it. +SLIRP_VERSION = 4.6.1 +SLIRP_SOURCE = libslirp-$(SLIRP_VERSION).tar.xz +SLIRP_SITE = https://gitlab.freedesktop.org/slirp/libslirp/uploads/83b199ea6fcdfc0c243dfde8546ee4c9 +SLIRP_LICENSE = BSD-3-Clause +SLIRP_LICENSE_FILES = COPYRIGHT +SLIRP_CPE_ID_VENDOR = libslirp_project +SLIRP_CPE_ID_PRODUCT = libslirp SLIRP_INSTALL_STAGING = YES +SLIRP_DEPENDENCIES = libglib2 -# As we're using the git tree, there's no ./configure, -# so we need to autoreconf. -SLIRP_AUTORECONF = YES - -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/smack/smack.mk b/package/smack/smack.mk index d2ac005ab9..b7b656e644 100644 --- a/package/smack/smack.mk +++ b/package/smack/smack.mk @@ -14,4 +14,10 @@ SMACK_DEPENDENCIES = host-pkgconf # Sources from GitHub, no configure script included. SMACK_AUTORECONF = YES +define SMAKE_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SMACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK) +endef + $(eval $(autotools-package)) diff --git a/package/smartmontools/smartmontools.hash b/package/smartmontools/smartmontools.hash index bec007aabd..3c5535b29a 100644 --- a/package/smartmontools/smartmontools.hash +++ b/package/smartmontools/smartmontools.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/smartmontools/files/smartmontools/7.1/ -md5 430cd5f64caa4524018b536e5ecd9c29 smartmontools-7.1.tar.gz -sha1 207dc2b50cab1c6fba7bc248665fbbe3189374e1 smartmontools-7.1.tar.gz +# From http://sourceforge.net/projects/smartmontools/files/smartmontools/7.2/ +md5 e8d134c69ae4959a05cb56b31172ffb1 smartmontools-7.2.tar.gz +sha1 8d68241096f6ed5b1bbcd8b427fa4a881c1f3e33 smartmontools-7.2.tar.gz # Locally computed -sha256 3f734d2c99deb1e4af62b25d944c6252de70ca64d766c4c7294545a2e659b846 smartmontools-7.1.tar.gz +sha256 5cd98a27e6393168bc6aaea070d9e1cd551b0f898c52f66b2ff2e5d274118cd6 smartmontools-7.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index 9dc2f789cc..2e2bbcd4e2 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -4,12 +4,12 @@ # ################################################################################ -SMARTMONTOOLS_VERSION = 7.1 +SMARTMONTOOLS_VERSION = 7.2 SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION) SMARTMONTOOLS_LICENSE = GPL-2.0+ SMARTMONTOOLS_LICENSE_FILES = COPYING -# We're patching configure.ac -SMARTMONTOOLS_AUTORECONF = YES +SMARTMONTOOLS_CPE_ID_VENDOR = smartmontools +SMARTMONTOOLS_SELINUX_MODULES = smartmon ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) SMARTMONTOOLS_CONF_OPTS += --with-libcap-ng diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk index 1a36c75d47..45f4d6c1f0 100644 --- a/package/smcroute/smcroute.mk +++ b/package/smcroute/smcroute.mk @@ -9,13 +9,14 @@ SMCROUTE_SOURCE = smcroute-$(SMCROUTE_VERSION).tar.xz SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) SMCROUTE_LICENSE = GPL-2.0+ SMCROUTE_LICENSE_FILES = COPYING +SMCROUTE_CPE_ID_VENDOR = troglobit SMCROUTE_CONF_OPTS = ac_cv_func_setpgrp_void=yes #BUG:The package Makefile uses CC?= even though the package is autotools based SMCROUTE_MAKE_ENV = $(TARGET_CONFIGURE_OPTS) ifeq ($(BR2_PACKAGE_LIBCAP),y) -SMCROUTE_DEPENDENCIES = libcap +SMCROUTE_DEPENDENCIES += libcap SMCROUTE_CONF_OPTS += --with-libcap else SMCROUTE_CONF_OPTS += --without-libcap diff --git a/package/smstools3/0001-fix-Makefile.patch b/package/smstools3/0001-fix-Makefile.patch index 5842357451..338a53e745 100644 --- a/package/smstools3/0001-fix-Makefile.patch +++ b/package/smstools3/0001-fix-Makefile.patch @@ -7,6 +7,8 @@ Although make-3.81 is happy about it, make-4.0 (and probably 3.82 too) do whine loudly. Signed-off-by: "Yann E. MORIN" +[Fabrice: update for 3.1.21] +Signed-off-by: Fabrice Fontaine diff -durN smstools3-3.1.15.orig/src/Makefile smstools3-3.1.15/src/Makefile --- smstools3-3.1.15.orig/src/Makefile 2010-09-21 13:29:14.000000000 +0200 @@ -15,15 +17,15 @@ diff -durN smstools3-3.1.15.orig/src/Makefile smstools3-3.1.15/src/Makefile all: smsd --smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o +-smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o charshift.o - ifneq (,$(findstring SOLARIS,$(CFLAGS))) ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS))) - override LFLAGS += -lsocket -lnsl + override LFLAGS += -lsocket -lnsl endif endif -+smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o ++smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o charshift.o ifneq (,$(findstring NOSTATS,$(CFLAGS))) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) else diff --git a/package/smstools3/smstools3.hash b/package/smstools3/smstools3.hash index 9eb73e9380..27eda2af96 100644 --- a/package/smstools3/smstools3.hash +++ b/package/smstools3/smstools3.hash @@ -1,4 +1,7 @@ -# Locally calculated -sha256 ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59 smstools3-3.1.15.tar.gz -sha256 61ae4d83c30236cc7df40b1ccbbe6be07d334f9579b8d0facecc34334fe15b61 doc/license.html +# From http://smstools3.kekekasvi.com/packages/ +md5 6a9f038fb38a49cc3a4f8f14a88fb8af smstools-3.1.21.tar.gz +sha256 a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084 smstools3-3.1.21.tar.gz + +# Hash for license files +sha256 884d8f0377259f291432f4fa31d5a9720eefa0e0d797652ae686b6325a434624 doc/license.html sha256 786b4da4dd900cad87a7dc17769458607bdeae575d62e6e98ad7144e9225f8d3 LICENSE diff --git a/package/smstools3/smstools3.mk b/package/smstools3/smstools3.mk index 2dfd11b8c5..d13900bc03 100644 --- a/package/smstools3/smstools3.mk +++ b/package/smstools3/smstools3.mk @@ -4,10 +4,11 @@ # ################################################################################ -SMSTOOLS3_VERSION = 3.1.15 +SMSTOOLS3_VERSION = 3.1.21 SMSTOOLS3_SITE = http://smstools3.kekekasvi.com/packages SMSTOOLS3_LICENSE = GPL-2.0+ SMSTOOLS3_LICENSE_FILES = doc/license.html LICENSE +SMSTOOLS3_SELINUX_MODULES = smstools SMSTOOLS3_CFLAGS = $(TARGET_CFLAGS) SMSTOOLS3_CFLAGS += -D NUMBER_OF_MODEMS=$(BR2_PACKAGE_SMSTOOLS3_NB_MODEMS) diff --git a/package/snappy/snappy.hash b/package/snappy/snappy.hash index e9ac4324c0..c08c5b7fe4 100644 --- a/package/snappy/snappy.hash +++ b/package/snappy/snappy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4 snappy-1.1.7.tar.gz +sha256 16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f snappy-1.1.8.tar.gz sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk index 74d398de81..e1fa28fbce 100644 --- a/package/snappy/snappy.mk +++ b/package/snappy/snappy.mk @@ -4,10 +4,11 @@ # ################################################################################ -SNAPPY_VERSION = 1.1.7 +SNAPPY_VERSION = 1.1.8 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3-Clause SNAPPY_LICENSE_FILES = COPYING +SNAPPY_CPE_ID_VENDOR = google SNAPPY_INSTALL_STAGING = YES SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_TESTS=OFF diff --git a/package/sngrep/sngrep.hash b/package/sngrep/sngrep.hash index a751d95394..33fa91ef5e 100644 --- a/package/sngrep/sngrep.hash +++ b/package/sngrep/sngrep.hash @@ -1,6 +1,6 @@ -# From https://github.com/irontec/sngrep/releases/download/v1.4.6/sngrep-1.4.6.tar.gz.md5sum -md5 094e76786b118258bac69e1514aac826 sngrep-1.4.6.tar.gz +# From https://github.com/irontec/sngrep/releases/download/v1.4.7/sngrep-1.4.7.tar.gz.md5sum +md5 78fe753e24f36ddaf627bc2b734f45ba sngrep-1.4.7.tar.gz # Locally computed -sha256 638d6557dc68db401b07d73b2e7f8276800281f021fe0c942992566d6b59a48a sngrep-1.4.6.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE +sha256 3c96aadd8b8c6b7adb5552d6fb4234f2000f15109b0f6c5feb632c81306cc49b sngrep-1.4.7.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index 1cb3814c9e..841a7bb991 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNGREP_VERSION = 1.4.6 +SNGREP_VERSION = 1.4.7 SNGREP_SITE = $(call github,irontec,sngrep,v$(SNGREP_VERSION)) SNGREP_LICENSE = GPL-3.0+ SNGREP_LICENSE_FILES = LICENSE diff --git a/package/snmppp/Config.in b/package/snmppp/Config.in index 8d284673bc..1f05f53f9f 100644 --- a/package/snmppp/Config.in +++ b/package/snmppp/Config.in @@ -21,10 +21,15 @@ config BR2_PACKAGE_SNMPPP_LOGGING config BR2_PACKAGE_SNMPPP_SNMPV3 bool "enable SNMPv3" default y + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help Enable optional support for SNMP++. This selects OpenSSL. +comment "SNMPv3 needs a toolchain w/ gcc >= 4.8" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + endif comment "snmp++ needs a toolchain w/ threads, C++, dynamic library" diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index bc54d8c6ba..2dcf836fc7 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 06a2af44b2976b61667756e3f74604820fce0ef8bfc7f31280308f1eeb7633f3 snmp++-3.3.11a.tar.gz -sha256 5538f9efc2559a35025df5d6bf19dc85c2bfe54dca6e8409d5690d4f7c69166a src/v3.cpp +sha256 a3eb75e2310c315d9b2c2094154c7cd9b46684adb80a4b36b8957dcc09af4041 snmp++-3.4.2.tar.gz +sha256 f6fd4321c7eb6e51a272f91f964aea7f53039bb2b55f690d5a9d042f3a5d79b9 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 0e862faa48..601e28e207 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.3.11a +SNMPPP_VERSION = 3.4.2 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf @@ -14,6 +14,7 @@ SNMPPP_LICENSE = SNMP++ SNMPPP_LICENSE_FILES = src/v3.cpp ifeq ($(BR2_PACKAGE_SNMPPP_SNMPV3),y) +SNMPPP_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" SNMPPP_CONF_OPTS += --enable-snmpv3 SNMPPP_DEPENDENCIES += openssl else diff --git a/package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch b/package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch index afe9672a3c..66d4fa2839 100644 --- a/package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch +++ b/package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch @@ -7,6 +7,8 @@ Remove the code that adds unsafe header/library path when cross-compiling on a Fedora host machine. Signed-off-by: Sergio Prado +[Fabrice: Update for 2.9.18.1 (also fix build on Centos host machine)] +Signed-off-by: Fabrice Fontaine --- configure.in | 24 ------------------------ 1 file changed, 24 deletions(-) @@ -15,7 +17,7 @@ diff --git a/configure.in b/configure.in index e6586f399898..fb35d4d7e3e3 100644 --- a/configure.in +++ b/configure.in -@@ -957,30 +957,6 @@ if test "x$enable_dlclose" = "xno"; then +@@ -957,54 +957,6 @@ if test "x$enable_dlclose" = "xno"; then AC_DEFINE([DISABLE_DLCLOSE_FOR_VALGRIND_TESTING],[1],[Don't close opened shared objects for valgrind leak testing of dynamic libraries]) fi @@ -42,6 +44,30 @@ index e6586f399898..fb35d4d7e3e3 100644 - extra_incl="-I/usr/include/tirpc" - fi -fi +- +-################################################## +-# Centos 8+ does not have inbuilt SunRPC support # +-# in glibc and is separately availble in tirpc # +-# package. Make sure we've got the library and # +-# link it # +-################################################## +-if test -f /etc/centos-release ; then +- LINUX_FLAVOUR=$(awk '{ print $1 }' /etc/centos-release) +- DISTRO_VERSION=`cut -d ' ' -f 4 /etc/centos-release | cut -d '.' -f 1` +- if [[ "$LINUX_FLAVOUR" == "CentOS" ]] && [[ $DISTRO_VERSION -ge 8 ]]; then +- TIRPC="" +- AC_CHECK_LIB(tirpc,bindresvport,, TIRPC="no") +- echo "$TIRPC" +- if test "x$TIRPC" = "xno"; then +- echo +- echo " ERROR! tirpc not found, get it by running " +- echo " yum install libtirpc-devel or dnf install libtirpc-devel" +- exit +- fi +- LIBS="${LIBS} -ltirpc" +- extra_incl="-I/usr/include/tirpc" +- fi +-fi - Z_LIB="" AC_CHECK_HEADERS(zlib.h,, Z_LIB="no") diff --git a/package/snort/snort.hash b/package/snort/snort.hash index 7364df1330..6df7ae5229 100644 --- a/package/snort/snort.hash +++ b/package/snort/snort.hash @@ -1,6 +1,9 @@ +# From https://www.snort.org/downloads/snort/md5s +md5 2b4e30300ef6feca1f60c267e727c6c0 snort-2.9.18.1.tar.gz + # Locally computed: -sha256 2cccfc1d1a706586cd47ae9f085a7d5e4e36390b8e9c28cd2020b4b5b587f6c3 snort-2.9.15.1.tar.gz +sha256 da8af0f1b2e4f247d970c6a3c0e83fb6dcd5c84faa21aea49f306f269e8e28aa snort-2.9.18.1.tar.gz # Hash for license files: -sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE -sha256 3f1cbfb20bb2c608e1a474421880d08b8cba6abb00ab7736d22c481d71656a6d COPYING +sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE +sha256 3f1cbfb20bb2c608e1a474421880d08b8cba6abb00ab7736d22c481d71656a6d COPYING diff --git a/package/snort/snort.mk b/package/snort/snort.mk index 0f1d6b13de..54017d3460 100644 --- a/package/snort/snort.mk +++ b/package/snort/snort.mk @@ -4,10 +4,12 @@ # ################################################################################ -SNORT_VERSION = 2.9.15.1 +SNORT_VERSION = 2.9.18.1 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING +SNORT_CPE_ID_VENDOR = snort +SNORT_SELINUX_MODULES = snort SNORT_DEPENDENCIES = libpcap libdnet daq pcre zlib host-pkgconf diff --git a/package/socat/socat.hash b/package/socat/socat.hash index e5b65925d1..5a4c520455 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,8 +1,8 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 3cca4f8cd9d2d1caabd9cc099451bac9 socat-1.7.3.4.tar.bz2 +md5 36cad050ecf4981ab044c3fbd75c643f socat-1.7.4.1.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc socat-1.7.3.4.tar.bz2 +sha256 3faca25614e89123dff5045680549ecef519d02e331aaf3c4f5a8f6837c675e9 socat-1.7.4.1.tar.bz2 # Locally calculated -sha256 4846488cea98a2905dc75b7aa5eea721568e372447efe06b85bd896ee8c54f10 README -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL +sha256 b1ebebbce145027f4268211f36d121b083aeeabdc1736eb144b8afd8e86ce8da README +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 4bfdc18f91..61c9852565 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,11 +4,12 @@ # ################################################################################ -SOCAT_VERSION = 1.7.3.4 +SOCAT_VERSION = 1.7.4.1 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception SOCAT_LICENSE_FILES = README COPYING COPYING.OpenSSL +SOCAT_CPE_ID_VENDOR = dest-unreach ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) SOCAT_CONF_ENV += \ diff --git a/package/socketcand/socketcand.hash b/package/socketcand/socketcand.hash index 6ee0c314a8..713939897d 100644 --- a/package/socketcand/socketcand.hash +++ b/package/socketcand/socketcand.hash @@ -1,3 +1,3 @@ # Locally computed sha256 3c5cc7af4ff707ac344e62d2e37a74b59aeccd14b88e837cc142c52b69d64a39 socketcand-69e2201222f015a1abe7a58ecf61325012cd91b1.tar.gz -sha256 b32028a4080be38208ee951c6e8afc6f3bfb3d5496559b260ab0dce9472740f6 socketcand.c +sha256 18bda0db4e3c56cefdb1b9b01b7eada7764c0746f6321378c30d78f5ee81cfee socketcand.c diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk index b11aa3c91e..dbf859d3f9 100644 --- a/package/socketcand/socketcand.mk +++ b/package/socketcand/socketcand.mk @@ -11,7 +11,7 @@ SOCKETCAND_LICENSE = BSD-3-Clause or GPL-2.0 SOCKETCAND_LICENSE_FILES = socketcand.c ifeq ($(BR2_PACKAGE_LIBCONFIG),y) -SOCKETCAND_DEPENDENCIES = libconfig +SOCKETCAND_DEPENDENCIES += libconfig else SOCKETCAND_CONF_OPTS = --without-config endif diff --git a/package/sofia-sip/Config.in b/package/sofia-sip/Config.in index 24e2148ab9..2ad1940833 100644 --- a/package/sofia-sip/Config.in +++ b/package/sofia-sip/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_SOFIA_SIP client software for uses such as VoIP, IM, and many other real-time and person-to-person communication services. - http://sofia-sip.sourceforge.net/ + https://github.com/freeswitch/sofia-sip comment "sofia-sip needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 6e81ec878f..0484cc1501 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 sofia-sip-1.12.11.tar.gz +sha256 b539444a5d03e281b829ee9133ae9e717f2d2a03399808365e5ab85574e25d95 sofia-sip-1.13.3-8071e8accd.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 831b9ea54d..fb565637eb 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,8 +4,8 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.12.11 -SOFIA_SIP_SITE = http://downloads.sourceforge.net/project/sofia-sip/sofia-sip/$(SOFIA_SIP_VERSION) +SOFIA_SIP_VERSION = 1.13.3-8071e8accd +SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ @@ -20,14 +20,14 @@ SOFIA_SIP_CONF_OPTS += --without-glib endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -SOFIA_SIP_CONF_OPTS += --with-openssl +SOFIA_SIP_CONF_OPTS += \ + --enable-nth \ + --with-openssl=pkg-config SOFIA_SIP_DEPENDENCIES += openssl else -SOFIA_SIP_CONF_OPTS += --without-openssl -endif - -ifeq ($(BR2_ENABLE_DEBUG),y) -SOFIA_SIP_CONF_OPTS += --enable-ndebug +SOFIA_SIP_CONF_OPTS += \ + --disable-nth \ + --without-openssl endif $(eval $(autotools-package)) diff --git a/package/softether/Config.in b/package/softether/Config.in index bfb45b0315..f8933cdc00 100644 --- a/package/softether/Config.in +++ b/package/softether/Config.in @@ -6,6 +6,9 @@ config BR2_PACKAGE_SOFTETHER select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 select BR2_PACKAGE_READLINE help The SoftEther Server is a fully integrated implementation of diff --git a/package/solarus/Config.in b/package/solarus/Config.in index 6bed38a6f5..bcfa640890 100644 --- a/package/solarus/Config.in +++ b/package/solarus/Config.in @@ -1,17 +1,17 @@ config BR2_PACKAGE_SOLARUS bool "solarus" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on !BR2_STATIC_LIBS # SDL2 - depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_GLM select BR2_PACKAGE_LIBMODPLUG select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG # runtime select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_LUAJIT if !BR2_PACKAGE_LUA_5_1 select BR2_PACKAGE_OPENAL select BR2_PACKAGE_PHYSFS select BR2_PACKAGE_SDL2 @@ -25,9 +25,9 @@ config BR2_PACKAGE_SOLARUS http://www.solarus-games.org https://github.com/solarus-games/solarus -comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library" - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS || BR2_PACKAGE_LUA_5_1 +comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.9, NPTL, dynamic library, and luajit or lua 5.1" + depends on !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ || !BR2_PACKAGE_HAS_LIBGL diff --git a/package/solarus/solarus.hash b/package/solarus/solarus.hash index 3092b13507..6e1200b19c 100644 --- a/package/solarus/solarus.hash +++ b/package/solarus/solarus.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c14cd97bad6e12310b938d90abd4e8ebdd0abb403cdcc015d5add82dfc5a085b solarus-v1.6.2.tar.bz2 +sha256 4b4ac59df8ab63ee2e305cbf48118d6be0cf9665968eb0b06dd1acdf4346516f solarus-v1.6.5.tar.bz2 -sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f license.txt +sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f license.txt diff --git a/package/solarus/solarus.mk b/package/solarus/solarus.mk index 6f5853e909..07d9af5248 100644 --- a/package/solarus/solarus.mk +++ b/package/solarus/solarus.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOLARUS_VERSION = 1.6.2 +SOLARUS_VERSION = 1.6.5 SOLARUS_SITE = \ https://gitlab.com/solarus-games/solarus/-/archive/v$(SOLARUS_VERSION) SOLARUS_SOURCE = solarus-v$(SOLARUS_VERSION).tar.bz2 @@ -16,14 +16,21 @@ SOLARUS_LICENSE_FILES = license.txt # Install libsolarus.so SOLARUS_INSTALL_STAGING = YES -SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \ - sdl2_image sdl2_ttf +SOLARUS_DEPENDENCIES = glm libmodplug libogg libvorbis openal physfs \ + sdl2 sdl2_image sdl2_ttf # Disable launcher GUI (requires Qt5) SOLARUS_CONF_OPTS = \ -DSOLARUS_GUI=OFF \ -DSOLARUS_TESTS=OFF +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +SOLARUS_DEPENDENCIES += libgl +else +SOLARUS_CONF_OPTS += -DSOLARUS_GL_ES=ON +SOLARUS_DEPENDENCIES += libgles +endif + ifeq ($(BR2_PACKAGE_LUAJIT),y) SOLARUS_CONF_OPTS += -DSOLARUS_USE_LUAJIT=ON SOLARUS_DEPENDENCIES += luajit diff --git a/package/sox/sox.hash b/package/sox/sox.hash index 1a4a7dbf7f..d2006e0291 100644 --- a/package/sox/sox.hash +++ b/package/sox/sox.hash @@ -1,6 +1,4 @@ -# From http://sourceforge.net/projects/sox/files/sox/14.4.2/ -md5 ba804bb1ce5c71dd484a102a5b27d0dd sox-14.4.2.tar.bz2 -sha1 dc9668256b9d81ef25d672f14f12ec026b0b4087 sox-14.4.2.tar.bz2 # Locally computed +sha256 3d06ba8fc39ac92f16da73593be48afe0a704fe4dc4f6eca2e5137ef77cd5115 sox-7524160b29a476f7e87bc14fddf12d349f9a3c5e-br1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a LICENSE.LGPL diff --git a/package/sox/sox.mk b/package/sox/sox.mk index 013ccbbcf4..4b09b94bc3 100644 --- a/package/sox/sox.mk +++ b/package/sox/sox.mk @@ -4,107 +4,138 @@ # ################################################################################ -SOX_VERSION = 14.4.2 -SOX_SITE = http://downloads.sourceforge.net/project/sox/sox/$(SOX_VERSION) -SOX_SOURCE = sox-$(SOX_VERSION).tar.bz2 -SOX_DEPENDENCIES = host-pkgconf +SOX_VERSION = 7524160b29a476f7e87bc14fddf12d349f9a3c5e +SOX_SITE = git://git.code.sf.net/p/sox/code +SOX_SITE_METHOD = git +SOX_DEPENDENCIES = host-autoconf-archive host-pkgconf SOX_LICENSE = GPL-2.0+ (sox binary), LGPL-2.1+ (libraries) SOX_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL +SOX_CPE_ID_VENDOR = sound_exchange_project +SOX_CPE_ID_PRODUCT = sound_exchange +# From git and we're patching configure.ac +SOX_AUTORECONF = YES +SOX_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive +SOX_INSTALL_STAGING = YES + +SOX_IGNORE_CVES += CVE-2017-11332 CVE-2017-11358 CVE-2017-11359 \ + CVE-2017-15370 CVE-2017-15371 CVE-2017-15372 CVE-2017-15642 \ + CVE-2017-18189 CVE-2019-8354 CVE-2019-8355 CVE-2019-8356 \ + CVE-2019-8357 CVE-2019-13590 SOX_CONF_OPTS = \ --with-distro="Buildroot" \ - --without-ffmpeg \ - --disable-gomp \ --disable-stack-protector ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM),y) SOX_DEPENDENCIES += alsa-lib +SOX_CONF_OPTS += --enable-alsa else -SOX_CONF_OPTS += --without-alsa +SOX_CONF_OPTS += --disable-alsa endif ifeq ($(BR2_PACKAGE_FILE),y) SOX_DEPENDENCIES += file +SOX_CONF_OPTS += --enable-magic else -SOX_CONF_OPTS += --without-magic +SOX_CONF_OPTS += --disable-magic endif ifeq ($(BR2_PACKAGE_FLAC),y) SOX_DEPENDENCIES += flac +SOX_CONF_OPTS += --enable-flac else -SOX_CONF_OPTS += --without-flac +SOX_CONF_OPTS += --disable-flac endif ifeq ($(BR2_PACKAGE_LAME),y) SOX_DEPENDENCIES += lame +SOX_CONF_OPTS += --with-lame else SOX_CONF_OPTS += --without-lame endif ifeq ($(BR2_PACKAGE_LIBAO),y) SOX_DEPENDENCIES += libao +SOX_CONF_OPTS += --enable-ao else -SOX_CONF_OPTS += --without-ao +SOX_CONF_OPTS += --disable-ao +endif + +ifeq ($(BR2_PACKAGE_LIBGSM),y) +SOX_DEPENDENCIES += libgsm +SOX_CONF_OPTS += --enable-gsm +else +SOX_CONF_OPTS += --disable-gsm endif ifeq ($(BR2_PACKAGE_LIBID3TAG),y) SOX_DEPENDENCIES += libid3tag +SOX_CONF_OPTS += --with-id3tag else SOX_CONF_OPTS += --without-id3tag endif ifeq ($(BR2_PACKAGE_LIBMAD),y) SOX_DEPENDENCIES += libmad +SOX_CONF_OPTS += --with-mad else SOX_CONF_OPTS += --without-mad endif ifeq ($(BR2_PACKAGE_LIBPNG),y) SOX_DEPENDENCIES += libpng +SOX_CONF_OPTS += --with-png else SOX_CONF_OPTS += --without-png endif ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) SOX_DEPENDENCIES += libsndfile +SOX_CONF_OPTS += --enable-sndfile else -SOX_CONF_OPTS += --without-sndfile +SOX_CONF_OPTS += --disable-sndfile endif ifeq ($(BR2_PACKAGE_LIBVORBIS),y) SOX_DEPENDENCIES += libvorbis +SOX_CONF_OPTS += --enable-oggvorbis else -SOX_CONF_OPTS += --without-oggvorbis +SOX_CONF_OPTS += --disable-oggvorbis endif ifeq ($(BR2_PACKAGE_OPENCORE_AMR),y) SOX_DEPENDENCIES += opencore-amr +SOX_CONF_OPTS += --enable-amrwb --enable-amrnb else -SOX_CONF_OPTS += --without-amrwb --without-amrnb +SOX_CONF_OPTS += --disable-amrwb --disable-amrnb endif ifeq ($(BR2_PACKAGE_OPUSFILE),y) SOX_DEPENDENCIES += opusfile +SOX_CONF_OPTS += --enable-opus else -SOX_CONF_OPTS += --without-opus +SOX_CONF_OPTS += --disable-opus endif ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) SOX_DEPENDENCIES += pulseaudio +SOX_CONF_OPTS += --enable-pulseaudio else -SOX_CONF_OPTS += --without-pulseaudio +SOX_CONF_OPTS += --disable-pulseaudio endif ifeq ($(BR2_PACKAGE_TWOLAME),y) SOX_DEPENDENCIES += twolame +SOX_CONF_OPTS += --with-twolame else SOX_CONF_OPTS += --without-twolame endif ifeq ($(BR2_PACKAGE_WAVPACK),y) SOX_DEPENDENCIES += wavpack +SOX_CONF_OPTS += --enable-wavpack else -SOX_CONF_OPTS += --without-wavpack +SOX_CONF_OPTS += --disable-wavpack endif $(eval $(autotools-package)) diff --git a/package/spandsp/Config.in b/package/spandsp/Config.in index a2d5b85d79..c64eee8acd 100644 --- a/package/spandsp/Config.in +++ b/package/spandsp/Config.in @@ -1,9 +1,10 @@ config BR2_PACKAGE_SPANDSP bool "spandsp" select BR2_PACKAGE_TIFF + select BR2_PACKAGE_TIFF_JPEG help Spandsp is a library of many DSP functions for telephony. These range from simple modules, such as DTMF detection, to a complete software FAX machine. - http://www.soft-switch.org/ + https://github.com/freeswitch/spandsp diff --git a/package/spandsp/spandsp.hash b/package/spandsp/spandsp.hash index 1123e29c1b..d38b069198 100644 --- a/package/spandsp/spandsp.hash +++ b/package/spandsp/spandsp.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 0fcdda74bd9703dd66c3e9721bf2d81bd7c185c539d1887768c2b332ab703d51 spandsp-20180108.tar.gz -sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a COPYING +sha256 a11beed46b488a4cac3b0c42042ad28448bcee4c0027a82d5449180bbb178836 spandsp-3.0.0-6ec23e5a7e.tar.gz +sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a COPYING diff --git a/package/spandsp/spandsp.mk b/package/spandsp/spandsp.mk index e02c15a776..4735212f31 100644 --- a/package/spandsp/spandsp.mk +++ b/package/spandsp/spandsp.mk @@ -4,19 +4,21 @@ # ################################################################################ -SPANDSP_VERSION = 20180108 -SPANDSP_SITE = https://www.soft-switch.org/downloads/spandsp/snapshots - +SPANDSP_VERSION = 3.0.0-6ec23e5a7e +SPANDSP_SITE = https://files.freeswitch.org/downloads/libs SPANDSP_LICENSE = LGPL-2.1 (library), GPL-2.0 (test suite) SPANDSP_LICENSE_FILES = COPYING +# We're patching configure.ac +SPANDSP_AUTORECONF = YES SPANDSP_DEPENDENCIES = tiff host-pkgconf SPANDSP_INSTALL_STAGING = YES SPANDSP_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`" +# MMX on i686 raises a build failure SPANDSP_CONF_OPTS = \ --disable-builtin-tiff \ - $(if $(BR2_X86_CPU_HAS_MMX),--enable-mmx,--disable-mmx) \ + $(if $(BR2_x86_64),--enable-mmx,--disable-mmx) \ $(if $(BR2_X86_CPU_HAS_SSE),--enable-sse,--disable-sse) \ $(if $(BR2_X86_CPU_HAS_SSE2),--enable-sse2,--disable-sse2) \ $(if $(BR2_X86_CPU_HAS_SSE3),--enable-sse3,--disable-sse3) \ diff --git a/package/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk index ed97d0a7b4..8caa1e2b3c 100644 --- a/package/spawn-fcgi/spawn-fcgi.mk +++ b/package/spawn-fcgi/spawn-fcgi.mk @@ -9,5 +9,6 @@ SPAWN_FCGI_SITE = http://www.lighttpd.net/download SPAWN_FCGI_SOURCE = spawn-fcgi-$(SPAWN_FCGI_VERSION).tar.bz2 SPAWN_FCGI_LICENSE = BSD-3-Clause SPAWN_FCGI_LICENSE_FILES = COPYING +SPAWN_FCGI_CPE_ID_VENDOR = lighttpd $(eval $(autotools-package)) diff --git a/package/spdlog/Config.in b/package/spdlog/Config.in index 4aee1f7dd1..877c1b6ab7 100644 --- a/package/spdlog/Config.in +++ b/package/spdlog/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_SPDLOG depends on BR2_USE_WCHAR # fmt select BR2_PACKAGE_FMT help - Very fast, header only, C++ logging library. + Very fast, header-only/compiled, C++ logging library. https://github.com/gabime/spdlog diff --git a/package/spdlog/spdlog.hash b/package/spdlog/spdlog.hash index 2b51877aa2..5d1ff2f520 100644 --- a/package/spdlog/spdlog.hash +++ b/package/spdlog/spdlog.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a spdlog-1.5.0.tar.gz -sha256 7d40b1967fca203d22b0eaf75f54566167ded823863abedf4de869fcea057038 LICENSE +sha256 944d0bd7c763ac721398dca2bb0f3b5ed16f67cef36810ede5061f35a543b4b8 spdlog-1.8.5.tar.gz +sha256 a7241a379cb98d37788f82c2fc2e484c3ae85dae881fd3406f0637644850926f LICENSE diff --git a/package/spdlog/spdlog.mk b/package/spdlog/spdlog.mk index f8eb9bc0f9..ee875ae560 100644 --- a/package/spdlog/spdlog.mk +++ b/package/spdlog/spdlog.mk @@ -4,10 +4,11 @@ # ################################################################################ -SPDLOG_VERSION = 1.5.0 +SPDLOG_VERSION = 1.8.5 SPDLOG_SITE = $(call github,gabime,spdlog,v$(SPDLOG_VERSION)) SPDLOG_LICENSE = MIT SPDLOG_LICENSE_FILES = LICENSE +SPDLOG_INSTALL_STAGING = YES SPDLOG_DEPENDENCIES = fmt SPDLOG_CONF_OPTS += \ -DSPDLOG_BUILD_TESTS=OFF \ @@ -15,8 +16,10 @@ SPDLOG_CONF_OPTS += \ -DSPDLOG_BUILD_BENCH=OFF \ -DSPDLOG_FMT_EXTERNAL=ON -# Header-only library -SPDLOG_INSTALL_STAGING = YES -SPDLOG_INSTALL_TARGET = NO +ifeq ($(BR2_STATIC_LIBS),y) +SPDLOG_CONF_OPTS += -DSPDLOG_BUILD_SHARED=OFF +else +SPDLOG_CONF_OPTS += -DSPDLOG_BUILD_SHARED=ON +endif $(eval $(cmake-package)) diff --git a/package/speexdsp/speexdsp.hash b/package/speexdsp/speexdsp.hash index 955c4c0a0c..fd9870dc58 100644 --- a/package/speexdsp/speexdsp.hash +++ b/package/speexdsp/speexdsp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f3997997f3af3e7382b44abc9d2a55db5bd8754b22e798e2d16ac309cd6474a speexdsp-SpeexDSP-1.2.0.tar.gz -sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING +sha256 c92c7e428cb5ca11b4e6f13118ff288332f330b6fefc93cb39bf7b43b13cb1f7 speexdsp-SpeexDSP-1.2.0-br1.tar.gz +sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING diff --git a/package/speexdsp/speexdsp.mk b/package/speexdsp/speexdsp.mk index 901f22b9e6..35c06dd833 100644 --- a/package/speexdsp/speexdsp.mk +++ b/package/speexdsp/speexdsp.mk @@ -5,7 +5,7 @@ ################################################################################ SPEEXDSP_VERSION = SpeexDSP-1.2.0 -SPEEXDSP_SITE = https://git.xiph.org/speexdsp.git +SPEEXDSP_SITE = https://gitlab.xiph.org/xiph/speexdsp.git SPEEXDSP_SITE_METHOD = git SPEEXDSP_LICENSE = BSD-3-Clause SPEEXDSP_LICENSE_FILES = COPYING diff --git a/package/spi-tools/spi-tools.hash b/package/spi-tools/spi-tools.hash index eb8073f783..a1ef4c2b9b 100644 --- a/package/spi-tools/spi-tools.hash +++ b/package/spi-tools/spi-tools.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 201ffcb53e64f28a05aa0a8de5686f7ac644268da1305c0d5f70a3d96b4a22ce spi-tools-0.8.4.tar.gz -sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE +sha256 5eb24670461dcf2c58471114dc69b5204dab1c0cc5053878f6de79503bd8cc9f spi-tools-1.0.0.tar.gz +sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk index c25521a07f..26d0dcf546 100644 --- a/package/spi-tools/spi-tools.mk +++ b/package/spi-tools/spi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPI_TOOLS_VERSION = 0.8.4 +SPI_TOOLS_VERSION = 1.0.0 SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) # autoreconf must be run as specified in package documentation SPI_TOOLS_AUTORECONF = YES diff --git a/package/spice-protocol/spice-protocol.hash b/package/spice-protocol/spice-protocol.hash index c23135141a..f02cf7f0e2 100644 --- a/package/spice-protocol/spice-protocol.hash +++ b/package/spice-protocol/spice-protocol.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 b6a4aa1ca32668790b45a494bbd000e9d05797b391d5a5d4b91adf1118216eac spice-protocol-0.14.0.tar.bz2 +# From https://www.spice-space.org/download/releases/spice-protocol-0.14.3.tar.xz.sha256sum +sha256 f986e5bc2a1598532c4897f889afb0df9257ac21c160c083703ae7c8de99487a spice-protocol-0.14.3.tar.xz # Hash for license file -sha256 eb55ea746be694c449224c7ddce6340648b075fd377281712a19094e7fb7ef92 COPYING +sha256 eb55ea746be694c449224c7ddce6340648b075fd377281712a19094e7fb7ef92 COPYING diff --git a/package/spice-protocol/spice-protocol.mk b/package/spice-protocol/spice-protocol.mk index f8c55c7b01..172d45687d 100644 --- a/package/spice-protocol/spice-protocol.mk +++ b/package/spice-protocol/spice-protocol.mk @@ -4,11 +4,11 @@ # ################################################################################ -SPICE_PROTOCOL_VERSION = 0.14.0 -SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2 +SPICE_PROTOCOL_VERSION = 0.14.3 +SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.xz SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases SPICE_PROTOCOL_LICENSE = BSD-3-Clause SPICE_PROTOCOL_LICENSE_FILES = COPYING SPICE_PROTOCOL_INSTALL_STAGING = YES -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/spice/spice.hash b/package/spice/spice.hash index 4243244129..b228f213a5 100644 --- a/package/spice/spice.hash +++ b/package/spice/spice.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b203b3882e06f4c7249a3150d90c84e1a90490d41ead255a3d2cede46f4a29a7 spice-0.14.2.tar.bz2 -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 b320cf8f4bd2852750acb703c15b72856027e5a8554f8217dfbb3cc09deba0f5 spice-0.15.0.tar.bz2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/spice/spice.mk b/package/spice/spice.mk index bed6931c2e..5f7bcd9d2f 100644 --- a/package/spice/spice.mk +++ b/package/spice/spice.mk @@ -4,11 +4,12 @@ # ################################################################################ -SPICE_VERSION = 0.14.2 +SPICE_VERSION = 0.15.0 SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases/spice-server SPICE_LICENSE = LGPL-2.1+ SPICE_LICENSE_FILES = COPYING +SPICE_CPE_ID_VENDOR = spice_project SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ host-pkgconf \ @@ -17,8 +18,6 @@ SPICE_DEPENDENCIES = \ openssl \ pixman \ spice-protocol -# We're patching subprojects/spice-common/configure.ac -SPICE_AUTORECONF = YES # We disable everything for now, because the dependency tree can become # quite deep if we try to enable some features, and I have not tested that. @@ -46,11 +45,6 @@ else SPICE_CONF_OPTS += --disable-opus endif -# no enable/disable, detected using pkg-config -ifeq ($(BR2_PACKAGE_OPUS),y) -SPICE_DEPENDENCIES += opus -endif - # We need to tweak spice.pc because it /forgets/ (for static linking) that # it should link against libz and libjpeg. libz is pkg-config-aware, while # libjpeg isn't, hence the two-line tweak diff --git a/package/sqlcipher/sqlcipher.hash b/package/sqlcipher/sqlcipher.hash index c37db7a20a..ddc78ef7d6 100644 --- a/package/sqlcipher/sqlcipher.hash +++ b/package/sqlcipher/sqlcipher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f sqlcipher-4.3.0.tar.gz +sha256 b8df69b998c042ce7f8a99f07cf11f45dfebe51110ef92de95f1728358853133 sqlcipher-4.4.3.tar.gz sha256 3eee3c7964a9becc94d747bd36703d31fc86eb994680b06a61bfd4f2661eaac8 LICENSE diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk index 14290745aa..776e2d0dcf 100644 --- a/package/sqlcipher/sqlcipher.mk +++ b/package/sqlcipher/sqlcipher.mk @@ -4,10 +4,11 @@ # ################################################################################ -SQLCIPHER_VERSION = 4.3.0 +SQLCIPHER_VERSION = 4.4.3 SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,v$(SQLCIPHER_VERSION)) SQLCIPHER_LICENSE = BSD-3-Clause SQLCIPHER_LICENSE_FILES = LICENSE +SQLCIPHER_CPE_ID_VENDOR = zetetic SQLCIPHER_DEPENDENCIES = host-pkgconf openssl host-tcl SQLCIPHER_INSTALL_STAGING = YES diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in index 87c0f6c073..0ae9878d7b 100644 --- a/package/sqlite/Config.in +++ b/package/sqlite/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_SQLITE self-contained, embeddable, zero-configuration SQL database engine. - http://www.sqlite.org/ + https://www.sqlite.org/ if BR2_PACKAGE_SQLITE diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 1d4bd03eda..ec66543224 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,6 +1,3 @@ -# From https://www.sqlite.org/download.html -sha1 8383f29d53fa1d4383e4c8eb3e087f2ed940a9e0 sqlite-autoconf-3300100.tar.gz -# Calculated based on the hash above -sha256 8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60 sqlite-autoconf-3300100.tar.gz -# Locally calculated -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms +# Locally computed +sha256 f52b72a5c319c3e516ed7a92e123139a6e87af08a2dc43d7757724f6132e6db0 sqlite-autoconf-3350500.tar.gz +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index c5cf9607a4..0c2f27f127 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,11 +4,13 @@ # ################################################################################ -SQLITE_VERSION = 3300100 -SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz -SQLITE_SITE = https://www.sqlite.org/2019 +SQLITE_VERSION = 3.35.5 +SQLITE_TAR_VERSION = 3350500 +SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz +SQLITE_SITE = https://www.sqlite.org/2021 SQLITE_LICENSE = Public domain SQLITE_LICENSE_FILES = tea/license.terms +SQLITE_CPE_ID_VENDOR = sqlite SQLITE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_SQLITE_STAT4),y) diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 15707e198e..cbc3c906d8 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -8,6 +8,7 @@ SQUASHFS_VERSION = 4.4 SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION)) SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING +SQUASHFS_CPE_ID_VENDOR = squashfs_project SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y) diff --git a/package/squeezelite/squeezelite.mk b/package/squeezelite/squeezelite.mk index 2ed3d8b769..b0347c4df9 100644 --- a/package/squeezelite/squeezelite.mk +++ b/package/squeezelite/squeezelite.mk @@ -40,11 +40,6 @@ ifeq ($(BR2_PACKAGE_SQUEEZELITE_VISEXPORT),y) SQUEEZELITE_MAKE_OPTS += -DVISEXPORT endif -ifeq ($(BR2_PACKAGE_WIRINGPI),y) -SQUEEZELITE_DEPENDENCIES += wiringpi -SQUEEZELITE_MAKE_OPTS += -DRPI -endif - define SQUEEZELITE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ OPTS="$(SQUEEZELITE_MAKE_OPTS)" -C $(@D) all diff --git a/package/squid/Config.in b/package/squid/Config.in index 726160b01d..0df2aedef6 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_SQUID # needs fork() depends on BR2_USE_MMU select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_LIBTOOL select BR2_PACKAGE_LIBXML2 help Caching proxy for the Web supporting HTTP, HTTPS, FTP, and diff --git a/package/squid/squid.hash b/package/squid/squid.hash index 765e67cf3d..b1a8feb78e 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v4/squid-4.10.tar.xz.asc -md5 af7ac6e70f9bd03ae4fcec0c9b99c38a squid-4.10.tar.xz -sha1 b8b267771550bb8c7f2b2968b305118090e7217a squid-4.10.tar.xz +# From http://www.squid-cache.org/Versions/v4/squid-4.17.tar.xz.asc +md5 47b94b2d27516f1764c9d5dc1b9645e5 squid-4.17.tar.xz +sha1 f6bd15fabbd67b53a831fe9f67de3279868036c1 squid-4.17.tar.xz # Locally calculated -sha256 98f0100afd8a42ea5f6b81eb98b0e4b36d7a54beab1c73d2f1705ab49b025f1f squid-4.10.tar.xz +sha256 cb928ac08c7c86b151b1c8f827abe1a84d83181a2a86e0d512286163e1e31418 squid-4.17.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index aeaec425e4..a30a87e20d 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,12 +4,14 @@ # ################################################################################ -SQUID_VERSION = 4.10 +SQUID_VERSION = 4.17 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v4 SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING -SQUID_DEPENDENCIES = libcap host-libcap libxml2 host-pkgconf \ +SQUID_CPE_ID_VENDOR = squid-cache +SQUID_SELINUX_MODULES = apache squid +SQUID_DEPENDENCIES = libcap host-libcap libtool libxml2 host-pkgconf \ $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) SQUID_CONF_ENV = \ ac_cv_epoll_works=yes \ @@ -32,6 +34,8 @@ SQUID_CONF_OPTS = \ --enable-auth-ntlm="fake" \ --disable-strict-error-checking \ --enable-external-acl-helpers="file_userip" \ + --disable-ltdl-install \ + --without-included-ltdl \ --with-logdir=/var/log/squid/ \ --with-pidfile=/var/run/squid.pid \ --with-swapdir=/var/cache/squid/ \ @@ -62,6 +66,13 @@ else SQUID_CONF_OPTS += --without-gnutls endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +SQUID_CONF_OPTS += --with-systemd +SQUID_DEPENDENCIES += systemd +else +SQUID_CONF_OPTS += --without-systemd +endif + define SQUID_CLEANUP_TARGET rm -f $(addprefix $(TARGET_DIR)/usr/bin/, \ RunCache RunAccel) diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in index 7383b6094d..bc54b698d8 100644 --- a/package/sshfs/Config.in +++ b/package/sshfs/Config.in @@ -1,10 +1,10 @@ config BR2_PACKAGE_SSHFS bool "sshfs (FUSE)" depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2 - depends on BR2_USE_MMU # libfuse, glib2 - depends on !BR2_STATIC_LIBS # libfuse - select BR2_PACKAGE_LIBFUSE + depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse3, glib2 + depends on BR2_USE_MMU # libfuse3, glib2 + depends on !BR2_STATIC_LIBS # libfuse3 + select BR2_PACKAGE_LIBFUSE3 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_OPENSSH diff --git a/package/sshfs/sshfs.hash b/package/sshfs/sshfs.hash index a8878e6931..106f06f09f 100644 --- a/package/sshfs/sshfs.hash +++ b/package/sshfs/sshfs.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 7f689174d02e6b7e2631306fda4fb8e6b4483102d1bce82b3cdafba33369ad22 sshfs-2.8.tar.gz +sha256 fe5d3436d61b46974889e0c4515899c21a9d67851e3793c209989f72353d7750 sshfs-3.7.1.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk index ee96ad67e8..6759f6ab3b 100644 --- a/package/sshfs/sshfs.mk +++ b/package/sshfs/sshfs.mk @@ -4,13 +4,14 @@ # ################################################################################ -SSHFS_VERSION = 2.8 -SSHFS_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs_$(SSHFS_VERSION) +SSHFS_VERSION = 3.7.1 +SSHFS_SOURCE = sshfs-$(SSHFS_VERSION).tar.xz +SSHFS_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs-$(SSHFS_VERSION) SSHFS_LICENSE = GPL-2.0 SSHFS_LICENSE_FILES = COPYING SSHFS_DEPENDENCIES = \ - libglib2 libfuse openssh \ + libglib2 libfuse3 openssh \ $(TARGET_NLS_DEPENDENCIES) \ $(if $(BR2_ENABLE_LOCALE),,libiconv) -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/sshguard/sshguard.hash b/package/sshguard/sshguard.hash index beb77a4d62..9bbb41336f 100644 --- a/package/sshguard/sshguard.hash +++ b/package/sshguard/sshguard.hash @@ -1,4 +1,4 @@ -# sha256 from https://sourceforge.net/projects/sshguard/files/sshguard/2.4.0/sshguard-2.4.0.sha256 -sha256 065ca4091b3a96802714b560dbbc3d9f0e67574e99e2b6e8857aa1027d17d6c0 sshguard-2.4.0.tar.gz +# sha256 from https://sourceforge.net/projects/sshguard/files/sshguard/2.4.1/sshguard-2.4.1.sha256 +sha256 875d02e6e67dced614790ed5e36aef1160edea940f353a79306cbb1852af3c67 sshguard-2.4.1.tar.gz # Locally calculated sha256 c3ae64f12153a1bc55bc234d09f40a08ab0e0149fffc972c0b7f02d5a12c1a5c COPYING diff --git a/package/sshguard/sshguard.mk b/package/sshguard/sshguard.mk index ceff520693..3616fba780 100644 --- a/package/sshguard/sshguard.mk +++ b/package/sshguard/sshguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSHGUARD_VERSION = 2.4.0 +SSHGUARD_VERSION = 2.4.1 SSHGUARD_SITE = https://sourceforge.net/projects/sshguard/files/sshguard/$(SSHGUARD_VERSION) SSHGUARD_LICENSE = ISC, Public Domain (fnv hash), BSD-3-Clause (SimCList) SSHGUARD_LICENSE_FILES = COPYING diff --git a/package/sslh/Config.in b/package/sslh/Config.in index 21bd65f165..f6b46f3218 100644 --- a/package/sslh/Config.in +++ b/package/sslh/Config.in @@ -1,14 +1,8 @@ config BR2_PACKAGE_SSLH bool "sslh" - depends on BR2_INSTALL_LIBSTDCPP - # uses fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_LIBCONFIG + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBCONFIG if BR2_PACKAGE_SYSTEMD help Applicative protocol multiplexer http://www.rutschle.net/tech/sslh.shtml - -comment "sslh needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/sslh/sslh.hash b/package/sslh/sslh.hash index c25b37b8ab..00e5c12d77 100644 --- a/package/sslh/sslh.hash +++ b/package/sslh/sslh.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a7f49b0a1cfcb7bb9d97f5ffa932bff11c5f65d9a9bd8fe1812481dee5855116 sslh-v1.20.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 3bfe783726f82c1f5a4be630ddc494ebb08dbb69980662cd7ffdeb7bc9e1e706 sslh-v1.21c.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index ba91f8c4d6..4bde143cd8 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -4,16 +4,21 @@ # ################################################################################ -SSLH_VERSION = 1.20 +SSLH_VERSION = 1.21c 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_DEPENDENCIES = libconfig - SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) +ifeq ($(BR2_PACKAGE_LIBBSD),y) +SSLH_DEPENDENCIES += libbsd +SSLH_MAKE_OPTS += USELIBBSD=1 +else +SSLH_MAKE_OPTS += USELIBBSD= +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) SSLH_DEPENDENCIES += libcap SSLH_MAKE_OPTS += USELIBCAP=1 @@ -21,6 +26,13 @@ else SSLH_MAKE_OPTS += USELIBCAP= endif +ifeq ($(BR2_PACKAGE_LIBCONFIG),y) +SSLH_DEPENDENCIES += libconfig +SSLH_MAKE_OPTS += USELIBCONFIG=1 +else +SSLH_MAKE_OPTS += USELIBCONFIG= +endif + ifeq ($(BR2_PACKAGE_PCRE),y) SSLH_DEPENDENCIES += pcre SSLH_MAKE_OPTS += USELIBPCRE=1 diff --git a/package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch b/package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch index 64dc00d72c..acba5ad8e2 100644 --- a/package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch +++ b/package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch @@ -1,30 +1,44 @@ +From 31e4116ec355701e239cddcca720314523512a47 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Sun, 21 Mar 2021 17:59:15 +0100 +Subject: [PATCH] add uclibc alias and musl + Make linux-uclibcgnueabi an alias for linux-uclibceabi since it's what we use in buildroot toolchains. Slightly tweak musleabi to match the buildroot-used tuple. Signed-off-by: Gustavo Zacarias +[Rebased on 1.20.7.1] +Signed-off-by: Peter Seiderer +--- + data/ostable | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) -diff -Nura dpkg-1.18.3.orig/ostable dpkg-1.18.3/ostable ---- dpkg-1.18.3.orig/ostable 2015-10-15 08:05:04.471762555 -0300 -+++ dpkg-1.18.3/ostable 2015-10-15 08:11:05.206132648 -0300 -@@ -12,10 +12,10 @@ - # system part of the output of the GNU config.guess script. +diff --git a/data/ostable b/data/ostable +index 99c1f88..087dc6e 100644 +--- a/data/ostable ++++ b/data/ostable +@@ -14,10 +14,10 @@ + # system part of the output of the GNU config.guess script. # # --uclibceabi-linux linux-uclibceabi linux[^-]*-uclibceabi -+uclibceabi-linux linux-uclibceabi linux[^-]*-uclibc.*eabi - uclibc-linux linux-uclibc linux[^-]*-uclibc - musleabihf-linux linux-musleabihf linux[^-]*-musleabihf --musl-linux linux-musl linux[^-]*-musl -+musl-linux linux-musl linux[^-]*-musl[^-]* - gnueabihf-linux linux-gnueabihf linux[^-]*-gnueabihf - gnueabi-linux linux-gnueabi linux[^-]*-gnueabi - gnuabin32-linux linux-gnuabin32 linux[^-]*-gnuabin32 -@@ -34,6 +34,6 @@ - bsd-netbsd netbsd netbsd[^-]* - bsd-openbsd openbsd openbsd[^-]* - sysv-solaris solaris solaris[^-]* --uclibceabi-uclinux uclinux-uclibceabi uclinux[^-]*-uclibceabi -+uclibceabi-uclinux uclinux-uclibceabi uclinux[^-]*-uclibc.*eabi - uclibc-uclinux uclinux-uclibc uclinux[^-]*(-uclibc.*)? - tos-mint mint mint[^-]* +-eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi ++eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibc.*eabi + base-uclibc-linux linux-uclibc linux[^-]*-uclibc + eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf +-base-musl-linux linux-musl linux[^-]*-musl ++base-musl-linux linux-musl linux[^-]*-musl[^-]* + eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf + eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi + abin32-gnu-linux linux-gnuabin32 linux[^-]*-gnuabin32 +@@ -38,6 +38,6 @@ base-bsd-netbsd netbsd netbsd[^-]* + base-bsd-openbsd openbsd openbsd[^-]* + base-sysv-aix aix aix[^-]* + base-sysv-solaris solaris solaris[^-]* +-eabi-uclibc-uclinux uclinux-uclibceabi uclinux[^-]*-uclibceabi ++eabi-uclibc-uclinux uclinux-uclibceabi uclinux[^-]*-uclibc.*eabi + base-uclibc-uclinux uclinux-uclibc uclinux[^-]*(-uclibc.*)? + base-tos-mint mint mint[^-]* +-- +2.30.2 + diff --git a/package/start-stop-daemon/0002-just-warn-on-missing-arch.patch b/package/start-stop-daemon/0002-just-warn-on-missing-arch.patch index 2b9cd3db17..fc1f0f0743 100644 --- a/package/start-stop-daemon/0002-just-warn-on-missing-arch.patch +++ b/package/start-stop-daemon/0002-just-warn-on-missing-arch.patch @@ -1,19 +1,33 @@ +From 7b20d3f012013edd4e3bb48541bd2bda10dac186 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Sun, 21 Mar 2021 18:03:28 +0100 +Subject: [PATCH] just warn on missing arch + Just warn on missing arch Some architectures are not listed in dpkg list (e.g. mips64el, xtensa, sh4a). Don't break the build for that. Signed-off-by: Baruch Siach +[Rebased on 1.20.7.1] +Signed-off-by: Peter Seiderer --- -diff -Nuar dpkg-1.16.15-orig/m4/dpkg-arch.m4 dpkg-1.16.15/m4/dpkg-arch.m4 ---- dpkg-1.16.15-orig/m4/dpkg-arch.m4 2014-05-30 02:47:25.000000000 +0300 -+++ dpkg-1.16.15/m4/dpkg-arch.m4 2015-01-16 06:55:19.701596362 +0200 -@@ -57,7 +57,7 @@ - AC_MSG_CHECKING([dpkg architecture name]) - _DPKG_ARCHITECTURE([DEB_HOST_ARCH], [dpkg_arch]) - if test "x$dpkg_arch" = "x"; then -- AC_MSG_ERROR([cannot determine host dpkg architecture]) -+ AC_MSG_WARN([cannot determine host dpkg architecture]) - else - AC_MSG_RESULT([$dpkg_arch]) - fi + m4/dpkg-arch.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/dpkg-arch.m4 b/m4/dpkg-arch.m4 +index 71044c9..1394531 100644 +--- a/m4/dpkg-arch.m4 ++++ b/m4/dpkg-arch.m4 +@@ -58,7 +58,7 @@ AC_DEFUN([DPKG_ARCHITECTURE], [ + AC_MSG_CHECKING([dpkg architecture name]) + _DPKG_ARCHITECTURE([DEB_HOST_ARCH], [dpkg_arch]) + AS_IF([test "x$dpkg_arch" = "x"], [ +- AC_MSG_ERROR([cannot determine host dpkg architecture]) ++ AC_MSG_WARN([cannot determine host dpkg architecture]) + ], [ + AC_MSG_RESULT([$dpkg_arch]) + ]) +-- +2.30.2 + diff --git a/package/start-stop-daemon/start-stop-daemon.hash b/package/start-stop-daemon/start-stop-daemon.hash index e5d1d91129..61a15afb3f 100644 --- a/package/start-stop-daemon/start-stop-daemon.hash +++ b/package/start-stop-daemon/start-stop-daemon.hash @@ -1,4 +1,4 @@ -# From http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_1.18.10.dsc -sha256 025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5 dpkg_1.18.10.tar.xz +# From https://snapshot.debian.org/archive/debian/20210109T083441Z/pool/main/d/dpkg/dpkg_1.20.7.1.dsc +sha256 0aad2de687f797ef8ebdabc7bafd16dc1497f1ce23bd9146f9aa73f396a5636f dpkg_1.20.7.1.tar.xz # Locally computed sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/start-stop-daemon/start-stop-daemon.mk b/package/start-stop-daemon/start-stop-daemon.mk index 01a6719762..9db767dd16 100644 --- a/package/start-stop-daemon/start-stop-daemon.mk +++ b/package/start-stop-daemon/start-stop-daemon.mk @@ -7,9 +7,9 @@ # Debian start-stop-daemon is part of dpkg. Since start-stop-daemon is the only # interesting tool in it, we call the buildroot package start-stop-daemon. -START_STOP_DAEMON_VERSION = 1.18.10 +START_STOP_DAEMON_VERSION = 1.20.7.1 START_STOP_DAEMON_SOURCE = dpkg_$(START_STOP_DAEMON_VERSION).tar.xz -START_STOP_DAEMON_SITE = http://snapshot.debian.org/archive/debian/20160731T221931Z/pool/main/d/dpkg +START_STOP_DAEMON_SITE = https://snapshot.debian.org/archive/debian/20210109T083441Z/pool/main/d/dpkg START_STOP_DAEMON_CONF_OPTS = \ --disable-dselect \ --disable-update-alternatives \ diff --git a/package/stella/Config.in b/package/stella/Config.in index 709da98159..c14f48572b 100644 --- a/package/stella/Config.in +++ b/package/stella/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_STELLA depends on !BR2_STATIC_LIBS # sdl2 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_SDL2 select BR2_PACKAGE_LIBPNG @@ -13,10 +13,10 @@ config BR2_PACKAGE_STELLA https://stella-emu.github.io/ -comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 5" +comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 6" depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_6 comment "stella needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/stella/stella.hash b/package/stella/stella.hash index 395ee18d35..c40d96616a 100644 --- a/package/stella/stella.hash +++ b/package/stella/stella.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 bcbd82294f97d00457fdb727e9b08ff73b685dc7f77704cea1eceb58d8967387 stella-6.0.2-src.tar.xz -sha256 062e708b8b88ea911b5c08000f1c4a5588235aa0c303bc893b5d92fb45cafd04 Copyright.txt -sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt +sha256 0346900e9ba4b6d532b72d956adc5078502a9bd6bbc1648bb3dd68f5ffd4859b stella-6.4-src.tar.xz +sha256 d207ee9e563fdd062582df8cbb6c8303b9879bd107692c0db2a32477e47dfa35 Copyright.txt +sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/package/stella/stella.mk b/package/stella/stella.mk index 1295b75274..2dcfbeaccd 100644 --- a/package/stella/stella.mk +++ b/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 6.0.2 +STELLA_VERSION = 6.4 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash index ea1256df1b..3bd1e6b3f2 100644 --- a/package/stellarium/stellarium.hash +++ b/package/stellarium/stellarium.hash @@ -1,6 +1,5 @@ # From https://github.com/Stellarium/stellarium/releases -md5 2de84da8a2256f3239174e3ad8f83a5b stellarium-0.19.3.tar.gz -sha1 a82cfa21c8dcfbd0a0cf4e30c4ea017ceb2f87a5 stellarium-0.19.3.tar.gz +sha1 cc0b2c450ecead1481317f6038512a6a52d32001 stellarium-0.21.1.tar.gz +sha256 072309c6bc48233b39884ae558b23764d0e08eabd96b014b53d780be11a33211 stellarium-0.21.1.tar.gz # Locally computed -sha256 176e15d8d18340cf8c8cfed14f364cbda345d94e77cc97589c163c45d9cb225d stellarium-0.19.3.tar.gz -sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING +sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index ff1eb27018..20e0e9ffec 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLARIUM_VERSION = 0.19.3 +STELLARIUM_VERSION = 0.21.1 STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ STELLARIUM_LICENSE_FILES = COPYING diff --git a/package/stm32flash/stm32flash.hash b/package/stm32flash/stm32flash.hash index 3adcb96d31..514d71f823 100644 --- a/package/stm32flash/stm32flash.hash +++ b/package/stm32flash/stm32flash.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 58788826b80f16f2084632299340f9a3155b326936210e5f7a58f9dbd1b18bdd stm32flash-3cebf121f7b32b9edfcb0d49f0fb43ccf33e5650.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt +sha256 dec1a81a3ba85a61dfa39ec12e391ea16a8d431470f41d34413f7ab183da46ef stm32flash-v0.6-br1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt diff --git a/package/stm32flash/stm32flash.mk b/package/stm32flash/stm32flash.mk index a8ae9b01df..1c68a0ffbe 100644 --- a/package/stm32flash/stm32flash.mk +++ b/package/stm32flash/stm32flash.mk @@ -4,7 +4,7 @@ # ################################################################################ -STM32FLASH_VERSION = 3cebf121f7b32b9edfcb0d49f0fb43ccf33e5650 +STM32FLASH_VERSION = v0.6 STM32FLASH_SITE = git://git.code.sf.net/p/stm32flash/code STM32FLASH_LICENSE = GPL-2.0+ STM32FLASH_LICENSE_FILES = gpl-2.0.txt diff --git a/package/strace/Config.in b/package/strace/Config.in index 5b33dad392..c394d4c398 100644 --- a/package/strace/Config.in +++ b/package/strace/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_STRACE bool "strace" # needs at least kernel headers 4.0 on nios2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 || !BR2_nios2 + # needs at least kernel headers 5.0 on xtensa + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_xtensa depends on !BR2_nds32 && !BR2_RISCV_32 help A useful diagnostic, instructional, and debugging tool. @@ -16,3 +18,7 @@ config BR2_PACKAGE_STRACE comment "strace needs a toolchain w/ headers >= 4.0 on nios2" depends on BR2_nios2 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + +comment "strace needs a toolchain w/ headers >= 5.0 on xtensa" + depends on BR2_xtensa + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 5b645ebe7e..f7a634000c 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/5.5/strace-5.5.tar.xz.asc -sha256 9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff strace-5.5.tar.xz -sha256 6370eb67db918210944a8511a6995ebe9567852f26b4f15a01e5c8cf2aef7c46 COPYING +# https://strace.io/files/5.12/strace-5.12.tar.xz.asc +sha256 29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4 strace-5.12.tar.xz +sha256 f847d5ef26ad1151ca63bb88536b23a4cac5040c67917f3d5ee7ea1316e2b736 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 569a822e42..810f55e82b 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,20 +4,13 @@ # ################################################################################ -STRACE_VERSION = 5.5 +STRACE_VERSION = 5.12 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ STRACE_LICENSE_FILES = COPYING LGPL-2.1-or-later -STRACE_CONF_OPTS = --enable-mpers=check - -# strace bundle some kernel headers to build libmpers, this mixes userspace -# headers and kernel headers which break the build with musl. -# The stddef.h from gcc is used instead of the one from musl. -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -STRACE_CONF_OPTS += st_cv_m32_mpers=no \ - st_cv_mx32_mpers=no -endif +STRACE_CPE_ID_VENDOR = strace_project +STRACE_CONF_OPTS = --enable-mpers=no ifeq ($(BR2_PACKAGE_LIBUNWIND),y) STRACE_DEPENDENCIES += libunwind diff --git a/package/stress-ng/Config.in b/package/stress-ng/Config.in index 4fcfa3554c..64b473b75c 100644 --- a/package/stress-ng/Config.in +++ b/package/stress-ng/Config.in @@ -1,16 +1,11 @@ config BR2_PACKAGE_STRESS_NG bool "stress-ng" depends on BR2_USE_MMU # fork() - # disabled on musl: stress-malloc.c needs mallopt() and M_MMAP_THRESHOLD - depends on !BR2_TOOLCHAIN_USES_MUSL # perf.c needs PERF_COUNT_HW_REF_CPU_CYCLES depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 and ARC depends on !BR2_nios2 depends on !BR2_arc - depends on !BR2_STATIC_LIBS # keyutils - select BR2_PACKAGE_KEYUTILS # stress-key.c needs keyutils.h - select BR2_PACKAGE_ATTR # stress-xattr.c needs xattr.h help stress-ng will stress test a computer system in various selectable ways. It was designed to exercise various physical @@ -19,8 +14,7 @@ config BR2_PACKAGE_STRESS_NG http://kernel.ubuntu.com/~cking/stress-ng/ -comment "stress-ng needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.3" +comment "stress-ng needs a toolchain w/ headers >= 3.3" depends on !BR2_nios2 && !BR2_arc depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 \ - || BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index a2b9b9ef95..41e2801915 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 85ae86587f605225cc736e1ddba6cc5fd129dfbba0f7d94df755e2e6ac5230e6 stress-ng-0.10.07.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 f847be115f60d3ad7d37c806fd1bfb1412aa3c631fca581d6dc233322f50d6a5 stress-ng-0.12.02.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 55e3d297bc..53d7b7e5b7 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,18 +4,20 @@ # ################################################################################ -STRESS_NG_VERSION = 0.10.07 +STRESS_NG_VERSION = 0.12.02 STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz -STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng +STRESS_NG_SITE = https://kernel.ubuntu.com/~cking/tarballs/stress-ng STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING -STRESS_NG_DEPENDENCIES = attr keyutils - ifeq ($(BR2_PACKAGE_LIBBSD),y) STRESS_NG_DEPENDENCIES += libbsd endif +ifeq ($(BR2_PACKAGE_KEYUTILS),y) +STRESS_NG_DEPENDENCIES += keyutils +endif + define STRESS_NG_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) endef diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index 0438eeced6..368cd1ecc0 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -44,6 +44,10 @@ config BR2_PACKAGE_STRONGSWAN_GMP bool "GNU MP (libgmp)" select BR2_PACKAGE_GMP +config BR2_PACKAGE_STRONGSWAN_WOLFSSL + bool "wolfssl" + select BR2_PACKAGE_WOLFSSL + endchoice config BR2_PACKAGE_STRONGSWAN_AF_ALG @@ -71,6 +75,7 @@ config BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC config BR2_PACKAGE_STRONGSWAN_EAP bool "Enable EAP protocols" + select BR2_PACKAGE_GMP help Enable various EAP protocols: - mschapv2 diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index 4d1a593a5c..69b3547f91 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,9 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.6.3.tar.bz2.md5 -md5 a6a28eeb22aa58080a7581771a5b63f9 strongswan-5.6.3.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.4.tar.bz2.md5 +md5 9c387eb77f0159fdefbcf7e81c905c35 strongswan-5.9.4.tar.bz2 # Calculated based on the hash above -sha256 c3c7dc8201f40625bba92ffd32eb602a8909210d8b3fac4d214c737ce079bf24 strongswan-5.6.3.tar.bz2 +sha256 45fdf1a4c2af086d8ff5b76fd7b21d3b6f0890f365f83bf4c9a75dda26887518 strongswan-5.9.4.tar.bz2 # Locally calculated -sha256 e66c243593ee0713f5fd13bcd7f624bc50eebc54bf87f790ced429ff698077e7 strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch -sha256 415d104717cb0781770e9077d00b3df310b11e65e4b9c1d35b62fbba04549263 strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 021a59cecc..dbdcfe0a28 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,14 +4,12 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.6.3 +STRONGSWAN_VERSION = 5.9.4 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org -STRONGSWAN_PATCH = \ - $(STRONGSWAN_SITE)/patches/27_gmp_pkcs1_verify_patch/strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch \ - $(STRONGSWAN_SITE)/patches/28_gmp_pkcs1_overflow_patch/strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch STRONGSWAN_LICENSE = GPL-2.0+ STRONGSWAN_LICENSE_FILES = COPYING LICENSE +STRONGSWAN_CPE_ID_VENDOR = strongswan STRONGSWAN_DEPENDENCIES = host-pkgconf STRONGSWAN_INSTALL_STAGING = YES STRONGSWAN_CONF_OPTS += \ @@ -38,6 +36,7 @@ STRONGSWAN_CONF_OPTS += \ --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) \ + --enable-wolfssl=$(if $(BR2_PACKAGE_STRONGSWAN_WOLFSSL),yes,no) \ --with-ipseclibdir=/usr/lib \ --with-plugindir=/usr/lib/ipsec/plugins \ --with-imcvdir=/usr/lib/ipsec/imcvs \ @@ -75,7 +74,8 @@ STRONGSWAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \ $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \ $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \ - $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite) + $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite) \ + $(if $(BR2_PACKAGE_STRONGSWAN_WOLFSSL),wolfssl) ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y) STRONGSWAN_DEPENDENCIES += \ diff --git a/package/stunnel/Config.in b/package/stunnel/Config.in index e4a956770e..087fecd930 100644 --- a/package/stunnel/Config.in +++ b/package/stunnel/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_STUNNEL bool "stunnel" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help Stunnel is a program that wraps any TCP connection with an SSL connection. diff --git a/package/stunnel/stunnel.hash b/package/stunnel/stunnel.hash index b741b0e816..0ae20cb906 100644 --- a/package/stunnel/stunnel.hash +++ b/package/stunnel/stunnel.hash @@ -1,5 +1,5 @@ -# From https://www.stunnel.org/downloads/stunnel-5.56.tar.gz.sha256 -sha256 7384bfb356b9a89ddfee70b5ca494d187605bb516b4fff597e167f97e2236b22 stunnel-5.56.tar.gz +# From https://www.stunnel.org/downloads/stunnel-5.59.tar.gz.sha256 +sha256 137776df6be8f1701f1cd590b7779932e123479fb91e5192171c16798815ce9f stunnel-5.59.tar.gz # Locally calculated -sha256 f46e2613769e23e23348b6eb667dc85309da2252c8cc2016db92ad93d743aea4 COPYING.md -sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d COPYRIGHT.md +sha256 28b55d0157efd5ceb63640faeebb50fda13b1f49aec0b9c1240b9a3ea9f0eb4c COPYING.md +sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d COPYRIGHT.md diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index f8265c4cf4..cf2e29cb9b 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -5,7 +5,7 @@ ################################################################################ STUNNEL_VERSION_MAJOR = 5 -STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).56 +STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).59 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x STUNNEL_DEPENDENCIES = host-pkgconf openssl STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ @@ -15,6 +15,8 @@ STUNNEL_CONF_ENV = \ LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` STUNNEL_LICENSE = GPL-2.0+ STUNNEL_LICENSE_FILES = COPYING.md COPYRIGHT.md +STUNNEL_CPE_ID_VENDOR = stunnel +STUNNEL_SELINUX_MODULES = stunnel ifeq ($(BR2_INIT_SYSTEMD),y) STUNNEL_DEPENDENCIES += systemd diff --git a/package/subversion/subversion.hash b/package/subversion/subversion.hash index 581834f98d..534d596514 100644 --- a/package/subversion/subversion.hash +++ b/package/subversion/subversion.hash @@ -1,5 +1,5 @@ -# From https://www.apache.org/dist/subversion/subversion-1.12.2.tar.bz2.sha512 -sha512 b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136 subversion-1.12.2.tar.bz2 +# From https://www.apache.org/dist/subversion/subversion-1.14.1.tar.bz2.sha512 +sha512 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd subversion-1.14.1.tar.bz2 # Locally calculated -sha256 484aff0cfbb81155a10f903ed756e27e9fc65578c245a295bae295c4bb51eaad LICENSE +sha256 484aff0cfbb81155a10f903ed756e27e9fc65578c245a295bae295c4bb51eaad LICENSE diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk index 2044a6420f..d4cc717536 100644 --- a/package/subversion/subversion.mk +++ b/package/subversion/subversion.mk @@ -4,11 +4,12 @@ # ################################################################################ -SUBVERSION_VERSION = 1.12.2 +SUBVERSION_VERSION = 1.14.1 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 -SUBVERSION_SITE = http://mirror.catn.com/pub/apache/subversion +SUBVERSION_SITE = https://downloads.apache.org/subversion SUBVERSION_LICENSE = Apache-2.0 SUBVERSION_LICENSE_FILES = LICENSE +SUBVERSION_CPE_ID_VENDOR = apache SUBVERSION_DEPENDENCIES = \ host-pkgconf \ apr \ diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index fff1aa2343..ee30b32265 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ # From: http://www.sudo.ws/download.html -sha256 7ea8d97a3cee4c844e0887ea7a1bd80eb54cc98fd77966776cb1a80653ad454f sudo-1.8.31.tar.gz +sha256 539e2ef43c8a55026697fb0474ab6a925a11206b5aa58710cb42a0e1c81f0978 sudo-1.9.5p2.tar.gz # Locally calculated -sha256 be099fd0ee954224f392dde163aef6d6359c58a5afa1ebb1bd55058318add789 doc/LICENSE +sha256 505c5955c373514e2533a24a8346f44038e29cba874f5ca83beb171a7409089f doc/LICENSE diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index a4def4368a..df09161957 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,10 +4,15 @@ # ################################################################################ -SUDO_VERSION = 1.8.31 +SUDO_VERSION_MAJOR = 1.9.5 +SUDO_VERSION_MINOR = p2 +SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause SUDO_LICENSE_FILES = doc/LICENSE +SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR) +SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR) +SUDO_SELINUX_MODULES = sudo # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ diff --git a/package/sunxi-boards/Config.in b/package/sunxi-boards/Config.in index d9fd8529f3..eaf492f2b2 100644 --- a/package/sunxi-boards/Config.in +++ b/package/sunxi-boards/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SUNXI_BOARDS bool "sunxi script.bin board file" depends on BR2_arm + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-sunxi-tools select BR2_PACKAGE_HOST_SUNXI_TOOLS help Sunxi-boards requires a compiled .fex files for hardware @@ -23,3 +24,7 @@ config BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE See inside sys_config/ directory in sunxi-boards source code to see the list of valid .fex files. endif + +comment "sunxi script.bin board file needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-mainline-driver/Config.in index 057f20db66..90bc308bc5 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-mainline-driver/Config.in @@ -22,4 +22,18 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER - CONFIG_CMA - CONFIG_DMA_CMA + starting from Linux Kernel >= 4.20 following options must be + enabled: + - CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM + + The following kernel command line options must be passed: + + - drm_kms_helper.drm_leak_fbdev_smem = 1 + since drm_kms_helper.drm_leak_fbdev_smem is set to 0 by + default + + - drm_kms_helper.drm_fbdev_overalloc >= 200 + since the driver requires at least double buffering and + fails to work with the default value(100). + https://github.com/mripard/sunxi-mali/blob/master/README.md diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash index 7c01d07d20..f08e80f114 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 98abeb8ff2e7e824ec89c7be9984ff298db1f35e48d79092238799ff5a239e91 sunxi-mali-mainline-driver-ec654ee9caeb0c4348caacd0cf5eb2730d1d70e2.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-mainline-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index 0edcdee4d6..feffaa7ae6 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_MALI_MAINLINE_DRIVER_VERSION = ec654ee9caeb0c4348caacd0cf5eb2730d1d70e2 +SUNXI_MALI_MAINLINE_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux SUNXI_MALI_MAINLINE_DRIVER_LICENSE = GPL-2.0 @@ -32,4 +32,10 @@ define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -i endef +define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) +endef + $(eval $(generic-package)) diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash b/package/sunxi-mali-mainline/sunxi-mali-mainline.hash index 978be01024..e1c18fd4f7 100644 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash +++ b/package/sunxi-mali-mainline/sunxi-mali-mainline.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 72969ecf470b9e5ce787c2f8f36242926e1e892af0891924ee59a2cd206de39f sunxi-mali-mainline-d691cb93884ca8ac67860502117bbec283dc19aa.tar.gz -sha256 8a06bcae44a41a886f339b4338422415a786787f113e9ed6456ae117104a0b6a EULA_for_Mali_400MP_AW.pdf +sha256 72969ecf470b9e5ce787c2f8f36242926e1e892af0891924ee59a2cd206de39f sunxi-mali-mainline-d691cb93884ca8ac67860502117bbec283dc19aa.tar.gz +sha256 8a06bcae44a41a886f339b4338422415a786787f113e9ed6456ae117104a0b6a EULA_for_Mali_400MP_AW.pdf diff --git a/package/sunxi-tools/Config.in b/package/sunxi-tools/Config.in index 80a7130a92..5f72667284 100644 --- a/package/sunxi-tools/Config.in +++ b/package/sunxi-tools/Config.in @@ -24,14 +24,16 @@ config BR2_PACKAGE_SUNXI_TOOLS_BOOTINFO config BR2_PACKAGE_SUNXI_TOOLS_FEL bool "sunxi-fel" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help The sunxi-fel command can interact with a sunxi device in fel mode. This allows do download code to memory and execute it. -comment "sunxi-fel needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "sunxi-fel needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_SUNXI_TOOLS_NAND_PART bool "sunxi-nand-part" diff --git a/package/sunxi-tools/Config.in.host b/package/sunxi-tools/Config.in.host index 5fab5e6ff5..51f13cf623 100644 --- a/package/sunxi-tools/Config.in.host +++ b/package/sunxi-tools/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_SUNXI_TOOLS bool "host sunxi-tools" depends on BR2_arm + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i) based devices. This includes fex2bin which can be used to @@ -10,3 +11,7 @@ config BR2_PACKAGE_HOST_SUNXI_TOOLS mainline Linux kernel version. http://linux-sunxi.org/Sunxi-tools + +comment "host sunxi-tools needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/sunxi-tools/sunxi-tools.hash b/package/sunxi-tools/sunxi-tools.hash index 2de26c418b..84acc2c76c 100644 --- a/package/sunxi-tools/sunxi-tools.hash +++ b/package/sunxi-tools/sunxi-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 da5d762608517b4b2e9bd392bd9a63afae3973d9c8264cbcfb757ddac8120d1b sunxi-tools-1.4.1.tar.gz +sha256 81f48014a520cb83cac4e17f5ae627a637c4d6a422b60c693c5a705c92e43822 sunxi-tools-1.4.2.tar.gz sha256 2b0d4dda4bf8034e1506507a67f80f982131137afe62bf144d248f9faea31da4 LICENSE.md diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk index 35254263cf..c2913ee8f7 100644 --- a/package/sunxi-tools/sunxi-tools.mk +++ b/package/sunxi-tools/sunxi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_TOOLS_VERSION = 1.4.1 +SUNXI_TOOLS_VERSION = 1.4.2 SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,v$(SUNXI_TOOLS_VERSION)) SUNXI_TOOLS_LICENSE = GPL-2.0+ SUNXI_TOOLS_LICENSE_FILES = LICENSE.md diff --git a/package/supertux/Config.in b/package/supertux/Config.in index c77d1ae2bd..5cacdd658e 100644 --- a/package/supertux/Config.in +++ b/package/supertux/Config.in @@ -17,7 +17,6 @@ config BR2_PACKAGE_SUPERTUX select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBGLEW - select BR2_PACKAGE_LIBGLU # GL/glu.h select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBVORBIS diff --git a/package/supertux/supertux.mk b/package/supertux/supertux.mk index 5842b17ba4..e4a4630918 100644 --- a/package/supertux/supertux.mk +++ b/package/supertux/supertux.mk @@ -15,7 +15,7 @@ SUPERTUX_LICENSE_FILES = LICENSE.txt data/AUTHORS # Use bundled squirrel, tinygettext sexp-cpp packages which are hardcoded in # the CMake build system. -SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype libcurl libgl libglew libglu \ +SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype libcurl libgl libglew \ libogg libpng libvorbis openal physfs sdl2 sdl2_image # CMAKE_BUILD_TYPE=Release: disable profiling code (-pg) @@ -30,6 +30,7 @@ SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype libcurl libgl libglew libglu # ENABLE_OPENGLES2=OFF: Disable opengles2 for now. SUPERTUX_CONF_OPTS += \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -DGLEW_NO_GLU" \ -DENABLE_BOOST_STATIC_LIBS=OFF \ -DBUILD_DOCUMENTATION=OFF \ -DENABLE_OPENGL=ON \ diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index fcb27445da..8af006d632 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_SUPERTUXKART depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP # openal + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS # openal depends on BR2_PACKAGE_HAS_LIBGL @@ -16,7 +17,6 @@ config BR2_PACKAGE_SUPERTUXKART select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBFRIBIDI select BR2_PACKAGE_LIBGLEW - select BR2_PACKAGE_LIBGLU select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBSQUISH @@ -25,6 +25,7 @@ config BR2_PACKAGE_SUPERTUXKART select BR2_PACKAGE_OPENAL select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime help Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart racer with multiple karts, tracks and modes you can play. @@ -33,7 +34,7 @@ config BR2_PACKAGE_SUPERTUXKART http://supertuxkart.sourceforge.net/Main_Page -comment "supertuxkart needs an OpenGL backend, a uClibc or glibc toolchain w/ NPTL, C++" +comment "supertuxkart needs an OpenGL backend, a uClibc or glibc toolchain w/ NPTL, C++, gcc >= 4.9" depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU @@ -41,5 +42,6 @@ comment "supertuxkart needs an OpenGL backend, a uClibc or glibc toolchain w/ NP depends on BR2_PACKAGE_XORG7 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !BR2_PACKAGE_HAS_LIBGL \ || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/supertuxkart/supertuxkart.mk b/package/supertuxkart/supertuxkart.mk index 4427ddd1ee..97cd2a40b8 100644 --- a/package/supertuxkart/supertuxkart.mk +++ b/package/supertuxkart/supertuxkart.mk @@ -24,7 +24,6 @@ SUPERTUXKART_DEPENDENCIES = \ libfribidi \ libgl \ libglew \ - libglu \ libogg \ libpng \ libsquish \ diff --git a/package/supervisor/Config.in b/package/supervisor/Config.in index 623c3a836e..7ca3cae134 100644 --- a/package/supervisor/Config.in +++ b/package/supervisor/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_SUPERVISOR bool "supervisor" depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_MELD3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime dependency help A client/server system that allows its users to control a diff --git a/package/supervisor/supervisor.mk b/package/supervisor/supervisor.mk index 424f46a7c2..92e8323080 100644 --- a/package/supervisor/supervisor.mk +++ b/package/supervisor/supervisor.mk @@ -8,6 +8,7 @@ SUPERVISOR_VERSION = 4.1.0 SUPERVISOR_SITE = https://files.pythonhosted.org/packages/de/87/ee1ad8fa533a4b5f2c7623f4a2b585d3c1947af7bed8e65bc7772274320e SUPERVISOR_LICENSE = BSD-like, rdflib (http_client.py), PSF (medusa) SUPERVISOR_LICENSE_FILES = COPYRIGHT.txt LICENSES.txt +SUPERVISOR_CPE_ID_VENDOR = supervisord SUPERVISOR_SETUP_TYPE = setuptools define SUPERVISOR_INSTALL_CONF_FILES diff --git a/package/suricata/Config.in b/package/suricata/Config.in index 2add34956e..5f7eb21da0 100644 --- a/package/suricata/Config.in +++ b/package/suricata/Config.in @@ -1,8 +1,11 @@ config BR2_PACKAGE_SURICATA bool "suricata" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_JANSSON select BR2_PACKAGE_LIBHTP select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBYAML @@ -18,5 +21,6 @@ config BR2_PACKAGE_SURICATA https://suricata-ids.org comment "suricata needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/suricata/suricata.hash b/package/suricata/suricata.hash index dc52999a9d..74cc7435cb 100644 --- a/package/suricata/suricata.hash +++ b/package/suricata/suricata.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 cee5f6535cd7fe63fddceab62eb3bc66a63fc464466c88ec7a41b7a1331ac74b suricata-4.1.5.tar.gz +sha256 daf134bb2d7c980035e9ae60f7aaf313323a809340009f26e48110ccde81f602 suricata-6.0.3.tar.gz # Hash for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 48a6205eed..e7067acdc1 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -4,19 +4,19 @@ # ################################################################################ -SURICATA_VERSION = 4.1.5 +SURICATA_VERSION = 6.0.3 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE -# We're patching configure.ac +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 SURICATA_AUTORECONF = YES -# 0004-stream-reject-broken-ACK-packets.patch -SURICATA_IGNORE_CVES += CVE-2019-18792 - SURICATA_DEPENDENCIES = \ host-pkgconf \ - $(if $(BR2_PACKAGE_JANSSON),jansson) \ + host-rustc \ + jansson \ $(if $(BR2_PACKAGE_LIBCAP_NG),libcap-ng) \ $(if $(BR2_PACKAGE_LIBEVENT),libevent) \ libhtp \ @@ -27,12 +27,14 @@ SURICATA_DEPENDENCIES = \ pcre \ $(if $(BR2_PACKAGE_XZ),xz) -SURICATA_CONF_ENV = ac_cv_path_HAVE_SPHINXBUILD=no +SURICATA_CONF_ENV = \ + ac_cv_path_HAVE_SPHINXBUILD=no \ + CARGO_HOME=$(HOST_DIR)/share/cargo \ + RUST_TARGET=$(RUSTC_TARGET_NAME) SURICATA_CONF_OPTS = \ --disable-gccprotect \ --disable-pie \ - --disable-rust \ --disable-suricata-update \ --enable-non-bundled-htp @@ -42,6 +44,10 @@ SURICATA_CONF_OPTS = \ # download through wget/curl) SURICATA_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install install-conf +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +SURICATA_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_PACKAGE_FILE),y) SURICATA_DEPENDENCIES += file SURICATA_CONF_OPTS += --enable-libmagic @@ -49,19 +55,9 @@ else SURICATA_CONF_OPTS += --disable-libmagic endif -# --disable-libgeoip disables libgeoip when --enable-geoip is requested. -# This allows libmaxminddb to be picked up instead of libgeoip when both are -# installed on the system. ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) SURICATA_DEPENDENCIES += libmaxminddb -SURICATA_CONF_OPTS += \ - --enable-geoip \ - --disable-libgeoip -else ifeq ($(BR2_PACKAGE_GEOIP),y) -SURICATA_DEPENDENCIES += geoip -SURICATA_CONF_OPTS += \ - --enable-geoip \ - --enable-libgeoip +SURICATA_CONF_OPTS += --enable-geoip else SURICATA_CONF_OPTS += --disable-geoip endif diff --git a/package/swig/swig.hash b/package/swig/swig.hash index fdc57129b8..08b2b5a1ef 100644 --- a/package/swig/swig.hash +++ b/package/swig/swig.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7a00b4d0d53ad97a14316135e2d702091cd5f193bb58bcfcd8bc59d41e7887a9 swig-4.0.1.tar.gz +sha256 d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc swig-4.0.2.tar.gz sha256 f53abaeed775018d519a1b9615f0ca17894772bd9ca21c2a156bf340ac41c13e LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-GPL sha256 7f50d942373a871211c5efee03f3db2f9efd1cff1002b0ef8e3748baa611a5c2 LICENSE-UNIVERSITIES diff --git a/package/swig/swig.mk b/package/swig/swig.mk index 5881a0e423..437cf448be 100644 --- a/package/swig/swig.mk +++ b/package/swig/swig.mk @@ -5,7 +5,7 @@ ################################################################################ SWIG_VERSION_MAJOR = 4.0 -SWIG_VERSION = $(SWIG_VERSION_MAJOR).1 +SWIG_VERSION = $(SWIG_VERSION_MAJOR).2 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) HOST_SWIG_DEPENDENCIES = host-bison host-pcre HOST_SWIG_CONF_OPTS = \ diff --git a/package/swupdate/Config.in b/package/swupdate/Config.in index c0081032b6..6b832cfcbf 100644 --- a/package/swupdate/Config.in +++ b/package/swupdate/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SWUPDATE bool "swupdate" + depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() # swupdate requires a parser and uses libconfig as default @@ -32,14 +33,12 @@ config BR2_PACKAGE_SWUPDATE compressed archives. * Select BR2_PACKAGE_ZSTD if you want to deal with zstd compressed archives. - * Select BR2_PACKAGE_UBOOT_TOOLS and BR2_PACKAGE_ZLIB to add - support for setting the U-Boot environment. * Select BR2_PACKAGE_ZEROMQ to add support for using a remote handler. * Select BR2_PACKAGE_LIBRSYNC to add support for using rdiff handler. * Select BR2_PACKAGE_LIBUBOOTENV to add support for setting - the U-Boot environment with the new API. + the U-Boot environment. * Select BR2_PACKAGE_LIBGPIOD to add support for microcontroller firmware update. * Select BR2_PACKAGE_EFIBOOTMGR to add support for EFI Boot @@ -61,9 +60,16 @@ config BR2_PACKAGE_SWUPDATE_CONFIG I you wish to use your own modified swupdate configuration file specify the config file location with this option. +config BR2_PACKAGE_SWUPDATE_WEBSERVER + bool "swupdate webserver" + default y + help + Enable update from remote using a web server on the target. + config BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE bool "install default website" default y + depends on BR2_PACKAGE_SWUPDATE_WEBSERVER help Install the provided website to /var/www/swupdate. @@ -72,6 +78,6 @@ config BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE installed to /var/www/swupdate. endif -comment "swupdate needs a toolchain w/ threads" +comment "swupdate needs a toolchain w/ dynamic library, threads" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/swupdate/swupdate.config b/package/swupdate/swupdate.config index 9d255c8ee4..a6b7a74948 100644 --- a/package/swupdate/swupdate.config +++ b/package/swupdate/swupdate.config @@ -14,6 +14,7 @@ CONFIG_HAVE_DOT_CONFIG=y # CONFIG_CURL is not set # CONFIG_CURL_SSL is not set # CONFIG_SYSTEMD is not set +CONFIG_DEFAULT_CONFIG_FILE="/etc/swupdate.cfg" CONFIG_SCRIPTS=y # CONFIG_HW_COMPATIBILITY is not set CONFIG_SW_VERSIONS_FILE="/etc/sw-versions" @@ -82,7 +83,7 @@ CONFIG_MONGOOSE=y CONFIG_MONGOOSEIPV6=y # -# SSL support needs libcrypto, libssl +# SSL support needs an SSL implementation # # @@ -103,6 +104,7 @@ CONFIG_PARSERROOT="" # # ubivol support needs libubi # +# CONFIG_DISKPART is not set CONFIG_RAW=y # CONFIG_RDIFFHANDLER is not set # CONFIG_SHELLSCRIPTHANDLER is not set diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 3de8d25f46..8bfbc7c8b9 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,6 +1,13 @@ # Locally calculated -sha256 31b2561c9c91ab1e8b6f73704f9a3560816961c2cade4f5d5fc15f55c77ec819 swupdate-2019.11.tar.gz -sha256 43492b377cf2fb67942d1dd231146bd4e6578646ad13ef289297c9dd75cbc478 Licenses/Exceptions -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt -sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e Licenses/mit.txt +sha256 5afe78ae94e869bcb911d8592251641cdab80096d8e5149d483054ea49f9aab8 swupdate-2021.04.tar.gz +sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt +sha256 3139f288c2e4cbe4a8c0e8c13c82661f3c798d446e1fbbc27a48a69aa7b4ec0d LICENSES/BSD-2-Clause.txt +sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt +sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt +sha256 6e4efcb1952c7976d3fae93b802c591384c4f50949225a802adf41bc266fa3e6 LICENSES/CC-BY-ND-4.0.txt +sha256 5d51b52a40391a26cbb2accf5dc5d1c165de49a022d9d5efb50b22204d2682ec LICENSES/GPL-2.0-only.txt +sha256 43fd695e9b198a9a4997cc2d02e10d26cae937e2c4930b9eff9c6d349c85cd32 LICENSES/GPL-2.0-or-later.txt +sha256 492e801f1b0632185431472f148885a4fe8e990b10da57b4986a8bcf140a5374 LICENSES/ISC.txt +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt +sha256 43492b377cf2fb67942d1dd231146bd4e6578646ad13ef289297c9dd75cbc478 LICENSES/LicenseRef-OpenSSL-Exception.txt +sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSES/MIT.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 2b51edb66d..4bcdb96602 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,18 +4,31 @@ # ################################################################################ -SWUPDATE_VERSION = 2019.11 +SWUPDATE_VERSION = 2021.04 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) -SWUPDATE_LICENSE = GPL-2.0+ with OpenSSL exception, LGPL-2.1+, MIT -SWUPDATE_LICENSE_FILES = Licenses/Exceptions Licenses/gpl-2.0.txt \ - Licenses/lgpl-2.1.txt Licenses/mit.txt +SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+ with OpenSSL exception, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-2-Clause, BSD-3-Clause, CC0-1.0, CC-BY-ND-4.0 +SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ + LICENSES/BSD-2-Clause.txt \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/CC0-1.0.txt \ + LICENSES/CC-BY-ND-4.0.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-2.0-or-later.txt \ + LICENSES/ISC.txt \ + LICENSES/LGPL-2.1-or-later.txt \ + LICENSES/LicenseRef-OpenSSL-Exception.txt \ + LICENSES/MIT.txt # swupdate uses $CROSS-cc instead of $CROSS-gcc, which is not # available in all external toolchains, and use CC for linking. Ensure # TARGET_CC is used for both. -SWUPDATE_MAKE_ENV = CC="$(TARGET_CC)" LD="$(TARGET_CC)" +SWUPDATE_MAKE_ENV = CC="$(TARGET_CC)" LD="$(TARGET_CC)" SKIP_STRIP=y -# swupdate bundles its own version of mongoose (version 6.11) +# swupdate bundles its own version of mongoose (version 6.16) + +ifeq ($(BR2_PACKAGE_E2FSPROGS),y) +SWUPDATE_DEPENDENCIES += e2fsprogs +endif ifeq ($(BR2_PACKAGE_EFIBOOTMGR),y) SWUPDATE_DEPENDENCIES += efibootmgr @@ -38,6 +51,13 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBARCHIVE=n endif +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) +SWUPDATE_DEPENDENCIES += util-linux +SWUPDATE_MAKE_ENV += HAVE_LIBBLKID=y +else +SWUPDATE_MAKE_ENV += HAVE_LIBBLKID=n +endif + ifeq ($(BR2_PACKAGE_LIBCONFIG),y) SWUPDATE_DEPENDENCIES += libconfig SWUPDATE_MAKE_ENV += HAVE_LIBCONFIG=y @@ -73,11 +93,11 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBWEBSOCKETS=n endif -ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER):$(BR2_STATIC_LIBS),y:) +ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y) SWUPDATE_DEPENDENCIES += luainterpreter host-pkgconf # defines the base name for the pkg-config file ("lua" or "luajit") define SWUPDATE_SET_LUA_VERSION - $(call KCONFIG_SET_OPT,CONFIG_LUAPKG,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER),$(SWUPDATE_BUILD_CONFIG)) + $(call KCONFIG_SET_OPT,CONFIG_LUAPKG,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER)) endef SWUPDATE_MAKE_ENV += HAVE_LUA=y else @@ -110,20 +130,38 @@ SWUPDATE_MAKE_ENV += HAVE_MBEDTLS=n endif endif -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -SWUPDATE_DEPENDENCIES += systemd +ifeq ($(BR2_PACKAGE_P11_KIT),y) +SWUPDATE_DEPENDENCIES += p11-kit +SWUPDATE_MAKE_ENV += HAVE_P11KIT=y +else +SWUPDATE_MAKE_ENV += HAVE_P11KIT=n endif -ifeq ($(BR2_PACKAGE_UBOOT_TOOLS),y) -SWUPDATE_DEPENDENCIES += uboot-tools -SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=y -else ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y) +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +SWUPDATE_DEPENDENCIES += systemd +define SWUPDATE_SET_SYSTEMD + $(call KCONFIG_ENABLE_OPT,CONFIG_SYSTEMD) +endef +else +define SWUPDATE_SET_SYSTEMD + $(call KCONFIG_DISABLE_OPT,CONFIG_SYSTEMD) +endef +endif + +ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y) SWUPDATE_DEPENDENCIES += libubootenv SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=y else SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=n endif +ifeq ($(BR2_PACKAGE_WOLFSSL),y) +SWUPDATE_DEPENDENCIES += wolfssl +SWUPDATE_MAKE_ENV += HAVE_WOLFSSL=y +else +SWUPDATE_MAKE_ENV += HAVE_WOLFSSL=n +endif + ifeq ($(BR2_PACKAGE_ZEROMQ),y) SWUPDATE_DEPENDENCIES += zeromq SWUPDATE_MAKE_ENV += HAVE_LIBZEROMQ=y @@ -149,33 +187,39 @@ ifeq ($(BR2_PACKAGE_LIBRSYNC),y) SWUPDATE_DEPENDENCIES += librsync endif +ifeq ($(BR2_PACKAGE_SWUPDATE_WEBSERVER),y) +define SWUPDATE_SET_WEBSERVER + $(call KCONFIG_ENABLE_OPT,CONFIG_WEBSERVER) +endef +else +define SWUPDATE_SET_WEBSERVER + $(call KCONFIG_DISABLE_OPT,CONFIG_WEBSERVER) +endef +endif + SWUPDATE_BUILD_CONFIG = $(@D)/.config SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig -ifeq ($(BR2_STATIC_LIBS),y) -define SWUPDATE_PREFER_STATIC - $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(SWUPDATE_BUILD_CONFIG)) -endef -endif - SWUPDATE_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" define SWUPDATE_KCONFIG_FIXUP_CMDS - $(SWUPDATE_PREFER_STATIC) $(SWUPDATE_SET_LUA_VERSION) + $(SWUPDATE_SET_SYSTEMD) + $(SWUPDATE_SET_WEBSERVER) endef define SWUPDATE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) $(SWUPDATE_MAKE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) $(SWUPDATE_MAKE_OPTS) endef define SWUPDATE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/swupdate $(TARGET_DIR)/usr/bin/swupdate + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ + $(SWUPDATE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install $(if $(BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE), \ mkdir -p $(TARGET_DIR)/var/www/swupdate; \ cp -dpfr $(@D)/examples/www/v2/* $(TARGET_DIR)/var/www/swupdate) @@ -189,4 +233,28 @@ $(error No Swupdate configuration file specified, check your BR2_PACKAGE_SWUPDAT endif endif +# Services and configs derived from meta-swupdate(MIT license) +# https://github.com/sbabic/meta-swupdate/tree/master/recipes-support/swupdate/swupdate +define SWUPDATE_INSTALL_COMMON + mkdir -p $(TARGET_DIR)/etc/swupdate/conf.d \ + $(TARGET_DIR)/usr/lib/swupdate/conf.d + $(INSTALL) -D -m 755 package/swupdate/swupdate.sh \ + $(TARGET_DIR)/usr/lib/swupdate/swupdate.sh + $(if $(BR2_PACKAGE_SWUPDATE_WEBSERVER), \ + $(INSTALL) -D -m 644 package/swupdate/10-mongoose-args \ + $(TARGET_DIR)/usr/lib/swupdate/conf.d/10-mongoose-args) +endef +define SWUPDATE_INSTALL_INIT_SYSTEMD + $(SWUPDATE_INSTALL_COMMON) + $(INSTALL) -D -m 644 package/swupdate/swupdate.service \ + $(TARGET_DIR)/usr/lib/systemd/system/swupdate.service + $(INSTALL) -D -m 644 package/swupdate/tmpfiles-swupdate.conf \ + $(TARGET_DIR)/usr/lib/tmpfiles.d/tmpfiles-swupdate.conf +endef +define SWUPDATE_INSTALL_INIT_SYSV + $(SWUPDATE_INSTALL_COMMON) + $(INSTALL) -D -m 755 package/swupdate/S80swupdate \ + $(TARGET_DIR)/etc/init.d/S80swupdate +endef + $(eval $(kconfig-package)) diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk index 0453fba521..a7c7adade3 100644 --- a/package/sylpheed/sylpheed.mk +++ b/package/sylpheed/sylpheed.mk @@ -10,9 +10,13 @@ SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.xz SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR) SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPL-2.1+ (library, attachment plugin) SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB +SYLPHEED_CPE_ID_VENDOR = sylpheed_project SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2 +# 0001-harden-link-checker-before-accepting-click.patch +SYLPHEED_IGNORE_CVES += CVE-2021-37746 + # Remove the -I$(includedir) from the Makefiles # because it refers to the host /usr/include. define SYLPHEED_PRECONFIGURE diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk index 63c6e5cbc1..bc7ebea070 100644 --- a/package/synergy/synergy.mk +++ b/package/synergy/synergy.mk @@ -8,6 +8,7 @@ SYNERGY_VERSION = 2.0.12-beta SYNERGY_SITE = $(call github,symless,synergy-core,v$(SYNERGY_VERSION)) SYNERGY_LICENSE = GPL-2.0 SYNERGY_LICENSE_FILES = LICENSE +SYNERGY_CPE_ID_VENDOR = symless SYNERGY_DEPENDENCIES = xlib_libX11 xlib_libXtst # Avoid using buildroot commit hash inside cmake/Version.cmake diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in index 0a1b3f8935..06d20c7f7b 100644 --- a/package/sysdig/Config.in +++ b/package/sysdig/Config.in @@ -1,18 +1,18 @@ config BR2_PACKAGE_SYSDIG bool "sysdig" depends on BR2_LINUX_KERNEL - depends on BR2_INSTALL_LIBSTDCPP # libjson - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP # jsoncpp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on !BR2_STATIC_LIBS # luajit, elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, jq + depends on !BR2_STATIC_LIBS # elfutils depends on BR2_USE_WCHAR # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_JQ select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBB64 select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LUAJIT select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB @@ -25,8 +25,9 @@ config BR2_PACKAGE_SYSDIG https://github.com/draios/sysdig/wiki -comment "sysdig needs a glibc or uclibc toolchain w/ C++, gcc >= 4.8, dynamic library and a Linux kernel to be built" +comment "sysdig needs a glibc or uclibc toolchain w/ C++, threads, gcc >= 4.8, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \ + || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 diff --git a/package/sysdig/sysdig.mk b/package/sysdig/sysdig.mk index c604032cf4..08d93750ae 100644 --- a/package/sysdig/sysdig.mk +++ b/package/sysdig/sysdig.mk @@ -8,10 +8,21 @@ SYSDIG_VERSION = 0.23.1 SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION)) SYSDIG_LICENSE = GPL-2.0 SYSDIG_LICENSE_FILES = COPYING +SYSDIG_CPE_ID_VENDOR = sysdig SYSDIG_CONF_OPTS = -DENABLE_DKMS=OFF -DUSE_BUNDLED_DEPS=OFF -SYSDIG_DEPENDENCIES = zlib luajit jsoncpp libcurl ncurses openssl jq libb64 elfutils SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO +SYSDIG_DEPENDENCIES = \ + elfutils \ + jq \ + jsoncpp \ + libb64 \ + libcurl \ + luainterpreter \ + ncurses \ + openssl \ + zlib + # sysdig creates the module Makefile from a template, which contains a # single place-holder, KBUILD_FLAGS, wich is only replaced with two # things: diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in index fda58e020e..3315a6ddc9 100644 --- a/package/sysklogd/Config.in +++ b/package/sysklogd/Config.in @@ -1,8 +1,48 @@ config BR2_PACKAGE_SYSKLOGD - bool "syslogd & klogd" + bool "sysklogd" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS help - System log daemons syslogd and klogd. + The continuation of the original sysklogd package, based on + the original Berkeley syslog daemon. Now with kernel + logging, and log rotation built-in. It can both receive from + and send to remote syslog servers. The v2.x series include + extended support for RFC5424 with an alt. syslogp() API for + clients. https://github.com/troglobit/sysklogd/ + +if BR2_PACKAGE_SYSKLOGD + +config BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY + int "Retry delay (sec)" + default "180" + help + Retry delay (seconds) for sending to remote syslog servers. + + When set up to forward logs to a remote syslog server, the + network may not always be available. E.g., default interface + down, or no route to the remote server. This setting controls + the back-off time before retrying. + + Default: 180 seconds + +config BR2_PACKAGE_SYSKLOGD_LOGGER + bool "logger tool" + help + Generate log messages from scripts or from the command line. + + This version of logger is receommended for use with sysklogd. + It makes use of the new syslogp() API for RFC5424 style logs, + e.g. MSGID, strucutred data (SD), etc. + + The BusyBox, or util-linux, logger tools can also be used, but + are limited to RFC3164 style messages. + +endif + +comment "sysklogd needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 6f7ab6ece8..6d3ba8f960 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,3 +1,6 @@ +# Upstream .md5 and .sha256 from GitHub +md5 2c6749c49f52b8c5dad18e9a9315e7dd sysklogd-2.2.3.tar.gz +sha256 e7ea09c15511a63c430e84f65ce3bf55a0386ee419ab52e9341c4a9fabae59ad sysklogd-2.2.3.tar.gz + # Locally calculated -sha256 1e9e18564c5bba474954d55ea6e2a0e3dc1bc145d8973c5fd098b088a9be9ceb sysklogd-1.6.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 7a25d0eb6f..7c5de95743 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,16 +4,28 @@ # ################################################################################ -SYSKLOGD_VERSION = 1.6 -SYSKLOGD_SITE = $(call github,troglobit,sysklogd,v$(SYSKLOGD_VERSION)) -SYSKLOGD_LICENSE = GPL-2.0+ -SYSKLOGD_LICENSE_FILES = COPYING -# From git -SYSKLOGD_AUTORECONF = YES -SYSKLOGD_CONF_OPTS = --exec-prefix=/ +SYSKLOGD_VERSION = 2.2.3 +SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) +SYSKLOGD_LICENSE = BSD-3-Clause +SYSKLOGD_LICENSE_FILES = LICENSE +SYSKLOGD_CPE_ID_VENDOR = sysklogd_project + +# Busybox install logger in /usr/bin, and syslogd in /sbin, so install in +# the same locations so that busybox does not install its applets in there. +SYSKLOGD_CONF_OPTS = \ + --bindir=/usr/bin \ + --sbindir=/sbin \ + --with-suspend-time=$(BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY) + +# Disable/Enable utilities +ifeq ($(BR2_PACKAGE_SYSKLOGD_LOGGER),y) +SYSKLOGD_CONF_OPTS += --with-logger +else +SYSKLOGD_CONF_OPTS += --without-logger +endif define SYSKLOGD_INSTALL_SAMPLE_CONFIG - $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ + $(INSTALL) -D -m 0644 $(@D)/syslog.conf \ $(TARGET_DIR)/etc/syslog.conf endef @@ -22,15 +34,11 @@ SYSKLOGD_POST_INSTALL_TARGET_HOOKS += SYSKLOGD_INSTALL_SAMPLE_CONFIG define SYSKLOGD_INSTALL_INIT_SYSV $(INSTALL) -m 755 -D package/sysklogd/S01syslogd \ $(TARGET_DIR)/etc/init.d/S01syslogd - $(INSTALL) -m 755 -D package/sysklogd/S02klogd \ - $(TARGET_DIR)/etc/init.d/S02klogd endef define SYSKLOGD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/syslogd.service \ $(TARGET_DIR)/usr/lib/systemd/system/syslogd.service - $(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/klogd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/klogd.service endef $(eval $(autotools-package)) diff --git a/package/sysklogd/syslogd.service b/package/sysklogd/syslogd.service index adaac679f2..c7e724e13b 100644 --- a/package/sysklogd/syslogd.service +++ b/package/sysklogd/syslogd.service @@ -1,10 +1,10 @@ [Unit] Description=System Logging Service Requires=syslog.socket -Wants=klogd.service [Service] -ExecStart=/sbin/syslogd -m 0 -n +EnvironmentFile=-/etc/default/syslogd +ExecStart=/sbin/syslogd -m 0 -F $SYSLOGD_ARGS StandardOutput=null Restart=on-failure diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index e23d80580d..4d1526b812 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.26 +@version: 3.33 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index edb7efe195..df8002341c 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 90214223864df252cea80dbb35c88a2464edcbbb2c9fbc6f6f6c13ee60cb62cd syslog-ng-3.26.1.tar.gz -sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING -sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt +sha256 0b786a06077b9150191d714f45a1b4b3792952cb58163a3af336f074da9fb14b syslog-ng-3.33.2.tar.gz +sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING +sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index a0c21a8907..765e886b12 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,10 +6,11 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.26.1 +SYSLOG_NG_VERSION = 3.33.2 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt +SYSLOG_NG_CPE_ID_VENDOR = oneidentity SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \ libglib2 openssl pcre # We're patching configure.ac @@ -99,10 +100,10 @@ endif ifeq ($(BR2_PACKAGE_NETSNMP),y) SYSLOG_NG_DEPENDENCIES += netsnmp -SYSLOG_NG_CONF_OPTS += --enable-snmp-dest +SYSLOG_NG_CONF_OPTS += --enable-afsnmp SYSLOG_NG_CONF_OPTS += --with-net-snmp="$(STAGING_DIR)/usr/bin" else -SYSLOG_NG_CONF_OPTS += --disable-snmp-dest +SYSLOG_NG_CONF_OPTS += --disable-afsnmp endif define SYSLOG_NG_INSTALL_INIT_SYSV @@ -113,7 +114,7 @@ endef # By default syslog-ng installs a .service that requires a config file at # /etc/default, so provide one with the default values. define SYSLOG_NG_INSTALL_INIT_SYSTEMD - mkdir $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d printf '[Install]\nDefaultInstance=default\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d/buildroot-default-instance.conf endef diff --git a/package/sysrepo/Config.in b/package/sysrepo/Config.in index 31f817faa1..8de141efc2 100644 --- a/package/sysrepo/Config.in +++ b/package/sysrepo/Config.in @@ -5,13 +5,9 @@ config BR2_PACKAGE_SYSREPO depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # host-protobuf - select BR2_PACKAGE_LIBAVL - select BR2_PACKAGE_LIBEV select BR2_PACKAGE_LIBYANG select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP - select BR2_PACKAGE_PROTOBUF_C help Sysrepo is an YANG-based configuration and operational state data store for Unix/Linux applications. @@ -31,4 +27,3 @@ comment "sysrepo needs a toolchain w/ C++, NPTL, dynamic library, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" diff --git a/package/sysrepo/S51sysrepo-plugind b/package/sysrepo/S51sysrepo-plugind index 74b68396bf..60ea3ba7a9 100644 --- a/package/sysrepo/S51sysrepo-plugind +++ b/package/sysrepo/S51sysrepo-plugind @@ -1,7 +1,7 @@ #!/bin/sh DAEMON="sysrepo-plugind" -PIDFILE="/var/run/$DAEMON.pid" +EXECUTABLE="/usr/bin/$DAEMON" SYSREPO_PLUGIND_ARGS="" @@ -10,7 +10,7 @@ SYSREPO_PLUGIND_ARGS="" start() { printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -x "$EXECUTABLE" \ -- $SYSREPO_PLUGIND_ARGS status=$? if [ "$status" -eq 0 ]; then @@ -23,7 +23,7 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - start-stop-daemon -K -q -p $PIDFILE + start-stop-daemon -K -q -x "$EXECUTABLE" status=$? if [ "$status" -eq 0 ]; then echo "OK" diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index ff2e1166b2..693a2bbf7d 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,2 +1,3 @@ -sha256 be405a33b1713d1114f3c092a6349b25a2de2a0f43a15dc6984c029f70230b3b sysrepo-1.3.21.tar.gz -sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE +# Locally calculated +sha256 2cc7537a03f48dc3c955436e1e0ed077bc3b31a755d6979d24ca42e1187fce01 sysrepo-1.4.122.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 5f87ac38a3..c0db05e52c 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,17 +4,19 @@ # ################################################################################ -SYSREPO_VERSION = 1.3.21 +SYSREPO_VERSION = 1.4.122 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = Apache-2.0 SYSREPO_LICENSE_FILES = LICENSE -SYSREPO_DEPENDENCIES = libev libavl libyang pcre protobuf-c host-sysrepo -HOST_SYSREPO_DEPENDENCIES = host-libev host-libavl host-libyang host-pcre host-protobuf-c +SYSREPO_DEPENDENCIES = libyang pcre host-sysrepo +HOST_SYSREPO_DEPENDENCIES = host-libyang host-pcre SYSREPO_CONF_OPTS = \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) + -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \ + -DENABLE_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF \ + -DREPO_PATH=/etc/sysrepo ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) SYSREPO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic @@ -26,8 +28,9 @@ define SYSREPO_INSTALL_INIT_SYSV endef HOST_SYSREPO_CONF_OPTS = \ - -DCMAKE_BUILD_TYPE=Release \ -DBUILD_EXAMPLES=OFF \ + -DENABLE_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF \ -DREPO_PATH=$(TARGET_DIR)/etc/sysrepo $(eval $(cmake-package)) diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index 57fc8f181e..b573f312c6 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,5 +1,5 @@ # From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 4da5a48d0152eba5b34d94bf28dcb08fc48fb32b sysstat-12.2.1.tar.xz +sha1 1e38bc029979def730ae1fb1e39f631bd1a3bc73 sysstat-12.4.2.tar.xz # Locally calculated -sha256 8edb0e19b514ac560a098a02933a4735b881296d61014db89bf80f05dd7a4732 sysstat-12.2.1.tar.xz +sha256 3701b2c1883d50eb384d7b95ce5b6df0a71fdcb3c23f96cb58098d1bcffa018f sysstat-12.4.2.tar.xz sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index f994ad6e3c..6948f6b390 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,13 +4,21 @@ # ################################################################################ -SYSSTAT_VERSION = 12.2.1 +SYSSTAT_VERSION = 12.4.2 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard -SYSSTAT_CONF_OPTS = --disable-file-attr --disable-sensors +SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ SYSSTAT_LICENSE_FILES = COPYING -SYSSTAT_MAKE_OPTS += LFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" +SYSSTAT_CPE_ID_VENDOR = sysstat_project +SYSSTAT_SELINUX_MODULES = sysstat + +ifeq ($(BR2_PACKAGE_LM_SENSORS),y) +SYSSTAT_DEPENDENCIES += lm-sensors +SYSSTAT_CONF_OPTS += --enable-sensors +else +SYSSTAT_CONF_OPTS += --disable-sensors +endif $(eval $(autotools-package)) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 8a3149ee5e..0148cad791 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -12,6 +12,7 @@ config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS default y if BR2_riscv default y if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb default y if BR2_sparc || BR2_sparc64 + default y if BR2_s390x menuconfig BR2_PACKAGE_SYSTEMD bool "systemd" @@ -28,12 +29,10 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_DBUS # runtime dependency only select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT - select BR2_PACKAGE_UTIL_LINUX_NOLOGIN select BR2_PACKAGE_UTIL_LINUX_FSCK select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools @@ -112,35 +111,55 @@ config BR2_PACKAGE_SYSTEMD_BOOT https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/ +config BR2_PACKAGE_SYSTEMD_INITRD + bool "Services for booting from initrd" + help + Install various services that are only useful if systemd is + run from an initrd. + +config BR2_PACKAGE_SYSTEMD_KERNELINSTALL + bool "install kernel-install and related files" + help + kernel-install is used to install and remove kernel and + initramfs images to and from the boot loader partition. + The boot loader partition will usually be one of + /boot, /efi, or /boot/efi. + +config BR2_PACKAGE_SYSTEMD_ANALYZE + bool "systemd-analyze" + help + systemd-analyze may be used to determine system boot-up + performance statistics and retrieve other state and tracing + information from the system and service manager, and to + verify the correctness of unit files. + It is also used to access special functions useful for + advanced system manager debugging. + config BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH string default "ia32" if BR2_i386 default "x64" if BR2_x86_64 depends on BR2_PACKAGE_SYSTEMD_BOOT -config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY - bool "HTTP server for journal events" +config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE + bool "enable journal remote tools" + select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBMICROHTTPD help + journal remote functionality adds three tools: + systemd-journal-gatewayd serves journal events over the - network. Clients must connect using HTTP. The server - listens on port 19531 by default. + network. - http://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.service.html - -config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE - bool "enable systemd-journal-remote" - depends on BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY - select BR2_PACKAGE_LIBCURL - help systemd-journal-remote is a command to receive serialized - journal events and store them to journal files. Input - streams are in the Journal Export Format[1], i.e. like the - output from journalctl --output=export. For transport over - the network, this serialized stream is usually carried over - an HTTPS connection. + journal events and store them to journal files. + systemd-journal-upload will upload journal entries to the + URL specified with --url=. + + https://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.service.html https://www.freedesktop.org/software/systemd/man/systemd-journal-remote.service.html + https://www.freedesktop.org/software/systemd/man/systemd-journal-upload.html config BR2_PACKAGE_SYSTEMD_BACKLIGHT bool "enable backlight support" @@ -187,12 +206,35 @@ config BR2_PACKAGE_SYSTEMD_FIRSTBOOT config BR2_PACKAGE_SYSTEMD_HIBERNATE bool "enable hibernation support" + select BR2_PACKAGE_SYSTEMD_INITRD help 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 +config BR2_PACKAGE_SYSTEMD_HOMED + bool "enable home daemon" + depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2 + depends on BR2_USE_MMU # cryptsetup -> lvm2 + depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # fscrypt_key + select BR2_PACKAGE_CRYPTSETUP + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + systemd-homed is a system service that may be used to create, + remove, change or inspect home directories. + + https://www.freedesktop.org/software/systemd/man/systemd-homed.service.html + +comment "homed support needs a toolchain w/ threads, dynamic library, kernel headers >= 4.12" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + config BR2_PACKAGE_SYSTEMD_HOSTNAMED bool "enable hostname daemon" default y @@ -218,8 +260,6 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_LZ4 select BR2_PACKAGE_XZ select BR2_PACKAGE_ZLIB help @@ -278,13 +318,19 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD http://www.freedesktop.org/software/systemd/man/systemd-networkd.html +config BR2_PACKAGE_SYSTEMD_OOMD + bool "enable out-of-memory killer" + help + systemd-oomd is a system service that uses cgroups-v2 and + pressure stall information (PSI) to monitor and take action + on processes before an OOM occurs in kernel space. + + https://www.freedesktop.org/software/systemd/man/systemd-oomd.html + config BR2_PACKAGE_SYSTEMD_POLKIT bool "enable polkit support" - depends on BR2_HOST_GCC_AT_LEAST_4_9 # polkit - depends on BR2_INSTALL_LIBSTDCPP # polkit - depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS # polkit - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # polkit - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # polkit + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # polkit -> c++17 + depends on BR2_TOOLCHAIN_HAS_THREADS # polkit depends on BR2_USE_WCHAR # libglib2 select BR2_PACKAGE_POLKIT help @@ -295,13 +341,27 @@ config BR2_PACKAGE_SYSTEMD_POLKIT http://wiki.freedesktop.org/www/Software/polkit/ -comment "polkit support needs a toolchain with C++, wchar, NPTL, gcc >= 4.9" - depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_HOST_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_USE_WCHAR +comment "polkit support needs a toolchain with threads, wchar, gcc >= 7" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_SYSTEMD_PORTABLED + bool "enable portable services" + help + Portable services are systemd services that can be dynamically + attached and detached from the system. + + These services must come with their own root directory which + they are bound to through an automatically generated drop-in. + + They also have restrictions applied by the host system in the + form of profiles. + + This functionality is provided by the system service + systemd-portabled along with the corresponding CLI + portablectl. + + https://systemd.io/PORTABLE_SERVICES/ config BR2_PACKAGE_SYSTEMD_QUOTACHECK bool "enable quotacheck tools" @@ -366,6 +426,23 @@ config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT When this feature is enabled, Systemd mounts smackfs and manages security labels for sockets. +config BR2_PACKAGE_SYSTEMD_SYSEXT + bool "enable sysext support" + help + systemd-sysext activates/deactivates system extension + images. + + System extension images may – dynamically at runtime — + extend the /usr/ and /opt/ directory hierarchies with + additional files. + + This is particularly useful on immutable system images where + a /usr/ and/or /opt/ hierarchy residing on a read-only file + system shall be extended temporarily at runtime without + making any persistent modifications. + + https://www.freedesktop.org/software/systemd/man/systemd-sysext.html + config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" help diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index eacb797ed4..a83ff7d989 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,6 +1,6 @@ # sha256 locally computed -sha256 bd1c467045989ab986b29d003f17960ccb201bc923093db978b4cfb299ae8a63 systemd-245.4.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 -sha256 f7299f5f5e8bdffd347dce1bed888b1cea6ddaf27de521c307265098bcbeae92 README -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 tools/chromiumos/LICENSE +sha256 773ee546ad6df0921ea6f9e12294eb102bf68c1ac9eb3dcaca1764f8306d6e13 systemd-249.5.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 +sha256 f5645b4b846479859d6618fa7a5a1722681aa7fc43c1e45f8bf8e1fe5738d618 README +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 tools/chromiumos/LICENSE diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 0a4a84e7e2..d5b0f7203b 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,45 +4,53 @@ # ################################################################################ -SYSTEMD_VERSION = 245.4 +SYSTEMD_VERSION = 249.5 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE +SYSTEMD_CPE_ID_VENDOR = freedesktop SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ host-gperf \ + host-python3-jinja2 \ kmod \ libcap \ - util-linux \ + util-linux-libs \ $(TARGET_NLS_DEPENDENCIES) +SYSTEMD_SELINUX_MODULES = systemd udev xdg + SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ - -Drootlibdir='/usr/lib' \ - -Dblkid=true \ - -Dman=false \ - -Dima=false \ - -Dldconfig=false \ - -Ddefault-dnssec=no \ -Ddefault-hierarchy=hybrid \ - -Dtests=false \ + -Didn=true \ + -Dima=false \ + -Dkexec-path=/usr/sbin/kexec \ + -Dkmod-path=/usr/bin/kmod \ + -Dldconfig=false \ + -Dloadkeys-path=/usr/bin/loadkeys \ + -Dman=false \ + -Dmount-path=/usr/bin/mount \ + -Dmode=release \ + -Dnss-systemd=true \ + -Dquotacheck-path=/usr/sbin/quotacheck \ + -Dquotaon-path=/usr/sbin/quotaon \ + -Drootlibdir='/usr/lib' \ + -Dsetfont-path=/usr/bin/setfont \ -Dsplit-bin=true \ -Dsplit-usr=false \ - -Dsystem-uid-max=999 \ - -Dsystem-gid-max=999 \ - -Dtelinit-path=$(TARGET_DIR)/sbin/telinit \ - -Dkmod-path=/usr/bin/kmod \ - -Dkexec-path=/usr/sbin/kexec \ -Dsulogin-path=/usr/sbin/sulogin \ - -Dmount-path=/usr/bin/mount \ + -Dsystem-gid-max=999 \ + -Dsystem-uid-max=999 \ + -Dsysvinit-path= \ + -Dsysvrcnd-path= \ + -Dtelinit-path= \ + -Dtests=false \ -Dumount-path=/usr/bin/umount \ - -Dnobody-group=nogroup \ - -Didn=true \ - -Dhomed=false \ - -Dnss-systemd=true + -Dutmp=false ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl @@ -51,6 +59,19 @@ else SYSTEMD_CONF_OPTS += -Dacl=false endif +ifeq ($(BR2_PACKAGE_LESS),y) +SYSTEMD_CONF_OPTS += -Durlify=true +else +SYSTEMD_CONF_OPTS += -Durlify=false +endif + +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +SYSTEMD_DEPENDENCIES += libapparmor +SYSTEMD_CONF_OPTS += -Dapparmor=true +else +SYSTEMD_CONF_OPTS += -Dapparmor=false +endif + ifeq ($(BR2_PACKAGE_AUDIT),y) SYSTEMD_DEPENDENCIES += audit SYSTEMD_CONF_OPTS += -Daudit=true @@ -72,6 +93,13 @@ else SYSTEMD_CONF_OPTS += -Delfutils=false endif +ifeq ($(BR2_PACKAGE_GNUTLS),y) +SYSTEMD_DEPENDENCIES += gnutls +SYSTEMD_CONF_OPTS += -Dgnutls=true +else +SYSTEMD_CONF_OPTS += -Dgnutls=false +endif + ifeq ($(BR2_PACKAGE_IPTABLES),y) SYSTEMD_DEPENDENCIES += iptables SYSTEMD_CONF_OPTS += -Dlibiptc=true @@ -111,6 +139,13 @@ else SYSTEMD_CONF_OPTS += -Dbzip2=false endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +SYSTEMD_DEPENDENCIES += zstd +SYSTEMD_CONF_OPTS += -Dzstd=true +else +SYSTEMD_CONF_OPTS += -Dzstd=false +endif + ifeq ($(BR2_PACKAGE_LZ4),y) SYSTEMD_DEPENDENCIES += lz4 SYSTEMD_CONF_OPTS += -Dlz4=true @@ -125,6 +160,12 @@ else SYSTEMD_CONF_OPTS += -Dpam=false endif +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),y) +SYSTEMD_CONF_OPTS += -Dfdisk=true +else +SYSTEMD_CONF_OPTS += -Dfdisk=false +endif + ifeq ($(BR2_PACKAGE_VALGRIND),y) SYSTEMD_DEPENDENCIES += valgrind SYSTEMD_CONF_OPTS += -Dvalgrind=true @@ -155,9 +196,23 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) SYSTEMD_DEPENDENCIES += libgcrypt -SYSTEMD_CONF_OPTS += -Dgcrypt=true +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade -Dgcrypt=true else -SYSTEMD_CONF_OPTS += -Dgcrypt=false +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no -Dgcrypt=false +endif + +ifeq ($(BR2_PACKAGE_P11_KIT),y) +SYSTEMD_DEPENDENCIES += p11-kit +SYSTEMD_CONF_OPTS += -Dp11kit=true +else +SYSTEMD_CONF_OPTS += -Dp11kit=false +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +SYSTEMD_DEPENDENCIES += openssl +SYSTEMD_CONF_OPTS += -Dopenssl=true +else +SYSTEMD_CONF_OPTS += -Dopenssl=false endif ifeq ($(BR2_PACKAGE_PCRE2),y) @@ -167,23 +222,50 @@ else SYSTEMD_CONF_OPTS += -Dpcre2=false endif -ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) -SYSTEMD_DEPENDENCIES += libmicrohttpd -SYSTEMD_CONF_OPTS += -Dmicrohttpd=true -ifeq ($(BR2_PACKAGE_LIBQRENCODE),y) -SYSTEMD_CONF_OPTS += -Dqrencode=true -SYSTEMD_DEPENDENCIES += libqrencode +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) +SYSTEMD_CONF_OPTS += -Dblkid=true else -SYSTEMD_CONF_OPTS += -Dqrencode=false +SYSTEMD_CONF_OPTS += -Dblkid=false endif + +ifeq ($(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),y) +SYSTEMD_CONF_OPTS += -Dnologin-path=/sbin/nologin else -SYSTEMD_CONF_OPTS += -Dmicrohttpd=false -Dqrencode=false +SYSTEMD_CONF_OPTS += -Dnologin-path=/bin/false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_INITRD),y) +SYSTEMD_CONF_OPTS += -Dinitrd=true +else +SYSTEMD_CONF_OPTS += -Dinitrd=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_KERNELINSTALL),y) +SYSTEMD_CONF_OPTS += -Dkernel-install=true +else +SYSTEMD_CONF_OPTS += -Dkernel-install=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_ANALYZE),y) +SYSTEMD_CONF_OPTS += -Danalyze=true +else +SYSTEMD_CONF_OPTS += -Danalyze=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) -SYSTEMD_CONF_OPTS += -Dremote=true +# remote also depends on libcurl, this is already added above. +SYSTEMD_DEPENDENCIES += libmicrohttpd +SYSTEMD_CONF_OPTS += -Dremote=true -Dmicrohttpd=true +SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * - - - systemd Journal Remote else -SYSTEMD_CONF_OPTS += -Dremote=false +SYSTEMD_CONF_OPTS += -Dremote=false -Dmicrohttpd=false +endif + +ifeq ($(BR2_PACKAGE_LIBQRENCODE),y) +SYSTEMD_DEPENDENCIES += libqrencode +SYSTEMD_CONF_OPTS += -Dqrencode=true +else +SYSTEMD_CONF_OPTS += -Dqrencode=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) @@ -268,9 +350,9 @@ SYSTEMD_CONF_OPTS += -Dlogind=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_MACHINED),y) -SYSTEMD_CONF_OPTS += -Dmachined=true +SYSTEMD_CONF_OPTS += -Dmachined=true -Dnss-mymachines=true else -SYSTEMD_CONF_OPTS += -Dmachined=false +SYSTEMD_CONF_OPTS += -Dmachined=false -Dnss-mymachines=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_IMPORTD),y) @@ -279,6 +361,13 @@ else SYSTEMD_CONF_OPTS += -Dimportd=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_HOMED),y) +SYSTEMD_CONF_OPTS += -Dhomed=true +SYSTEMD_DEPENDENCIES += cryptsetup openssl +else +SYSTEMD_CONF_OPTS += -Dhomed=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_HOSTNAMED),y) SYSTEMD_CONF_OPTS += -Dhostnamed=true else @@ -318,7 +407,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true -SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /var/lib/systemd/coredump - - Core Dumper +SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing else SYSTEMD_CONF_OPTS += -Dcoredump=false endif @@ -329,6 +418,12 @@ else SYSTEMD_CONF_OPTS += -Dpstore=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_OOMD),y) +SYSTEMD_CONF_OPTS += -Doomd=true +else +SYSTEMD_CONF_OPTS += -Doomd=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_POLKIT),y) SYSTEMD_CONF_OPTS += -Dpolkit=true SYSTEMD_DEPENDENCIES += polkit @@ -336,9 +431,21 @@ else SYSTEMD_CONF_OPTS += -Dpolkit=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_PORTABLED),y) +SYSTEMD_CONF_OPTS += -Dportabled=true +else +SYSTEMD_CONF_OPTS += -Dportabled=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSEXT),y) +SYSTEMD_CONF_OPTS += -Dsysext=true +else +SYSTEMD_CONF_OPTS += -Dsysext=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true -SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - Network Manager +SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),) define SYSTEMD_INSTALL_NETWORK_CONFS @@ -356,10 +463,10 @@ define SYSTEMD_INSTALL_RESOLVCONF_HOOK ln -sf ../run/systemd/resolve/resolv.conf \ $(TARGET_DIR)/etc/resolv.conf endef -SYSTEMD_CONF_OPTS += -Dresolve=true -SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager +SYSTEMD_CONF_OPTS += -Dnss-resolve=true -Dresolve=true +SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - systemd Resolver else -SYSTEMD_CONF_OPTS += -Dresolve=false +SYSTEMD_CONF_OPTS += -Dnss-resolve=false -Dresolve=false endif ifeq ($(BR2_PACKAGE_GNUTLS),y) @@ -374,7 +481,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) SYSTEMD_CONF_OPTS += -Dtimesyncd=true -SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - Network Time Synchronization +SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - systemd Time Synchronization else SYSTEMD_CONF_OPTS += -Dtimesyncd=false endif @@ -400,7 +507,6 @@ SYSTEMD_CONF_OPTS += \ -Defi-cc=$(TARGET_CC) \ -Defi-ld=$(TARGET_LD) \ -Defi-libdir=$(STAGING_DIR)/usr/lib \ - -Defi-ldsdir=$(STAGING_DIR)/usr/lib \ -Defi-includedir=$(STAGING_DIR)/usr/include/efi SYSTEMD_BOOT_EFI_ARCH = $(call qstrip,$(BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH)) @@ -435,68 +541,92 @@ endef SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ SYSTEMD_INSTALL_INIT_HOOK \ - SYSTEMD_INSTALL_MACHINEID_HOOK \ - SYSTEMD_INSTALL_RESOLVCONF_HOOK + SYSTEMD_INSTALL_MACHINEID_HOOK define SYSTEMD_INSTALL_IMAGES_CMDS $(SYSTEMD_INSTALL_BOOT_FILES) endef define SYSTEMD_USERS - - - input -1 * - - - Input device group + # udev user groups + # systemd user groups - - systemd-journal -1 * - - - Journal - - - render -1 * - - - DRI rendering nodes - - - kvm -1 * - - - kvm nodes - systemd-bus-proxy -1 systemd-bus-proxy -1 * - - - Proxy D-Bus messages to/from a bus - systemd-journal-gateway -1 systemd-journal-gateway -1 * /var/log/journal - - Journal Gateway - systemd-journal-remote -1 systemd-journal-remote -1 * /var/log/journal/remote - - Journal Remote - systemd-journal-upload -1 systemd-journal-upload -1 * - - - Journal Upload + $(SYSTEMD_REMOTE_USER) $(SYSTEMD_COREDUMP_USER) $(SYSTEMD_NETWORKD_USER) $(SYSTEMD_RESOLVED_USER) $(SYSTEMD_TIMESYNCD_USER) endef +define SYSTEMD_INSTALL_NSSCONFIG_HOOK + $(SED) '/^passwd:/ {/systemd/! s/$$/ systemd/}' \ + -e '/^group:/ {/systemd/! s/$$/ [SUCCESS=merge] systemd/}' \ + -e '/^shadow:/ {/systemd/! s/$$/ systemd/}' \ + -e '/^gshadow:/ {/systemd/! s/$$/ systemd/}' \ + $(if $(BR2_PACKAGE_SYSTEMD_RESOLVED), \ + -e '/^hosts:/ s/[[:space:]]*mymachines//' \ + -e '/^hosts:/ {/resolve/! s/files/files resolve [!UNAVAIL=return]/}' ) \ + $(if $(BR2_PACKAGE_SYSTEMD_MYHOSTNAME), \ + -e '/^hosts:/ {/myhostname/! s/$$/ myhostname/}' ) \ + $(if $(BR2_PACKAGE_SYSTEMD_MACHINED), \ + -e '/^passwd:/ {/mymachines/! s/files/files mymachines/}' \ + -e '/^group:/ {/mymachines/! s/files/files [SUCCESS=merge] mymachines/}' \ + -e '/^hosts:/ {/mymachines/! s/files/files mymachines/}' ) \ + $(TARGET_DIR)/etc/nsswitch.conf +endef + +SYSTEMD_TARGET_FINALIZE_HOOKS += \ + SYSTEMD_INSTALL_NSSCONFIG_HOOK \ + SYSTEMD_INSTALL_RESOLVCONF_HOOK + ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) -# systemd needs getty.service for VTs and serial-getty.service for serial ttys -# note that console-getty.service should be used on /dev/console as it should not have dependencies -# also patch the file to use the correct baud-rate, the default baudrate is 115200 so look for that +# systemd provides multiple units to autospawn getty as neede +# * getty@.service to start a getty on normal TTY +# * sertial-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/* # -# systemd defaults to only have getty@tty.service enabled -# * DefaultInstance=tty1 in getty@service -# * no DefaultInstance in serial-getty@.service -# * WantedBy=getty.target in console-getty.service -# * console-getty is not enabled because of 90-systemd.preset -# We want "systemctl preset-all" to do the right thing, even when run on the target after boot -# * remove the default instance of getty@.service via a drop-in in /usr/lib -# * set a new DefaultInstance for getty@.service instead, if needed -# * set a new DefaultInstance for serial-getty@.service, if needed -# * override the systemd-provided preset for console-getty.service if needed +# the generator systemd-getty-generator will +# * 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 +# +# What we want to do +# * Enable a getty on $BR2_TARGET_GENERIC_TTY_PATH +# * 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 +# * rewrite baudrates if a baudrate is provided define SYSTEMD_INSTALL_SERVICE_TTY - mkdir $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d; \ + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d; \ printf '[Install]\nDefaultInstance=\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf; \ if [ $(BR2_TARGET_GENERIC_GETTY_PORT) = "console" ]; \ then \ - TARGET="console-getty.service"; \ - printf 'enable console-getty.service\n' \ - >$(TARGET_DIR)/usr/lib/systemd/system-preset/81-buildroot-tty.preset; \ + : ; \ elif echo $(BR2_TARGET_GENERIC_GETTY_PORT) | egrep -q 'tty[0-9]*$$'; \ then \ - TARGET="getty@.service"; \ printf '[Install]\nDefaultInstance=%s\n' \ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ >$(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf; \ else \ - TARGET="serial-getty@.service"; \ - mkdir $(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d;\ + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d;\ printf '[Install]\nDefaultInstance=%s\n' \ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ >$(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d/buildroot-console.conf;\ fi; \ if [ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE)) -gt 0 ] ; \ then \ - $(SED) 's,115200,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),' $(TARGET_DIR)/lib/systemd/system/$${TARGET}; \ + $(SED) 's/115200/$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),115200/' $(TARGET_DIR)/lib/systemd/system/getty@.service; \ + $(SED) 's/115200/$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),115200/' $(TARGET_DIR)/lib/systemd/system/serial-getty@.service; \ + $(SED) 's/115200/$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),115200/' $(TARGET_DIR)/lib/systemd/system/console-getty@.service; \ + $(SED) 's/115200/$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),115200/' $(TARGET_DIR)/lib/systemd/system/container-getty@.service; \ fi endef endif @@ -514,11 +644,25 @@ endef define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef -SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_PRESET_ALL +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) +define SYSTEMD_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE) + $(call KCONFIG_ENABLE_OPT,CONFIG_EPOLL) + $(call KCONFIG_ENABLE_OPT,CONFIG_SIGNALFD) + $(call KCONFIG_ENABLE_OPT,CONFIG_TIMERFD) + $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER) + $(call KCONFIG_ENABLE_OPT,CONFIG_PROC_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_SYSFS) + $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL) + $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR) +endef + # We need a very minimal host variant, so we disable as much as possible. HOST_SYSTEMD_CONF_OPTS = \ -Dsplit-bin=true \ @@ -527,6 +671,7 @@ HOST_SYSTEMD_CONF_OPTS = \ --libdir=lib \ --sysconfdir=/etc \ --localstatedir=/var \ + -Dmode=release \ -Dutmp=false \ -Dhibernate=false \ -Dldconfig=false \ @@ -538,11 +683,13 @@ HOST_SYSTEMD_CONF_OPTS = \ -Drepart=false \ -Dcoredump=false \ -Dpstore=false \ + -Doomd=false \ -Dlogind=false \ -Dhostnamed=false \ -Dlocaled=false \ -Dmachined=false \ -Dportabled=false \ + -Dsysext=false \ -Duserdb=false \ -Dhomed=false \ -Dnetworkd=false \ @@ -578,14 +725,24 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dtests=false \ -Dglib=false \ -Dacl=false \ - -Dsysvinit-path='' + -Dsysvinit-path='' \ + -Dinitrd=false \ + -Dxdg-autostart=false \ + -Dkernel-install=false \ + -Danalyze=false \ + -Dlibcryptsetup=false \ + -Daudit=false \ + -Dzstd=false HOST_SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ host-util-linux \ host-patchelf \ host-libcap \ - host-gperf + host-gperf \ + host-python3-jinja2 + +HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) # Fix RPATH After installation # * systemd provides a install_rpath instruction to meson because the binaries @@ -595,20 +752,14 @@ HOST_SYSTEMD_DEPENDENCIES = \ # * the original path had been tweaked by buildroot via LDFLAGS to add # $(HOST_DIR)/lib # * thus re-tweak rpath after the installation for all binaries that need it -HOST_SYSTEMD_HOST_TOOLS = \ - systemd-analyze \ - systemd-machine-id-setup \ - systemd-mount \ - systemd-nspawn \ - systemctl \ - udevadm - -HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) +HOST_SYSTEMD_HOST_TOOLS = busctl journalctl systemctl systemd-* udevadm define HOST_SYSTEMD_FIX_RPATH - $(foreach f,$(HOST_SYSTEMD_HOST_TOOLS), \ - $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(HOST_DIR)/bin/$(f) - ) + for f in $(addprefix $(HOST_DIR)/bin/,$(HOST_SYSTEMD_HOST_TOOLS)); do \ + [ -e $$f ] || continue; \ + $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $${f} \ + || exit 1; \ + done endef HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH diff --git a/package/sysvinit/sysvinit.hash b/package/sysvinit/sysvinit.hash index c1d9f94461..5b3c7837e2 100644 --- a/package/sysvinit/sysvinit.hash +++ b/package/sysvinit/sysvinit.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 2a2e26b72aa235a23ab1c8471005f890309ce1196c83fbc9413c57b9ab62b587 sysvinit-2.96.tar.xz +sha256 b05c3677bb698afe64c997968b00c49b2a9bd320ce963523230ee7ea41197757 sysvinit-2.99.tar.xz # Hash for license files: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index c778a9cde5..1bf10deb63 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -4,11 +4,12 @@ # ################################################################################ -SYSVINIT_VERSION = 2.96 +SYSVINIT_VERSION = 2.99 SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VERSION).tar.xz SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit SYSVINIT_LICENSE = GPL-2.0+ SYSVINIT_LICENSE_FILES = COPYING +SYSVINIT_CPE_ID_VENDOR = sysvinit_project SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR) diff --git a/package/taglib/Config.in b/package/taglib/Config.in index 9e6bb707fc..6a87a13215 100644 --- a/package/taglib/Config.in +++ b/package/taglib/Config.in @@ -11,15 +11,5 @@ config BR2_PACKAGE_TAGLIB http://taglib.org/ -if BR2_PACKAGE_TAGLIB - -config BR2_PACKAGE_TAGLIB_MP4 - bool "taglib mp4 support" - -config BR2_PACKAGE_TAGLIB_ASF - bool "taglib wma support" - -endif - comment "taglib needs a toolchain w/ C++, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk index 9381e16672..f31f1046a5 100644 --- a/package/taglib/taglib.mk +++ b/package/taglib/taglib.mk @@ -9,6 +9,7 @@ TAGLIB_SITE = http://taglib.github.io/releases TAGLIB_INSTALL_STAGING = YES TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1 TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL +TAGLIB_CPE_ID_VENDOR = taglib # 0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch TAGLIB_IGNORE_CVES += CVE-2017-12678 @@ -20,14 +21,6 @@ ifeq ($(BR2_PACKAGE_ZLIB),y) TAGLIB_DEPENDENCIES += zlib endif -ifeq ($(BR2_PACKAGE_TAGLIB_ASF),y) -TAGLIB_CONF_OPTS += -DWITH_ASF=ON -endif - -ifeq ($(BR2_PACKAGE_TAGLIB_MP4),y) -TAGLIB_CONF_OPTS += -DWITH_MP4=ON -endif - define TAGLIB_REMOVE_DEVFILE rm -f $(TARGET_DIR)/usr/bin/taglib-config endef diff --git a/package/tar/tar.hash b/package/tar/tar.hash index 90beb26094..1914a9f3b4 100644 --- a/package/tar/tar.hash +++ b/package/tar/tar.hash @@ -1,4 +1,4 @@ # Locally calculated after checking signature -sha256 d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8 tar-1.32.tar.xz -sha256 9173f222464dd3676118408840da5990527062b5c7daf6487bed7c396c45bfb1 tar-1.29.cpio.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28 tar-1.34.tar.xz +sha256 51337b19c71df92cd4f51c50efe4dc6ddc267d31fd54679be9e9bc2e6ce8132b tar-1.34.cpio.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 9e0a40e561..80d7495b00 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -4,7 +4,7 @@ # ################################################################################ -TAR_VERSION = 1.32 +TAR_VERSION = 1.34 TAR_SOURCE = tar-$(TAR_VERSION).tar.xz TAR_SITE = $(BR2_GNU_MIRROR)/tar # busybox installs in /bin, so we need tar to install as well in /bin @@ -12,6 +12,9 @@ TAR_SITE = $(BR2_GNU_MIRROR)/tar TAR_CONF_OPTS = --exec-prefix=/ TAR_LICENSE = GPL-3.0+ TAR_LICENSE_FILES = COPYING +TAR_CPE_ID_VENDOR = gnu +# only tar <= 1.16 +TAR_IGNORE_CVES += CVE-2007-4476 ifeq ($(BR2_PACKAGE_ACL),y) TAR_DEPENDENCIES += acl @@ -29,14 +32,10 @@ endif $(eval $(autotools-package)) -# host-tar is used to create the archives in the VCS download backends and tar -# 1.30 and forward have changed the archive format. So archives generated with -# earlier versions are not bit-for-bit reproducible and the hashes would not -# match. Hence host-tar must be kept at version 1.29. -HOST_TAR_VERSION = 1.29 # host-tar: use cpio.gz instead of tar.gz to prevent chicken-egg problem # of needing tar to build tar. -HOST_TAR_SOURCE = tar-$(HOST_TAR_VERSION).cpio.gz +HOST_TAR_SOURCE = tar-$(TAR_VERSION).cpio.gz + define HOST_TAR_EXTRACT_CMDS mkdir -p $(@D) cd $(@D) && \ diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 6d750b3cd2..7c456e89b3 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -10,6 +10,7 @@ TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION) TCL_LICENSE = TCL TCL_LICENSE_FILES = license.terms +TCL_CPE_ID_VENDOR = tcl TCL_SUBDIR = unix TCL_INSTALL_STAGING = YES TCL_AUTORECONF = YES diff --git a/package/tclap/tclap.mk b/package/tclap/tclap.mk index 63dea67ac4..e1856420f3 100644 --- a/package/tclap/tclap.mk +++ b/package/tclap/tclap.mk @@ -9,6 +9,7 @@ TCLAP_SITE = http://downloads.sourceforge.net/project/tclap TCLAP_LICENSE = MIT TCLAP_LICENSE_FILES = COPYING TCLAP_INSTALL_STAGING = YES +TCLAP_CPE_ID_VENDOR = tclap_project # This package is a pure C++ template library, only made of headers. TCLAP_INSTALL_TARGET = NO diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index da5c9aa749..1990aa797b 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at -# http://www.tcpdump.org/release/tcpdump-4.9.3.tar.gz.sig +# https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410 tcpdump-4.9.3.tar.gz -sha256 9b03d5d13e66d6de02a4bb2d0dd1cb9f41808d045962cdcc42350d5291b141a1 LICENSE +sha256 79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe tcpdump-4.99.1.tar.gz +sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 01a46b9b5f..7741c3b58e 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,27 +4,25 @@ # ################################################################################ -TCPDUMP_VERSION = 4.9.3 -TCPDUMP_SITE = http://www.tcpdump.org/release +TCPDUMP_VERSION = 4.99.1 +TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE +TCPDUMP_CPE_ID_VENDOR = tcpdump TCPDUMP_CONF_ENV = \ ac_cv_linux_vers=2 \ td_cv_buggygetaddrinfo=no \ PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config TCPDUMP_CONF_OPTS = \ --without-crypto \ - --with-system-libpcap \ + --disable-local-libpcap \ $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb) -TCPDUMP_DEPENDENCIES = libpcap - -ifeq ($(BR2_STATIC_LIBS),y) -TCPDUMP_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" -endif +TCPDUMP_DEPENDENCIES = libpcap host-pkgconf +TCPDUMP_SELINUX_MODULES = netutils # make install installs an unneeded extra copy of the tcpdump binary define TCPDUMP_REMOVE_DUPLICATED_BINARY - rm -f $(TARGET_DIR)/usr/sbin/tcpdump.$(TCPDUMP_VERSION) + rm -f $(TARGET_DIR)/usr/bin/tcpdump.$(TCPDUMP_VERSION) endef TCPDUMP_POST_INSTALL_TARGET_HOOKS += TCPDUMP_REMOVE_DUPLICATED_BINARY diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash index cc00bc09b1..e83efd78b1 100644 --- a/package/tcpreplay/tcpreplay.hash +++ b/package/tcpreplay/tcpreplay.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://github.com/appneta/tcpreplay/releases/download/v4.3.2/tcpreplay-4.3.2.tar.xz.asc +# https://github.com/appneta/tcpreplay/releases/download/v4.3.3/tcpreplay-4.3.3.tar.xz.asc # using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E -sha256 955aed6a40f49a5b8c1234fd0a928edc5c665d94b7755ab5769c30938e33f380 tcpreplay-4.3.2.tar.xz -sha256 5971b0c544622f4b210a9cc56436a970685d3b0666e373c09e3cf9304db15d05 docs/LICENSE +sha256 5e960e2a4432f583adbd11fa0855d17b73d9e0f2d6453b749f27aacaee53bab5 tcpreplay-4.3.3.tar.xz +sha256 5971b0c544622f4b210a9cc56436a970685d3b0666e373c09e3cf9304db15d05 docs/LICENSE diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index 39d0f44343..9208cb8176 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -4,11 +4,12 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.3.2 +TCPREPLAY_VERSION = 4.3.3 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) TCPREPLAY_SOURCE = tcpreplay-$(TCPREPLAY_VERSION).tar.xz TCPREPLAY_LICENSE = GPL-3.0 TCPREPLAY_LICENSE_FILES = docs/LICENSE +TCPREPLAY_CPE_ID_VENDOR = tcpreplay TCPREPLAY_CONF_ENV = \ ac_cv_path_ac_pt_PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config" TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr \ diff --git a/package/tegrarcm/Config.in.host b/package/tegrarcm/Config.in.host index d8cbb947d6..937d81bd56 100644 --- a/package/tegrarcm/Config.in.host +++ b/package/tegrarcm/Config.in.host @@ -1,8 +1,13 @@ config BR2_PACKAGE_HOST_TEGRARCM bool "host tegrarcm" depends on BR2_arm || BR2_armeb + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help This program is used to send code to a Tegra device in recovery mode. https://github.com/NVIDIA/tegrarcm + +comment "host tegrarcm needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm || BR2_armeb + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash index ed386fb7b3..be1d6f4269 100644 --- a/package/terminology/terminology.hash +++ b/package/terminology/terminology.hash @@ -1,3 +1,3 @@ -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.6.0.tar.xz.sha256sum -sha256 b95cb05653afe0dad77fc038a8d5276c02a9c08d64ac97ddf0cee8087d27bd77 terminology-1.6.0.tar.xz -sha256 a907d434f4691990ed8f2826ff7546672e9934a26c798351da12ed544dadc628 COPYING +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.9.0.tar.xz.sha256sum +sha256 3f3bc327da5cc239d468570afed29a17e2fda3b1fee02b28f02ee7ed5141e46c terminology-1.9.0.tar.xz +sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index add80825a7..29b59fb39e 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -4,14 +4,17 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.6.0 +TERMINOLOGY_VERSION = 1.9.0 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause TERMINOLOGY_LICENSE_FILES = COPYING +TERMINOLOGY_CPE_ID_VENDOR = enlightenment TERMINOLOGY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) efl host-pkgconf -TERMINOLOGY_CONF_OPTS = -Dedje-cc=$(HOST_DIR)/bin/edje_cc +TERMINOLOGY_CONF_OPTS = \ + -Dedje-cc=$(HOST_DIR)/bin/edje_cc \ + -Deet=$(HOST_DIR)/bin/eet ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) TERMINOLOGY_CONF_OPTS += -Dnls=true diff --git a/package/tftpd/tftpd.hash b/package/tftpd/tftpd.hash index c876b2edc2..3cccb0f20e 100644 --- a/package/tftpd/tftpd.hash +++ b/package/tftpd/tftpd.hash @@ -1,5 +1,5 @@ -# From https://www.kernel.org/pub/software/network/tftp/tftp-hpa/sha256sums.asc -sha256 afee361df96a2f88344e191f6a25480fd714e1d28d176c3f10cc43fa206b718b tftp-hpa-5.2.tar.xz +# Locally calculated +sha256 c86520c30dab0b6bcbae021ab26d2ac63227696596d37a9b02aa3e56ec5c2e77 tftpd-b2b34cecc8cbc18ff6f1fc00bda6ae6e9011e6c7-br1.tar.gz # Hash for license file -sha256 5efef82650b8ece733e37790fc70f05e426c9e1ef9640d4ebcb04867bd3f5e28 tftpd/tftpd.c +sha256 67754ebd8f265571d3226ac97e521b1bd6fd8a61363ecd4ab7806a6f90efab92 tftpd/tftpd.c diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 57905fda05..42b5f17821 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -4,12 +4,16 @@ # ################################################################################ -TFTPD_VERSION = 5.2 -TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz -TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa +TFTPD_VERSION = b2b34cecc8cbc18ff6f1fc00bda6ae6e9011e6c7 +TFTPD_SITE = git://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git TFTPD_CONF_OPTS = --without-tcpwrappers TFTPD_LICENSE = BSD-4-Clause TFTPD_LICENSE_FILES = tftpd/tftpd.c +TFTPD_CPE_ID_VENDOR = tftpd-hpa_project +TFTPD_CPE_ID_PRODUCT = tftpd-hpa +TFTPD_SELINUX_MODULES = tftp +# From git +TFTPD_AUTORECONF = YES define TFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk index 98e9c361e5..5619258c44 100644 --- a/package/thermald/thermald.mk +++ b/package/thermald/thermald.mk @@ -12,6 +12,7 @@ THERMALD_DEPENDENCIES = dbus dbus-glib libxml2 $(TARGET_NLS_DEPENDENCIES) # tools are GPL-3.0+ but are not added to the target THERMALD_LICENSE = GPL-2.0+ THERMALD_LICENSE_FILES = COPYING +THERMALD_CPE_ID_VENDOR = intel THERMALD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_INIT_SYSTEMD),y) diff --git a/package/thrift/thrift.hash b/package/thrift/thrift.hash index f342dc348d..20d6baeace 100644 --- a/package/thrift/thrift.hash +++ b/package/thrift/thrift.hash @@ -1,4 +1,4 @@ -# From https://www.apache.org/dist/thrift/0.13.0/thrift-0.13.0.tar.gz.sha256 -sha256 7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179 thrift-0.13.0.tar.gz +# From https://www.apache.org/dist/thrift/0.14.1/thrift-0.14.1.tar.gz.sha256 +sha256 13da5e1cd9c8a3bb89778c0337cc57eb0c29b08f3090b41cf6ab78594b410ca5 thrift-0.14.1.tar.gz # License files, locally calculated -sha256 23df881cec3192d1f4474633c14eb2ec30a45b84f8daeb82b9de5d2bd3ac8218 LICENSE +sha256 d315e6cdedc07c478de6992027bfb66f220886c6216fd7e9885ced30c3703646 LICENSE diff --git a/package/thrift/thrift.mk b/package/thrift/thrift.mk index 8ad37b6b2e..c36efce2ed 100644 --- a/package/thrift/thrift.mk +++ b/package/thrift/thrift.mk @@ -4,10 +4,11 @@ # ################################################################################ -THRIFT_VERSION = 0.13.0 +THRIFT_VERSION = 0.14.1 THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(THRIFT_VERSION) THRIFT_LICENSE = Apache-2.0 THRIFT_LICENSE_FILES = LICENSE +THRIFT_CPE_ID_VENDOR = apache THRIFT_DEPENDENCIES = host-pkgconf host-thrift boost \ libevent openssl zlib @@ -17,9 +18,10 @@ HOST_THRIFT_DEPENDENCIES = host-bison host-boost \ THRIFT_COMMON_CONF_OPTS = -DBUILD_TUTORIALS=OFF \ -DBUILD_TESTING=OFF \ + -DWITH_NODEJS=OFF \ -DWITH_PYTHON=OFF \ -DWITH_JAVA=OFF \ - -DWITH_QT4=OFF \ + -DWITH_JAVASCRIPT=OFF \ -DWITH_QT5=OFF THRIFT_CONF_OPTS = $(THRIFT_COMMON_CONF_OPTS) -DBUILD_COMPILER=OFF diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index fe96f7df65..3815705b58 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -8,6 +8,7 @@ THTTPD_VERSION = 2.29 THTTPD_SITE = https://acme.com/software/thttpd THTTPD_LICENSE = BSD-2-Clause THTTPD_LICENSE_FILES = thttpd.c +THTTPD_CPE_ID_VENDOR = acme THTTPD_MAKE = $(MAKE1) diff --git a/package/ti-sgx-demos/ti-sgx-demos.hash b/package/ti-sgx-demos/ti-sgx-demos.hash index 31044e9e3f..e5631c9630 100644 --- a/package/ti-sgx-demos/ti-sgx-demos.hash +++ b/package/ti-sgx-demos/ti-sgx-demos.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1324115da376bc8108923c596a3c4d8df24a968395461df11e0b715764a942d4 ti-sgx-demos-bb8b74cdd1323e76697b3eb2258f863b15fee287.tar.gz -sha256 052741ea66a4a48e0ef8cab259d2dc136e7cf52fda694af8d1fe9bd28abe333b LegalNotice.txt +sha256 5564741d7669b6303e52f4c0d1eaa04aa2633c0c6ad8ff7c5295b7ef3764c719 ti-sgx-demos-bb8b74cdd1323e76697b3eb2258f863b15fee287-br1.tar.gz +sha256 052741ea66a4a48e0ef8cab259d2dc136e7cf52fda694af8d1fe9bd28abe333b LegalNotice.txt diff --git a/package/ti-sgx-demos/ti-sgx-demos.mk b/package/ti-sgx-demos/ti-sgx-demos.mk index 8599e88e9b..4baebb9be5 100644 --- a/package/ti-sgx-demos/ti-sgx-demos.mk +++ b/package/ti-sgx-demos/ti-sgx-demos.mk @@ -4,7 +4,7 @@ # ################################################################################ -# This correpsonds to SDK 06.00.00.07 plus one pull request +# This corresponds to SDK 06.00.00.07 plus one pull request TI_SGX_DEMOS_VERSION = bb8b74cdd1323e76697b3eb2258f863b15fee287 TI_SGX_DEMOS_SITE = http://git.ti.com/git/graphics/img-pvr-sdk.git TI_SGX_DEMOS_SITE_METHOD = git @@ -12,7 +12,7 @@ TI_SGX_DEMOS_LICENSE = Imagination Technologies License Agreement TI_SGX_DEMOS_LICENSE_FILES = LegalNotice.txt define TI_SGX_DEMOS_INSTALL_TARGET_CMDS - cp -dpfr $(@D)/targetfs/arm/Examples/Advanced/Wayland/OGLES* \ + cp -dpfr $(@D)/targetfs/arm/Examples/Advanced/NullWS/OGLES* \ $(TARGET_DIR)/usr/bin/ endef diff --git a/package/ti-sgx-km/ti-sgx-km.hash b/package/ti-sgx-km/ti-sgx-km.hash index 1fd07d7467..c7030b2222 100644 --- a/package/ti-sgx-km/ti-sgx-km.hash +++ b/package/ti-sgx-km/ti-sgx-km.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f1505f38f9e82f958673bb1755e65090bdbc513a68d41640561d9d491bc4b0e3 ti-sgx-km-4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d.tar.gz -sha256 e9d660547691b2a9232850fd43aac16d40fd063023166fd27162020c30dc2bd4 eurasia_km/GPL-COPYING +sha256 213b4ff3893c74f026a06404dca185216809d062e54d17c2302d56ff7ede5181 ti-sgx-km-cf7f48cb30abfd5df7a60c9bf4bbb1dde0d496d9-br1.tar.gz +sha256 e9d660547691b2a9232850fd43aac16d40fd063023166fd27162020c30dc2bd4 eurasia_km/GPL-COPYING diff --git a/package/ti-sgx-km/ti-sgx-km.mk b/package/ti-sgx-km/ti-sgx-km.mk index ae294c300a..8ca6dbde2c 100644 --- a/package/ti-sgx-km/ti-sgx-km.mk +++ b/package/ti-sgx-km/ti-sgx-km.mk @@ -4,8 +4,8 @@ # ################################################################################ -# This correpsonds to SDK 06.00.00.07 -TI_SGX_KM_VERSION = 4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d +# This corresponds to SDK 06.01.00.08 +TI_SGX_KM_VERSION = cf7f48cb30abfd5df7a60c9bf4bbb1dde0d496d9 TI_SGX_KM_SITE = http://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git TI_SGX_KM_SITE_METHOD = git TI_SGX_KM_LICENSE = GPL-2.0 diff --git a/package/ti-sgx-um/Config.in b/package/ti-sgx-um/Config.in index ee87d46aa4..b97469a364 100644 --- a/package/ti-sgx-um/Config.in +++ b/package/ti-sgx-um/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_TI_SGX_UM bool "ti-sgx-um" depends on BR2_PACKAGE_TI_SGX_KM depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm - depends on BR2_PACKAGE_HAS_UDEV # ti-sgx-libgbm + depends on BR2_PACKAGE_HAS_UDEV # pre-built binaries depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBDRM @@ -17,7 +17,6 @@ config BR2_PACKAGE_TI_SGX_UM select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_POWERVR - select BR2_PACKAGE_TI_SGX_LIBGBM select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_WAYLAND help diff --git a/package/ti-sgx-um/ti-sgx-um.hash b/package/ti-sgx-um/ti-sgx-um.hash index ff54ecbd6d..109b2e9e56 100644 --- a/package/ti-sgx-um/ti-sgx-um.hash +++ b/package/ti-sgx-um/ti-sgx-um.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 cb1373a6335af3d3741c6b11cf217afc8bdbe182642229df359c38e3ccfc5866 ti-sgx-um-2a2e5bb090ced870d73ed4edbc54793e952cc6d8.tar.gz -sha256 368c306246c9130b5c90a6fef2f80085f70b6225b3f552654a288c0f39fc1531 TI-Linux-Graphics-DDK-UM-Manifest.doc +sha256 e52c743194516fcc92d570bc5a26dfaa26d18c13d92d41640019f544ef25be3a ti-sgx-um-909e237baf47d0bde006ff25552f5403fd7e359d-br1.tar.gz +sha256 368c306246c9130b5c90a6fef2f80085f70b6225b3f552654a288c0f39fc1531 TI-Linux-Graphics-DDK-UM-Manifest.doc diff --git a/package/ti-sgx-um/ti-sgx-um.mk b/package/ti-sgx-um/ti-sgx-um.mk index 0e26d057c1..83dbc6804c 100644 --- a/package/ti-sgx-um/ti-sgx-um.mk +++ b/package/ti-sgx-um/ti-sgx-um.mk @@ -4,8 +4,8 @@ # ################################################################################ -# This correpsonds to SDK 06.00.00.07 plus one pull request -TI_SGX_UM_VERSION = 2a2e5bb090ced870d73ed4edbc54793e952cc6d8 +# This corresponds to SDK 06.01.00.08 +TI_SGX_UM_VERSION = 909e237baf47d0bde006ff25552f5403fd7e359d TI_SGX_UM_SITE = http://git.ti.com/git/graphics/omap5-sgx-ddk-um-linux.git TI_SGX_UM_SITE_METHOD = git TI_SGX_UM_LICENSE = TI TSPA License diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 36f30c4418..ea08a1fc92 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634 tiff-4.1.0.tar.gz -sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT +sha256 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 tiff-4.3.0.tar.gz +sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index b26900ac70..f6c6de12c5 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,10 +4,12 @@ # ################################################################################ -TIFF_VERSION = 4.1.0 +TIFF_VERSION = 4.3.0 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = COPYRIGHT +TIFF_CPE_ID_VENDOR = libtiff +TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES TIFF_CONF_OPTS = \ --disable-cxx \ diff --git a/package/tinc/tinc.mk b/package/tinc/tinc.mk index 56a26e9a55..0726e81d52 100644 --- a/package/tinc/tinc.mk +++ b/package/tinc/tinc.mk @@ -9,6 +9,7 @@ TINC_SITE = http://www.tinc-vpn.org/packages TINC_DEPENDENCIES = lzo openssl zlib TINC_LICENSE = GPL-2.0+ with OpenSSL exception TINC_LICENSE_FILES = COPYING COPYING.README +TINC_CPE_ID_VENDOR = tinc-vpn TINC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) diff --git a/package/tini/tini.hash b/package/tini/tini.hash index 7c548183b6..83a97a40a3 100644 --- a/package/tini/tini.hash +++ b/package/tini/tini.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e5f46bca81266bdd511cf08018d66866870531794569c04f9b45f50dd23c28b0 LICENSE -sha256 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2 tini-0.18.0.tar.gz +sha256 e5f46bca81266bdd511cf08018d66866870531794569c04f9b45f50dd23c28b0 LICENSE +sha256 0fd35a7030052acd9f58948d1d900fe1e432ee37103c5561554408bdac6bbf0d tini-0.19.0.tar.gz diff --git a/package/tini/tini.mk b/package/tini/tini.mk index 986e612a83..9da54f8a25 100644 --- a/package/tini/tini.mk +++ b/package/tini/tini.mk @@ -4,10 +4,11 @@ # ################################################################################ -TINI_VERSION = 0.18.0 +TINI_VERSION = 0.19.0 TINI_SITE = $(call github,krallin,tini,v$(TINI_VERSION)) TINI_LICENSE = MIT TINI_LICENSE_FILES = LICENSE +TINI_CPE_ID_VENDOR = tini_project TINI_CFLAGS = $(TARGET_CFLAGS) \ -static \ @@ -30,6 +31,7 @@ endef define TINI_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/bin/tini $(TARGET_DIR)/usr/bin/tini + ln -sf tini $(TARGET_DIR)/usr/bin/docker-init endef # Tini's CMakeLists.txt is not suitable for Buildroot. diff --git a/package/tinycbor/tinycbor.hash b/package/tinycbor/tinycbor.hash index 8ff706bb67..29f0cfabf0 100644 --- a/package/tinycbor/tinycbor.hash +++ b/package/tinycbor/tinycbor.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 956eb4b670ea4969eaee67395b5bb6437b153960385b77357d6692e979d1b12d tinycbor-0.5.3.tar.gz -sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e LICENSE +sha256 e63668a71fd6d7abf1727dc31682ec7f107599a3c024a445c3e5da6af9328983 tinycbor-0.5.4.tar.gz +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e LICENSE diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index ef095ea67d..476da67363 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYCBOR_VERSION = 0.5.3 +TINYCBOR_VERSION = 0.5.4 TINYCBOR_SITE = $(call github,intel,tinycbor,v$(TINYCBOR_VERSION)) TINYCBOR_LICENSE = MIT TINYCBOR_LICENSE_FILES = LICENSE diff --git a/package/tinydtls/Config.in b/package/tinydtls/Config.in index 2f90eb2436..98cbbb5875 100644 --- a/package/tinydtls/Config.in +++ b/package/tinydtls/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_TINYDTLS machine. It is implemented in C and provides support for the mandatory cipher suites specified in CoAP. - https://sourceforge.net/projects/tinydtls + https://projects.eclipse.org/projects/iot.tinydtls comment "tinydtls needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/tinydtls/tinydtls.hash b/package/tinydtls/tinydtls.hash index 66644df7a1..be6bf182e7 100644 --- a/package/tinydtls/tinydtls.hash +++ b/package/tinydtls/tinydtls.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ccf6d8fbae03fb2e0ba32878ed8e57d8b4f73538b1064df90a3e764da5fac010 tinydtls-0.8.2.tar.gz -sha256 65fbf31c3551633e7dcc051fac80f2c1a73b0b077af9ed564d726155dfc40513 tinydtls.h +sha256 af73742835b5a66dc0b4a9c126ca8243b5db2986b4969d76e2b4531aa7e13f67 tinydtls-0.9-rc1.tar.gz +sha256 7e906fb56da52bb6bba38e77eec00e7d37fe65b0b7b28c4bf68ff036573d0de5 LICENSE diff --git a/package/tinydtls/tinydtls.mk b/package/tinydtls/tinydtls.mk index fe250014ca..6d839bc05a 100644 --- a/package/tinydtls/tinydtls.mk +++ b/package/tinydtls/tinydtls.mk @@ -4,13 +4,15 @@ # ################################################################################ -TINYDTLS_REL = r5 -TINYDTLS_VERSION = 0.8.2 -TINYDTLS_SITE = http://downloads.sourceforge.net/project/tinydtls/$(TINYDTLS_REL) -TINYDTLS_LICENSE = MIT -TINYDTLS_LICENSE_FILES = tinydtls.h +TINYDTLS_VERSION = 0.9-rc1 +TINYDTLS_SITE = $(call github,eclipse,tinydtls,v$(TINYDTLS_VERSION)) +TINYDTLS_LICENSE = EPL-1.0 or EDL-1.0 +TINYDTLS_LICENSE_FILES = LICENSE +TINYDTLS_CPE_ID_VENDOR = eclipse TINYDTLS_INSTALL_STAGING = YES -TINYDTLS_STRIP_COMPONENTS = 2 +TINYDTLS_DEPENDENCIES = host-pkgconf +# From git +TINYDTLS_AUTORECONF = YES # use inttypes.h data types instead of u_intXX_t for musl compatibility TINYDTLS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DSHA2_USE_INTTYPES_H" diff --git a/package/tinyproxy/tinyproxy.hash b/package/tinyproxy/tinyproxy.hash index 099c974881..8c58b98ca2 100644 --- a/package/tinyproxy/tinyproxy.hash +++ b/package/tinyproxy/tinyproxy.hash @@ -1,2 +1,4 @@ +# From https://github.com/tinyproxy/tinyproxy/releases/tag/1.11.0 +sha256 c1ec81cfc4c551d2c24e0227a5aeeaad8723bd9a39b61cd729e516b82eaa3f32 tinyproxy-1.11.0.tar.xz # locally computed -sha256 a23a8f647f622f01e51b93fa882ea5a15c20e026d45c3aafa81ec579e464daf7 tinyproxy-1.10.0.tar.bz2 +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/tinyproxy/tinyproxy.mk b/package/tinyproxy/tinyproxy.mk index 6120d183cc..3930e90d72 100644 --- a/package/tinyproxy/tinyproxy.mk +++ b/package/tinyproxy/tinyproxy.mk @@ -4,11 +4,11 @@ # ################################################################################ -TINYPROXY_VERSION = 1.10.0 +TINYPROXY_VERSION = 1.11.0 TINYPROXY_SITE = https://github.com/tinyproxy/tinyproxy/releases/download/$(TINYPROXY_VERSION) -TINYPROXY_SOURCE = tinyproxy-$(TINYPROXY_VERSION).tar.bz2 +TINYPROXY_SOURCE = tinyproxy-$(TINYPROXY_VERSION).tar.xz TINYPROXY_LICENSE = GPL-2.0+ TINYPROXY_LICENSE_FILES = COPYING -TINYPROXY_CONF_ENV = ac_cv_path_A2X=no +TINYPROXY_CPE_ID_VENDOR = tinyproxy_project $(eval $(autotools-package)) diff --git a/package/tinyxml2/tinyxml2.hash b/package/tinyxml2/tinyxml2.hash index bb0f8108f9..3c59d159b5 100644 --- a/package/tinyxml2/tinyxml2.hash +++ b/package/tinyxml2/tinyxml2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68ebd396a4220d5a9b5a621c6e9c66349c5cfdf5efaea3f16e3bb92e45f4e2a3 tinyxml2-7.1.0.tar.gz -sha256 beed3466425970b9d970e573947f1fe7d3cbe41ed7e2c39b0daf45f7de053c43 readme.md +sha256 6ce574fbb46751842d23089485ae73d3db12c1b6639cda7721bf3a7ee862012c tinyxml2-8.0.0.tar.gz +sha256 9332252e9b9e46db8285d4a3f0bf25f139bf1dca6781b956d57f2302efca6432 LICENSE.txt diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index 67f626428a..d760d54a2f 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -4,11 +4,12 @@ # ################################################################################ -TINYXML2_VERSION = 7.1.0 +TINYXML2_VERSION = 8.0.0 TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) TINYXML2_LICENSE = Zlib -TINYXML2_LICENSE_FILES = readme.md +TINYXML2_LICENSE_FILES = LICENSE.txt TINYXML2_INSTALL_STAGING = YES +TINYXML2_CPE_ID_VENDOR = tinyxml2_project ifeq ($(BR2_STATIC_LIBS),y) TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON diff --git a/package/tio/Config.in b/package/tio/Config.in index 6c748c5d12..d5d619100e 100644 --- a/package/tio/Config.in +++ b/package/tio/Config.in @@ -1,8 +1,15 @@ config BR2_PACKAGE_TIO bool "tio" + depends on !BR2_sparc64 && !BR2_sparc help "tio" is a simple TTY terminal application which features a straightforward commandline interface to easily connect to TTY devices for basic input/output. https://tio.github.io/ + +# tio is disabled for sparc and sparc64 architectures because it fails +# to build with a redefinition of 'struct termio' error, with no proper +# fix or workaround for now +comment "tio is disabled for sparc and sparc64 architectures" + depends on BR2_sparc64 || BR2_sparc diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index e27fca253d..75538e09ae 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 839d167a4517a6bffa6b6074e89a9a8630547b2dea2086f1fad15af12ab23b25 tmux-2.9a.tar.gz -sha256 ce75f1345a76c93bd0f413d1b93ff1baa0669f34a7242779a00c1b862b4f813a COPYING +sha256 918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386 tmux-3.1c.tar.gz +sha256 c031bd37f464c534277814f6aa38686fa023d094261d57fd2545ad592bb53ccd COPYING diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 169c9bb83f..281b7d8ee6 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,10 +4,11 @@ # ################################################################################ -TMUX_VERSION = 2.9a +TMUX_VERSION = 3.1c TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING +TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear diff --git a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch b/package/tor/0001-Fix-static-linking-with-OpenSSL.patch index e4cd24e138..26ed6fe819 100644 --- a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch +++ b/package/tor/0001-Fix-static-linking-with-OpenSSL.patch @@ -8,46 +8,32 @@ and remove host paths when looking for openssl. [Vincent: - Adapt the patch to make it apply on the new version.] -[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10 & - 0.3.4.8, 0.3.5.7] +[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10, + 0.3.4.8, 0.3.5.7, 0.4.4.5, 0.4.5.6 & 0.4.6.7] [Fabrice: fix detection of openssl functions in 0.3.5.8] Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls Signed-off-by: Fabrice Fontaine --- - acinclude.m4 | 2 +- configure.ac | 4 ++-- src/test/include.am | 8 ++++---- src/tools/include.am | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) -diff --git a/acinclude.m4 b/acinclude.m4 -index 5ecdf1d5c..be5633f4f 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -166,7 +166,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [ - - for tor_trydir in "$try$1dir" "(system)" "$prefix" /usr/local /usr/pkg $8; do - LDFLAGS="$tor_saved_LDFLAGS" -- LIBS="$tor_saved_LIBS $3" -+ LIBS="$3 $tor_saved_LIBS" - CPPFLAGS="$tor_saved_CPPFLAGS" - - if test -z "$tor_trydir" ; then diff --git a/configure.ac b/configure.ac index 05e1392cf..580befa6b 100644 --- a/configure.ac +++ b/configure.ac -@@ -885,7 +885,7 @@ AC_ARG_WITH(ssl-dir, +@@ -1074,7 +1074,7 @@ AC_ARG_WITH(ssl-dir, ]) AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1]) --TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32], -+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32], +-TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32], ++TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32], [#include char *getenv(const char *);], [struct ssl_cipher_st; -@@ -919,7 +919,7 @@ dnl Now check for particular openssl functions. +@@ -1104,7 +1104,7 @@ dnl Now check for particular openssl functions. save_LIBS="$LIBS" save_LDFLAGS="$LDFLAGS" save_CPPFLAGS="$CPPFLAGS" @@ -60,50 +46,49 @@ diff --git a/src/test/include.am b/src/test/include.am index ecb768957..39a622e88 100644 --- a/src/test/include.am +++ b/src/test/include.am -@@ -317,8 +317,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) +@@ -399,8 +399,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) src_test_test_ntor_cl_LDADD = \ - $(TOR_INTERNAL_LIBS) \ + libtor.a \ $(rust_ldadd) \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ -- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ +- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @TOR_LIB_MATH@ \ -+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ - @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ ++ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ @TOR_TRACE_LIBS@ src_test_test_ntor_cl_AM_CPPFLAGS = \ $(AM_CPPFLAGS) -@@ -327,8 +327,8 @@ src_test_test_hs_ntor_cl_SOURCES = src/test/test_hs_ntor_cl.c +@@ -409,8 +409,8 @@ src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) src_test_test_hs_ntor_cl_LDADD = \ - $(TOR_INTERNAL_LIBS) \ + libtor.a \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ -- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ +- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \ + @TOR_LIB_MATH@ \ -+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ ++ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \ + @CURVE25519_LIBS@ @TOR_TRACE_LIBS@ src_test_test_hs_ntor_cl_AM_CPPFLAGS = \ $(AM_CPPFLAGS) - diff --git a/src/tools/include.am b/src/tools/include.am index f7aa7e0d1..4c4e8aa7a 100644 --- a/src/tools/include.am +++ b/src/tools/include.am -@@ -30,7 +30,7 @@ src_tools_tor_gencert_LDADD = \ +@@ -35,7 +35,7 @@ src_tools_tor_gencert_LDADD = \ $(TOR_CRYPTO_LIBS) \ $(TOR_UTIL_LIBS) \ $(rust_ldadd) \ - @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \ + @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ + @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ endif -@@ -40,7 +40,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \ +@@ -45,7 +45,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \ src/trunnel/libor-trunnel.a \ $(TOR_CRYPTO_LIBS) \ $(TOR_UTIL_LIBS) \ - @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \ + @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_GDI@ + @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ if USE_NSS -- 2.20.1 - diff --git a/package/tor/tor.hash b/package/tor/tor.hash index e55f3ea3c2..4dabf777cb 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 06a1d835ddf382f6bca40a62e8fb40b71b2f73d56f0d53523c8bd5caf9b3026d tor-0.4.2.7.tar.gz -sha256 ae2afe6cd3fd9d512afbaa1ef218757eb00aa6b6aa5e2dfc2774b6837e373fa1 LICENSE +sha256 15ce1a37b4cc175b07761e00acdcfa2c08f0d23d6c3ab9c97c464bd38cc5476a tor-0.4.6.8.tar.gz +sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 09f780d3f5..31e6211693 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,10 +4,12 @@ # ################################################################################ -TOR_VERSION = 0.4.2.7 +TOR_VERSION = 0.4.6.8 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE +TOR_CPE_ID_VENDOR = torproject +TOR_SELINUX_MODULES = tor TOR_DEPENDENCIES = libevent openssl zlib TOR_AUTORECONF = YES @@ -72,9 +74,4 @@ endef TOR_POST_INSTALL_TARGET_HOOKS += TOR_INSTALL_CONF -define TOR_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/contrib/dist/tor.service \ - $(TARGET_DIR)/usr/lib/systemd/system/tor.service -endef - $(eval $(autotools-package)) diff --git a/package/tovid/Config.in b/package/tovid/Config.in index d5b7a28314..f972e18852 100644 --- a/package/tovid/Config.in +++ b/package/tovid/Config.in @@ -6,8 +6,9 @@ config BR2_PACKAGE_TOVID depends on BR2_USE_WCHAR depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 # mpv - depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 # mpv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mpv + depends on BR2_TOOLCHAIN_HAS_ATOMIC # mpv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mpv depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC # mpv # The below dependencies are runtime dependencies only select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng @@ -28,12 +29,13 @@ config BR2_PACKAGE_TOVID http://tovid.wikia.com/wiki/Installing_tovid -comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.5" +comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !BR2_INSTALL_LIBSTDCPP \ || !BR2_USE_WCHAR depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC @@ -41,7 +43,8 @@ comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.5" comment "tovid depends on python or python3" depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC diff --git a/package/tpm-tools/Config.in b/package/tpm-tools/Config.in index ca70adc80c..3ce6391acd 100644 --- a/package/tpm-tools/Config.in +++ b/package/tpm-tools/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_TPM_TOOLS depends on !BR2_STATIC_LIBS # trousers select BR2_PACKAGE_TROUSERS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help Tools to manage and diagnose a TPM diff --git a/package/tpm2-abrmd/tpm2-abrmd.hash b/package/tpm2-abrmd/tpm2-abrmd.hash index cff3266bc8..1c6e739056 100644 --- a/package/tpm2-abrmd/tpm2-abrmd.hash +++ b/package/tpm2-abrmd/tpm2-abrmd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 63cb59be1fd21e6ae233c37a0aa4a59883a4885a7bfd2c7e69979c5048518d50 tpm2-abrmd-2.3.0.tar.gz -sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE +sha256 1e587808c6739079d59f124d9c1a0058f8d34dd84f1f656c946667fa0a181c48 tpm2-abrmd-2.3.3.tar.gz +sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-abrmd/tpm2-abrmd.mk b/package/tpm2-abrmd/tpm2-abrmd.mk index e92fda252a..8de233008e 100644 --- a/package/tpm2-abrmd/tpm2-abrmd.mk +++ b/package/tpm2-abrmd/tpm2-abrmd.mk @@ -4,10 +4,11 @@ # ################################################################################ -TPM2_ABRMD_VERSION = 2.3.0 +TPM2_ABRMD_VERSION = 2.3.3 TPM2_ABRMD_SITE = https://github.com/tpm2-software/tpm2-abrmd/releases/download/$(TPM2_ABRMD_VERSION) TPM2_ABRMD_LICENSE = BSD-2-Clause TPM2_ABRMD_LICENSE_FILES = LICENSE +TPM2_ABRMD_SELINUX_MODULES = tpm2 TPM2_ABRMD_INSTALL_STAGING = YES TPM2_ABRMD_DEPENDENCIES = libglib2 tpm2-tss host-pkgconf TPM2_ABRMD_CONF_OPTS = \ diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 35ca63bf64..3be947648f 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -1,9 +1,14 @@ config BR2_PACKAGE_TPM2_TOOLS bool "tpm2-tools" depends on !BR2_STATIC_LIBS # tpm2-tss + depends on BR2_USE_WCHAR + # c16rtomb() not implemented in uClibc + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_TPM2_TSS + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help TPM (Trusted Platform Module) 2.0 CLI tools based on system API of TPM2-TSS. These tools can be used to manage keys, @@ -18,5 +23,6 @@ config BR2_PACKAGE_TPM2_TOOLS https://github.com/tpm2-software/tpm2-tools -comment "tpm2-tools needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index 16059627ac..bfb7e9b220 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 40b9263d8b949bd2bc03a3cd60fa242e27116727467f9bbdd0b5f2539a25a7b1 tpm2-tools-4.1.1.tar.gz -sha256 e10dce74279166bf7bc463eb6e462c2025bceb3e50cadfe865d92c1c3dc0bb21 LICENSE +sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz +sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 4ebca0f906..41f5bcf201 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,11 +4,15 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 4.1.1 +TPM2_TOOLS_VERSION = 4.3.2 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause -TPM2_TOOLS_LICENSE_FILES = LICENSE -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf +TPM2_TOOLS_LICENSE_FILES = doc/LICENSE +TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project +TPM2_TOOLS_SELINUX_MODULES = tpm2 +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux +# We're patching configure.ac +TPM2_TOOLS_AUTORECONF = YES # -fstack-protector-all and FORTIFY_SOURCE=2 is used by # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options diff --git a/package/tpm2-totp/tpm2-totp.mk b/package/tpm2-totp/tpm2-totp.mk index 250a016a50..42607c0b73 100644 --- a/package/tpm2-totp/tpm2-totp.mk +++ b/package/tpm2-totp/tpm2-totp.mk @@ -8,6 +8,7 @@ TPM2_TOTP_VERSION = 0.2.1 TPM2_TOTP_SITE = https://github.com/tpm2-software/tpm2-totp/releases/download/v$(TPM2_TOTP_VERSION) TPM2_TOTP_LICENSE = BSD-3-Clause TPM2_TOTP_LICENSE_FILES = LICENSE +TPM2_TOTP_SELINUX_MODULES = tpm2 TPM2_TOTP_DEPENDENCIES = libqrencode tpm2-tss host-pkgconf TPM2_TOTP_CONF_OPTS = \ --disable-defaultflags \ diff --git a/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch b/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch index b2a9cb4f78..812c753ffb 100644 --- a/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch +++ b/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch @@ -1,4 +1,4 @@ -From 158d0bc3a2a7a93090cc12c5b0dd3c27e6f44d61 Mon Sep 17 00:00:00 2001 +From 7dc753ad27a8cd14c9b00be94ca89b847cf05ce9 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 23 Dec 2019 08:02:19 -0300 Subject: [PATCH] Temporary fix for build without C++ @@ -28,17 +28,17 @@ Signed-off-by: Carlos Santos 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index cd50451d..a3bd7144 100644 +index ff59dd7c..3e4028fb 100755 --- a/configure.ac +++ b/configure.ac -@@ -25,7 +25,6 @@ AC_CANONICAL_HOST - AX_IS_RELEASE(dash-version) +@@ -26,7 +26,6 @@ AX_IS_RELEASE(dash-version) AX_CHECK_ENABLE_DEBUG([info]) --AC_PROG_CXX AC_PROG_CC +-AC_PROG_CXX AC_PROG_LN_S AC_USE_SYSTEM_EXTENSIONS + LT_INIT() -- -2.18.1 +2.26.2 diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index 2d619750f8..2fc56dbd76 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -33,5 +33,26 @@ config BR2_PACKAGE_TPM2_TSS https://github.com/tpm2-software/tpm2-tss +if BR2_PACKAGE_TPM2_TSS + +config BR2_PACKAGE_TPM2_TSS_FAPI + bool "fapi support" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_LIBCURL + help + This option allows to enable Feature API (FAPI). Feature + API (FAPI) as described in the "TSS 2.0 Feature API + Specification" along with "TSS 2.0 JSON Data Types and + Policy Language Specification" This API is designed to be + very high-level API, intended to make programming with the + TPM as simple as possible. The API functions are exposed + through a single library: libtss2-fapi. + + https://trustedcomputinggroup.org/wp-content/uploads/TSS_FAPI_v0.94_r04_pubrev.pdf + https://trustedcomputinggroup.org/wp-content/uploads/TSS_JSON_Policy_v0.7_r04_pubrev.pdf + +endif + comment "tpm2-tss needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index 3b778d4f1e..6856fd4fde 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9d8c8866829e3ff5e1649ecd82498cb1329e0691139458e53b69e6061febe3d3 tpm2-tss-2.3.3.tar.gz -sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE +sha256 78392be7309baf47f51b122f566ac915fd4d1760ea78571cba2e1484f9b5be17 tpm2-tss-3.0.3.tar.gz +sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 470020857a..9ffbef2f07 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,10 +4,12 @@ # ################################################################################ -TPM2_TSS_VERSION = 2.3.3 +TPM2_TSS_VERSION = 3.0.3 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE +TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project +TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack TPM2_TSS_INSTALL_STAGING = YES TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc --disable-defaultflags @@ -17,13 +19,11 @@ TPM2_TSS_AUTORECONF = YES # uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" -# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am -# with content from a fuzz testing run rather than an empty file, -# confusing autoreconf with -# 0001-configure-Only-use-CXX-when-fuzzing.patch -define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM - truncate -s 0 $(@D)/Makefile-fuzz-generated.am -endef -TPM2_TSS_POST_PATCH_HOOKS += TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM +ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) +TPM2_TSS_DEPENDENCIES += json-c libcurl +TPM2_TSS_CONF_OPTS += --enable-fapi +else +TPM2_TSS_CONF_OPTS += --disable-fapi +endif $(eval $(autotools-package)) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index c6447f34d4..0afde6705e 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,4 +1,6 @@ # Locally computed -sha256 3b3f564cc6ee30341051ccb7589b42f3abe4e676a21c029c7c127c7edf5bdcf0 trace-cmd-trace-cmd-v2.7.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB +sha256 8bab29530cd05272dccab48c9780644758e71ed990ce65c701b9095f7beae417 trace-cmd-trace-cmd-v2.9.1-br1.tar.gz +sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING +sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 +sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index dfca6a170d..bc431e5dd2 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,14 +4,14 @@ # ################################################################################ -TRACE_CMD_VERSION = trace-cmd-v2.7 -TRACE_CMD_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git +TRACE_CMD_VERSION = trace-cmd-v2.9.1 +TRACE_CMD_SITE = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git TRACE_CMD_SITE_METHOD = git -TRACE_CMD_INSTALL_STAGING = YES TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1 -TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB +TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB LICENSES/GPL-2.0 LICENSES/LGPL-2.1 TRACE_CMD_DEPENDENCIES = host-pkgconf +TRACE_CMD_MAKE_OPTS = prefix=/usr etcdir=/etc ifeq ($(BR2_PACKAGE_AUDIT),y) TRACE_CMD_DEPENDENCIES += audit @@ -19,10 +19,10 @@ endif ifeq ($(BR2_PACKAGE_PYTHON),y) TRACE_CMD_DEPENDENCIES += python host-swig -TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python +TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python else ifeq ($(BR2_PACKAGE_PYTHON3),y) TRACE_CMD_DEPENDENCIES += python3 host-swig -TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python3 +TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python3 else TRACE_CMD_MAKE_OPTS += NO_PYTHON=1 endif @@ -31,23 +31,29 @@ endif # redefining it on the command line causes build problems. TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) +# Sparc64 needs -fPIC +ifeq ($(BR2_sparc64),y) +TRACE_CMD_CFLAGS += -fPIC +endif + # trace-cmd use CPPFLAGS to add some extra flags. # But like for CFLAGS, $(TARGET_CPPFLAGS) contains _LARGEFILE64_SOURCE # that causes build problems. TRACE_CMD_CPPFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CPPFLAGS)) define TRACE_CMD_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TRACE_CMD_CFLAGS)" \ - CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \ - $(TRACE_CMD_MAKE_OPTS) \ - -C $(@D) all + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TRACE_CMD_CFLAGS)" \ + CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \ + $(MAKE) $(TRACE_CMD_MAKE_OPTS) -C $(@D) endef define TRACE_CMD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/trace-cmd $(TARGET_DIR)/usr/bin/trace-cmd - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/trace-cmd/plugins - $(INSTALL) -D -m 0755 $(@D)/plugin_*.so $(TARGET_DIR)/usr/lib/trace-cmd/plugins + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TRACE_CMD_CFLAGS)" \ + CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \ + DESTDIR=$(TARGET_DIR) \ + $(MAKE) $(TRACE_CMD_MAKE_OPTS) -C $(@D) install endef $(eval $(generic-package)) diff --git a/package/transmission/0001-fix-utypes.patch b/package/transmission/0001-fix-utypes.patch index 96403a6c36..81efa884a7 100644 --- a/package/transmission/0001-fix-utypes.patch +++ b/package/transmission/0001-fix-utypes.patch @@ -6,25 +6,25 @@ The corresponding upstream bug report (unfixed) can be found here: https://trac.transmissionbt.com/ticket/5232 Signed-off-by: Bernd Kuhls +[Fabrice: adapt to 3.00, which always uses stdbool.h] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: + - don't comment-out dropped code, just drop it + - use CR-LF in replacement code, as used by upstream +] +Signed-off-by: Yann E. MORIN --- transmission-2.82.org/third-party/libutp/utypes.h 2013-08-09 04:47:43.000000000 +0200 +++ transmission-2.82/third-party/libutp/utypes.h 2014-01-02 20:17:18.000000000 +0100 -@@ -35,8 +35,15 @@ +@@ -35,8 +35,8 @@ typedef const char * cstr; typedef char * str; -#ifndef __cplusplus -typedef uint8 bool; -#endif -+//#ifndef __cplusplus -+//typedef uint8 bool; -+//#endif -+#ifndef __cplusplus -+#ifdef HAVE_STDBOOL_H -+#include -+#else -+typedef uint8 bool; -+#endif -+#endif ++#ifndef __cplusplus ++#include ++#endif #endif //__UTYPES_H__ diff --git a/package/transmission/Config.in b/package/transmission/Config.in index dac4d1b330..980b042e33 100644 --- a/package/transmission/Config.in +++ b/package/transmission/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_TRANSMISSION depends on BR2_USE_MMU # fork() select BR2_PACKAGE_ZLIB select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBEVENT help diff --git a/package/transmission/S92transmission b/package/transmission/S92transmission index 29d7cd5863..85ff40ec16 100644 --- a/package/transmission/S92transmission +++ b/package/transmission/S92transmission @@ -93,7 +93,7 @@ stop() # 1 if daemon was already stopped # 2 if daemon could not be stopped # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/10/KILL/5 --pidfile $PIDFILE --name $NAME + start-stop-daemon --stop --quiet --retry=TERM/10/KILL/5 --pidfile $PIDFILE --exec $DAEMON RETVAL="$?" [ "$RETVAL" = 2 ] && return 2 diff --git a/package/transmission/transmission.hash b/package/transmission/transmission.hash index 0d2af32f4f..13cbc969d3 100644 --- a/package/transmission/transmission.hash +++ b/package/transmission/transmission.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 35442cc849f91f8df982c3d0d479d650c6ca19310a994eccdaa79a4af3916b7d transmission-2.94.tar.xz -sha256 20801783bf59e27d03ed6aab625b32a34e221ae95bf801db87827c8023398495 COPYING +sha256 9144652fe742f7f7dd6657716e378da60b751aaeda8bef8344b3eefc4db255f2 transmission-3.00.tar.xz +sha256 2b16da5bd02790d1e4d332cfd42b9dfd7d1b0ed3a16a75dc7e76b6ed239fdba9 COPYING diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index 8fbda5eea3..1660d2c2b9 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRANSMISSION_VERSION = 2.94 +TRANSMISSION_VERSION = 3.00 TRANSMISSION_SITE = https://github.com/transmission/transmission-releases/raw/master TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz TRANSMISSION_DEPENDENCIES = \ @@ -20,6 +20,7 @@ TRANSMISSION_CONF_OPTS = \ --enable-lightweight TRANSMISSION_LICENSE = GPL-2.0 or GPL-3.0 with OpenSSL exception TRANSMISSION_LICENSE_FILES = COPYING +TRANSMISSION_CPE_ID_VENDOR = transmissionbt ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) TRANSMISSION_DEPENDENCIES += libminiupnpc diff --git a/package/tremor/tremor.hash b/package/tremor/tremor.hash index 89661a64cd..89d8bde84e 100644 --- a/package/tremor/tremor.hash +++ b/package/tremor/tremor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ba94cfdf886399c550f76908285bfa9e322f24085de6f1810c2abea565c13a15 tremor-7c30a66346199f3f09017a09567c6c8a3a0eedc8.tar.gz -sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING +sha256 a387ebb4536ca98034eb91855616b971b0a85575943699b2a6d0be79b4a9f6a9 tremor-7c30a66346199f3f09017a09567c6c8a3a0eedc8-br1.tar.gz +sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk index 835fe36172..a865e681df 100644 --- a/package/tremor/tremor.mk +++ b/package/tremor/tremor.mk @@ -5,7 +5,7 @@ ################################################################################ TREMOR_VERSION = 7c30a66346199f3f09017a09567c6c8a3a0eedc8 -TREMOR_SITE = https://git.xiph.org/tremor.git +TREMOR_SITE = https://gitlab.xiph.org/xiph/tremor.git TREMOR_SITE_METHOD = git TREMOR_LICENSE = BSD-3-Clause TREMOR_LICENSE_FILES = COPYING diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk index adf7d1455c..befb8de826 100644 --- a/package/trinity/trinity.mk +++ b/package/trinity/trinity.mk @@ -9,6 +9,7 @@ TRINITY_SITE = http://codemonkey.org.uk/projects/trinity TRINITY_SOURCE = trinity-$(TRINITY_VERSION).tar.xz TRINITY_LICENSE = GPL-2.0 TRINITY_LICENSE_FILES = COPYING +TRINITY_CPE_ID_VENDOR = trinity_project define TRINITY_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) diff --git a/package/trousers/trousers.hash b/package/trousers/trousers.hash index 20c65c450e..f6c3427462 100644 --- a/package/trousers/trousers.hash +++ b/package/trousers/trousers.hash @@ -1,6 +1,6 @@ -# http://sourceforge.net/projects/trousers/files/trousers/0.3.14/ -sha1 9ca2cc9e1179465f6c5d9055e2b855e25031b85a trousers-0.3.14.tar.gz -md5 4a476b4f036dd20a764fb54fc24edbec trousers-0.3.14.tar.gz +# http://sourceforge.net/projects/trousers/files/trousers/0.3.15/ +sha1 75cd40e17c9385299e50ff2099905865442b59f1 trousers-0.3.15.tar.gz +md5 eb1b02e98c7d360749b9076196db3f0f trousers-0.3.15.tar.gz # Locally computed -sha256 ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 trousers-0.3.14.tar.gz -sha256 1ad596d12e7471549663c03e280b5b5d084a2e853fb86e4d766109818f9d7dae LICENSE +sha256 1e5be93e518372acf1d92d2f567d01a46fdb0b730487e544e6fb896c59cac77f trousers-0.3.15.tar.gz +sha256 1ad596d12e7471549663c03e280b5b5d084a2e853fb86e4d766109818f9d7dae LICENSE diff --git a/package/trousers/trousers.mk b/package/trousers/trousers.mk index 1d5364959c..b84425dea4 100644 --- a/package/trousers/trousers.mk +++ b/package/trousers/trousers.mk @@ -4,10 +4,11 @@ # ################################################################################ -TROUSERS_VERSION = 0.3.14 +TROUSERS_VERSION = 0.3.15 TROUSERS_SITE = http://downloads.sourceforge.net/project/trousers/trousers/$(TROUSERS_VERSION) TROUSERS_LICENSE = BSD-3-Clause TROUSERS_LICENSE_FILES = LICENSE +TROUSERS_CPE_ID_VENDOR = trustedcomputinggroup TROUSERS_INSTALL_STAGING = YES # Need autoreconf because of a patch touching configure.in and Makefile.am TROUSERS_AUTORECONF = YES diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash index 521e6c94bf..762fbebb26 100644 --- a/package/tslib/tslib.hash +++ b/package/tslib/tslib.hash @@ -1,5 +1,5 @@ -# https://github.com/libts/tslib/releases/download/1.21/tslib-1.21.tar.xz.sha256 -sha256 d2a57b823ea59e53a3b130eef05dfed1190b857854f886eec764e1ca1957cf56 tslib-1.21.tar.xz +# https://github.com/libts/tslib/releases/download/1.22/tslib-1.22.tar.xz.sha256 +sha256 aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a tslib-1.22.tar.xz # Locally computed sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 3a1b7a2188..45e29808bd 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.21 +TSLIB_VERSION = 1.22 TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in index 909d955c02..c033b29819 100644 --- a/package/tvheadend/Config.in +++ b/package/tvheadend/Config.in @@ -3,7 +3,7 @@ comment "tvheadend needs a toolchain w/ NPTL, headers >= 3.2, dynamic library" !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_4 -config BR2_PACKAGE_TVHEADEND +menuconfig BR2_PACKAGE_TVHEADEND bool "tvheadend" depends on !BR2_STATIC_LIBS # dladdr() depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL @@ -12,6 +12,7 @@ config BR2_PACKAGE_TVHEADEND select BR2_PACKAGE_DTV_SCAN_TABLES select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help Tvheadend is a TV streaming server for Linux supporting @@ -28,6 +29,36 @@ config BR2_PACKAGE_TVHEADEND if BR2_PACKAGE_TVHEADEND +config BR2_PACKAGE_TVHEADEND_DESCRAMBLER + bool "descrambler support" + default y + help + Enable support for various descrambler modules. + +config BR2_PACKAGE_TVHEADEND_IPTV + bool "IPTV support" + default y + help + Enable IPTV support. + + Note that some IPTV streams will need to be piped through + ffmpeg (the commandline tool), so you may have to enable it + with: + BR2_PACKAGE_FFMPEG=y + BR2_PACKAGE_FFMPEG_FFMPEG=y + +config BR2_PACKAGE_TVHEADEND_SATIP + bool "SAT>IP support" + default y + help + Enable SAT>IP support. + +config BR2_PACKAGE_TVHEADEND_TIMESHIFT + bool "timeshift support" + default y + help + Enable timeshift support. + config BR2_PACKAGE_TVHEADEND_TRANSCODING bool "transcoding support" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 92dc921825..1c896df140 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0c2cc2ee09d21b34f2d72d971557a843b20a9e7da3d6550c4ce2fbe37c35ba13 tvheadend-221c29b40b1e53ae09a69d9458442dd4fea665f5.tar.gz -sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md +sha256 fc734c36c98aa1535172621c3b6fcac9f1d253f850abc50d01b771937bfd2a76 tvheadend-dbaa0f850394af8ab845df802f5f781ac0218ec4.tar.gz +sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index df7fd7fd9c..b694c44e3b 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 221c29b40b1e53ae09a69d9458442dd4fea665f5 +TVHEADEND_VERSION = dbaa0f850394af8ab845df802f5f781ac0218ec4 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md @@ -29,7 +29,7 @@ endif ifeq ($(BR2_PACKAGE_TVHEADEND_TRANSCODING),y) TVHEADEND_CONF_OPTS += --enable-libav --enable-libx264 TVHEADEND_DEPENDENCIES += ffmpeg x264 -ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_XORG7),yy) +ifeq ($(BR2_PACKAGE_LIBVA),y) TVHEADEND_CONF_OPTS += --enable-vaapi TVHEADEND_DEPENDENCIES += libva else @@ -63,6 +63,40 @@ TVHEADEND_CONF_OPTS += \ --disable-libx265 endif +ifeq ($(BR2_PACKAGE_TVHEADEND_DESCRAMBLER),y) +TVHEADEND_CONF_OPTS += \ + --enable-cardclient \ + --enable-cwc \ + --enable-cccam \ + --enable-capmt \ + --enable-constcw +else +TVHEADEND_CONF_OPTS += \ + --disable-cardclient \ + --disable-cwc \ + --disable-cccam \ + --disable-capmt \ + --disable-constcw +endif + +ifeq ($(BR2_PACKAGE_TVHEADEND_IPTV),y) +TVHEADEND_CONF_OPTS += --enable-iptv +else +TVHEADEND_CONF_OPTS += --disable-iptv +endif + +ifeq ($(BR2_PACKAGE_TVHEADEND_SATIP),y) +TVHEADEND_CONF_OPTS += --enable-satip_client --enable-satip_server +else +TVHEADEND_CONF_OPTS += --disable-satip_client --disable-satip_server +endif + +ifeq ($(BR2_PACKAGE_TVHEADEND_TIMESHIFT),y) +TVHEADEND_CONF_OPTS += --enable-timeshift +else +TVHEADEND_CONF_OPTS += --disable-timeshift +endif + ifeq ($(BR2_PACKAGE_LIBDVBCSA),y) TVHEADEND_DEPENDENCIES += libdvbcsa TVHEADEND_CONF_OPTS += --enable-tvhcsa diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index e2338f13fe..f70627481a 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2019-September/000057.html -sha512 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565 tzdata2019c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html +sha512 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3 tzdata2021a.tar.gz # Locally computed: -sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE +sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index b656bc7f7f..922e7420bc 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,20 +4,20 @@ # ################################################################################ -TZDATA_VERSION = 2019c +TZDATA_VERSION = 2021a TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 TZDATA_DEPENDENCIES = host-tzdata HOST_TZDATA_DEPENDENCIES = host-zic TZDATA_LICENSE = Public domain -HOST_TZDATA_LICENSE_FILES = LICENSE +TZDATA_LICENSE_FILES = LICENSE # Take care when re-ordering this list since this might break zone # dependencies TZDATA_DEFAULT_ZONELIST = \ africa antarctica asia australasia europe northamerica \ - southamerica pacificnew etcetera backward systemv factory + southamerica etcetera backward factory ifeq ($(call qstrip,$(BR2_TARGET_TZ_ZONELIST)),default) TZDATA_ZONELIST = $(TZDATA_DEFAULT_ZONELIST) @@ -38,9 +38,6 @@ define TZDATA_SET_LOCALTIME endef endif -# No need to extract for target, we're using the host-installed files -TZDATA_EXTRACT_CMDS = - define TZDATA_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/zoneinfo cp -a $(HOST_DIR)/share/zoneinfo/* $(TARGET_DIR)/usr/share/zoneinfo @@ -54,8 +51,8 @@ endef define HOST_TZDATA_BUILD_CMDS (cd $(@D); \ for zone in $(TZDATA_ZONELIST); do \ - $(ZIC) -d _output/posix -y yearistype.sh $$zone || exit 1; \ - $(ZIC) -d _output/right -L leapseconds -y yearistype.sh $$zone || exit 1; \ + $(ZIC) -b fat -d _output/posix $$zone || exit 1; \ + $(ZIC) -b fat -d _output/right -L leapseconds $$zone || exit 1; \ done; \ ) endef diff --git a/package/uacme/Config.in b/package/uacme/Config.in index ea9babfda7..d693436115 100644 --- a/package/uacme/Config.in +++ b/package/uacme/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_UACME select BR2_PACKAGE_LIBCURL help uacme is a client for the ACMEv2 protocol described in - RFC8555, written in plain C code with minimal dependencies + RFC8555, written in plain C with minimal dependencies (libcurl and either of GnuTLS, OpenSSL or mbedTLS). The ACMEv2 protocol allows a Certificate Authority (https://letsencrypt.org is a popular one) and an applicant @@ -13,3 +13,22 @@ config BR2_PACKAGE_UACME issuance. https://github.com/ndilieto/uacme + +if BR2_PACKAGE_UACME + +config BR2_PACKAGE_UACME_UALPN + bool "enable ualpn" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_OPENSSL || BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBEV + help + Build and install ualpn, the transparent proxying tls-alpn-01 + challenge responder. + +comment "ualpn needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +comment "ualpn needs either OpenSSL or GnuTLS" + depends on !(BR2_PACKAGE_OPENSSL || BR2_PACKAGE_GNUTLS) + +endif diff --git a/package/uacme/uacme.hash b/package/uacme/uacme.hash index 5c68680b54..4ae85c1c5c 100644 --- a/package/uacme/uacme.hash +++ b/package/uacme/uacme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 08070779232c9711a227189ee2d3cb55042f6be2ea0aa59525cb7b554c4688b0 uacme-1.0.22.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 36027a587256cbaa86650cec2a5b3eb000480e1150bd83941565661b392625ac uacme-1.7.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index c5931e2682..2be96d534e 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -4,7 +4,7 @@ # ################################################################################ -UACME_VERSION = 1.0.22 +UACME_VERSION = 1.7.1 # Released versions are on branch upstream/latest, tagged as # upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not # include .tarball-version @@ -18,12 +18,19 @@ UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' ifeq ($(BR2_PACKAGE_GNUTLS),y) UACME_CONF_OPTS += --with-gnutls UACME_DEPENDENCIES += gnutls -else ifeq ($(BR2_PACKAGE_MBEDTLS),y) -UACME_CONF_OPTS += --with-mbedtls -UACME_DEPENDENCIES += mbedtls else ifeq ($(BR2_PACKAGE_OPENSSL),y) UACME_CONF_OPTS += --with-openssl UACME_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +UACME_CONF_OPTS += --with-mbedtls +UACME_DEPENDENCIES += mbedtls +endif + +ifeq ($(BR2_PACKAGE_UACME_UALPN),y) +UACME_DEPENDENCIES += libev +UACME_CONF_OPTS += --with-ualpn +else +UACME_CONF_OPTS += --without-ualpn endif $(eval $(autotools-package)) diff --git a/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch b/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch index a376afbc75..8557af499a 100644 --- a/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch +++ b/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch @@ -20,6 +20,8 @@ http://ftp.de.debian.org/debian/pool/main/u/u-boot/u-boot_2014.10+dfsg1-2.1.debi Signed-off-by: Jörg Krause [fabio: adapt it to 2016.09] Signed-off-by: Fabio Estevam +[Fabrice: adapt it to 2021.04] +Signed-off-by: Fabrice Fontaine --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -32,8 +34,8 @@ index 6aa08964ff..fcec83d183 100644 no-dot-config-targets := clean clobber mrproper distclean \ help %docs check% coccicheck \ -- ubootversion backup tests check qcheck -+ ubootversion backup tests tools-only check qcheck +- ubootversion backup tests check qcheck tcheck ++ ubootversion backup tests tools-only check qcheck tcheck config-targets := 0 mixed-targets := 0 diff --git a/package/uboot-tools/Config.in.host b/package/uboot-tools/Config.in.host index 52a4c2ec30..431cc8631d 100644 --- a/package/uboot-tools/Config.in.host +++ b/package/uboot-tools/Config.in.host @@ -37,6 +37,75 @@ config BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT public key is stored in a non-volatile place, any image can be verified in this way. -endif +endif # BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT -endif +config BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE + bool "Environment image" + help + Generate a valid binary environment image from a text file + describing the key=value pairs of the environment. + + This option can be useful to build enviornment configurations + as part of a Linux / rootfs only defconfig instead of using + post scripts. This supports a hardware use case of a single + bootloader only defconfig but multiple Linux / rootfs + defconfigs with different boot environments. + + The environment image will be called uboot-env.bin. + +if BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE + +config BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE + string "Source files for environment" + default BR2_TARGET_UBOOT_ENVIMAGE_SOURCE if BR2_TARGET_UBOOT_ENVIMAGE_SOURCE != "" # legacy + help + Text files describing the environment. Files should have + lines of the form var=value, one per line. Blank lines and + lines starting with a # are ignored. + + Multiple source files are concatenated in the order listed. + + Leave empty to generate image from compiled-in env if a U-boot + target build is configured (BR2_TARGET_UBOOT) + +config BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE + string "Size of environment" + default BR2_TARGET_UBOOT_ENVIMAGE_SIZE if BR2_TARGET_UBOOT_ENVIMAGE_SIZE != "" # legacy + help + Size of envronment, can be prefixed with 0x for hexadecimal + values. + +config BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_REDUNDANT + bool "Environment has two copies" + help + Some platforms define in their U-Boot configuration that the + U-Boot environment should be duplicated in two locations (for + extra safety). Check your U-Boot configuration for the + CONFIG_ENV_ADDR_REDUND and CONFIG_ENV_SIZE_REDUND settings to + see if this is the case for your platform. + + If it is the case, then you should enable this option to + ensure that the U-Boot environment image generated by + Buildroot is compatible with the "redundant environment" + mechanism of U-Boot. + +endif # BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE + +config BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT + bool "Generate a U-Boot boot script" + help + Generate a U-Boot boot script, given a file listing U-Boot + commands to be executed at boot time. The generated boot + script will be called 'boot.scr'. + +if BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT + +config BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE + string "U-Boot boot script source" + default BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE if BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE != "" # legacy + help + Source file to generate the U-Boot boot script. + +endif # BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT + +endif # BR2_PACKAGE_HOST_UBOOT_TOOLS diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index 6c17ef02b2..5a48926ebe 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 u-boot-2020.01.tar.bz2 +sha256 312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e u-boot-2021.07.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 8cafc084e1..81f60963ec 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,11 +4,13 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2020.01 +UBOOT_TOOLS_VERSION = 2021.07 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt +UBOOT_TOOLS_CPE_ID_VENDOR = denx +UBOOT_TOOLS_CPE_ID_PRODUCT = u-boot UBOOT_TOOLS_INSTALL_STAGING = YES # u-boot 2020.01+ needs make 4.0+ @@ -18,6 +20,8 @@ HOST_UBOOT_TOOLS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) define UBOOT_TOOLS_CONFIGURE_CMDS mkdir -p $(@D)/include/config touch $(@D)/include/config/auto.conf + mkdir -p $(@D)/include/generated + touch $(@D)/include/generated/autoconf.h endef UBOOT_TOOLS_MAKE_OPTS = CROSS_COMPILE="$(TARGET_CROSS)" \ @@ -87,9 +91,13 @@ define UBOOT_TOOLS_INSTALL_TARGET_CMDS $(UBOOT_TOOLS_INSTALL_FIT_CHECK_SIGN) endef +# host-uboot-tools + define HOST_UBOOT_TOOLS_CONFIGURE_CMDS mkdir -p $(@D)/include/config touch $(@D)/include/config/auto.conf + mkdir -p $(@D)/include/generated + touch $(@D)/include/generated/autoconf.h endef HOST_UBOOT_TOOLS_MAKE_OPTS = HOSTCC="$(HOSTCC)" \ @@ -106,14 +114,89 @@ HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE_MAX_SI HOST_UBOOT_TOOLS_DEPENDENCIES += host-openssl endif +ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE),y) + +UBOOT_TOOLS_GENERATE_ENV_FILE = $(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE)) + +# If BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE is left empty, we +# will use the default environment provided in the U-Boot build +# directory as boot-env-defaults.txt, which requires having uboot as a +# dependency. +# If BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE is not empty, is +# might be referring to a file within the U-Boot source tree, so we +# also need to have uboot as a dependency. +ifeq ($(BR2_TARGET_UBOOT),y) +HOST_UBOOT_TOOLS_DEPENDENCIES += uboot + +# Handle the case where BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE +# is left empty, use the default U-Boot environment. +ifeq ($(UBOOT_TOOLS_GENERATE_ENV_FILE),) +UBOOT_TOOLS_GENERATE_ENV_FILE = $(@D)/boot-env-defaults.txt +define HOST_UBOOT_TOOLS_GENERATE_ENV_DEFAULTS + CROSS_COMPILE="$(TARGET_CROSS)" \ + $(UBOOT_SRCDIR)/scripts/get_default_envs.sh \ + $(UBOOT_SRCDIR) \ + > $(UBOOT_TOOLS_GENERATE_ENV_FILE) +endef +endif # UBOOT_TOOLS_GENERATE_ENV_FILE +endif # BR2_TARGET_UBOOT + +ifeq ($(BR_BUILDING),y) +ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE)),) +$(error Please provide U-Boot environment size (BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE setting)) +endif +# If U-Boot is not available, ENVIMAGE_SOURCE must be provided by user, +# otherwise it is optional because the default can be taken from U-Boot +ifeq ($(BR2_TARGET_UBOOT),) +ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE)),) +$(error Please provide U-Boot environment file (BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE setting)) +endif +endif #BR2_TARGET_UBOOT +endif #BR_BUILDING + +define HOST_UBOOT_TOOLS_GENERATE_ENVIMAGE + $(HOST_UBOOT_TOOLS_GENERATE_ENV_DEFAULTS) + cat $(UBOOT_TOOLS_GENERATE_ENV_FILE) | \ + $(@D)/tools/mkenvimage -s $(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE) \ + $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_REDUNDANT),-r) \ + $(if $(filter "BIG",$(BR2_ENDIAN)),-b) \ + -o $(@D)/tools/uboot-env.bin \ + - +endef +define HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE + $(INSTALL) -m 0755 -D $(@D)/tools/uboot-env.bin $(BINARIES_DIR)/uboot-env.bin +endef +endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE + +ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT),y) +ifeq ($(BR_BUILDING),y) +ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE)),) +$(error Please define a source file for U-Boot boot script (BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE setting)) +endif +endif #BR_BUILDING + +define HOST_UBOOT_TOOLS_GENERATE_BOOT_SCRIPT + $(@D)/tools/mkimage -C none -A $(MKIMAGE_ARCH) -T script \ + -d $(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE)) \ + $(@D)/tools/boot.scr +endef +define HOST_UBOOT_TOOLS_INSTALL_BOOT_SCRIPT + $(INSTALL) -m 0755 -D $(@D)/tools/boot.scr $(BINARIES_DIR)/boot.scr +endef +endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT + define HOST_UBOOT_TOOLS_BUILD_CMDS $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only + $(HOST_UBOOT_TOOLS_GENERATE_ENVIMAGE) + $(HOST_UBOOT_TOOLS_GENERATE_BOOT_SCRIPT) endef define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/bin/mkimage $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage + $(HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE) + $(HOST_UBOOT_TOOLS_INSTALL_BOOT_SCRIPT) endef $(eval $(generic-package)) @@ -123,15 +206,15 @@ $(eval $(host-generic-package)) MKIMAGE = $(HOST_DIR)/bin/mkimage -# mkimage supports arm blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86 +# mkimage supports alpha arc arm arm64 blackfin ia64 invalid m68k microblaze mips mips64 nds32 nios2 or1k powerpc riscv s390 sandbox sh sparc sparc64 x86 x86_64 xtensa # KERNEL_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa -# For arm64, arc, xtensa we'll just keep KERNEL_ARCH -# For mips64, we'll just keep mips -# For i386 and x86_64, we need to convert -ifeq ($(KERNEL_ARCH),x86_64) -MKIMAGE_ARCH = x86 -else ifeq ($(KERNEL_ARCH),i386) +# For i386, we need to convert +# For openrisc, we need to convert +# For others, we'll just keep KERNEL_ARCH +ifeq ($(KERNEL_ARCH),i386) MKIMAGE_ARCH = x86 +else ifeq ($(KERNEL_ARCH),openrisc) +MKIMAGE_ARCH = or1k else MKIMAGE_ARCH = $(KERNEL_ARCH) endif diff --git a/package/ubus/Config.in b/package/ubus/Config.in index 28bf8e9ae4..391893e808 100644 --- a/package/ubus/Config.in +++ b/package/ubus/Config.in @@ -19,7 +19,7 @@ config BR2_PACKAGE_UBUS * Select BR2_PACKAGE_LUA_5_1 if you want to have Lua support. - https://wiki.openwrt.org/doc/techref/ubus + https://openwrt.org/docs/techref/ubus if BR2_PACKAGE_UBUS diff --git a/package/ubus/ubus.hash b/package/ubus/ubus.hash index bda58bc30c..15e67b53ed 100644 --- a/package/ubus/ubus.hash +++ b/package/ubus/ubus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 93ef2612853641ca8d16d07527115c72ed03f8eaa1c727a01b069a4e814247c0 ubus-34c6e818e431cc53478a0f7c7c1eca07d194d692.tar.gz -sha256 f53187f011575f6ec6c529136fd4658d67e674227c80b7b72c99b3654454ae7f ubusd_acl.h +sha256 0d2abb7212ad1ac0ac641d52f62e212bb090a1bbaeae975a78f44ab08d3e3c23 ubus-d1d9ddf98d39b0bdc055060fb962335439445690-br1.tar.gz +sha256 a3caa6c0e90c87b7c97c2ac3d0c0d416082ef777215faec2e9b24ea6e68f6988 ubusd_acl.h diff --git a/package/ubus/ubus.mk b/package/ubus/ubus.mk index 5fb57ead01..09668f7dd2 100644 --- a/package/ubus/ubus.mk +++ b/package/ubus/ubus.mk @@ -4,8 +4,9 @@ # ################################################################################ -UBUS_VERSION = 34c6e818e431cc53478a0f7c7c1eca07d194d692 -UBUS_SITE = git://git.openwrt.org/project/ubus.git +UBUS_VERSION = d1d9ddf98d39b0bdc055060fb962335439445690 +UBUS_SITE = https://git.openwrt.org/project/ubus.git +UBUS_SITE_METHOD = git UBUS_LICENSE = LGPL-2.1 UBUS_LICENSE_FILES = ubusd_acl.h diff --git a/package/uclibc-ng-test/uclibc-ng-test.mk b/package/uclibc-ng-test/uclibc-ng-test.mk index aeea799d88..ea5f224219 100644 --- a/package/uclibc-ng-test/uclibc-ng-test.mk +++ b/package/uclibc-ng-test/uclibc-ng-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_NG_TEST_VERSION = c6d62cbc60504c7f6867b486248b0ef7cc2da554 +UCLIBC_NG_TEST_VERSION = 0844445e7358eb10e716155b55b0fb23e88d644a UCLIBC_NG_TEST_SITE = git://uclibc-ng.org/git/uclibc-ng-test UCLIBC_NG_TEST_LICENSE = LGPL-2.1+ UCLIBC_NG_TEST_LICENSE_FILES = COPYING.LIB @@ -38,6 +38,10 @@ endif ifeq ($(BR2_STATIC_LIBS),y) UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 NO_NPTL=1 NO_DL=1 endif +# no TLS macros available +ifeq ($(BR2_nds32)$(BR2_s390x),y) +UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 +endif # to execute tests in a deterministic order, call test_gen separately define UCLIBC_NG_TEST_BUILD_CMDS diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index de2885bc92..2091166b62 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -53,7 +53,8 @@ config BR2_PTHREADS_NATIVE config BR2_PTHREADS bool "linuxthreads" - depends on BR2_m68k || BR2_microblaze || BR2_or1k || BR2_arm || BR2_armeb || BR2_xtensa + depends on !BR2_aarch64 && !BR2_aarch64_be + depends on !BR2_RISCV_64 select BR2_TOOLCHAIN_HAS_THREADS config BR2_PTHREADS_NONE @@ -106,6 +107,7 @@ config BR2_UCLIBC_TARGET_ARCH default "xtensa" if BR2_xtensa default "i386" if BR2_i386 default "x86_64" if BR2_x86_64 + default "riscv64" if BR2_RISCV_64 config BR2_UCLIBC_MIPS_ABI string diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index c1f161fa15..25bbabf2ea 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.32/uClibc-ng-1.0.32.tar.xz.sha256 -sha256 891b5e4573855e4c11e51d3a518f89a82e490d9aa73280c05ce3e4d7e739a370 uClibc-ng-1.0.32.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.38/uClibc-ng-1.0.39.tar.xz.sha256 +sha256 cb089dfe14867a38f222d6428e85d0e1191dcbb66dd9b1a671484f6bc7c81920 uClibc-ng-1.0.39.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 2af666c208..87e283de2a 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,16 +4,14 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.32 +UCLIBC_VERSION = 1.0.39 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ UCLIBC_LICENSE_FILES = COPYING.LIB UCLIBC_INSTALL_STAGING = YES - -define UCLIBC_HELP_CMDS - @echo ' uclibc-menuconfig - Run uClibc menuconfig' -endef +UCLIBC_CPE_ID_VENDOR = uclibc-ng_project +UCLIBC_CPE_ID_PRODUCT = uclibc-ng # uclibc is part of the toolchain so disable the toolchain dependency UCLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO @@ -28,11 +26,17 @@ ifndef UCLIBC_CONFIG_FILE UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG)) endif +UCLIBC_KCONFIG_EDITORS = menuconfig nconfig UCLIBC_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE) UCLIBC_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_UCLIBC_CONFIG_FRAGMENT_FILES)) +# UCLIBC_MAKE_FLAGS set HOSTCC to the default HOSTCC, which may be +# wrapped with ccache. However, host-ccache may not already be built +# and installed when we apply the configuration, so we override that +# to use the non-ccached host compiler. UCLIBC_KCONFIG_OPTS = \ $(UCLIBC_MAKE_FLAGS) \ + HOSTCC="$(HOSTCC_NOCCACHE)" \ PREFIX=$(STAGING_DIR) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(STAGING_DIR)/ @@ -54,18 +58,18 @@ endif # noMMU binary formats ifeq ($(BR2_BINFMT_FLAT_ONE),y) define UCLIBC_BINFMT_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF) endef endif ifeq ($(BR2_BINFMT_FLAT_SHARED),y) define UCLIBC_BINFMT_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA) + $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF) endef endif @@ -77,12 +81,12 @@ ifeq ($(UCLIBC_TARGET_ARCH),arc) UCLIBC_ARC_PAGE_SIZE = CONFIG_ARC_PAGE_SIZE_$(call qstrip,$(BR2_ARC_PAGE_SIZE)) define UCLIBC_ARC_PAGE_SIZE_CONFIG $(SED) '/CONFIG_ARC_PAGE_SIZE_*/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_PAGE_SIZE),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_PAGE_SIZE)) endef ifeq ($(BR2_ARC_ATOMIC_EXT),) define UCLIBC_ARC_ATOMICS_CONFIG - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_HAS_ATOMICS,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_HAS_ATOMICS) endef endif @@ -95,12 +99,12 @@ endif # arc ifeq ($(UCLIBC_TARGET_ARCH),arm) define UCLIBC_ARM_ABI_CONFIG $(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI) endef ifeq ($(BR2_BINFMT_FLAT),y) define UCLIBC_ARM_BINFMT_FLAT - $(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,DOPIC) endef endif @@ -110,7 +114,7 @@ endif # support the ARM instructions. ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB2):$(BR2_ARM_CPU_HAS_ARM),y:) define UCLIBC_ARM_NO_CONTEXT_FUNCS - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_CONTEXT_FUNCS,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_CONTEXT_FUNCS) endef endif @@ -125,7 +129,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),m68k) # disable DOPIC for flat without separate data ifeq ($(BR2_BINFMT_FLAT_ONE),y) define UCLIBC_M68K_BINFMT_FLAT - $(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,DOPIC) endef endif @@ -139,13 +143,13 @@ ifeq ($(UCLIBC_TARGET_ARCH),mips) UCLIBC_MIPS_ABI = CONFIG_MIPS_$(call qstrip,$(BR2_UCLIBC_MIPS_ABI))_ABI define UCLIBC_MIPS_ABI_CONFIG $(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_ABI),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_ABI)) endef UCLIBC_MIPS_NAN = CONFIG_MIPS_NAN_$(call qstrip,$(BR2_UCLIBC_MIPS_NAN)) define UCLIBC_MIPS_NAN_CONFIG $(SED) '/CONFIG_MIPS_NAN_.*/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_NAN),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_NAN)) endef endif # mips @@ -157,7 +161,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),sh) UCLIBC_SH_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_SH_TYPE)) define UCLIBC_SH_TYPE_CONFIG $(SED) '/CONFIG_SH[234A]*/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_SH_TYPE),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_SH_TYPE)) endef endif # sh @@ -170,7 +174,7 @@ UCLIBC_SPARC_TYPE = CONFIG_SPARC_$(call qstrip,$(BR2_UCLIBC_SPARC_TYPE)) define UCLIBC_SPARC_TYPE_CONFIG $(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \ $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_SPARC_TYPE),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_SPARC_TYPE)) endef endif # sparc @@ -181,9 +185,9 @@ endif # sparc ifeq ($(UCLIBC_TARGET_ARCH),powerpc) UCLIBC_POWERPC_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_POWERPC_TYPE)) define UCLIBC_POWERPC_TYPE_CONFIG - $(call KCONFIG_DISABLE_OPT,CONFIG_GENERIC,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,CONFIG_E500,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_POWERPC_TYPE),$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,CONFIG_GENERIC) + $(call KCONFIG_DISABLE_OPT,CONFIG_E500) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_POWERPC_TYPE)) endef endif # powerpc @@ -193,7 +197,7 @@ endif # powerpc ifeq ($(UCLIBC_TARGET_ARCH),i386) UCLIBC_X86_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_X86_TYPE)) define UCLIBC_X86_TYPE_CONFIG - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_X86_TYPE),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_X86_TYPE)) endef endif @@ -202,7 +206,7 @@ endif # ifeq ($(BR2_ENABLE_DEBUG),y) define UCLIBC_DEBUG_CONFIG - $(call KCONFIG_ENABLE_OPT,DODEBUG,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,DODEBUG) endef endif @@ -212,17 +216,17 @@ endif ifeq ($(call qstrip,$(BR2_ENDIAN)),BIG) define UCLIBC_ENDIAN_CONFIG - $(call KCONFIG_ENABLE_OPT,ARCH_BIG_ENDIAN,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,ARCH_WANTS_BIG_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_LITTLE_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,ARCH_BIG_ENDIAN) + $(call KCONFIG_ENABLE_OPT,ARCH_WANTS_BIG_ENDIAN) + $(call KCONFIG_DISABLE_OPT,ARCH_LITTLE_ENDIAN) + $(call KCONFIG_DISABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN) endef else define UCLIBC_ENDIAN_CONFIG - $(call KCONFIG_ENABLE_OPT,ARCH_LITTLE_ENDIAN,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_BIG_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_WANTS_BIG_ENDIAN,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,ARCH_LITTLE_ENDIAN) + $(call KCONFIG_ENABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN) + $(call KCONFIG_DISABLE_OPT,ARCH_BIG_ENDIAN) + $(call KCONFIG_DISABLE_OPT,ARCH_WANTS_BIG_ENDIAN) endef endif @@ -232,13 +236,13 @@ endif ifeq ($(BR2_USE_MMU),y) define UCLIBC_MMU_CONFIG - $(call KCONFIG_ENABLE_OPT,ARCH_HAS_MMU,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,ARCH_USE_MMU,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,ARCH_HAS_MMU) + $(call KCONFIG_ENABLE_OPT,ARCH_USE_MMU) endef else define UCLIBC_MMU_CONFIG - $(call KCONFIG_DISABLE_OPT,ARCH_HAS_MMU,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_USE_MMU,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,ARCH_HAS_MMU) + $(call KCONFIG_DISABLE_OPT,ARCH_USE_MMU) endef endif @@ -246,7 +250,7 @@ endif # IPv6 # -UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config) +UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6) # # soft-float @@ -254,14 +258,14 @@ UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config) ifeq ($(BR2_SOFT_FLOAT),y) define UCLIBC_FLOAT_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FPU,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,DO_C99_MATH,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FPU) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS) + $(call KCONFIG_ENABLE_OPT,DO_C99_MATH) endef else define UCLIBC_FLOAT_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FPU,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FPU) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS) endef endif @@ -270,13 +274,13 @@ endif # ifeq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y) define UCLIBC_SSP_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_SSP,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_SSP,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_SSP) + $(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_SSP) endef else define UCLIBC_SSP_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_SSP,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_SSP,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_SSP) + $(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_SSP) endef endif @@ -285,21 +289,21 @@ endif # ifeq ($(BR2_PTHREADS_NONE),y) define UCLIBC_THREAD_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE) endef else ifeq ($(BR2_PTHREADS),y) define UCLIBC_THREAD_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LINUXTHREADS) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE) endef else ifeq ($(BR2_PTHREADS_NATIVE),y) define UCLIBC_THREAD_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS_NATIVE) endef endif @@ -308,9 +312,9 @@ endif # ifeq ($(BR2_PTHREAD_DEBUG),y) -UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_ENABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config) +UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_ENABLE_OPT,PTHREADS_DEBUG_SUPPORT) else -UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_DISABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config) +UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_DISABLE_OPT,PTHREADS_DEBUG_SUPPORT) endif # @@ -319,18 +323,18 @@ endif ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LOCALE),y) define UCLIBC_LOCALE_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LOCALE,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_ALL_LOCALE,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_MINIMAL_LOCALE,$(@D)/.config) - $(call KCONFIG_SET_OPT,UCLIBC_BUILD_MINIMAL_LOCALES,"$(UCLIBC_LOCALES)",$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_PREGENERATED_LOCALE_DATA,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,DOWNLOAD_PREGENERATED_LOCALE_DATA,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_XLOCALE,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_GLIBC_DIGIT_GROUPING,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LOCALE) + $(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_ALL_LOCALE) + $(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_MINIMAL_LOCALE) + $(call KCONFIG_SET_OPT,UCLIBC_BUILD_MINIMAL_LOCALES,"$(UCLIBC_LOCALES)") + $(call KCONFIG_DISABLE_OPT,UCLIBC_PREGENERATED_LOCALE_DATA) + $(call KCONFIG_DISABLE_OPT,DOWNLOAD_PREGENERATED_LOCALE_DATA) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_XLOCALE) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_GLIBC_DIGIT_GROUPING) endef else define UCLIBC_LOCALE_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LOCALE,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LOCALE) endef endif @@ -339,9 +343,9 @@ endif # ifeq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y) -UCLIBC_WCHAR_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_WCHAR,$(@D)/.config) +UCLIBC_WCHAR_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_WCHAR) else -UCLIBC_WCHAR_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_WCHAR,$(@D)/.config) +UCLIBC_WCHAR_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_WCHAR) endif # @@ -349,9 +353,9 @@ endif # ifeq ($(BR2_STATIC_LIBS),y) -UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_DISABLE_OPT,HAVE_SHARED,$(@D)/.config) +UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_DISABLE_OPT,HAVE_SHARED) else -UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_ENABLE_OPT,HAVE_SHARED,$(@D)/.config) +UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_ENABLE_OPT,HAVE_SHARED) endif # @@ -365,13 +369,13 @@ UCLIBC_MAKE_FLAGS = \ HOSTCC="$(HOSTCC)" define UCLIBC_KCONFIG_FIXUP_CMDS - $(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH),$(@D)/.config) - $(call KCONFIG_SET_OPT,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)",$(@D)/.config) - $(call KCONFIG_SET_OPT,KERNEL_HEADERS,"$(LINUX_HEADERS_DIR)/usr/include",$(@D)/.config) - $(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/",$(@D)/.config) - $(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr",$(@D)/.config) - $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D)/.config) + $(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)") + $(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH)) + $(call KCONFIG_SET_OPT,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)") + $(call KCONFIG_SET_OPT,KERNEL_HEADERS,"$(LINUX_HEADERS_DIR)/usr/include") + $(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/") + $(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr") + $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib") $(UCLIBC_MMU_CONFIG) $(UCLIBC_BINFMT_CONFIG) $(UCLIBC_ARC_PAGE_SIZE_CONFIG) diff --git a/package/udev/udev.mk b/package/udev/udev.mk index cc4a6e3a26..05b35b21f0 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -4,4 +4,11 @@ # ################################################################################ +# Required by default rules for input devices +define UDEV_USERS + - - input -1 * - - - Input device group + - - render -1 * - - - DRI rendering nodes + - - kvm -1 * - - - kvm nodes +endef + $(eval $(virtual-package)) diff --git a/package/udftools/udftools.hash b/package/udftools/udftools.hash index 630a3427eb..5b3f10d37d 100644 --- a/package/udftools/udftools.hash +++ b/package/udftools/udftools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d67ce203d71d828619d6d3791ab33eefab4bc506e0ee73355ab6c2f91d52448e udftools-2.2.tar.gz -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 750dcf5c797765eb42265e0a56d1a99f97f94b7f6f4534263a5410503f0caf59 udftools-2.3.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/udftools/udftools.mk b/package/udftools/udftools.mk index db7c13cc77..7dc1c57eb2 100644 --- a/package/udftools/udftools.mk +++ b/package/udftools/udftools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UDFTOOLS_VERSION = 2.2 +UDFTOOLS_VERSION = 2.3 UDFTOOLS_SITE = https://github.com/pali/udftools/releases/download/$(UDFTOOLS_VERSION) UDFTOOLS_LICENSE = GPL-2.0+ UDFTOOLS_LICENSE_FILES = COPYING diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 04a632dd8d..82f11ae7de 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -1,24 +1,28 @@ config BR2_PACKAGE_UDISKS bool "udisks" depends on BR2_ENABLE_LOCALE # parted - depends on BR2_HOST_GCC_AT_LEAST_4_9 # spidermonkey - depends on BR2_INSTALL_LIBSTDCPP # spidermonkey depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS # spidermonkey - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # spidermonkey - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # polkit - depends on BR2_USE_MMU # lvm2 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # polkit -> C++17 + depends on BR2_TOOLCHAIN_HAS_THREADS # polkit depends on BR2_USE_WCHAR # dbus-glib -> glib2 - depends on !BR2_TOOLCHAIN_USES_UCLIBC # polkit, lvm2, parted - depends on !BR2_STATIC_LIBS # lvm2, spidermonkey + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libblockdev -> cryptsetup -> json-c + depends on !BR2_STATIC_LIBS # polkit -> duktape select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB - select BR2_PACKAGE_SG3_UTILS - select BR2_PACKAGE_POLKIT - select BR2_PACKAGE_PARTED - select BR2_PACKAGE_LVM2 select BR2_PACKAGE_LIBATASMART + select BR2_PACKAGE_LIBBLOCKDEV + select BR2_PACKAGE_LIBBLOCKDEV_CRYPTO + select BR2_PACKAGE_LIBBLOCKDEV_FS + select BR2_PACKAGE_LIBBLOCKDEV_LOOP + select BR2_PACKAGE_LIBBLOCKDEV_MDRAID + select BR2_PACKAGE_LIBBLOCKDEV_PART + select BR2_PACKAGE_LIBBLOCKDEV_SWAP select BR2_PACKAGE_LIBGUDEV + select BR2_PACKAGE_PARTED + select BR2_PACKAGE_POLKIT + select BR2_PACKAGE_SG3_UTILS + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT help The udisks project provides @@ -31,32 +35,13 @@ config BR2_PACKAGE_UDISKS http://www.freedesktop.org/wiki/Software/udisks -if BR2_PACKAGE_UDISKS - -config BR2_PACKAGE_UDISKS_LVM2 - bool "lvm2 support" - # The lvm app library can't compile against musl - depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_LVM2_APP_LIBRARY - help - Enable LVM2 support - -comment "lvm2 support needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC - -endif - comment "udisks needs udev /dev management" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV -comment "udisks needs a glibc or musl toolchain with locale, C++, wchar, dynamic library, NPTL, gcc >= 4.9" +comment "udisks needs a toolchain with dynamic library, locale, wchar, threads, gcc >= 7" depends on BR2_USE_MMU - depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS - depends on !BR2_ENABLE_LOCALE || BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_INSTALL_LIBSTDCPP || \ - BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_HOST_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_STATIC_LIBS || !BR2_ENABLE_LOCALE || \ + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/udisks/udisks.hash b/package/udisks/udisks.hash index b40161e323..ade4982a0b 100644 --- a/package/udisks/udisks.hash +++ b/package/udisks/udisks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 udisks-1.0.5.tar.gz -sha256 7d30f41a79a9b453b4972a6d7e3425ff104b39232891bde8ba659f1adb21f771 COPYING +sha256 b6b60ebab0d5e09624120c5d158882e87d8c2473db60783b63deeba74cb18d1c udisks-2.9.4.tar.bz2 +sha256 98046e932dc6c739001e79d7079a3bd958fc55475dcd917d27f884c0c93525cc COPYING diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk index fe8932a92e..2bf519a2cc 100644 --- a/package/udisks/udisks.mk +++ b/package/udisks/udisks.mk @@ -4,29 +4,39 @@ # ################################################################################ -UDISKS_VERSION = 1.0.5 -UDISKS_SITE = http://hal.freedesktop.org/releases +UDISKS_VERSION = 2.9.4 +UDISKS_SOURCE = udisks-$(UDISKS_VERSION).tar.bz2 +UDISKS_SITE = https://github.com/storaged-project/udisks/releases/download/udisks-$(UDISKS_VERSION) UDISKS_LICENSE = GPL-2.0+ UDISKS_LICENSE_FILES = COPYING -# For 0002-Fix-systemd-service-file.patch -UDISKS_AUTORECONF = YES +UDISKS_CPE_ID_VENDOR = freedesktop UDISKS_DEPENDENCIES = \ - sg3_utils \ host-pkgconf \ - udev \ dbus \ dbus-glib \ - polkit \ - parted \ - lvm2 \ libatasmart \ - libgudev + libblockdev \ + libgudev \ + parted \ + polkit \ + sg3_utils \ + udev \ + util-linux -UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages - -ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y) -UDISKS_CONF_OPTS += --enable-lvm2 -endif +UDISKS_CONF_OPTS = \ + --disable-acl \ + --disable-bcache \ + --disable-btrfs \ + --disable-fhs-media \ + --disable-introspection \ + --disable-iscsi \ + --disable-lsm \ + --disable-lvm2 \ + --disable-lvmcache \ + --disable-man \ + --disable-rpath \ + --disable-vdo \ + --disable-zram $(eval $(autotools-package)) diff --git a/package/udpcast/udpcast.hash b/package/udpcast/udpcast.hash index a70aa71981..9cdce0a286 100644 --- a/package/udpcast/udpcast.hash +++ b/package/udpcast/udpcast.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 ce9090ef80b6035a744a9b5ac335e61c99baa92c39ff53277266fbfcb836445a udpcast-20120424.tar.gz +sha256 9c19eebaa6e2f78127f0d59e95d0ce003b687d61e283b5963a1da6b8ac41f21a udpcast-20200328.tar.gz sha256 422befd3503b1f39a6027017f639874c1f274e37ec60ba3174894646b584ccbc COPYING diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk index e9116d2de0..34ebddd2d5 100644 --- a/package/udpcast/udpcast.mk +++ b/package/udpcast/udpcast.mk @@ -4,7 +4,7 @@ # ################################################################################ -UDPCAST_VERSION = 20120424 +UDPCAST_VERSION = 20200328 UDPCAST_SITE = http://www.udpcast.linux.lu/download UDPCAST_DEPENDENCIES = host-m4 UDPCAST_LICENSE = BSD-2-Clause, GPL-2.0+ diff --git a/package/uemacs/uemacs.hash b/package/uemacs/uemacs.hash index 7dcbba926e..c8dd620b8e 100644 --- a/package/uemacs/uemacs.hash +++ b/package/uemacs/uemacs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9b4a849f65edb482f59bc40f646e7cd79915b3030ea9bd825868347217db3c96 uemacs-1cdcf9df88144049750116e36fe20c8c39fa2517.tar.gz -sha256 6e2a4cf41ec8d4379c154923349733bc0d3935c6fa72c4337cf1bc137b98b90a README +sha256 96e30247365bb27bd74c550b637f5b2ffd2978379872a32a840f6667cec5fa2a uemacs-1cdcf9df88144049750116e36fe20c8c39fa2517-br1.tar.gz +sha256 6e2a4cf41ec8d4379c154923349733bc0d3935c6fa72c4337cf1bc137b98b90a README diff --git a/package/uftp/uftp.hash b/package/uftp/uftp.hash index 1497430011..aaebcad014 100644 --- a/package/uftp/uftp.hash +++ b/package/uftp/uftp.hash @@ -1,3 +1,3 @@ # Locally computed sha256 -sha256 91ba8aae80c7c9ccaf04600b628cbeca4699ed48268fe43d2bf539a41083f292 uftp-4.10.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.txt +sha256 562f71ea5a24b615eb491f5744bad01e9c2e58244c1d6252d5ae98d320d308e0 uftp-5.0.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.txt diff --git a/package/uftp/uftp.mk b/package/uftp/uftp.mk index cfef1f9e32..1c36cb0ce6 100644 --- a/package/uftp/uftp.mk +++ b/package/uftp/uftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -UFTP_VERSION = 4.10 +UFTP_VERSION = 5.0 UFTP_SITE = http://sourceforge.net/projects/uftp-multicast/files/source-tar UFTP_LICENSE = GPL-3.0+ UFTP_LICENSE_FILES = LICENSE.txt diff --git a/package/uhttpd/uhttpd.hash b/package/uhttpd/uhttpd.hash index e8bdb0bb6b..6f8b4a60f8 100644 --- a/package/uhttpd/uhttpd.hash +++ b/package/uhttpd/uhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9325c95c9bb1c51bf135700a65738884fa9cd548ff8166c8b61fdbf99825cd6d uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82.tar.gz -sha256 2a61a8a690e7646a4bfe4261bf77c49f47588db5fc234b3cc66809dcc0cb3985 uhttpd.h +sha256 8a537a377c8dc1abda147a1e3feb3fe3e3633a9d30e4e37d378cc6309dace2f0 uhttpd-f53a63999784bcb7dc513e221f3f25dd3de2f35e-br1.tar.gz +sha256 ce1803f83f776cc88661e303fede0e5ff52faf1d9f74508fadbecf7705b4c84d uhttpd.h diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk index cc7649d0ec..355a266d6b 100644 --- a/package/uhttpd/uhttpd.mk +++ b/package/uhttpd/uhttpd.mk @@ -4,8 +4,8 @@ # ################################################################################ -UHTTPD_VERSION = a8bf9c00842224edb394e79909053f7628ee6a82 -UHTTPD_SITE = http://git.openwrt.org/project/uhttpd.git +UHTTPD_VERSION = f53a63999784bcb7dc513e221f3f25dd3de2f35e +UHTTPD_SITE = https://git.openwrt.org/project/uhttpd.git UHTTPD_SITE_METHOD = git UHTTPD_LICENSE = ISC UHTTPD_LICENSE_FILES = uhttpd.h diff --git a/package/uhubctl/Config.in b/package/uhubctl/Config.in index c000b5ab49..52b0268a38 100644 --- a/package/uhubctl/Config.in +++ b/package/uhubctl/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_UHUBCTL bool "uhubctl" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Control USB power per-port on smart USB hubs. https://github.com/mvp/uhubctl -comment "uhubctl needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "uhubctl needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/uhubctl/uhubctl.hash b/package/uhubctl/uhubctl.hash index 255f7aa111..c696d70f6c 100644 --- a/package/uhubctl/uhubctl.hash +++ b/package/uhubctl/uhubctl.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 227fdd541067b84eaa0e15cdc171458a56de7591f7a1deaff3e6d42d2809450b uhubctl-2.1.0.tar.gz -sha256 05d376f74b3b539e2758d2b8a4bef5b15e567350d19c8581b5344bf4ce84414a LICENSE +sha256 391f24fd1f89cacce801df38ecc289b34c3627bc08ee69eec515af7e1a283d97 uhubctl-2.4.0.tar.gz +sha256 2d3aa0737e8db9dfd710f9a282b446cb7b15b2b3eecac383f0c45c64d736eea0 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/uhubctl/uhubctl.mk b/package/uhubctl/uhubctl.mk index da217a7bd7..3429d7d151 100644 --- a/package/uhubctl/uhubctl.mk +++ b/package/uhubctl/uhubctl.mk @@ -4,14 +4,14 @@ # ################################################################################ -UHUBCTL_VERSION = 2.1.0 +UHUBCTL_VERSION = 2.4.0 UHUBCTL_SITE = $(call github,mvp,uhubctl,v$(UHUBCTL_VERSION)) UHUBCTL_LICENSE = GPL-2.0 -UHUBCTL_LICENSE_FILES = LICENSE +UHUBCTL_LICENSE_FILES = LICENSE COPYING UHUBCTL_DEPENDENCIES = libusb define UHUBCTL_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) GIT_VERSION=v$(UHUBCTL_VERSION) -C $(@D) endef define UHUBCTL_INSTALL_TARGET_CMDS diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 1b86c12773..c00a53f3d5 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -13,6 +13,7 @@ ULOGD_DEPENDENCIES = host-pkgconf \ libnfnetlink ULOGD_LICENSE = GPL-2.0 ULOGD_LICENSE_FILES = COPYING +ULOGD_SELINUX_MODULES = ulogd # DB backends need threads ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) diff --git a/package/umtprd/umtprd.hash b/package/umtprd/umtprd.hash index 168b19e951..170837d84b 100644 --- a/package/umtprd/umtprd.hash +++ b/package/umtprd/umtprd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e1301bdd89170cc2c679446c1cc5873feaacd061bf0ab547fc0a11670bae9163 umtprd-1.0.0.tar.gz +sha256 cce45c7d3df0022fc013c79de21b1f11b1027d090aeb628669f08b0c20d2afdd umtprd-1.3.10.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/umtprd/umtprd.mk b/package/umtprd/umtprd.mk index 63faae43b3..f1a4e66cff 100644 --- a/package/umtprd/umtprd.mk +++ b/package/umtprd/umtprd.mk @@ -4,7 +4,7 @@ # ################################################################################ -UMTPRD_VERSION = 1.0.0 +UMTPRD_VERSION = 1.3.10 UMTPRD_SITE = https://github.com/viveris/uMTP-Responder/archive UMTPRD_LICENSE = GPL-3.0+ UMTPRD_LICENSE_FILES = LICENSE diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 11626d0b6f..3c872aedf5 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,3 +1,5 @@ +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.13.2.tar.gz.sha256 +sha256 0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83 unbound-1.13.2.tar.gz + # Locally calculated -sha256 152f486578242fe5c36e89995d0440b78d64c05123990aae16246b7f776ce955 unbound-1.10.0.tar.gz -sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE +sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 59543438fd..37456db416 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,11 +4,12 @@ # ################################################################################ -UNBOUND_VERSION = 1.10.0 +UNBOUND_VERSION = 1.13.2 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause UNBOUND_LICENSE_FILES = LICENSE +UNBOUND_CPE_ID_VENDOR = nlnetlabs UNBOUND_CONF_OPTS = \ --disable-rpath \ --disable-debug \ diff --git a/package/unionfs/unionfs.hash b/package/unionfs/unionfs.hash index f4310b023d..7c4a9f4ffb 100644 --- a/package/unionfs/unionfs.hash +++ b/package/unionfs/unionfs.hash @@ -1,4 +1,3 @@ # Locally computed -sha256 f24d7dd64c678cefacbebf2727b61e3127b8ecb6bb9176d7117dd31503455643 unionfs-2.0.tar.gz -sha256 976ca25b7706911f1a6e981c0fd236b607f497aa0b23d407825b0aad41f7c896 0001-include-asm-ioctl.h-for-_IOC_SIZE.patch sha256 f56a5579d670e18e0667700bc599acbc0b8217ca1f76b2adb3dad7d2953c4049 LICENSE +sha256 c705072a33a18cbc73ffe799331d43410b6deef5d6f2042038f8fd3ab17b6e2e unionfs-2.1.tar.gz diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk index e8b295335d..12cd368fe3 100644 --- a/package/unionfs/unionfs.mk +++ b/package/unionfs/unionfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNIONFS_VERSION = 2.0 +UNIONFS_VERSION = 2.1 UNIONFS_SITE = $(call github,rpodgorny,unionfs-fuse,v$(UNIONFS_VERSION)) UNIONFS_DEPENDENCIES = libfuse host-pkgconf UNIONFS_LICENSE = BSD-3-Clause diff --git a/package/unixodbc/unixodbc.hash b/package/unixodbc/unixodbc.hash index 4d0ad191d1..ba094f7627 100644 --- a/package/unixodbc/unixodbc.hash +++ b/package/unixodbc/unixodbc.hash @@ -1,6 +1,6 @@ -# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.7.tar.gz.md5 -md5 274a711b0c77394e052db6493840c6f9 unixODBC-2.3.7.tar.gz +# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.9.tar.gz.md5 +md5 06f76e034bb41df5233554abe961a16f unixODBC-2.3.9.tar.gz # Locally computed -sha256 45f169ba1f454a72b8fcbb82abd832630a3bf93baa84731cf2949f449e1e3e77 unixODBC-2.3.7.tar.gz -sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING -sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING +sha256 52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207 unixODBC-2.3.9.tar.gz +sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING +sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk index 2c936fe9d5..cdc4e69a7e 100644 --- a/package/unixodbc/unixodbc.mk +++ b/package/unixodbc/unixodbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNIXODBC_VERSION = 2.3.7 +UNIXODBC_VERSION = 2.3.9 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC UNIXODBC_INSTALL_STAGING = YES @@ -13,6 +13,13 @@ UNIXODBC_LICENSE_FILES = COPYING exe/COPYING UNIXODBC_CONF_OPTS = --enable-drivers --enable-driver-conf +ifeq ($(BR2_PACKAGE_LIBEDIT),y) +UNIXODBC_CONF_OPTS += --enable-editline +UNIXODBC_DEPENDENCIES += libedit +else +UNIXODBC_CONF_OPTS += --disable-editline +endif + ifeq ($(BR2_PACKAGE_LIBICONV),y) UNIXODBC_CONF_OPTS += --enable-iconv UNIXODBC_DEPENDENCIES += libiconv @@ -34,4 +41,10 @@ else UNIXODBC_CONF_OPTS += --disable-readline endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +UNIXODBC_CONF_OPTS += --enable-threads +else +UNIXODBC_CONF_OPTS += --disable-threads +endif + $(eval $(autotools-package)) diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index f688a4e364..7900c44d1d 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3591685c8f5bbcb0be09de3d0a0544adb88966b9cccb80986f6cd2b534fd91a6 unrarsrc-5.8.3.tar.gz -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt +sha256 3d010d14223e0c7a385ed740e8f046edcbe885e5c22c5ad5733d009596865300 unrarsrc-5.9.4.tar.gz +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index cdaff26988..ab8d9228c8 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,9 +4,9 @@ # ################################################################################ -UNRAR_VERSION = 5.8.3 +UNRAR_VERSION = 5.9.4 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz -UNRAR_SITE = http://www.rarlab.com/rar +UNRAR_SITE = https://www.rarlab.com/rar UNRAR_LICENSE = unrar UNRAR_LICENSE_FILES = license.txt diff --git a/package/unscd/Config.in b/package/unscd/Config.in index 23cc5a4fcb..88f1062103 100644 --- a/package/unscd/Config.in +++ b/package/unscd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_UNSCD bool "unscd" + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_USES_GLIBC help Micro Name Service Caching Daemon @@ -22,4 +23,5 @@ config BR2_PACKAGE_UNSCD http://busybox.net/~vda/unscd comment "unscd needs a glibc toolchain" + depends on !BR2_RISCV_32 depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/unscd/unscd.hash b/package/unscd/unscd.hash index 671149fda2..9ed698fd2a 100644 --- a/package/unscd/unscd.hash +++ b/package/unscd/unscd.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 9078255b2b9c344d9a0c3333ce23dda9d745f158dde0ea2244a8c56ba93f7a40 nscd-0.53.c +sha256 90e12c71732474cac4d055bf9d104e599178b4e1ecb6d3b8c556eaa11f8f6447 nscd-0.54.c diff --git a/package/unscd/unscd.mk b/package/unscd/unscd.mk index c79ec44000..94b46460f6 100644 --- a/package/unscd/unscd.mk +++ b/package/unscd/unscd.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNSCD_VERSION = 0.53 +UNSCD_VERSION = 0.54 UNSCD_SOURCE = nscd-$(UNSCD_VERSION).c UNSCD_SITE = http://busybox.net/~vda/unscd UNSCD_LICENSE = GPL-2.0 diff --git a/package/unzip/unzip.hash b/package/unzip/unzip.hash index d05957d5e2..8b3f275533 100644 --- a/package/unzip/unzip.hash +++ b/package/unzip/unzip.hash @@ -1,20 +1,6 @@ +# From https://snapshot.debian.org/archive/debian/20210110T204103Z/pool/main/u/unzip/unzip_6.0-26.dsc +sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip_6.0.orig.tar.gz +sha256 88cb7c0f1fd13252b662dfd224b64b352f9e75cd86389557fcb23fa6d2638599 unzip_6.0-26.debian.tar.xz + # Locally computed: -sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip60.tgz -sha256 7469b81d5d29ac4fd670f7c86ba0cb9fa34f137a2d4d5198437d92ddf918984b LICENSE -sha256 66a364d75cea29363768ca6d43dd11b9913a59e42b8da16c4f63516c3e4ce7c1 07-increase-size-of-cfactorstr.patch -sha256 3a8cfd2702d220c6c119eaf805b018b66460284e585e92adc8a572d190471724 08-allow-greater-hostver-values.patch -sha256 0a1b23118b2f4a3ed097348ab33050d4f79b3863ab30e6d64ac382589834e3de 09-cve-2014-8139-crc-overflow.patch -sha256 32b1eda30644c44a8bdb9a02ff08bb2eca107f8eb16dda6992a9b778a0de395e 10-cve-2014-8140-test-compr-eb.patch -sha256 1f60f6e28b36f3cddb7da64c528cfe29160cefa1232e13bb8a47561f574067a9 11-cve-2014-8141-getzip64data.patch -sha256 c05885bb48b41603f0893ada88f15c0fae3b3f9f6489f24ad630a400f6271351 12-cve-2014-9636-test-compr-eb.patch -sha256 788c29727ff0689c3b1828466127758426f6d2c769048aa985950373747c76f3 14-cve-2015-7696.patch -sha256 e85dab65c3ebf3c4ab3359a4143cfd0efccfd1cac517a4e7bd5f518f41a02b6f 15-cve-2015-7697.patch -sha256 95dd15d5d9cdf5cea18c357b152930d6d52660599e0fd4907d6405870fdd9fe1 16-fix-integer-underflow-csiz-decrypted.patch -sha256 ea04cfc8b7ca3b3c03117da0d891870b8c542d26188ef5593fd7e479f4f29f4e 17-restore-unix-timestamps-accurately.patch -sha256 1872ffdd4d82edd7b1e62c469642bf16a1ca12dd26d41bd3f0b44f0f7602eb63 18-cve-2014-9913-unzip-buffer-overflow.patch -sha256 60840ea8f5d11a276972fb5b43652cdd49a9ed93b2cc0586ad309bf52104b012 19-cve-2016-9844-zipinfo-buffer-overflow.patch -sha256 4eabc3faeddd56ebc3d5053486b61f8758d840902725fd555d3472cffb094437 20-cve-2018-1000035-unzip-buffer-overflow.patch -sha256 df3b0eeea8dcc161a2565e306b5dda13d27de43145e198baaf0eab822321ee7e 21-fix-warning-messages-on-big-files.patch -sha256 2cf5a89e921da99e883bcde0ea03e2c77ae9185f57efaf35e7d43bc24353cfdc 22-cve-2019-13232-fix-bug-in-undefer-input.patch -sha256 c8e82c80fc7760f90567118a465e4cfa1b8e5d0a5723f9c70e3d21247e550615 23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch -sha256 37ba0bea723beeb22670babda18bd980368cc6591bc7bd9caa04f62692c7e5ac 24-cve-2019-13232-do-not-raise-alert-for-misplaced-central-directory.patch +sha256 7469b81d5d29ac4fd670f7c86ba0cb9fa34f137a2d4d5198437d92ddf918984b LICENSE diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk index 1d972055de..e8c9366a1b 100644 --- a/package/unzip/unzip.mk +++ b/package/unzip/unzip.mk @@ -4,29 +4,26 @@ # ################################################################################ -UNZIP_VERSION = 60 -UNZIP_SOURCE = unzip$(UNZIP_VERSION).tgz -UNZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src +UNZIP_VERSION = 6.0 +UNZIP_SOURCE = unzip_$(UNZIP_VERSION).orig.tar.gz +UNZIP_PATCH = unzip_$(UNZIP_VERSION)-26.debian.tar.xz +UNZIP_SITE = https://snapshot.debian.org/archive/debian/20210110T204103Z/pool/main/u/unzip UNZIP_LICENSE = Info-ZIP UNZIP_LICENSE_FILES = LICENSE +UNZIP_CPE_ID_VENDOR = unzip_project -UNZIP_PATCH = \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/07-increase-size-of-cfactorstr.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/08-allow-greater-hostver-values.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/09-cve-2014-8139-crc-overflow.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/10-cve-2014-8140-test-compr-eb.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/11-cve-2014-8141-getzip64data.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/12-cve-2014-9636-test-compr-eb.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/14-cve-2015-7696.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/15-cve-2015-7697.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/16-fix-integer-underflow-csiz-decrypted.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/17-restore-unix-timestamps-accurately.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/18-cve-2014-9913-unzip-buffer-overflow.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/19-cve-2016-9844-zipinfo-buffer-overflow.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/20-cve-2018-1000035-unzip-buffer-overflow.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/21-fix-warning-messages-on-big-files.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/22-cve-2019-13232-fix-bug-in-undefer-input.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/24-cve-2019-13232-do-not-raise-alert-for-misplaced-central-directory.patch +# unzip_$(UNZIP_VERSION)-26.debian.tar.xz has patches to fix: +UNZIP_IGNORE_CVES = \ + CVE-2014-8139 \ + CVE-2014-8140 \ + CVE-2014-8141 \ + CVE-2014-9636 \ + CVE-2014-9913 \ + CVE-2015-7696 \ + CVE-2015-7697 \ + CVE-2016-9844 \ + CVE-2018-18384 \ + CVE-2018-1000035 \ + CVE-2019-13232 $(eval $(cmake-package)) diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index fe1d82202d..f585a73d7f 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,5 +1,5 @@ -# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.6.tar.gz.sha256: -sha256 80ed85a323a1721a9e2ceb64923cedbf69c45f22fb9bc6853c9c11b46dc83a1d upmpdcli-1.4.6.tar.gz +# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.5.12.tar.gz.sha256: +sha256 1d7b6ab360c2549a7e3eff4f261471761dd837e18327a3ca29de1981c090ff3b upmpdcli-1.5.12.tar.gz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 67d805f0cc..d1c0aef912 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 1.4.6 +UPMPDCLI_VERSION = 1.5.12 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = LGPL-2.1+ UPMPDCLI_LICENSE_FILES = COPYING diff --git a/package/upower/Config.in b/package/upower/Config.in index e564384348..612a2b74b9 100644 --- a/package/upower/Config.in +++ b/package/upower/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_UPOWER bool "upower" depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_HAS_THREADS # libgudev, libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_MMU # libgudev depends on BR2_USE_WCHAR # libgudev select BR2_PACKAGE_LIBGUDEV @@ -22,6 +23,7 @@ comment "upower needs udev /dev management" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV -comment "upower needs a toolchain w/ threads, wchar" +comment "upower needs a toolchain w/ threads, wchar, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/upx/upx.hash b/package/upx/upx.hash index cc7fb66c97..7f3698ca0d 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 527ce757429841f51675352b1f9f6fc8ad97b18002080d7bf8672c466d8c6a3c upx-3.91-src.tar.bz2 +sha256 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714 upx-3.96-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index 1fe7162c21..e693a70db1 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,21 +4,23 @@ # ################################################################################ -UPX_VERSION = 3.91 -UPX_SITE = http://upx.sourceforge.net/download -UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.bz2 +UPX_VERSION = 3.96 +UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) +UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING +UPX_CPE_ID_VENDOR = upx_project + +# 0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch +UPX_IGNORE_CVES += CVE-2021-20285 HOST_UPX_DEPENDENCIES = host-ucl host-zlib # We need to specify all, otherwise the default target only prints a message # stating to "please choose a target for 'make'"... :-( define HOST_UPX_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) CPPFLAGS="$(HOST_CPPFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" UPX_UCLDIR=$(HOST_DIR) \ - CXXFLAGS_WERROR= \ - -C $(@D) all + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + UPX_UCLDIR=$(HOST_DIR) CXXFLAGS_WERROR= -C $(@D) all endef # UPX has no install procedure, so install it manually. diff --git a/package/usb_modeswitch/Config.in b/package/usb_modeswitch/Config.in index 579761c040..ecb043a146 100644 --- a/package/usb_modeswitch/Config.in +++ b/package/usb_modeswitch/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_USB_MODESWITCH bool "usb_modeswitch" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_JIMTCL if !BR2_PACKAGE_TCL || BR2_PACKAGE_TCL_SHLIB_ONLY select BR2_PACKAGE_LIBUSB help @@ -20,5 +21,6 @@ config BR2_PACKAGE_USB_MODESWITCH http://www.draisberghof.de/usb_modeswitch/ -comment "usb_modeswitch needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "usb_modeswitch needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/usb_modeswitch/usb_modeswitch.hash b/package/usb_modeswitch/usb_modeswitch.hash index 4cbd5dbea2..765a2438c2 100644 --- a/package/usb_modeswitch/usb_modeswitch.hash +++ b/package/usb_modeswitch/usb_modeswitch.hash @@ -1,5 +1,5 @@ -# From http://www.draisberghof.de/usb_modeswitch/ -md5 be73dcc84025794081a1d4d4e5a75e4c usb-modeswitch-2.6.0.tar.bz2 +# From https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-versions.xml +md5 69d00d6ed7097b97d972a159d14cfba1 usb-modeswitch-2.6.1.tar.bz2 # Locally calculated -sha256 c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3 usb-modeswitch-2.6.0.tar.bz2 -sha256 6195429209313925c0eba6c0da4ee7a6cb4277b99e35c886913f80f91ec20b94 COPYING +sha256 5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34 usb-modeswitch-2.6.1.tar.bz2 +sha256 6195429209313925c0eba6c0da4ee7a6cb4277b99e35c886913f80f91ec20b94 COPYING diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index 7e9ed422b6..f2ee004b42 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_VERSION = 2.6.0 +USB_MODESWITCH_VERSION = 2.6.1 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb @@ -17,12 +17,11 @@ USB_MODESWITCH_BUILD_TARGETS = all USB_MODESWITCH_INSTALL_TARGETS = install-script else USB_MODESWITCH_DEPENDENCIES += jimtcl +USB_MODESWITCH_INSTALL_TARGETS = install-common ifeq ($(BR2_STATIC_LIBS),y) USB_MODESWITCH_BUILD_TARGETS = all-with-statlink-dispatcher -USB_MODESWITCH_INSTALL_TARGETS = install-statlink else USB_MODESWITCH_BUILD_TARGETS = all-with-dynlink-dispatcher -USB_MODESWITCH_INSTALL_TARGETS = install-dynlink endif endif diff --git a/package/usb_modeswitch_data/Config.in b/package/usb_modeswitch_data/Config.in index 95b2a073bd..6da7d3bb0f 100644 --- a/package/usb_modeswitch_data/Config.in +++ b/package/usb_modeswitch_data/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_USB_MODESWITCH_DATA bool "usb_modeswitch_data" depends on BR2_TOOLCHAIN_HAS_THREADS # usb_modeswitch -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # usb_modeswitch -> libusb select BR2_PACKAGE_USB_MODESWITCH help USB mode switch data @@ -9,5 +10,6 @@ config BR2_PACKAGE_USB_MODESWITCH_DATA http://www.draisberghof.de/usb_modeswitch/ -comment "usb_modeswitch_data needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "usb_modeswitch_data needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/usbredir/Config.in b/package/usbredir/Config.in index 78b0bff6e4..8ce180a884 100644 --- a/package/usbredir/Config.in +++ b/package/usbredir/Config.in @@ -1,9 +1,11 @@ -comment "usbredir needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "usbredir needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_USBREDIR bool "usbredir" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help usbredir is the name of a network protocol for sending usb diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in index 923853af04..a38eb2f2e5 100644 --- a/package/usbutils/Config.in +++ b/package/usbutils/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_USBUTILS bool "usbutils" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_PACKAGE_HAS_UDEV # needs hwdb select BR2_PACKAGE_LIBUSB help @@ -8,5 +9,7 @@ config BR2_PACKAGE_USBUTILS http://linux-usb.sourceforge.net/ -comment "usbutils needs udev /dev management and toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_HAS_UDEV +comment "usbutils needs udev /dev management and toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_PACKAGE_HAS_UDEV || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/usbutils/usbutils.hash b/package/usbutils/usbutils.hash index 4404913193..96426aeea2 100644 --- a/package/usbutils/usbutils.hash +++ b/package/usbutils/usbutils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc -sha256 88634625f91840bc1993d2731cc081ee8d3b13d56069a95bdd6ac6ef0e063e46 usbutils-012.tar.xz +sha256 9e23494fcc78b7a80ee29a07dd179c95ae2f71509c35728dbbabc2d1cca41338 usbutils-013.tar.xz # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0.txt -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0.txt +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0.txt diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 2389386e50..ef5fd12013 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBUTILS_VERSION = 012 +USBUTILS_VERSION = 013 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils USBUTILS_DEPENDENCIES = host-pkgconf libusb udev diff --git a/package/ushare/ushare.hash b/package/ushare/ushare.hash index 03c675f094..013b247951 100644 --- a/package/ushare/ushare.hash +++ b/package/ushare/ushare.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665 ushare-1.1a.tar.bz2 +sha256 e4563141a171138900540cc979f205cf666e820f709d47a98521bc77f53a99e6 ushare-2.1.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk index bb194f6374..df9da223ec 100644 --- a/package/ushare/ushare.mk +++ b/package/ushare/ushare.mk @@ -4,9 +4,8 @@ # ################################################################################ -USHARE_VERSION = 1.1a -USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2 -USHARE_SITE = http://ushare.geexbox.org/releases +USHARE_VERSION = 2.1 +USHARE_SITE = $(call github,ddugovic,uShare,v$(USHARE_VERSION)) USHARE_DEPENDENCIES = host-pkgconf libupnp $(TARGET_NLS_DEPENDENCIES) USHARE_LICENSE = GPL-2.0+ USHARE_LICENSE_FILES = COPYING @@ -19,7 +18,12 @@ USHARE_CONF_OPTS = \ --sysconfdir=/etc \ --disable-strip -ifeq ($(BR2_SYSTEM_ENABLE_NLS),) +USHARE_MAKE_OPTS = LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" + +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +USHARE_CONF_OPTS += --enable-nls +USHARE_MAKE_OPTS += GMSGFMT="$(HOST_DIR)/bin/msgfmt" +else USHARE_CONF_OPTS += --disable-nls endif @@ -32,7 +36,7 @@ define USHARE_CONFIGURE_CMDS endef define USHARE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(USHARE_MAKE_OPTS) -C $(@D) endef define USHARE_INSTALL_TARGET_CMDS diff --git a/package/ustream-ssl/ustream-ssl.hash b/package/ustream-ssl/ustream-ssl.hash index ba315f88dc..0c51a977cc 100644 --- a/package/ustream-ssl/ustream-ssl.hash +++ b/package/ustream-ssl/ustream-ssl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 63ecc9d78ef83020a4539a89c8a3690657e7bbe7580ae02cc0e7b4267ffea5cd ustream-ssl-23a3f2830341acd1db149175baf7315a33bd0edb.tar.gz -sha256 90dd1590cf400a548438e2575e1ff46d8fb8cebae7d09f544aae7e059e30b6c5 ustream-ssl.h +sha256 e77e579b718085c1447339e0fcd5385b85a783d5c92544e48a6b37b1695a7f39 ustream-ssl-68d09243b6fd4473004b27ff6483352e76e6af1a-br1.tar.gz +sha256 cf28f0f01a57423983fa062eb0f04bb1a78891863cb58c53059c3d8cb52c1dd4 ustream-ssl.h diff --git a/package/ustream-ssl/ustream-ssl.mk b/package/ustream-ssl/ustream-ssl.mk index 7804eb5d38..bee8d7de15 100644 --- a/package/ustream-ssl/ustream-ssl.mk +++ b/package/ustream-ssl/ustream-ssl.mk @@ -4,8 +4,9 @@ # ################################################################################ -USTREAM_SSL_VERSION = 23a3f2830341acd1db149175baf7315a33bd0edb -USTREAM_SSL_SITE = git://git.openwrt.org/project/ustream-ssl.git +USTREAM_SSL_VERSION = 68d09243b6fd4473004b27ff6483352e76e6af1a +USTREAM_SSL_SITE = https://git.openwrt.org/project/ustream-ssl.git +USTREAM_SSL_SITE_METHOD = git USTREAM_SSL_LICENSE = ISC USTREAM_SSL_LICENSE_FILES = ustream-ssl.h USTREAM_SSL_INSTALL_STAGING = YES diff --git a/package/utf8proc/utf8proc.hash b/package/utf8proc/utf8proc.hash index da85a3c7cc..2deff4e0c5 100644 --- a/package/utf8proc/utf8proc.hash +++ b/package/utf8proc/utf8proc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b2e5d547c1d94762a6d03a7e05cea46092aab68636460ff8648f1295e2cdfbd7 utf8proc-2.4.0.tar.gz -sha256 6acb7a86aca74317c6b4dddc2eadeb53bededb95a94a48c3fcd517f4473a653d LICENSE.md +sha256 4c06a9dc4017e8a2438ef80ee371d45868bda2237a98b26554de7a95406b283b utf8proc-2.6.1.tar.gz +sha256 fbc720fcc90fb44396985646f67e4d19be03e0c0539f7138ed9dc6efba49dc49 LICENSE.md diff --git a/package/utf8proc/utf8proc.mk b/package/utf8proc/utf8proc.mk index 2d60387e70..bedd38ca53 100644 --- a/package/utf8proc/utf8proc.mk +++ b/package/utf8proc/utf8proc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UTF8PROC_VERSION = 2.4.0 +UTF8PROC_VERSION = 2.6.1 UTF8PROC_SITE = $(call github,JuliaStrings,utf8proc,v$(UTF8PROC_VERSION)) UTF8PROC_LICENSE = MIT UTF8PROC_LICENSE_FILES = LICENSE.md diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 996f0cd7fa..1f33eb5514 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -9,6 +9,9 @@ menuconfig BR2_PACKAGE_UTIL_LINUX if BR2_PACKAGE_UTIL_LINUX +config BR2_PACKAGE_UTIL_LINUX_LIBS + bool + config BR2_PACKAGE_UTIL_LINUX_LIBBLKID bool "libblkid" depends on BR2_USE_MMU # fork() @@ -84,15 +87,14 @@ config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH bool "chfn/chsh" depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # linux-pam select BR2_PACKAGE_LINUX_PAM help Change login shell, real user name and information -comment "chfn/chsh needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "chfn/chsh needs a toolchain w/ wchar, locale, dynamic library" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS config BR2_PACKAGE_UTIL_LINUX_CHMEM bool "chmem" diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index f9a3d1e867..3f9fe39818 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,9 +1,9 @@ -# From https://www.kernel.org/pub/linux/utils/util-linux/v2.35/sha256sums.asc -sha256 d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9 util-linux-2.35.1.tar.xz +# From https://www.kernel.org/pub/linux/utils/util-linux/v2.36/sha256sums.asc +sha256 f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f util-linux-2.36.2.tar.xz # License files, locally calculated -sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing -sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause -sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later -sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63 Documentation/licenses/COPYING.ISC -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Documentation/licenses/COPYING.LGPL-2.1-or-later +sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing +sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause +sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later +sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63 Documentation/licenses/COPYING.ISC +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Documentation/licenses/COPYING.LGPL-2.1-or-later diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index b6ccaaa78d..4bc7a11294 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -4,9 +4,11 @@ # ################################################################################ -UTIL_LINUX_VERSION_MAJOR = 2.35 -UTIL_LINUX_VERSION_MINOR = 1 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).$(UTIL_LINUX_VERSION_MINOR) +# When making changes to this file, please check if +# util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. + +UTIL_LINUX_VERSION_MAJOR = 2.36 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) @@ -21,19 +23,17 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \ Documentation/licenses/COPYING.ISC \ Documentation/licenses/COPYING.LGPL-2.1-or-later +UTIL_LINUX_CPE_ID_VENDOR = kernel UTIL_LINUX_INSTALL_STAGING = YES -UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) +UTIL_LINUX_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs) \ + $(TARGET_NLS_DEPENDENCIES) UTIL_LINUX_CONF_OPTS += \ --disable-rpath \ --disable-makeinstall-chown -UTIL_LINUX_LIBS = $(TARGET_NLS_LIBS) - -# system depends on util-linux so we enable systemd support -# (which needs systemd to be installed) -UTIL_LINUX_CONF_OPTS += \ - --without-systemd \ - --with-systemdsystemunitdir=no +UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS) HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -43,6 +43,10 @@ HOST_UTIL_LINUX_CONF_OPTS = \ --with-systemdsystemunitdir=no \ --without-python +ifneq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES)$(BR2_PACKAGE_UTIL_LINUX_CRAMFS)$(BR2_PACKAGE_UTIL_LINUX_FSCK)$(BR2_PACKAGE_UTIL_LINUX_LOSETUP),) +UTIL_LINUX_SELINUX_MODULES = fstools +endif + # Prevent the installation from attempting to move shared libraries from # ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are # the same when merged usr is in use. @@ -50,6 +54,20 @@ ifeq ($(BR2_ROOTFS_MERGED_USR),y) UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +UTIL_LINUX_CONF_OPTS += --with-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system +UTIL_LINUX_DEPENDENCIES += systemd +else +UTIL_LINUX_CONF_OPTS += --without-systemd --with-systemdsystemunitdir=no +endif + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +UTIL_LINUX_CONF_OPTS += --with-udev +UTIL_LINUX_DEPENDENCIES += udev +else +UTIL_LINUX_CONF_OPTS += --without-udev +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) UTIL_LINUX_DEPENDENCIES += ncurses ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) @@ -68,16 +86,12 @@ endif UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses endif -ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) -UTIL_LINUX_DEPENDENCIES += libcap-ng -endif - # Unfortunately, the util-linux does LIBS="" at the end of its # configure script. So we have to pass the proper LIBS value when # calling the configure script to make configure tests pass properly, # and then pass it again at build time. -UTIL_LINUX_CONF_ENV += LIBS="$(UTIL_LINUX_LIBS)" -UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS)" +UTIL_LINUX_CONF_ENV += LIBS="$(UTIL_LINUX_LINK_LIBS)" +UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LINK_LIBS)" ifeq ($(BR2_PACKAGE_LIBSELINUX),y) UTIL_LINUX_DEPENDENCIES += libselinux @@ -92,6 +106,9 @@ define UTIL_LINUX_SELINUX_PAMFILES_TWEAK endef endif +# Used by setpriv +UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBCAP_NG),libcap-ng) + # Used by cramfs utils UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) @@ -172,6 +189,7 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --enable-libblkid \ --enable-libmount \ --enable-libuuid \ + --without-libmagic \ --without-ncurses \ --without-ncursesw \ --without-tinfo @@ -193,6 +211,7 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --disable-nsenter \ --disable-pg \ --disable-rfkill \ + --disable-runuser \ --disable-schedutils \ --disable-setpriv \ --disable-setterm \ @@ -228,7 +247,7 @@ endif ifeq ($(BR2_PACKAGE_READLINE),y) UTIL_LINUX_CONF_OPTS += --with-readline -UTIL_LINUX_LIBS += $(if $(BR2_STATIC_LIBS),-lcurses) +UTIL_LINUX_LINK_LIBS += $(if $(BR2_STATIC_LIBS),-lcurses) UTIL_LINUX_DEPENDENCIES += readline else UTIL_LINUX_CONF_OPTS += --without-readline @@ -241,6 +260,13 @@ else UTIL_LINUX_CONF_OPTS += --without-audit endif +ifeq ($(BR2_PACKAGE_FILE),y) +UTIL_LINUX_CONF_OPTS += --with-libmagic +UTIL_LINUX_DEPENDENCIES += file +else +UTIL_LINUX_CONF_OPTS += --without-libmagic +endif + # Install PAM configuration files ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) define UTIL_LINUX_INSTALL_PAMFILES @@ -266,3 +292,7 @@ UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_GETTY_SYMLINK $(eval $(autotools-package)) $(eval $(host-autotools-package)) + +# Must be included after the autotools-package call, to make sure all variables +# are available +include package/util-linux/util-linux-libs/util-linux-libs.mk diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index c74db9b916..2aeb4732cd 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 578179ee76d010c5c9fb180a1b60e45e9f04968718d62c51ec0f71b43564bab9 uvw-2.3.1_libuv-v1.34.tar.gz -sha256 755b2f245af22830c15b60c54469c0d92fbed42009b0d0074cec4b3959905757 LICENSE +sha256 dd610cb1626b8a7779ed251584bcc0362fb98fcee13e699680f61828a1ba55de uvw-2.9.0_libuv_v1.41.tar.gz +sha256 5de32af2469480cf3261c9781962e0887366666ba8ee1f4a32c386c77fc50c88 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 71b23b2ac1..96375926d9 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.3.1_libuv-v1.34 +UVW_VERSION = 2.9.0_libuv_v1.41 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO @@ -13,8 +13,4 @@ UVW_DEPENDENCIES = libuv UVW_LICENSE = MIT UVW_LICENSE_FILES = LICENSE -# The following CMake variable disables a TRY_RUN call in the -pthread -# test which is not allowed when cross-compiling (for cmake < 3.10) -UVW_CONF_OPTS = -DTHREADS_PTHREAD_ARG=OFF - $(eval $(cmake-package)) diff --git a/package/v4l2loopback/v4l2loopback.hash b/package/v4l2loopback/v4l2loopback.hash index b9d65c821c..f4491e02d0 100644 --- a/package/v4l2loopback/v4l2loopback.hash +++ b/package/v4l2loopback/v4l2loopback.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3f6bb14b80865ec8df557c26fd2c5ba91d726580773a75a62aa2959864ef70ba v4l2loopback-0.12.3.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 e152cd6df6a8add172fb74aca3a9188264823efa5a2317fe960d45880b9406ae v4l2loopback-0.12.5.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/v4l2loopback/v4l2loopback.mk b/package/v4l2loopback/v4l2loopback.mk index 8fa0704989..7701bc3a30 100644 --- a/package/v4l2loopback/v4l2loopback.mk +++ b/package/v4l2loopback/v4l2loopback.mk @@ -4,7 +4,7 @@ # ################################################################################ -V4L2LOOPBACK_VERSION = 0.12.3 +V4L2LOOPBACK_VERSION = 0.12.5 V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,v$(V4L2LOOPBACK_VERSION)) V4L2LOOPBACK_LICENSE = GPL-2.0+ V4L2LOOPBACK_LICENSE_FILES = COPYING diff --git a/package/vala/0001-dont-add-dirty-to-valac-version.patch b/package/vala/0001-dont-add-dirty-to-valac-version.patch index a2a0623369..8d878cd495 100644 --- a/package/vala/0001-dont-add-dirty-to-valac-version.patch +++ b/package/vala/0001-dont-add-dirty-to-valac-version.patch @@ -11,15 +11,18 @@ The effect is that valac gets built as being version x.y.z-dirty, which breaks programs (such as Midori) that explicitly check for valac-x.y.z. Signed-off-by: Simon Dawson +[Fabrice: update for 0.52.4] +Signed-off-by: Fabrice Fontaine diff -Nur a/build-aux/git-version-gen b/build-aux/git-version-gen --- a/build-aux/git-version-gen 2010-08-15 12:49:03.000000000 +0100 +++ b/build-aux/git-version-gen 2012-05-14 10:17:19.977204570 +0100 @@ -135,7 +135,7 @@ - *) # Append the suffix only if there isn't one already. - case $v in - *-dirty) ;; -- *) v="$v-dirty" ;; -+ #*) v="$v-dirty" ;; - esac ;; - esac + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; +- *) v="$v-dirty" ;; ++ #*) v="$v-dirty" ;; + esac ;; + esac + fi diff --git a/package/vala/vala.hash b/package/vala/vala.hash index 319c7ef2f4..7f3a099940 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/vala/0.46/vala-0.46.6.sha256sum -sha256 ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a vala-0.46.6.tar.xz +# From https://download.gnome.org/sources/vala/0.52/vala-0.52.4.sha256sum +sha256 ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31 vala-0.52.4.tar.xz # Locally computed sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 95365faf18..94e18d349b 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -4,12 +4,13 @@ # ################################################################################ -VALA_VERSION_MAJOR = 0.46 -VALA_VERSION = $(VALA_VERSION_MAJOR).6 +VALA_VERSION_MAJOR = 0.52 +VALA_VERSION = $(VALA_VERSION_MAJOR).4 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPL-2.1+ VALA_LICENSE_FILES = COPYING +VALA_CPE_ID_VENDOR = gnome HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2 # Yes, the autoconf script understands ':' as "xsltproc is not diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash index 3c7b98ef2b..648a590ca3 100644 --- a/package/valgrind/valgrind.hash +++ b/package/valgrind/valgrind.hash @@ -1,6 +1,8 @@ -# From http://valgrind.org/downloads/current.html -md5 46e5fbdcbc3502a5976a317a0860a975 valgrind-3.15.0.tar.bz2 +# From https://valgrind.org/downloads/current.html +md5 afe11b5572c3121a781433b7c0ab741b valgrind-3.17.0.tar.bz2 +# locally computed +sha256 ad3aec668e813e40f238995f60796d9590eee64a16dff88421430630e69285a2 valgrind-3.17.0.tar.bz2 # License files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 56976e64523fa1e68db4e6f464f5b2cb89d7d08f54b1d012e317b8db286b3faf COPYING.DOCS +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 56976e64523fa1e68db4e6f464f5b2cb89d7d08f54b1d012e317b8db286b3faf COPYING.DOCS diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 41b2625191..b87e1e518f 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,11 +4,12 @@ # ################################################################################ -VALGRIND_VERSION = 3.15.0 -VALGRIND_SITE = ftp://sourceware.org/pub/valgrind +VALGRIND_VERSION = 3.17.0 +VALGRIND_SITE = https://sourceware.org/pub/valgrind VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2 VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS +VALGRIND_CPE_ID_VENDOR = valgrind VALGRIND_CONF_OPTS = \ --disable-ubsan \ --without-mpicc @@ -63,7 +64,7 @@ VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_INSTALL_UCLIBC_SUPP ifeq ($(BR2_PACKAGE_VALGRIND_MEMCHECK),) define VALGRIND_REMOVE_MEMCHECK - rm -f $(TARGET_DIR)/usr/lib/valgrind/*memcheck* + rm -f $(TARGET_DIR)/usr/libexec/valgrind/*memcheck* endef VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_MEMCHECK @@ -71,7 +72,7 @@ endif ifeq ($(BR2_PACKAGE_VALGRIND_CACHEGRIND),) define VALGRIND_REMOVE_CACHEGRIND - rm -f $(TARGET_DIR)/usr/lib/valgrind/*cachegrind* + rm -f $(TARGET_DIR)/usr/libexec/valgrind/*cachegrind* for i in cg_annotate cg_diff cg_merge; do \ rm -f $(TARGET_DIR)/usr/bin/$$i ; \ done @@ -82,7 +83,7 @@ endif ifeq ($(BR2_PACKAGE_VALGRIND_CALLGRIND),) define VALGRIND_REMOVE_CALLGRIND - rm -f $(TARGET_DIR)/usr/lib/valgrind/*callgrind* + rm -f $(TARGET_DIR)/usr/libexec/valgrind/*callgrind* for i in callgrind_annotate callgrind_control ; do \ rm -f $(TARGET_DIR)/usr/bin/$$i ; \ done @@ -93,7 +94,7 @@ endif ifeq ($(BR2_PACKAGE_VALGRIND_HELGRIND),) define VALGRIND_REMOVE_HELGRIND - rm -f $(TARGET_DIR)/usr/lib/valgrind/*helgrind* + rm -f $(TARGET_DIR)/usr/libexec/valgrind/*helgrind* endef VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_HELGRIND @@ -101,7 +102,7 @@ endif ifeq ($(BR2_PACKAGE_VALGRIND_DRD),) define VALGRIND_REMOVE_DRD - rm -f $(TARGET_DIR)/usr/lib/valgrind/*drd* + rm -f $(TARGET_DIR)/usr/libexec/valgrind/*drd* endef VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_DRD @@ -109,8 +110,8 @@ endif ifeq ($(BR2_PACKAGE_VALGRIND_MASSIF),) define VALGRIND_REMOVE_MASSIF - rm -f $(TARGET_DIR)/usr/lib/valgrind/*massif* - rm -f $(TARGET_DIR)/usr/bin/ms_script + rm -f $(TARGET_DIR)/usr/libexec/valgrind/*massif* + rm -f $(TARGET_DIR)/usr/bin/ms_print endef VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_MASSIF @@ -118,7 +119,7 @@ endif ifeq ($(BR2_PACKAGE_VALGRIND_DHAT),) define VALGRIND_REMOVE_DHAT - rm -f $(TARGET_DIR)/usr/lib/valgrind/*dhat* + rm -f $(TARGET_DIR)/usr/libexec/valgrind/*dhat* endef VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_DHAT @@ -126,7 +127,7 @@ endif ifeq ($(BR2_PACKAGE_VALGRIND_SGCHECK),) define VALGRIND_REMOVE_SGCHECK - rm -f $(TARGET_DIR)/usr/lib/valgrind/*sgcheck* + rm -f $(TARGET_DIR)/usr/libexec/valgrind/*sgcheck* endef VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_SGCHECK @@ -134,7 +135,7 @@ endif ifeq ($(BR2_PACKAGE_VALGRIND_BBV),) define VALGRIND_REMOVE_BBV - rm -f $(TARGET_DIR)/usr/lib/valgrind/*bbv* + rm -f $(TARGET_DIR)/usr/libexec/valgrind/*bbv* endef VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_BBV @@ -142,7 +143,7 @@ endif ifeq ($(BR2_PACKAGE_VALGRIND_LACKEY),) define VALGRIND_REMOVE_LACKEY - rm -f $(TARGET_DIR)/usr/lib/valgrind/*lackey* + rm -f $(TARGET_DIR)/usr/libexec/valgrind/*lackey* endef VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_LACKEY @@ -150,7 +151,7 @@ endif ifeq ($(BR2_PACKAGE_VALGRIND_NULGRIND),) define VALGRIND_REMOVE_NULGRIND - rm -f $(TARGET_DIR)/usr/lib/valgrind/*none* + rm -f $(TARGET_DIR)/usr/libexec/valgrind/*none* endef VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_NULGRIND diff --git a/package/valijson/valijson.hash b/package/valijson/valijson.hash index 6f11000669..e184ccb7c0 100644 --- a/package/valijson/valijson.hash +++ b/package/valijson/valijson.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 77dbebb40dab2e834557c2fcc39122cdb2d0fe26bf591c2b3e0df5a316a45592 valijson-0.2.tar.gz +sha256 2ac881a36f90810b41b66511502dea1e7886137ad31bcfb4e917d929c5028c35 valijson-0.3.tar.gz sha256 1a0f99926a2dbec30eba3db820236d9953fbe3048976923ac24980e655fbe991 LICENSE diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index 31efeede34..e425757d26 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -4,10 +4,11 @@ # ################################################################################ -VALIJSON_VERSION = 0.2 +VALIJSON_VERSION = 0.3 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE +VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO VALIJSON_DEPENDENCIES = boost diff --git a/package/vboot-utils/vboot-utils.hash b/package/vboot-utils/vboot-utils.hash index e2ddf77734..efef776caa 100644 --- a/package/vboot-utils/vboot-utils.hash +++ b/package/vboot-utils/vboot-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d95b64b1f1de4a3ffa5c2e446d7c8e92aa197aee10de24206b2ea2deb5a8b947 vboot-utils-bbdd62f9b030db7ad8eef789aaf58a7ff9a25656.tar.gz +sha256 9cdeaa2e4e1190c0cd200e1b07d394e5d24f57cc0efffdce861d5de934035bf7 vboot-utils-bbdd62f9b030db7ad8eef789aaf58a7ff9a25656-br1.tar.gz sha256 cb9dc8e96aedf9120b6757a60387db10f3c1a8e3fd97bb9d0f11327be5a7ed4d LICENSE diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk index 29337601c4..76d6f352b7 100644 --- a/package/vde2/vde2.mk +++ b/package/vde2/vde2.mk @@ -9,6 +9,8 @@ VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2 VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION) VDE2_LICENSE = GPL-2.0+, LGPL-2.1+, BSD-3-Clause VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde +VDE2_CPE_ID_VENDOR = vde_project +VDE2_CPE_ID_PRODUCT = vde VDE2_INSTALL_STAGING = YES # We touch configure.ac, so we need to autoreconf diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash index 99f6ba822d..3776296aa5 100644 --- a/package/vdr/vdr.hash +++ b/package/vdr/vdr.hash @@ -1,5 +1,3 @@ -# From https://www.linuxtv.org/pipermail/vdr/2019-June/029497.html -md5 b2897fe6b6e6711d512a69642b1b8ec1 vdr-2.4.1.tar.bz2 # Locally computed -sha256 25c3f835c4f3ff92cd2db10c004439ef22c2e895193c77fbe8cc7eac4858a1dc vdr-2.4.1.tar.bz2 -sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING +sha256 27026b78a663758211d15c83a21555e28d91ab640c6d4f6cdd860f2abf1cae84 vdr-2.5.6.tar.gz +sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 83cdede307..251ffb9f04 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -4,22 +4,23 @@ # ################################################################################ -VDR_VERSION = 2.4.1 -VDR_SOURCE = vdr-$(VDR_VERSION).tar.bz2 -VDR_SITE = ftp://ftp.tvdr.de/vdr +VDR_VERSION = 2.5.6 +VDR_SITE = $(call github,vdr-projects,vdr,$(VDR_VERSION)) VDR_LICENSE = GPL-2.0+ VDR_LICENSE_FILES = COPYING +VDR_CPE_ID_VENDOR = tvdr VDR_INSTALL_STAGING = YES VDR_DEPENDENCIES = \ + host-pkgconf \ freetype \ fontconfig \ jpeg \ libcap \ $(TARGET_NLS_DEPENDENCIES) -VDR_INCLUDE_DIRS = -I$(STAGING_DIR)/usr/include/freetype2 VDR_MAKE_FLAGS = \ NO_KBD=yes \ + PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ PLUGINLIBDIR=/usr/lib/vdr \ PREFIX=/usr \ VIDEODIR=/var/lib/vdr @@ -27,8 +28,6 @@ VDR_LDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) VDR_DEPENDENCIES += libfribidi -VDR_INCLUDE_DIRS += -I$(STAGING_DIR)/usr/include/fribidi -VDR_LDFLAGS += -lfribidi VDR_MAKE_FLAGS += BIDI=1 endif @@ -38,7 +37,6 @@ VDR_LDFLAGS += -liconv endif VDR_MAKE_ENV = \ - INCLUDES="$(VDR_INCLUDE_DIRS)" \ LDFLAGS="$(VDR_LDFLAGS)" \ $(VDR_MAKE_FLAGS) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index eb5928e91c..bbe65c4dda 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 8a72323817210daf40abe545bdf7637591b9b541a0fb3560baed76e436132dba vim-8.2.0000.tar.gz -sha256 accdbd6761e7dd7e580545fe30f3a5a7707d50073aec4b8afef85c30fc9c031b README.txt +sha256 ac2264c45684218232ec49a6ae8b88b9a68312b664b93b811868d24c39d8dc11 vim-8.2.3565.tar.gz +sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE +sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 1fbb6a6b86..960759aab4 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.0000 +VIM_VERSION = 8.2.3565 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src @@ -22,7 +22,8 @@ VIM_CONF_ENV = \ # GUI/X11 headers leak from the host so forcibly disable them VIM_CONF_OPTS = --with-tlib=ncurses --enable-gui=no --without-x VIM_LICENSE = Charityware -VIM_LICENSE_FILES = README.txt +VIM_LICENSE_FILES = LICENSE README.txt +VIM_CPE_ID_VENDOR = vim ifeq ($(BR2_PACKAGE_ACL),y) VIM_CONF_OPTS += --enable-acl diff --git a/package/vlc/Config.in b/package/vlc/Config.in index 70e1ca41a1..964b7660af 100644 --- a/package/vlc/Config.in +++ b/package/vlc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_VLC bool "vlc" + depends on !BR2_RISCV_32 depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS @@ -8,7 +9,6 @@ config BR2_PACKAGE_VLC depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS - select BR2_PACKAGE_VLC_OPENCV_BACKEND if BR2_PACKAGE_OPENCV select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3 select BR2_PACKAGE_ZLIB if BR2_PACKAGE_TAGLIB help @@ -18,17 +18,13 @@ config BR2_PACKAGE_VLC http://www.videolan.org/vlc/ -config BR2_PACKAGE_VLC_OPENCV_BACKEND - bool - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT - config BR2_PACKAGE_VLC_OPENCV3_BACKEND bool select BR2_PACKAGE_OPENCV3_LIB_IMGPROC select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, gcc >= 4.9, headers >= 3.7" + depends on !BR2_RISCV_32 depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS \ || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \ diff --git a/package/vlc/vlc.hash b/package/vlc/vlc.hash index d1d3e45b0c..468ec7df35 100644 --- a/package/vlc/vlc.hash +++ b/package/vlc/vlc.hash @@ -1,9 +1,7 @@ -# From http://download.videolan.org/pub/videolan/vlc/3.0.8/vlc-3.0.8.tar.xz.sha256 -sha256 e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6 vlc-3.0.8.tar.xz -# From http://download.videolan.org/pub/videolan/vlc/3.0.8/vlc-3.0.8.tar.xz.sha1 -sha1 424a9795e051c198e7fa28107b15809ee6820d43 vlc-3.0.8.tar.xz -# From http://download.videolan.org/pub/videolan/vlc/3.0.8/vlc-3.0.8.tar.xz.md5 -md5 744442ec0c145453ea1d257914c8072e vlc-3.0.8.tar.xz +# From https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz.sha256 +sha256 ffae35fc64f625c175571d2346bc5f6207be99762517f15423e74f18399410f6 vlc-3.0.16.tar.xz +# From https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz.sha1 +sha1 e22ac839a09b5ead8992ae6aa8ea886364283e6a vlc-3.0.16.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 4b1cd68d8b..06fc650f6f 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -4,11 +4,13 @@ # ################################################################################ -VLC_VERSION = 3.0.8 +VLC_VERSION = 3.0.16 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ VLC_LICENSE_FILES = COPYING COPYING.LIB +VLC_CPE_ID_VENDOR = videolan +VLC_CPE_ID_PRODUCT = vlc_media_player VLC_DEPENDENCIES = host-pkgconf VLC_AUTORECONF = YES @@ -123,6 +125,13 @@ else VLC_CONF_OPTS += --disable-avahi endif +ifeq ($(BR2_PACKAGE_DAV1D),y) +VLC_CONF_OPTS += --enable-dav1d +VLC_DEPENDENCIES += dav1d +else +VLC_CONF_OPTS += --disable-dav1d +endif + ifeq ($(BR2_PACKAGE_DBUS),y) VLC_CONF_OPTS += --enable-dbus VLC_DEPENDENCIES += dbus @@ -202,13 +211,9 @@ else VLC_CONF_OPTS += --disable-gles2 endif -ifeq ($(BR2_PACKAGE_OPENCV)$(BR2_PACKAGE_OPENCV3),y) +ifeq ($(BR2_PACKAGE_OPENCV3),y) VLC_CONF_OPTS += --enable-opencv -ifeq ($(BR2_PACKAGE_OPENCV),y) -VLC_DEPENDENCIES += opencv -else VLC_DEPENDENCIES += opencv3 -endif else VLC_CONF_OPTS += --disable-opencv endif @@ -373,9 +378,9 @@ else VLC_CONF_OPTS += --disable-theora endif -ifeq ($(BR2_PACKAGE_LIBUPNP)$(BR2_PACKAGE_LIBUPNP18),y) +ifeq ($(BR2_PACKAGE_LIBUPNP),y) VLC_CONF_OPTS += --enable-upnp -VLC_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18) +VLC_DEPENDENCIES += libupnp else VLC_CONF_OPTS += --disable-upnp endif @@ -433,6 +438,9 @@ endif ifeq ($(BR2_PACKAGE_LIVE555),y) VLC_CONF_OPTS += --enable-live555 VLC_DEPENDENCIES += live555 +ifneq ($(BR2_PACKAGE_OPENSSL),y) +VLC_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -DNO_OPENSSL" +endif else VLC_CONF_OPTS += --disable-live555 endif @@ -567,4 +575,11 @@ ifeq ($(BR2_PACKAGE_ZLIB),y) VLC_DEPENDENCIES += zlib endif +ifeq ($(BR2_PACKAGE_GNUTLS),y) +VLC_CONF_OPTS += --enable-gnutls +VLC_DEPENDENCIES += gnutls +else +VLC_CONF_OPTS += --disable-gnutls +endif + $(eval $(autotools-package)) diff --git a/package/vnstat/vnstat.hash b/package/vnstat/vnstat.hash index 94b4adc40b..0f269039b1 100644 --- a/package/vnstat/vnstat.hash +++ b/package/vnstat/vnstat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a0955999abd56d5463d257ffdccc9b1e9ad9ea504de81e64ba4c197f1245abaa vnstat-2.4.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 4c28a1d8bc03c2b6e7ab96c876e07dd8ea174b7cad73b7190ecb2b9501e83e9e vnstat-2.7.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/vnstat/vnstat.mk b/package/vnstat/vnstat.mk index f0ef1cc69d..7f5ff67b82 100644 --- a/package/vnstat/vnstat.mk +++ b/package/vnstat/vnstat.mk @@ -4,10 +4,11 @@ # ################################################################################ -VNSTAT_VERSION = 2.4 +VNSTAT_VERSION = 2.7 VNSTAT_SITE = http://humdi.net/vnstat VNSTAT_LICENSE = GPL-2.0 VNSTAT_LICENSE_FILES = COPYING +VNSTAT_SELINUX_MODULES = vnstatd VNSTAT_DEPENDENCIES = host-pkgconf sqlite VNSTAT_CONF_OPTS = --disable-extra-paths diff --git a/package/vorbis-tools/vorbis-tools.hash b/package/vorbis-tools/vorbis-tools.hash index 76122be13f..a4f463e466 100644 --- a/package/vorbis-tools/vorbis-tools.hash +++ b/package/vorbis-tools/vorbis-tools.hash @@ -1,4 +1,4 @@ # From http://downloads.xiph.org/releases/vorbis/SHA256SUMS -sha256 a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc vorbis-tools-1.4.0.tar.gz +sha256 db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0 vorbis-tools-1.4.2.tar.gz # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/vorbis-tools/vorbis-tools.mk b/package/vorbis-tools/vorbis-tools.mk index 407ea975e7..936d2d816c 100644 --- a/package/vorbis-tools/vorbis-tools.mk +++ b/package/vorbis-tools/vorbis-tools.mk @@ -4,20 +4,14 @@ # ################################################################################ -VORBIS_TOOLS_VERSION = 1.4.0 +VORBIS_TOOLS_VERSION = 1.4.2 VORBIS_TOOLS_SITE = http://downloads.xiph.org/releases/vorbis VORBIS_TOOLS_LICENSE = GPL-2.0 VORBIS_TOOLS_LICENSE_FILES = COPYING +VORBIS_TOOLS_CPE_ID_VENDOR = xiph VORBIS_TOOLS_DEPENDENCIES = libao libogg libvorbis libcurl VORBIS_TOOLS_CONF_OPTS = --program-transform-name='' -# 0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch -VORBIS_TOOLS_IGNORE_CVES += CVE-2015-6749 -# 0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch -VORBIS_TOOLS_IGNORE_CVES += CVE-2014-9638 CVE-2014-9639 -# 0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch -VORBIS_TOOLS_IGNORE_CVES += CVE-2014-9640 - # ogg123 calls math functions but forgets to link with libm VORBIS_TOOLS_CONF_ENV = LIBS=-lm @@ -25,6 +19,10 @@ ifeq ($(BR2_PACKAGE_FLAC),y) VORBIS_TOOLS_DEPENDENCIES += flac endif +ifeq ($(BR2_PACKAGE_OPUSFILE),y) +VORBIS_TOOLS_DEPENDENCIES += opusfile +endif + ifeq ($(BR2_PACKAGE_SPEEX),y) VORBIS_TOOLS_DEPENDENCIES += speex endif diff --git a/package/vpnc/vpnc.hash b/package/vpnc/vpnc.hash index f512a77792..a1b3b3b200 100644 --- a/package/vpnc/vpnc.hash +++ b/package/vpnc/vpnc.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 c10a5c2c0813198ca2404dd36db380cdb6395b46338123b341775095cf61521d vpnc-b1243d29e0c00312ead038b04a2cf5e2fa31d740.tar.gz +sha256 5929d3b7f72970c8f7850e0daba0d9d05aaaa1281c69f58ac8647be11385ede5 vpnc-0.5.3r550-2jnpr1.tar.gz sha256 bf3ec1bd1dec31a6ab8980bfd04569f506432f35ee01e88a3910847784bc2de1 COPYING diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk index 81cd830ead..8db5e766c1 100644 --- a/package/vpnc/vpnc.mk +++ b/package/vpnc/vpnc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VPNC_VERSION = b1243d29e0c00312ead038b04a2cf5e2fa31d740 +VPNC_VERSION = 0.5.3r550-2jnpr1 VPNC_SITE = $(call github,ndpgroup,vpnc,$(VPNC_VERSION)) VPNC_LICENSE = GPL-2.0+ VPNC_LICENSE_FILES = COPYING diff --git a/package/vsftpd/S70vsftpd b/package/vsftpd/S70vsftpd index 38bcfd431f..62f9a1b744 100644 --- a/package/vsftpd/S70vsftpd +++ b/package/vsftpd/S70vsftpd @@ -9,12 +9,12 @@ DAEMON=/usr/sbin/$NAME case "$1" in start) printf "Starting $DESC: " - start-stop-daemon -S -b -x $NAME + start-stop-daemon -S -b -x $DAEMON echo "OK" ;; stop) printf "Stopping $DESC: " - start-stop-daemon -K -x $NAME + start-stop-daemon -K -x $DAEMON echo "OK" ;; restart|force-reload) diff --git a/package/vsftpd/vsftpd.hash b/package/vsftpd/vsftpd.hash index 955cd30889..485e5ba2f0 100644 --- a/package/vsftpd/vsftpd.hash +++ b/package/vsftpd/vsftpd.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7 vsftpd-3.0.3.tar.gz +sha256 26b602ae454b0ba6d99ef44a09b6b9e0dfa7f67228106736df1f278c70bc91d3 vsftpd-3.0.5.tar.gz # Locally computed sha256 c9cf119e2f9dbcf187fb805ba5aded105db26a693803636fb7228c98460ffbf2 COPYING diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index 2f86d91ba2..3e7b233e48 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -4,11 +4,13 @@ # ################################################################################ -VSFTPD_VERSION = 3.0.3 +VSFTPD_VERSION = 3.0.5 VSFTPD_SITE = https://security.appspot.com/downloads VSFTPD_LIBS = -lcrypt VSFTPD_LICENSE = GPL-2.0 VSFTPD_LICENSE_FILES = COPYING +VSFTPD_CPE_ID_VENDOR = vsftpd_project +VSFTPD_SELINUX_MODULES = ftp define VSFTPD_DISABLE_UTMPX $(SED) 's/.*VSF_BUILD_UTMPX/#undef VSF_BUILD_UTMPX/' $(@D)/builddefs.h @@ -47,6 +49,11 @@ define VSFTPD_USERS ftp -1 ftp -1 * /home/ftp - - Anonymous FTP User endef +define VSFTPD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 package/vsftpd/vsftpd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/vsftpd.service +endef + define VSFTPD_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/vsftpd/S70vsftpd $(TARGET_DIR)/etc/init.d/S70vsftpd endef diff --git a/package/vte/Config.in b/package/vte/Config.in index fa29de8c71..96de3d38cc 100644 --- a/package/vte/Config.in +++ b/package/vte/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_VTE bool "vte" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # libgtk3 -> host-libgtk3 -> host-librsvg depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU @@ -22,6 +23,7 @@ config BR2_PACKAGE_VTE http://github.com/GNOME/vte comment "vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ @@ -29,6 +31,7 @@ comment "vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND && \ diff --git a/package/vtun/Config.in b/package/vtun/Config.in index d63e7c76ef..eca6f67946 100644 --- a/package/vtun/Config.in +++ b/package/vtun/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_VTUN depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LZO select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_ZLIB help Tool for easily creating Virtual Tunnels over TCP/IP networks diff --git a/package/vuejs/vuejs.hash b/package/vuejs/vuejs.hash index d2b30b8d34..db4a5bbe3e 100644 --- a/package/vuejs/vuejs.hash +++ b/package/vuejs/vuejs.hash @@ -1,3 +1,2 @@ # Locally computed -sha256 7ee4d5e4ec7d44fb9918ecb074ad7701eb0bcb3a840cee3c2924734ef3fd888a v2.6.11.tar.gz -sha256 17fb24bc303763f3fe1911ee24e5225c7ad59f0e3a5d8123e9b730c100a306a6 LICENSE +sha256 a69f04bf138af09a956150675151edb9354aeec8bd627c21cbcfa646248214fa vue-3.0.5.tgz diff --git a/package/vuejs/vuejs.mk b/package/vuejs/vuejs.mk index f7e197c4af..43b45e00b7 100644 --- a/package/vuejs/vuejs.mk +++ b/package/vuejs/vuejs.mk @@ -4,15 +4,14 @@ # ################################################################################ -VUEJS_VERSION = 2.6.11 -VUEJS_SOURCE = v$(VUEJS_VERSION).tar.gz -VUEJS_SITE = https://github.com/vuejs/vue/archive +VUEJS_VERSION = 3.0.5 +VUEJS_SOURCE = vue-$(VUEJS_VERSION).tgz +VUEJS_SITE = https://registry.npmjs.org/vue/- VUEJS_LICENSE = MIT -VUEJS_LICENSE_FILES = LICENSE # Install .min.js as .js define VUEJS_INSTALL_TARGET_CMDS - $(INSTALL) -m 644 -D $(@D)/dist/vue.min.js \ + $(INSTALL) -m 644 -D $(@D)/dist/vue.global.prod.js \ $(TARGET_DIR)/var/www/vue.js endef diff --git a/package/waf/waf.hash b/package/waf/waf.hash index 572562cf92..e9d387e7d0 100644 --- a/package/waf/waf.hash +++ b/package/waf/waf.hash @@ -1,3 +1,7 @@ # Locally computed -sha1 d857c29d49848e0fc42e69daa25e0ec2e732ac17 waf-2.0.19 -sha256 ba63c90a865a9bcf46926c4e6776f9a3f73d29f33d49b7f61f96bc37b7397cef waf-2.0.19 +sha1 494ada411468129ed229f946ecec3048400e320b waf-2.0.22 +sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf-2.0.22 + +# The waf script also contains its license, but is renamed `waf` in the extract +# step, so this is a synonym for the above, to check WAF_LICENSE +sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf diff --git a/package/waf/waf.mk b/package/waf/waf.mk index ae3eb0f1ed..5cc0dc3714 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -4,9 +4,11 @@ # ################################################################################ -WAF_VERSION = 2.0.19 +WAF_VERSION = 2.0.22 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io +WAF_LICENSE = BSD-3-Clause +WAF_LICENSE_FILES = waf define HOST_WAF_EXTRACT_CMDS $(INSTALL) -D -m 0755 $(HOST_WAF_DL_DIR)/waf-$(WAF_VERSION) $(@D)/waf diff --git a/package/waffle/waffle.hash b/package/waffle/waffle.hash index f496927e32..84821312c1 100644 --- a/package/waffle/waffle.hash +++ b/package/waffle/waffle.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d662f6743f688dc5ea4b7d29f558eb54bd8f57350080f04a006693d22e5d1d5b waffle-1.5.2.tar.gz -sha256 630844d1911c8a1b7b888a1de9097c4860b7e381362fd5aa64141d58ab7ecc9b LICENSE.txt +sha256 234e65bdd2dd8f7d3bc8e9ad1a7cc80fce78a1deed3a04fe7f1d2c2edac0cd8a waffle-v1.6.1.tar.bz2 +sha256 630844d1911c8a1b7b888a1de9097c4860b7e381362fd5aa64141d58ab7ecc9b LICENSE.txt diff --git a/package/waffle/waffle.mk b/package/waffle/waffle.mk index 280e295cb3..3340dc1c60 100644 --- a/package/waffle/waffle.mk +++ b/package/waffle/waffle.mk @@ -4,8 +4,9 @@ # ################################################################################ -WAFFLE_VERSION = 1.5.2 -WAFFLE_SITE = $(call github,waffle-gl,waffle,v$(WAFFLE_VERSION)) +WAFFLE_VERSION = 1.6.1 +WAFFLE_SOURCE = waffle-v$(WAFFLE_VERSION).tar.bz2 +WAFFLE_SITE = https://gitlab.freedesktop.org/mesa/waffle/-/archive/v$(WAFFLE_VERSION) WAFFLE_INSTALL_STAGING = YES WAFFLE_LICENSE = BSD-2-Clause WAFFLE_LICENSE_FILES = LICENSE.txt @@ -15,7 +16,8 @@ WAFFLE_DEPENDENCIES = host-pkgconf WAFFLE_CONF_OPTS = -Dwaffle_build_tests=OFF \ -Dwaffle_build_examples=OFF \ -Dwaffle_build_manpages=OFF \ - -Dwaffle_build_htmldocs=OFF + -Dwaffle_build_htmldocs=OFF \ + -Dwaffle_has_nacl=OFF ifeq ($(BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND),y) WAFFLE_DEPENDENCIES += libegl wayland @@ -45,4 +47,15 @@ else WAFFLE_CONF_OPTS += -Dwaffle_has_gbm=OFF endif +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +WAFFLE_DEPENDENCIES += bash-completion +endif + +ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy) +WAFFLE_DEPENDENCIES += mesa3d +WAFFLE_CONF_OPTS += -Dwaffle_has_surfaceless_egl=ON +else +WAFFLE_CONF_OPTS += -Dwaffle_has_surfaceless_egl=OFF +endif + $(eval $(cmake-package)) diff --git a/package/wampcc/wampcc.mk b/package/wampcc/wampcc.mk index 5e7ee03651..11bb1f90b5 100644 --- a/package/wampcc/wampcc.mk +++ b/package/wampcc/wampcc.mk @@ -13,7 +13,7 @@ WAMPCC_LICENSE_FILES = LICENSE # Uses __atomic_fetch_add_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -WAMPCC_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +WAMPCC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif $(eval $(cmake-package)) diff --git a/package/wavemon/wavemon.mk b/package/wavemon/wavemon.mk index 3ae1141ec4..d2af6c2bc0 100644 --- a/package/wavemon/wavemon.mk +++ b/package/wavemon/wavemon.mk @@ -13,4 +13,11 @@ WAVEMON_DEPENDENCIES = host-pkgconf libnl ncurses # Handwritten Makefile.in, automake isn't used WAVEMON_MAKE_OPTS = CC="$(TARGET_CC)" +ifeq ($(BR2_PACKAGE_LIBCAP),y) +WAVEMON_CONF_OPTS += --with-libcap +WAVEMON_DEPENDENCIES += libcap +else +WAVEMON_CONF_OPTS += --without-libcap +endif + $(eval $(autotools-package)) diff --git a/package/wavpack/wavpack.hash b/package/wavpack/wavpack.hash index 6b1f90a1fe..abc9ab6905 100644 --- a/package/wavpack/wavpack.hash +++ b/package/wavpack/wavpack.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 77e5b1cfa26e387e4275b362f0c3fb9a27106447d9bce00f9f794f30badb77e3 wavpack-5.2.0.tar.xz -sha256 2ab58075e26305cc16920e9867c1d43f46ce81adab2051100dd316a3a93a2619 COPYING +sha256 4bde6a6b2a86614a6bd2579e60dcc974e2c8f93608d2281110a717c1b3c28b79 wavpack-5.4.0.tar.xz +sha256 f38defde000d62c4ff158f1445cb85a0c2f67cbc1d3cfa34ed882f439f6e3b43 COPYING diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 8cb7754b2b..485ab9b2ae 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAVPACK_VERSION = 5.2.0 +WAVPACK_VERSION = 5.4.0 WAVPACK_SITE = \ https://github.com/dbry/WavPack/releases/download/$(WAVPACK_VERSION) WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.xz @@ -12,6 +12,7 @@ WAVPACK_INSTALL_STAGING = YES WAVPACK_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv) WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING +WAVPACK_CPE_ID_VENDOR = wavpack ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index ed60d1c995..84028b97d5 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -5,7 +5,7 @@ ################################################################################ WAYLAND_PROTOCOLS_VERSION = 1.20 -WAYLAND_PROTOCOLS_SITE = http://wayland.freedesktop.org/releases +WAYLAND_PROTOCOLS_SITE = https://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT WAYLAND_PROTOCOLS_LICENSE_FILES = COPYING diff --git a/package/wayland/Config.in b/package/wayland/Config.in index 32718fc2b2..c22d9c7ef5 100644 --- a/package/wayland/Config.in +++ b/package/wayland/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_WAYLAND to talk to its clients as well as a library implementation of the protocol. - http://wayland.freedesktop.org/ + https://wayland.freedesktop.org/ comment "wayland needs a toolchain w/ threads, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash index 8774101884..e9dcb63a90 100644 --- a/package/wayland/wayland.hash +++ b/package/wayland/wayland.hash @@ -1,8 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2019-March/040335.html -md5 d91f970aea11fd549eae023d06f91af3 wayland-1.17.0.tar.xz -sha1 4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600 wayland-1.17.0.tar.xz -sha256 72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4 wayland-1.17.0.tar.xz -sha512 c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 wayland-1.17.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2021-January/041692.html +sha256 baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15 wayland-1.19.0.tar.xz +sha512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef wayland-1.19.0.tar.xz # Locally calculated -sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING +sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk index e325c6d752..ecfe95d68a 100644 --- a/package/wayland/wayland.mk +++ b/package/wayland/wayland.mk @@ -4,21 +4,18 @@ # ################################################################################ -WAYLAND_VERSION = 1.17.0 -WAYLAND_SITE = http://wayland.freedesktop.org/releases +WAYLAND_VERSION = 1.19.0 +WAYLAND_SITE = https://wayland.freedesktop.org/releases WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT WAYLAND_LICENSE_FILES = COPYING +WAYLAND_CPE_ID_VENDOR = wayland WAYLAND_INSTALL_STAGING = YES WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2 -# 0002-configure-add-option-to-disable-tests.patch -WAYLAND_AUTORECONF = YES - -# wayland-scanner is only needed for building, not on the target -WAYLAND_CONF_OPTS = --with-host-scanner --disable-tests -HOST_WAYLAND_CONF_OPTS = --disable-tests +WAYLAND_CONF_OPTS = -Dtests=false -Ddocumentation=false +HOST_WAYLAND_CONF_OPTS = -Dtests=false -Ddocumentation=false # Remove the DTD from the target, it's not needed at runtime define WAYLAND_TARGET_CLEANUP @@ -26,5 +23,5 @@ define WAYLAND_TARGET_CLEANUP endef WAYLAND_POST_INSTALL_TARGET_HOOKS += WAYLAND_TARGET_CLEANUP -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/waylandpp/Config.in b/package/waylandpp/Config.in index 3d7362b3c0..86ca965056 100644 --- a/package/waylandpp/Config.in +++ b/package/waylandpp/Config.in @@ -3,14 +3,16 @@ config BR2_PACKAGE_WAYLANDPP depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND depends on BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_WAYLAND help Wayland C++ bindings https://github.com/NilsBrause/waylandpp -comment "waylandpp needs an OpenGL-EGL/wayland backend, a toolchain w/ gcc >= 4.9, host gcc >= 4.9" +comment "waylandpp needs an OpenGL-EGL/wayland backend, a toolchain w/ gcc >= 4.9, host gcc >= 4.9, C++ support" depends on BR2_PACKAGE_WAYLAND depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ !BR2_HOST_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_INSTALL_LIBSTDCPP diff --git a/package/waylandpp/waylandpp.hash b/package/waylandpp/waylandpp.hash index 39ea3e1708..1b806af9b0 100644 --- a/package/waylandpp/waylandpp.hash +++ b/package/waylandpp/waylandpp.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 fa31b659a6bb93b322e1068831c9a0135a4687d8ef9ceb2e7660c909ce10bfa6 waylandpp-0.2.7.tar.gz -sha256 8ff91f682a38f8a603b173222a60e8dc71754a79a522a316fb6b76ce138c542c LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 scanner/gpl-3.0.txt +sha256 e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d waylandpp-0.2.8.tar.gz +sha256 8ff91f682a38f8a603b173222a60e8dc71754a79a522a316fb6b76ce138c542c LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 scanner/gpl-3.0.txt diff --git a/package/waylandpp/waylandpp.mk b/package/waylandpp/waylandpp.mk index 8630b05bb3..45d9ccd528 100644 --- a/package/waylandpp/waylandpp.mk +++ b/package/waylandpp/waylandpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLANDPP_VERSION = 0.2.7 +WAYLANDPP_VERSION = 0.2.8 WAYLANDPP_SITE = $(call github,NilsBrause,waylandpp,$(WAYLANDPP_VERSION)) WAYLANDPP_LICENSE = MIT, GPL-3.0+ (wayland_scanner) WAYLANDPP_LICENSE_FILES = LICENSE scanner/gpl-3.0.txt diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 86f58821a3..425bf81e4e 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -12,18 +12,24 @@ 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 glibc toolchain w/ C++, gcc >= 7" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, 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_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU config BR2_PACKAGE_WEBKITGTK bool "webkitgtk" + depends on !BR2_STATIC_LIBS # wayland + depends on !BR2_BINFMT_FLAT # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS select BR2_PACKAGE_CAIRO @@ -96,8 +102,11 @@ config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX select BR2_PACKAGE_GST1_LIBAV help This option pulls in all of the required dependencies @@ -108,7 +117,7 @@ if BR2_PACKAGE_WEBKITGTK_MULTIMEDIA config BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL bool "use gstreamer-gl" default y - depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM help Use the GStreamer GL elements for handling video content. This is recommended as it improves performance of video diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index b63a734e3d..7cb6c90b21 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.28.0.tar.xz.sums -md5 0bf11df8117ea64f6b8de59d278a2c78 webkitgtk-2.28.0.tar.xz -sha1 927d0922b986fd06567015ce4425ed05d9fca209 webkitgtk-2.28.0.tar.xz -sha256 361f3d178f62a9c112cbadfedd46106c34455c26d57a12a28fb3b09178d20e8b webkitgtk-2.28.0.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.32.4.tar.xz.sums +md5 51a167e5d03bacf30c5c588e6aa23143 webkitgtk-2.32.4.tar.xz +sha1 f7255ffb488e727e9e250e0dae9f192266f50f01 webkitgtk-2.32.4.tar.xz +sha256 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd webkitgtk-2.32.4.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 2578847b05..6687d7f61b 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.28.0 +WEBKITGTK_VERSION = 2.32.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -12,11 +12,13 @@ WEBKITGTK_LICENSE = LGPL-2.1+, BSD-2-Clause WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 +WEBKITGTK_CPE_ID_VENDOR = webkitgtk WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ + -DENABLE_GAMEPAD=OFF \ -DENABLE_GEOLOCATION=OFF \ -DENABLE_GTKDOC=OFF \ -DENABLE_INTROSPECTION=OFF \ @@ -66,7 +68,7 @@ ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_ACCELERATED_2D_CANVAS=ON \ -DENABLE_GLES2=OFF \ - -DENABLE_OPENGL=ON \ + -DENABLE_GRAPHICS_CONTEXT_GL=ON \ -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt @@ -84,13 +86,13 @@ WEBKITGTK_DEPENDENCIES += libegl ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_GLES2=ON \ - -DENABLE_OPENGL=ON + -DENABLE_GRAPHICS_CONTEXT_GL=ON WEBKITGTK_DEPENDENCIES += libgles else # Disable general OpenGL (shading) if there's no GLESv2 WEBKITGTK_CONF_OPTS += \ -DENABLE_GLES2=OFF \ - -DENABLE_OPENGL=OFF + -DENABLE_GRAPHICS_CONTEXT_GL=OFF endif # We must explicitly state the wayland target ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) @@ -104,13 +106,25 @@ else WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF endif +ifeq ($(BR2_INIT_SYSTEMD),y) +WEBKITGTK_CONF_OPTS += -DUSE_SYSTEMD=ON +WEBKITGTK_DEPENDENCIES += systemd +else +WEBKITGTK_CONF_OPTS += -DUSE_SYSTEMD=OFF +endif + # JIT is not supported for MIPS r6, but the WebKit build system does not -# have a check for these processors. Disable JIT forcibly here and use -# the CLoop interpreter instead. +# have a check for these processors. The same goes for ARMv5 and ARMv6. +# Disable JIT forcibly here and use the CLoop interpreter instead. # -# Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=191258 -ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON +# Also, we have to disable the sampling profiler, which does NOT work +# with ENABLE_C_LOOP. +# +# Upstream bugs: https://bugs.webkit.org/show_bug.cgi?id=191258 +# https://bugs.webkit.org/show_bug.cgi?id=172765 +# +ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif $(eval $(cmake-package)) diff --git a/package/webp/webp.hash b/package/webp/webp.hash index a2d0000266..24cec6dfa3 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043 libwebp-1.1.0.tar.gz -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING +sha256 2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c libwebp-1.2.0.tar.gz +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/package/webp/webp.mk b/package/webp/webp.mk index 4a94554984..ecf26faa31 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,11 +4,13 @@ # ################################################################################ -WEBP_VERSION = 1.1.0 +WEBP_VERSION = 1.2.0 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause WEBP_LICENSE_FILES = COPYING +WEBP_CPE_ID_VENDOR = webmproject +WEBP_CPE_ID_PRODUCT = libwebp WEBP_INSTALL_STAGING = YES WEBP_CONF_OPTS += \ diff --git a/package/websocketpp/websocketpp.hash b/package/websocketpp/websocketpp.hash index 8bf671d96e..e4d0c929d5 100644 --- a/package/websocketpp/websocketpp.hash +++ b/package/websocketpp/websocketpp.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 178899de48c02853b55b1ea8681599641cedcdfce59e56beaff3dd0874bf0286 websocketpp-0.8.1.tar.gz +sha256 6ce889d85ecdc2d8fa07408d6787e7352510750daa66b5ad44aacb47bea76755 websocketpp-0.8.2.tar.gz sha256 b31e597bc777d884a39663c11d0557a0af40780e1f451de11ea5103924a69667 COPYING diff --git a/package/websocketpp/websocketpp.mk b/package/websocketpp/websocketpp.mk index 47da4dbe2f..59b365aa54 100644 --- a/package/websocketpp/websocketpp.mk +++ b/package/websocketpp/websocketpp.mk @@ -4,10 +4,11 @@ # ################################################################################ -WEBSOCKETPP_VERSION = 0.8.1 +WEBSOCKETPP_VERSION = 0.8.2 WEBSOCKETPP_SITE = $(call github,zaphoyd,websocketpp,$(WEBSOCKETPP_VERSION)) WEBSOCKETPP_LICENSE = BSD-3c, MIT, Zlib WEBSOCKETPP_LICENSE_FILES = COPYING +WEBSOCKETPP_CPE_ID_VENDOR = zaphoyd WEBSOCKETPP_INSTALL_STAGING = YES # Only installs headers WEBSOCKETPP_INSTALL_TARGET = NO diff --git a/package/weston/Config.in b/package/weston/Config.in index bf783b70d4..8f3dbc7931 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_LIBDRM # Runtime dependency select BR2_PACKAGE_XKEYBOARD_CONFIG + select BR2_PACKAGE_WESTON_SHELL_DESKTOP if !BR2_PACKAGE_WESTON_HAS_SHELL help Weston is the reference implementation of a Wayland compositor, and a useful compositor in its own right. @@ -39,11 +40,11 @@ config BR2_PACKAGE_WESTON_DEFAULT_FBDEV config BR2_PACKAGE_WESTON_DEFAULT_DRM bool "drm" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL select BR2_PACKAGE_WESTON_DRM comment "drm backend needs mesa3d w/ EGL driver" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_DEFAULT_X11 bool "X11" @@ -63,11 +64,11 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL # Uses libgbm from mesa3d comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_FBDEV bool "fbdev compositor" @@ -119,6 +120,30 @@ config BR2_PACKAGE_WESTON_XWAYLAND comment "XWayland support needs libepoxy and X.org enabled" depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY +# Weston needs at least one shell; this can be one of the bundled ones, +# below, of from a third-party package, which should then select this. +config BR2_PACKAGE_WESTON_HAS_SHELL + bool + +config BR2_PACKAGE_WESTON_SHELL_DESKTOP + bool "desktop shell" + default y + +config BR2_PACKAGE_WESTON_SHELL_FULLSCREEN + bool "fullscreen shell" + default y + select BR2_PACKAGE_WESTON_HAS_SHELL + +config BR2_PACKAGE_WESTON_SHELL_IVI + bool "ivi shell" + default y + select BR2_PACKAGE_WESTON_HAS_SHELL + +config BR2_PACKAGE_WESTON_SHELL_KIOSK + bool "kiosk shell" + default y + select BR2_PACKAGE_WESTON_HAS_SHELL + config BR2_PACKAGE_WESTON_DEMO_CLIENTS bool "demo clients" depends on BR2_USE_MMU # pango diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 07695fda83..5a6b38686a 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-January/041147.html -md5 53e4810d852df0601d01fd986a5b22b3 weston-8.0.0.tar.xz -sha1 80200a9c677d34c2de52230be444bd03ecd84229 weston-8.0.0.tar.xz -sha256 7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848 weston-8.0.0.tar.xz -sha512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c weston-8.0.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2020-September/041595.html +md5 b406da0fe9139fd39653238fde22a6cf weston-9.0.0.tar.xz +sha1 90b9540a0bd6d6f7a465817f1c696d4d393183c9 weston-9.0.0.tar.xz +sha256 5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe weston-9.0.0.tar.xz +sha512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90 weston-9.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index b22e685948..6dd5439291 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,17 +4,17 @@ # ################################################################################ -WESTON_VERSION = 8.0.0 -WESTON_SITE = http://wayland.freedesktop.org/releases +WESTON_VERSION = 9.0.0 +WESTON_SITE = https://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING +WESTON_CPE_ID_VENDOR = wayland WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ libxkbcommon pixman libpng jpeg udev cairo libinput libdrm WESTON_CONF_OPTS = \ - -Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \ -Dbackend-headless=false \ -Dcolor-management-colord=false \ -Dremoting=false @@ -57,9 +57,16 @@ endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) WESTON_CONF_OPTS += -Drenderer-gl=true WESTON_DEPENDENCIES += libegl libgles +ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy) +WESTON_CONF_OPTS += -Dpipewire=true +WESTON_DEPENDENCIES += pipewire +else +WESTON_CONF_OPTS += -Dpipewire=false +endif else WESTON_CONF_OPTS += \ - -Drenderer-gl=false + -Drenderer-gl=false \ + -Dpipewire=false endif ifeq ($(BR2_PACKAGE_WESTON_RDP),y) @@ -126,11 +133,28 @@ else WESTON_CONF_OPTS += -Dtest-junit-xml=false endif -ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy) -WESTON_CONF_OPTS += -Dpipewire=true -WESTON_DEPENDENCIES += pipewire +ifeq ($(BR2_PACKAGE_WESTON_SHELL_DESKTOP),y) +WESTON_CONF_OPTS += -Dshell-desktop=true else -WESTON_CONF_OPTS += -Dpipewire=false +WESTON_CONF_OPTS += -Dshell-desktop=false +endif + +ifeq ($(BR2_PACKAGE_WESTON_SHELL_FULLSCREEN),y) +WESTON_CONF_OPTS += -Dshell-fullscreen=true +else +WESTON_CONF_OPTS += -Dshell-fullscreen=false +endif + +ifeq ($(BR2_PACKAGE_WESTON_SHELL_IVI),y) +WESTON_CONF_OPTS += -Dshell-ivi=true +else +WESTON_CONF_OPTS += -Dshell-ivi=false +endif + +ifeq ($(BR2_PACKAGE_WESTON_SHELL_KIOSK),y) +WESTON_CONF_OPTS += -Dshell-kiosk=true +else +WESTON_CONF_OPTS += -Dshell-kiosk=false endif ifeq ($(BR2_PACKAGE_WESTON_DEMO_CLIENTS),y) diff --git a/package/wf111/Config.in b/package/wf111/Config.in index 8dd20a7cc5..bb4b1a5d03 100644 --- a/package/wf111/Config.in +++ b/package/wf111/Config.in @@ -19,6 +19,10 @@ config BR2_PACKAGE_WF111 https://www.silabs.com/wireless/wi-fi/bluegiga-legacy-modules/device.wf111 +comment "wf111 needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + depends on BR2_ARM_CPU_ARMV5 || BR2_ARM_CPU_ARMV7A || BR2_i386 + comment "wf111 needs a glibc toolchain" depends on BR2_LINUX_KERNEL depends on BR2_ARM_CPU_ARMV5 || BR2_ARM_CPU_ARMV7A || BR2_i386 diff --git a/package/wget/Config.in b/package/wget/Config.in index acb20f8f09..ba03a75e7a 100644 --- a/package/wget/Config.in +++ b/package/wget/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_WGET depends on BR2_USE_MMU depends on BR2_USE_WCHAR depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL help Network utility to retrieve files from http, https and ftp. diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 956e1127f3..7f89bedb88 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.20.3.tar.lz.sig -# with key 1CB27DBC98614B2D5841646D08302DB6A2670428 -sha256 69607ce8216c2d1126b7a872db594b3f21e511e660e07ca1f81be96650932abb wget-1.20.3.tar.lz +# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 +sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 7b9c3e75d9..f30fa39917 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,12 +4,13 @@ # ################################################################################ -WGET_VERSION = 1.20.3 +WGET_VERSION = 1.21.2 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING +WGET_CPE_ID_VENDOR = gnu ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls @@ -21,6 +22,10 @@ else WGET_CONF_OPTS += --without-ssl endif +ifeq ($(BR2_PACKAGE_LIBICONV),y) +WGET_DEPENDENCIES += libiconv +endif + ifeq ($(BR2_PACKAGE_LIBIDN2),y) WGET_CONF_OPTS += --with-libidn WGET_DEPENDENCIES += libidn2 diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 4dc4c3e220..1478d60697 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20200216T145122Z/pool/main/w/whois/whois_5.5.6.dsc -sha256 cba1e9000c60950f46a96ba23e8eea8aee240a2b8560e63a6bfb33f9034af14e whois_5.5.6.tar.xz +# From http://snapshot.debian.org/archive/debian/20210606T204545Z/pool/main/w/whois/whois_5.5.10.dsc +sha256 2391037b079695d0e9fd3c85ab021809a539cf093d25b6c51ca65019a54158dd whois_5.5.10.tar.xz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/whois/whois.mk b/package/whois/whois.mk index a96f20caae..c5d0a6f2ad 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.5.6 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20200216T145122Z/pool/main/w/whois +WHOIS_VERSION = 5.5.10 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20210606T204545Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz WHOIS_DEPENDENCIES = \ host-pkgconf \ diff --git a/package/wilink-bt-firmware/wilink-bt-firmware.hash b/package/wilink-bt-firmware/wilink-bt-firmware.hash index 7adcc86037..b0aa6b91e7 100644 --- a/package/wilink-bt-firmware/wilink-bt-firmware.hash +++ b/package/wilink-bt-firmware/wilink-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9e3c3e8aa19e6cf59a72f235391a095d6d953c325b669d8a7815e32616c232df wilink-bt-firmware-43fca73c6a98c63fcb98f82af5bf83761778e005.tar.gz -sha256 21fd99ce784dc33b39ec0b4a383a9a9b8dafea261d73ad4548683c4eecd87f37 LICENSE +sha256 209e1a46a945e7d4d031e22fb7bd1e3fc96fa3b99d069051ce257c5e2e0843f4 wilink-bt-firmware-43fca73c6a98c63fcb98f82af5bf83761778e005-br1.tar.gz +sha256 21fd99ce784dc33b39ec0b4a383a9a9b8dafea261d73ad4548683c4eecd87f37 LICENSE diff --git a/package/wine/wine.hash b/package/wine/wine.hash index e6d0ef88ed..083e3dd3eb 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4 wine-5.0.tar.xz +sha256 b493065f2f83ee429c62e2ec58698a3cf63ef78722e1b20765823152e8582c56 wine-6.0.tar.xz # Locally calculated -sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 f3ca909e68d38c972e8ded5248b4745958dbb26f2e581ad73cfbedb6b0408e58 LICENSE +sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB +sha256 111398f1be25b1ae1f124512fe61569e6b4555408e2feb9bc82f9fe57d39b302 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index a4b6c6a15f..08eadb5b7c 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,11 +4,12 @@ # ################################################################################ -WINE_VERSION = 5.0 +WINE_VERSION = 6.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/5.0 +WINE_SITE = https://dl.winehq.org/wine/source/6.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE +WINE_CPE_ID_VENDOR = winehq WINE_DEPENDENCIES = host-bison host-flex host-wine HOST_WINE_DEPENDENCIES = host-bison host-flex @@ -25,6 +26,7 @@ WINE_CONF_OPTS = \ --without-gphoto \ --without-gsm \ --without-hal \ + --without-mingw \ --without-opencl \ --without-oss \ --without-vkd3d \ @@ -117,13 +119,6 @@ else WINE_CONF_OPTS += --without-opengl endif -ifeq ($(BR2_PACKAGE_LIBGLU),y) -WINE_CONF_OPTS += --with-glu -WINE_DEPENDENCIES += libglu -else -WINE_CONF_OPTS += --without-glu -endif - ifeq ($(BR2_PACKAGE_LIBKRB5),y) WINE_CONF_OPTS += --with-krb5 WINE_DEPENDENCIES += libkrb5 @@ -145,11 +140,18 @@ else WINE_CONF_OPTS += --without-png endif +ifeq ($(BR2_PACKAGE_LIBUSB),y) +WINE_CONF_OPTS += --with-usb +WINE_DEPENDENCIES += libusb +else +WINE_CONF_OPTS += --without-usb +endif + ifeq ($(BR2_PACKAGE_LIBV4L),y) -WINE_CONF_OPTS += --with-v4l +WINE_CONF_OPTS += --with-v4l2 WINE_DEPENDENCIES += libv4l else -WINE_CONF_OPTS += --without-v4l +WINE_CONF_OPTS += --without-v4l2 endif ifeq ($(BR2_PACKAGE_LIBXML2),y) @@ -175,13 +177,6 @@ else WINE_CONF_OPTS += --without-mpg123 endif -ifeq ($(BR2_PACKAGE_NCURSES),y) -WINE_CONF_OPTS += --with-curses -WINE_DEPENDENCIES += ncurses -else -WINE_CONF_OPTS += --without-curses -endif - ifeq ($(BR2_PACKAGE_OPENAL),y) WINE_CONF_OPTS += --with-openal WINE_DEPENDENCIES += openal @@ -196,7 +191,7 @@ else WINE_CONF_OPTS += --without-ldap endif -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d else @@ -309,13 +304,6 @@ else WINE_CONF_OPTS += --without-xxf86vm endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -WINE_CONF_OPTS += --with-zlib -WINE_DEPENDENCIES += zlib -else -WINE_CONF_OPTS += --without-zlib -endif - # host-gettext is essential for .po file support in host-wine wrc ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) HOST_WINE_DEPENDENCIES += host-gettext @@ -331,15 +319,19 @@ endif # Wine only needs the host tools to be built, so cut-down the # build time by building just what we need. +HOST_WINE_TOOLS = \ + tools \ + tools/sfnt2fon \ + tools/widl \ + tools/winebuild \ + tools/winegcc \ + tools/wmc \ + tools/wrc + define HOST_WINE_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ - tools \ - tools/sfnt2fon \ - tools/widl \ - tools/winebuild \ - tools/winegcc \ - tools/wmc \ - tools/wrc + $(foreach t, $(HOST_WINE_TOOLS), + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/$(t) + ) endef # Wine only needs its host variant to be built, not that it is @@ -360,11 +352,9 @@ HOST_WINE_CONF_OPTS += \ --without-coreaudio \ --without-faudio \ --without-cups \ - --without-curses \ --without-dbus \ --without-fontconfig \ --without-gphoto \ - --without-glu \ --without-gnutls \ --without-gsm \ --without-gssapi \ @@ -373,6 +363,7 @@ HOST_WINE_CONF_OPTS += \ --without-jpeg \ --without-krb5 \ --without-ldap \ + --without-mingw \ --without-mpg123 \ --without-netapi \ --without-openal \ @@ -386,7 +377,8 @@ HOST_WINE_CONF_OPTS += \ --without-sane \ --without-sdl \ --without-tiff \ - --without-v4l \ + --without-usb \ + --without-v4l2 \ --without-vkd3d \ --without-vulkan \ --without-x \ @@ -401,8 +393,7 @@ HOST_WINE_CONF_OPTS += \ --without-xshape \ --without-xshm \ --without-xslt \ - --without-xxf86vm \ - --without-zlib + --without-xxf86vm $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/wireguard-linux-compat/Config.in b/package/wireguard-linux-compat/Config.in index 4ee214be63..4e8e95bdc3 100644 --- a/package/wireguard-linux-compat/Config.in +++ b/package/wireguard-linux-compat/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_WIREGUARD_LINUX_COMPAT depends on BR2_LINUX_KERNEL # kernel module requires 3.10+ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + # kernel module in upstream linux since 5.6 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 help WireGuard is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be @@ -19,5 +21,9 @@ config BR2_PACKAGE_WIREGUARD_LINUX_COMPAT https://www.wireguard.com +comment "wireguard-linux-compat needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + comment "wireguard-linux-compat needs a toolchain w/ headers >= 3.10" - depends on BR2_LINUX_KERNEL && !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + depends on BR2_LINUX_KERNEL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.hash b/package/wireguard-linux-compat/wireguard-linux-compat.hash index a9675b5180..e18bd10cf7 100644 --- a/package/wireguard-linux-compat/wireguard-linux-compat.hash +++ b/package/wireguard-linux-compat/wireguard-linux-compat.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2020-April/005237.html -sha256 7dfb4a8315e1d6ae406ff32d01c496175df558dd65968a19e5222d02c7cfb77a wireguard-linux-compat-1.0.20200401.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2021-June/006781.html +sha256 3f5d990006e6eabfd692d925ec314fff2c5ee7dcdb869a6510d579acfdd84ec0 wireguard-linux-compat-1.0.20210606.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.mk b/package/wireguard-linux-compat/wireguard-linux-compat.mk index d5a2341d77..1b7ec941db 100644 --- a/package/wireguard-linux-compat/wireguard-linux-compat.mk +++ b/package/wireguard-linux-compat/wireguard-linux-compat.mk @@ -4,12 +4,20 @@ # ################################################################################ -WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200401 +WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20210606 WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0 WIREGUARD_LINUX_COMPAT_LICENSE_FILES = COPYING WIREGUARD_LINUX_COMPAT_MODULE_SUBDIRS = src +define WIREGUARD_LINUX_COMPAT_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_FOU) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_MANAGER) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/package/wireguard-tools/wireguard-tools.hash b/package/wireguard-tools/wireguard-tools.hash index 475a7450a9..dab7f72ca8 100644 --- a/package/wireguard-tools/wireguard-tools.hash +++ b/package/wireguard-tools/wireguard-tools.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2020-March/005191.html -sha256 757ed31d4d48d5fd7853bfd9bfa6a3a1b53c24a94fe617439948784a2c0ed987 wireguard-tools-1.0.20200319.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2021-February/006407.html +sha256 1f72da217044622d79e0bab57779e136a3df795e3761a3fc1dc0941a9055877c wireguard-tools-1.0.20210223.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard-tools/wireguard-tools.mk b/package/wireguard-tools/wireguard-tools.mk index fc2ec876b3..d2f633be62 100644 --- a/package/wireguard-tools/wireguard-tools.mk +++ b/package/wireguard-tools/wireguard-tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -WIREGUARD_TOOLS_VERSION = 1.0.20200319 +WIREGUARD_TOOLS_VERSION = 1.0.20210223 WIREGUARD_TOOLS_SITE = https://git.zx2c4.com/wireguard-tools/snapshot WIREGUARD_TOOLS_SOURCE = wireguard-tools-$(WIREGUARD_TOOLS_VERSION).tar.xz WIREGUARD_TOOLS_LICENSE = GPL-2.0 WIREGUARD_TOOLS_LICENSE_FILES = COPYING +WIREGUARD_TOOLS_SELINUX_MODULES = wireguard ifeq ($(BR2_INIT_SYSTEMD),y) WIREGUARD_TOOLS_MAKE_OPTS += WITH_SYSTEMDUNITS=yes diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index d6cb72ee79..abe8f6b000 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 cd917ed86b63ce8d93947979f1f18948f03a4ac0ad89ec25227b36ac00dc54bf wireless-regdb-2019.06.03.tar.xz +sha256 cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446 wireless-regdb-2021.08.28.tar.xz # Locally computed -sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE +sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 31b62e36e1..0db8c6f345 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,11 +4,12 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2019.06.03 +WIRELESS_REGDB_VERSION = 2021.08.28 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/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk index b87ab20fb2..1d29c3b102 100644 --- a/package/wireless_tools/wireless_tools.mk +++ b/package/wireless_tools/wireless_tools.mk @@ -10,6 +10,8 @@ WIRELESS_TOOLS_SITE = https://hewlettpackard.github.io/wireless-tools WIRELESS_TOOLS_SOURCE = wireless_tools.$(WIRELESS_TOOLS_VERSION).tar.gz WIRELESS_TOOLS_LICENSE = GPL-2.0 WIRELESS_TOOLS_LICENSE_FILES = COPYING +WIRELESS_TOOLS_CPE_ID_VERSION = $(WIRELESS_TOOLS_VERSION_MAJOR) +WIRELESS_TOOLS_CPE_ID_UPDATE = pre9 WIRELESS_TOOLS_INSTALL_STAGING = YES WIRELESS_TOOLS_BUILD_TARGETS = iwmulticall diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index e52edb9f69..95fc9b38f3 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_WIRESHARK depends on BR2_USE_MMU # fork(), glib2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + select BR2_PACKAGE_C_ARES select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -20,12 +21,12 @@ config BR2_PACKAGE_WIRESHARK_GUI bool "Qt5 GUI" default y depends on BR2_INSTALL_LIBSTDCPP # qt5 + depends on BR2_HOST_GCC_AT_LEAST_5 # qt5 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qt5 depends on !BR2_arc # qt5 depends on BR2_PACKAGE_HAS_UDEV # qt5 input select BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_FONTCONFIG # runtime select BR2_PACKAGE_QT5BASE_PNG # runtime select BR2_PACKAGE_QT5BASE_WIDGETS @@ -36,10 +37,11 @@ config BR2_PACKAGE_WIRESHARK_GUI help Enable Qt5 GUI -comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 4.8" +comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, host gcc >= 5.0, gcc >= 5.0" depends on !BR2_arc depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_HOST_GCC_AT_LEAST_5 endif # BR2_PACKAGE_WIRESHARK diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 8b8261840a..0876703e49 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-3.2.2.txt -sha1 9cc54a56e9c2ed77e1bc436d9ae2f7bba68d26f8 wireshark-3.2.2.tar.xz -sha256 5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208feeded79 wireshark-3.2.2.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.7.txt +sha1 3fa4bb774030442b9908243a9927d38479c52bf5 wireshark-3.4.7.tar.xz +sha256 6c4cee51ef997cb9d9aaee84113525a5629157d3c743d7c4e320000de804a09d wireshark-3.4.7.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index ead6b164ed..6ee4b20391 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,12 +4,19 @@ # ################################################################################ -WIRESHARK_VERSION = 3.2.2 +WIRESHARK_VERSION = 3.4.7 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license WIRESHARK_LICENSE_FILES = COPYING -WIRESHARK_DEPENDENCIES = host-pkgconf host-python3 libgcrypt libpcap libglib2 \ +WIRESHARK_CPE_ID_VENDOR = wireshark +WIRESHARK_DEPENDENCIES = \ + c-ares \ + host-pkgconf \ + host-python3 \ + libgcrypt \ + libglib2 \ + libpcap \ speexdsp WIRESHARK_MAKE_ENV = \ @@ -18,6 +25,7 @@ WIRESHARK_MAKE_ENV = \ WIRESHARK_CONF_OPTS = \ -DDISABLE_WERROR=ON \ + -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF @@ -35,6 +43,16 @@ endef WIRESHARK_PRE_BUILD_HOOKS += WIRESHARK_BUILD_LEMON_TOOL +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ifeq ($(BR2_GCC_ENABLE_LTO),y) +WIRESHARK_CONF_OPTS += -DENABLE_LTO=ON +else +WIRESHARK_CONF_OPTS += -DENABLE_LTO=OFF +endif + ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),y) WIRESHARK_CONF_OPTS += -DBUILD_wireshark=ON WIRESHARK_DEPENDENCIES += qt5base qt5multimedia qt5svg qt5tools @@ -56,13 +74,6 @@ else WIRESHARK_CONF_OPTS += -DENABLE_BROTLI=OFF endif -ifeq ($(BR2_PACKAGE_C_ARES),y) -WIRESHARK_CONF_OPTS += -DENABLE_CARES=ON -WIRESHARK_DEPENDENCIES += c-ares -else -WIRESHARK_CONF_OPTS += -DENABLE_CARES=OFF -endif - ifeq ($(BR2_PACKAGE_GNUTLS),y) WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=ON WIRESHARK_DEPENDENCIES += gnutls @@ -127,6 +138,13 @@ else WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=OFF endif +ifeq ($(BR2_PACKAGE_OPUS),y) +WIRESHARK_CONF_OPTS += -DENABLE_OPUS=ON +WIRESHARK_DEPENDENCIES += opus +else +WIRESHARK_CONF_OPTS += -DENABLE_OPUS=OFF +endif + ifeq ($(BR2_PACKAGE_SBC),y) WIRESHARK_CONF_OPTS += -DENABLE_SBC=ON WIRESHARK_DEPENDENCIES += sbc @@ -155,6 +173,13 @@ else WIRESHARK_CONF_OPTS += -DBUILD_sdjournal=OFF endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +WIRESHARK_CONF_OPTS += -DENABLE_ZSTD=ON +WIRESHARK_DEPENDENCIES += zstd +else +WIRESHARK_CONF_OPTS += -DENABLE_ZSTD=OFF +endif + # Disable plugins as some of them (like l16mono) can't be built # statically. ENABLE_STATIC=ON actually means "disable shared library" # and ENABLE_STATIC=OFF means "enable shared library". So for the diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 5509552ca4..9896713ca7 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 6896f8ad6c44aff3e583006eeee839600848a0e37118ebbb7514eca9409ae08b wolfssl-4.3.0-stable.tar.gz +sha256 50db45f348f47e00c93dd244c24108220120cb3cc9d01434789229c32937c444 wolfssl-4.8.1-stable.tar.gz # Hash for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 74adaaef40b96c71378b6daa3feb8ccd4a1bfd9b76debf3f3f29cf3a0e86c9a0 LICENSING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 b23c1da1f85d699d3288d73c952b4cd02760d23dc1ddc1b221cbb8be82387189 LICENSING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 8834a0f468..d3dce0a401 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,12 +4,13 @@ # ################################################################################ -WOLFSSL_VERSION = 4.3.0-stable +WOLFSSL_VERSION = 4.8.1-stable WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) WOLFSSL_INSTALL_STAGING = YES -WOLFSSL_LICENSE = GPL-2.0 +WOLFSSL_LICENSE = GPL-2.0+ WOLFSSL_LICENSE_FILES = COPYING LICENSING +WOLFSSL_CPE_ID_VENDOR = wolfssl WOLFSSL_DEPENDENCIES = host-pkgconf @@ -17,6 +18,8 @@ WOLFSSL_DEPENDENCIES = host-pkgconf # script, so we need autoreconf WOLFSSL_AUTORECONF = YES +WOLFSSL_CONF_OPTS = --disable-examples --disable-crypttests + ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) WOLFSSL_CONF_OPTS += --enable-all else diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index cba7fa07e1..8f095cdf2d 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -1,6 +1,8 @@ -config BR2_PACKAGE_WPA_SUPPLICANT +menuconfig BR2_PACKAGE_WPA_SUPPLICANT bool "wpa_supplicant" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL help WPA supplicant for secure wireless networks @@ -29,6 +31,33 @@ config BR2_PACKAGE_WPA_SUPPLICANT_NL80211 comment "nl80211 support needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS +config BR2_PACKAGE_WPA_SUPPLICANT_WEXT + bool "Enable wext (deprecated)" + default y if !BR2_TOOLCHAIN_HAS_THREADS + help + Enable support for wext. This is the historic wireless API + for Linux, which is now deprecated and in maintenance-only in + the kernel. It may still be required by out-of-tree drivers. + +config BR2_PACKAGE_WPA_SUPPLICANT_WIRED + bool "Enable wired support" + select BR2_PACKAGE_WPA_SUPPLICANT_EAP + help + Include the "wired" driver, so the internal IEEE 802.1x + supplicant can be used with Ethernet. This also enables + support for MACSEC. + +comment "wpa_supplicant will be useless without at least one driver" + depends on !BR2_PACKAGE_WPA_SUPPLICANT_NL80211 && \ + !BR2_PACKAGE_WPA_SUPPLICANT_WEXT && \ + !BR2_PACKAGE_WPA_SUPPLICANT_WIRED + +config BR2_PACKAGE_WPA_SUPPLICANT_IBSS_RSN + bool "Enable IBSS RSN" + depends on BR2_PACKAGE_WPA_SUPPLICANT_NL80211 + help + Enable support for RSN/WPA2 in Ad-Hoc mode. + config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT bool "Enable AP mode" depends on BR2_PACKAGE_WPA_SUPPLICANT_NL80211 @@ -38,7 +67,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT set. This links in parts of hostapd functionality into wpa_supplicant, making it bigger but dispensing the need for a separate hostapd binary in some applications hence being - smaller overall. + smaller overall. It also enables support for Wi-Fi Direct. config BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY bool "Enable Wi-Fi Display" @@ -63,10 +92,11 @@ config BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN config BR2_PACKAGE_WPA_SUPPLICANT_EAP bool "Enable EAP" help - Enable support for EAP. + Enable support for EAP, 802.1x/WPA-Enterprise and FILS. config BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT bool "Enable HS20" + select BR2_PACKAGE_WPA_SUPPLICANT_EAP help Enable Hotspot 2.0 and IEEE 802.11u interworking functionality. @@ -90,6 +120,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WPA3 config BR2_PACKAGE_WPA_SUPPLICANT_CLI bool "Install wpa_cli binary" + select BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE help Install wpa_cli command line utility @@ -107,6 +138,11 @@ config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE help Install wpa_passphrase command line utility. +config BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE + bool "Enable the Unix-socket control interface" + help + Enable support for the Unix-socket-based API. + config BR2_PACKAGE_WPA_SUPPLICANT_DBUS bool "Enable support for the DBus control interface" depends on BR2_TOOLCHAIN_HAS_THREADS # dbus @@ -121,6 +157,6 @@ config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION bool "Introspection support" depends on BR2_PACKAGE_WPA_SUPPLICANT_DBUS help - Add introspection support for new DBus control interface. + Add introspection support for the DBus control interface. endif diff --git a/package/wpa_supplicant/wpa_supplicant.hash b/package/wpa_supplicant/wpa_supplicant.hash index ff5a2edb34..2387391a3c 100644 --- a/package/wpa_supplicant/wpa_supplicant.hash +++ b/package/wpa_supplicant/wpa_supplicant.hash @@ -1,3 +1,5 @@ # Locally calculated sha256 fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 wpa_supplicant-2.9.tar.gz sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README +sha256 c4d65cc13863e0237d0644198558e2c47b4ed91e2b2be4516ff590724187c4a5 0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch +sha256 7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 8e7b9c3a65..e9078b9f89 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -6,32 +6,35 @@ WPA_SUPPLICANT_VERSION = 2.9 WPA_SUPPLICANT_SITE = http://w1.fi/releases +WPA_SUPPLICANT_PATCH = \ + https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch \ + https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch WPA_SUPPLICANT_LICENSE = BSD-3-Clause WPA_SUPPLICANT_LICENSE_FILES = README +WPA_SUPPLICANT_CPE_ID_VENDOR = w1.fi WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config WPA_SUPPLICANT_SUBDIR = wpa_supplicant -WPA_SUPPLICANT_DBUS_OLD_SERVICE = fi.epitest.hostap.WPASupplicant -WPA_SUPPLICANT_DBUS_NEW_SERVICE = fi.w1.wpa_supplicant1 +WPA_SUPPLICANT_DBUS_SERVICE = fi.w1.wpa_supplicant1 WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) +WPA_SUPPLICANT_SELINUX_MODULES = networkmanager # 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch WPA_SUPPLICANT_IGNORE_CVES += CVE-2019-16275 +# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch +WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-27803 + +# 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch +WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-30004 + # install the wpa_client library WPA_SUPPLICANT_INSTALL_STAGING = YES WPA_SUPPLICANT_CONFIG_EDITS = -# Add support for simple background scan -WPA_SUPPLICANT_CONFIG_SET = CONFIG_BGSCAN_SIMPLE - WPA_SUPPLICANT_CONFIG_ENABLE = \ - CONFIG_IEEE80211AC \ - CONFIG_IEEE80211N \ - CONFIG_IEEE80211R \ CONFIG_INTERNAL_LIBTOMMATH \ - CONFIG_DEBUG_FILE \ CONFIG_MATCH_IFACE WPA_SUPPLICANT_CONFIG_DISABLE = \ @@ -50,6 +53,14 @@ else WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_DRIVER_NL80211 endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WEXT),) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_DRIVER_WEXT +endif + +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_IBSS_RSN), ) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_IBSS_RSN +endif + # Trailing underscore on purpose to not enable CONFIG_EAPOL_TEST ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_EAP_ @@ -58,11 +69,22 @@ ifeq ($(BR2_STATIC_LIBS),y) WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_TNC endif else -WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP +WPA_SUPPLICANT_CONFIG_DISABLE += \ + CONFIG_EAP \ + CONFIG_IEEE8021X_EAPOL \ + CONFIG_FILS endif -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_HS20 \ +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WIRED),) +WPA_SUPPLICANT_CONFIG_DISABLE += \ + CONFIG_DRIVER_WIRED \ + CONFIG_MACSEC \ + CONFIG_DRIVER_MACSEC +endif + +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),) +WPA_SUPPLICANT_CONFIG_DISABLE += \ + CONFIG_HS20 \ CONFIG_INTERWORKING endif @@ -82,9 +104,8 @@ else WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_WIFI_DISPLAY endif -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING),y) -WPA_SUPPLICANT_CONFIG_SET += CONFIG_MESH -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_IEEE80211W +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING),) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_MESH endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN),y) @@ -93,8 +114,8 @@ WPA_SUPPLICANT_CONFIG_ENABLE += \ CONFIG_AUTOSCAN_PERIODIC endif -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_WPS +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_WPS endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA3),y) @@ -115,10 +136,14 @@ WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf libopenssl WPA_SUPPLICANT_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl` WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/' else -WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_PWD +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_PWD CONFIG_EAP_TEAP WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE),) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_CTRL_IFACE\> +endif + ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS),y) WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus WPA_SUPPLICANT_MAKE_ENV = \ @@ -127,8 +152,8 @@ WPA_SUPPLICANT_MAKE_ENV = \ WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_NEW define WPA_SUPPLICANT_INSTALL_DBUS_NEW $(INSTALL) -m 0644 -D \ - $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service \ - $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service + $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_SERVICE).service \ + $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service endef ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION),y) @@ -139,8 +164,8 @@ else WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_CTRL_IFACE_DBUS_NEW endif -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_DEBUG_SYSLOG +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG),) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_DEBUG_SYSLOG endif ifeq ($(BR2_PACKAGE_READLINE),y) @@ -201,7 +226,6 @@ define WPA_SUPPLICANT_INSTALL_DBUS $(INSTALL) -m 0644 -D \ $(@D)/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \ $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf - $(WPA_SUPPLICANT_INSTALL_DBUS_OLD) $(WPA_SUPPLICANT_INSTALL_DBUS_NEW) endef endif diff --git a/package/wpebackend-fdo/Config.in b/package/wpebackend-fdo/Config.in index 161e4c9a7e..8a8c820c9b 100644 --- a/package/wpebackend-fdo/Config.in +++ b/package/wpebackend-fdo/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_WPEBACKEND_FDO depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_MMU # libglib2 depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBWPE select BR2_PACKAGE_WAYLAND diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index 1380934af3..f280024b28 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.6.0.tar.xz.sums -md5 456afeed22f6749f7b2a97c11660835d wpebackend-fdo-1.6.0.tar.xz -sha1 d128e2c7ff273d9b9f31217f6ac25be3b266d805 wpebackend-fdo-1.6.0.tar.xz -sha256 7f5bd7b9d8f97b1655f4dcd39fad92719d0fb3985b251da5802df13aaa09f567 wpebackend-fdo-1.6.0.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.10.0.tar.xz.sums +md5 306adbb0c66dc753e1794c83b7a2682b wpebackend-fdo-1.10.0.tar.xz +sha1 bf71718a213c6511dea278ade5ce90967d181995 wpebackend-fdo-1.10.0.tar.xz +sha256 b89dfd3500a4dec711132cd7bff72599e67d56a419d000730e14bb99547509cc wpebackend-fdo-1.10.0.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 99e10c5a01..72f0ad9019 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,12 +4,12 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.6.0 +WPEBACKEND_FDO_VERSION = 1.10.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES WPEBACKEND_FDO_LICENSE = BSD-2-Clause WPEBACKEND_FDO_LICENSE_FILES = COPYING -WPEBACKEND_FDO_DEPENDENCIES = libglib2 libwpe wayland +WPEBACKEND_FDO_DEPENDENCIES = libepoxy libglib2 libwpe wayland -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index f3029976f1..6fc1e668fd 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -12,12 +12,13 @@ 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" +comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, 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_7 \ + || !BR2_HOST_GCC_AT_LEAST_4_9 comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS @@ -29,6 +30,7 @@ config BR2_PACKAGE_WPEWEBKIT bool "wpewebkit" depends on !BR2_STATIC_LIBS # wayland depends on !BR2_BINFMT_FLAT # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 @@ -93,6 +95,7 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP @@ -104,10 +107,15 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA if BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA +config BR2_PACKAGE_WPEWEBKIT_MEDIA_STREAM + bool "media-stream support" + help + This option enables media-stream support. + config BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL bool "use gstreamer-gl" default y - depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM help Use the GStreamer GL elements for handling video content. This is recommended as it improves performance of video diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 2e7016fe38..ff8bd1f30a 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.28.0.tar.xz.sums -md5 4298b9d38b4f05f92995422ea9979893 wpewebkit-2.28.0.tar.xz -sha1 9e791b6112cca8cda51ae7e991b545f4bf0bb46c wpewebkit-2.28.0.tar.xz -sha256 a85cd3cb46206a4929a9562d53379a7e7e2ec1a3224b34e2dcf5da30bb906722 wpewebkit-2.28.0.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.32.4.tar.xz.sums +md5 94ca1cc3f7b2de8b96c59d6e59cafcd0 wpewebkit-2.32.4.tar.xz +sha1 19b8ebdbfef193ca50f7625703d871db87624f86 wpewebkit-2.32.4.tar.xz +sha256 381f1422cbc319db1aa42dda48de39590ed90ac3bec6b81ec83f3f2cae5c3eeb wpewebkit-2.32.4.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 9c969cae5a..9ad569a472 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.28.0 +WPEWEBKIT_VERSION = 2.32.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -12,6 +12,8 @@ WPEWEBKIT_LICENSE = LGPL-2.1+, BSD-2-Clause WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 +WPEWEBKIT_CPE_ID_VENDOR = wpewebkit +WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo @@ -44,6 +46,13 @@ WPEWEBKIT_CONF_OPTS += \ -DENABLE_WEB_AUDIO=OFF endif +ifeq ($(BR2_PACKAGE_WPEWEBKIT_MEDIA_STREAM),y) +WPEWEBKIT_CONF_OPTS += -DENABLE_MEDIA_STREAM=ON +WPEWEBKIT_DEPENDENCIES += gst1-plugins-bad +else +WPEWEBKIT_CONF_OPTS += -DENABLE_MEDIA_STREAM=OFF +endif + ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL),y) WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=ON else @@ -63,13 +72,25 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF endif +ifeq ($(BR2_INIT_SYSTEMD),y) +WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=ON +WPEWEBKIT_DEPENDENCIES += systemd +else +WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=OFF +endif + # JIT is not supported for MIPS r6, but the WebKit build system does not -# have a check for these processors. Disable JIT forcibly here and use -# the CLoop interpreter instead. +# have a check for these processors. The same goes for ARMv5 and ARMv6. +# Disable JIT forcibly here and use the CLoop interpreter instead. # -# Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=191258 -ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON +# Also, we have to disable the sampling profiler, which does NOT work +# with ENABLE_C_LOOP. +# +# Upstream bugs: https://bugs.webkit.org/show_bug.cgi?id=191258 +# https://bugs.webkit.org/show_bug.cgi?id=172765 +# +ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif $(eval $(cmake-package)) diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk index fb691c2422..4cbd9cf62f 100644 --- a/package/x11r7/libxcb/libxcb.mk +++ b/package/x11r7/libxcb/libxcb.mk @@ -9,22 +9,23 @@ LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.xz LIBXCB_SITE = http://xcb.freedesktop.org/dist LIBXCB_LICENSE = MIT LIBXCB_LICENSE_FILES = COPYING +LIBXCB_CPE_ID_VENDOR = x LIBXCB_INSTALL_STAGING = YES LIBXCB_DEPENDENCIES = \ host-libxslt xcb-proto xlib_libXdmcp xlib_libXau \ - host-xcb-proto host-python host-pkgconf + host-xcb-proto host-python3 host-pkgconf HOST_LIBXCB_DEPENDENCIES = \ host-libxslt host-xcb-proto host-xlib_libXdmcp \ - host-xlib_libXau host-python host-pkgconf + host-xlib_libXau host-python3 host-pkgconf LIBXCB_CONF_OPTS = --with-doxygen=no HOST_LIBXCB_CONF_OPTS = --with-doxygen=no -# libxcb is not python3 friendly, so force the python interpreter -HOST_LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 -LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 +# Force detection of Buildroot host-python3 over system python +LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 +HOST_LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash index 7a13a01a15..72077bee60 100644 --- a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash +++ b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-January/003035.html -md5 bf8086aa878f0d1bb7715e5865183cc4 fonttosfnt-1.1.0.tar.bz2 -sha1 0e0ea8c92941bf9126b87fae5bb723c8e1035ae2 fonttosfnt-1.1.0.tar.bz2 -sha256 7283fd477e3de75cce40b91b5012953e30b862975555d4482435e2ee7b0f46dc fonttosfnt-1.1.0.tar.bz2 -sha512 f4fb9814c23bfd6f83771959444d2c37eb4ba32edee43c37cf21f0181be80c6e278307641b0f4dae4ee5d10db3289e95194f99757ea4bbca343fff15498e7173 fonttosfnt-1.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-June/003093.html +sha256 1a1bb4ef25856dea7de3d491ae7231493225b400bee0f6a1f949017ffd203a64 fonttosfnt-1.2.2.tar.bz2 +sha512 ceac6ccb064043d46f9f16f31fb89c6cbf7f026d049f7b5325d6af97e809b4cd068e6149413bb328c0af601a98b5070e21d469888a6853f6cabecd5b46f60240 fonttosfnt-1.2.2.tar.bz2 # Locally computed -sha256 f83378580cb7909a98b52bf5cd6a29f4894d76318c5c5312dd3f17a3e92beef1 COPYING +sha256 f83378580cb7909a98b52bf5cd6a29f4894d76318c5c5312dd3f17a3e92beef1 COPYING diff --git a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk index ab1d955771..9fdccbb843 100644 --- a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk +++ b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_FONTTOSFNT_VERSION = 1.1.0 +XAPP_FONTTOSFNT_VERSION = 1.2.2 XAPP_FONTTOSFNT_SOURCE = fonttosfnt-$(XAPP_FONTTOSFNT_VERSION).tar.bz2 XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_FONTTOSFNT_LICENSE = MIT diff --git a/package/x11r7/xapp_twm/xapp_twm.hash b/package/x11r7/xapp_twm/xapp_twm.hash index 572ecb9820..26661f1fbd 100644 --- a/package/x11r7/xapp_twm/xapp_twm.hash +++ b/package/x11r7/xapp_twm/xapp_twm.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002857.html -md5 e322c08eeb635f924ede5b8eba3db54e twm-1.0.10.tar.bz2 -sha1 f632a47620dfe6d75b003839d269b14fa22b262e twm-1.0.10.tar.bz2 -sha256 6449eadca16ce0f0d900605b0cc020b95f40619261b7beccfb46bcc1836445d7 twm-1.0.10.tar.bz2 -sha512 1280683fce7ebbf5670239cb1f3cee2b40612bd9850d98827e793cf8bf298bdb58e48387cab943ea6befc6f7b34da2567353c22b8eaeb8bcf1b9e303cd7e6a9e twm-1.0.10.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-June/003047.html +sha256 f4e8a842dec410e79741f25ed4dfac09df080835d0bba2e3983b5914569b68c7 twm-1.0.11.tar.xz +sha512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d twm-1.0.11.tar.xz # Locally computed -sha256 4809ffc9656bc9a704e19ab467d1cedc97c48c9d1f9a4018e6d99d2e61f75945 COPYING +sha256 4809ffc9656bc9a704e19ab467d1cedc97c48c9d1f9a4018e6d99d2e61f75945 COPYING diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk index 0af30f737c..46d4ca331d 100644 --- a/package/x11r7/xapp_twm/xapp_twm.mk +++ b/package/x11r7/xapp_twm/xapp_twm.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_TWM_VERSION = 1.0.10 -XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.bz2 +XAPP_TWM_VERSION = 1.0.11 +XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.xz XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_TWM_LICENSE = MIT XAPP_TWM_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xev/xapp_xev.hash b/package/x11r7/xapp_xev/xapp_xev.hash index 160e09e4f3..8b9a006c46 100644 --- a/package/x11r7/xapp_xev/xapp_xev.hash +++ b/package/x11r7/xapp_xev/xapp_xev.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002948.html -md5 eec82a5d4b599736f0fa637e96136746 xev-1.2.3.tar.bz2 -sha1 3a294934b9e150abc3cccc4182a40ed9b5ea9871 xev-1.2.3.tar.bz2 -sha256 66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09 xev-1.2.3.tar.bz2 -sha512 47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e xev-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-July/003048.html +sha256 d700e08bfe751ed2dbf802baa204b056d0e49348b6eb3c6f9cb035d8ae4885e2 xev-1.2.4.tar.bz2 +sha512 383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca xev-1.2.4.tar.bz2 # Locally computed -sha256 9b840f2e1900889124cc999f3158da2b6b07bf6d0d77bdbb01ce65d2e702dc83 COPYING +sha256 9b840f2e1900889124cc999f3158da2b6b07bf6d0d77bdbb01ce65d2e702dc83 COPYING diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk index 137a6f2050..7d5f3cbb82 100644 --- a/package/x11r7/xapp_xev/xapp_xev.mk +++ b/package/x11r7/xapp_xev/xapp_xev.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XEV_VERSION = 1.2.3 +XAPP_XEV_VERSION = 1.2.4 XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2 XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XEV_LICENSE = MIT diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash index 98bd0c43a3..bccaae6f57 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash @@ -1,5 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2020-February/003037.html -sha256 06242c169fc11caf601cac46d781d467748c6a330e15b36dce46520b8ac8d435 xkbcomp-1.4.3.tar.bz2 -sha512 827713c0413aecdcad2b61edb7b8c7c7a002e18505b9041f570e2f680907193cb5ff8a5b424695e21110b2d06c145cbf0e397e52347421ee946f06e2a51f135d xkbcomp-1.4.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-March/003075.html +sha256 6851086c4244b6fd0cc562880d8ff193fb2bbf1e141c73632e10731b31d4b05e xkbcomp-1.4.5.tar.bz2 +sha512 2e84f8d6b083e2e818cb95e5d2a184da00e50d71b280e92d1a71465a9a4348f922f4ddccb42cfeee6f76705bbfc8580ef67aedd0d958aaa1ae6bbcc66ccd8154 xkbcomp-1.4.5.tar.bz2 + # Locally computed -sha256 f1a78f5796fe2374f2b93e579328a02283e57d2a8316484b31799b12debe7ee3 COPYING +sha256 6b833fdc05906ce57f016dc791db86830d49ee4da2861ce45806c50b3f4dda9e COPYING diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk index e97f8fdd8b..b52f5e6850 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XKBCOMP_VERSION = 1.4.3 +XAPP_XKBCOMP_VERSION = 1.4.5 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKBCOMP_LICENSE = MIT diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk index 4bb21ecf0b..9f491ccdc6 100644 --- a/package/x11r7/xapp_xload/xapp_xload.mk +++ b/package/x11r7/xapp_xload/xapp_xload.mk @@ -18,4 +18,8 @@ ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) XAPP_XLOAD_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -DRLOADSTUB" endif +ifeq ($(BR2_SYSTEM_ENABLE_NLS),) +XAPP_XLOAD_CONF_ENV += ac_cv_search_gettext=no +endif + $(eval $(autotools-package)) diff --git a/package/x11r7/xapp_xprop/xapp_xprop.hash b/package/x11r7/xapp_xprop/xapp_xprop.hash index f513e12c24..43eed80ba4 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.hash +++ b/package/x11r7/xapp_xprop/xapp_xprop.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002969.html -md5 cc369c28383a5d7144e7197ee7d30bfa xprop-1.2.4.tar.bz2 -sha1 0549a927d01930218f1d0089d0157eb9538b34a5 xprop-1.2.4.tar.bz2 -sha256 8c77fb096e46c60032b7e2bde9492c3ffcc18734f50b395085a5f10bfd3cf753 xprop-1.2.4.tar.bz2 -sha512 6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7 xprop-1.2.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-November/003064.html +sha256 9b92ed0316bf2486121d8bac88bd1878f16b43bd335f18009b1f941f1eca93a1 xprop-1.2.5.tar.bz2 +sha512 93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559 xprop-1.2.5.tar.bz2 # Locally computed -sha256 f19ff982936cca133b9593a6561c3817512207e0b4c951d0e4eb5956d30d4415 COPYING +sha256 f19ff982936cca133b9593a6561c3817512207e0b4c951d0e4eb5956d30d4415 COPYING diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk index a0ad4302cb..75f0d37cdc 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.mk +++ b/package/x11r7/xapp_xprop/xapp_xprop.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XPROP_VERSION = 1.2.4 +XAPP_XPROP_VERSION = 1.2.5 XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2 XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XPROP_LICENSE = MIT diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.hash b/package/x11r7/xapp_xrdb/xapp_xrdb.hash index b8a6896ca7..606fd26060 100644 --- a/package/x11r7/xapp_xrdb/xapp_xrdb.hash +++ b/package/x11r7/xapp_xrdb/xapp_xrdb.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002953.html -md5 34ae801ef994d192c70fcce2bdb2a1b2 xrdb-1.2.0.tar.bz2 -sha1 79596928246288a217abdec0e4a2315ec9b07963 xrdb-1.2.0.tar.bz2 -sha256 f23a65cfa1f7126040d68b6cf1e4567523edac10f8dc06f23d840d330c7c6946 xrdb-1.2.0.tar.bz2 -sha512 14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef xrdb-1.2.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-August/003107.html +sha256 4f5d031c214ffb88a42ae7528492abde1178f5146351ceb3c05f3b8d5abee8b4 xrdb-1.2.1.tar.bz2 +sha512 d88135cdfea8536523dfb986249ee42761d5363c936352f12f55b4d0c849f21236f7d74d39869c5ec5b549019d6ed89d9096cde4b3c2b4816c2778a8e370b5c9 xrdb-1.2.1.tar.bz2 # Locally computed -sha256 ca1b3e2f9f37c35876b69a9c1c5a7860fae59b7ba87a1d2dc541b722e29b1ecc COPYING +sha256 ca1b3e2f9f37c35876b69a9c1c5a7860fae59b7ba87a1d2dc541b722e29b1ecc COPYING diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk index b445805d17..4f9860d25a 100644 --- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk +++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XRDB_VERSION = 1.2.0 +XAPP_XRDB_VERSION = 1.2.1 XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2 -XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XRDB_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XRDB_LICENSE = MIT XAPP_XRDB_LICENSE_FILES = COPYING XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu diff --git a/package/x11r7/xapp_xwd/xapp_xwd.hash b/package/x11r7/xapp_xwd/xapp_xwd.hash index 606618bcc6..7595286499 100644 --- a/package/x11r7/xapp_xwd/xapp_xwd.hash +++ b/package/x11r7/xapp_xwd/xapp_xwd.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002876.html -md5 11794a8eba6d295a192a8975287fd947 xwd-1.0.7.tar.bz2 -sha1 65ce0617be29687cf6082c3a0e85d15a0dcccda9 xwd-1.0.7.tar.bz2 -sha256 cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794 xwd-1.0.7.tar.bz2 -sha512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e xwd-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-August/003102.html +sha256 fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b xwd-1.0.8.tar.bz2 +sha512 d2aaf42c60d20c4b09f4947d3702058dbfad4633b2c5c8ea62e8897fc9ced1ab3417ce99255a223286d21a731f543019470737e3074f1bc68033b4eb47bc773e xwd-1.0.8.tar.bz2 # Locally computed -sha256 7cfda56afd92a1ecd2f23bd0064e01b5141053390d854785504adfe2c0fbd946 COPYING +sha256 7cfda56afd92a1ecd2f23bd0064e01b5141053390d854785504adfe2c0fbd946 COPYING diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk index 4d7ed0f877..1c5bd50166 100644 --- a/package/x11r7/xapp_xwd/xapp_xwd.mk +++ b/package/x11r7/xapp_xwd/xapp_xwd.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XWD_VERSION = 1.0.7 +XAPP_XWD_VERSION = 1.0.8 XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2 -XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XWD_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XWD_LICENSE = MIT XAPP_XWD_LICENSE_FILES = COPYING XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libxkbfile diff --git a/package/x11r7/xcb-proto/xcb-proto.hash b/package/x11r7/xcb-proto/xcb-proto.hash index c6d2d8e341..e6bc2379bf 100644 --- a/package/x11r7/xcb-proto/xcb-proto.hash +++ b/package/x11r7/xcb-proto/xcb-proto.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-February/003038.html -sha256 186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605 xcb-proto-1.14.tar.xz -sha512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690 xcb-proto-1.14.tar.xz +# From https://lists.x.org/archives/xorg-announce/2020-October/003061.html +sha256 f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3 xcb-proto-1.14.1.tar.xz +sha512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d xcb-proto-1.14.1.tar.xz # Locally computed -sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd COPYING +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd COPYING diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk index f7a3ad55b1..64190c817f 100644 --- a/package/x11r7/xcb-proto/xcb-proto.mk +++ b/package/x11r7/xcb-proto/xcb-proto.mk @@ -4,16 +4,20 @@ # ################################################################################ -XCB_PROTO_VERSION = 1.14 +XCB_PROTO_VERSION = 1.14.1 XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.xz -XCB_PROTO_SITE = http://xcb.freedesktop.org/dist +XCB_PROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XCB_PROTO_LICENSE = MIT XCB_PROTO_LICENSE_FILES = COPYING XCB_PROTO_INSTALL_STAGING = YES -XCB_PROTO_DEPENDENCIES = host-python -HOST_XCB_PROTO_DEPENDENCIES = host-python +XCB_PROTO_DEPENDENCIES = host-python3 +HOST_XCB_PROTO_DEPENDENCIES = host-python3 + +# Force detection of Buildroot host-python3 over system python +XCB_PROTO_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 +HOST_XCB_PROTO_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index c33893efe7..3ee726bfdc 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,7 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003017.html -md5 d600e8e2e30747b8ce49ec5294ff0ab6 xf86-input-libinput-0.29.0.tar.bz2 -sha1 efa9dbe08ee827949aff0bd752f8270237247c56 xf86-input-libinput-0.29.0.tar.bz2 -sha256 c28b56a21754b972db31798e6a4cf4dc9d69208d08f8fe41701a94def5e94bee xf86-input-libinput-0.29.0.tar.bz2 -sha512 f19ef2e9e0c1336d8e0b17853e1fe0c66ecf50e7b10b10b6c5cbafc99323694597821e15e8e358419ef3c68d1009967fd2ec3760800c85adbb71ac3ecc99954b xf86-input-libinput-0.29.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-June/003094.html +sha256 e11d2a41419124a6e9b148f1df181bf7819fc7398c8ee9a1b6390b0742c68d16 xf86-input-libinput-1.1.0.tar.bz2 +sha512 7def9a4834a9203d1672613b1a4b384a0eb3d664818865b375969bf9ca96c512b752859acc8916de9224f7e488f8d59953308e53b983dfa8031ca01fd707fa2b xf86-input-libinput-1.1.0.tar.bz2 + # Locally computed -sha256 b808a8a077995380c6064bec41616f98546b0b2e79bb7f3d0247d290e275b396 COPYING +sha256 4114220b281561e80f3422f0e7ae8d3e1fc85131ffc2e3b6265119e66f1adb27 COPYING diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index 2208500556..73cdad9b85 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.29.0 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.1.0 XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in index fdf1ebd18b..1246014dca 100644 --- a/package/x11r7/xdriver_xf86-video-ati/Config.in +++ b/package/x11r7/xdriver_xf86-video-ati/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI bool "xf86-video-ati" + depends on BR2_i386 || BR2_x86_64 # DRI radeon r100 driver depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_RADEON @@ -10,4 +11,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI ATI video driver comment "xf86-video-ati needs mesa3d" + depends on BR2_i386 || BR2_x86_64 depends on !BR2_PACKAGE_MESA3D 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 07e4abf801..7a66c28b52 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,4 +1,3 @@ -# From https://lists.x.org/archives/xorg-announce/2016-December/002750.html -sha256 c6694c21ee3d9560f6e925925ef1d3818b1988e899b6a0592dbae597c87ac97e xf86-video-geode-2.11.19.tar.bz2 # 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 54616f65fe..dbeae1aa65 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,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.19 +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_LICENSE = MIT diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash index e5d46c86f3..5873b4b11c 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 61b3a7a22f80d1cbc797c329615e1699f3906c9261de7eabcf0de2bf2399de55 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga.tar.gz +sha256 638a8aa8b64f860900d003527529689bc342d18ff5e41a9e1750884544898e67 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz sha256 9d3e373f0440cc0c58853e963636a7c1ffda9308ec5f30ebe9adfb9c16a8a1e4 COPYING-MIT diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash index ff816c7bbe..26002a7966 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b074366aad25cae38bb455792ac3110d52bcb0e4a183766c37ee12cbe56d7f8c xdriver_xf86-video-intel-f66d39544bb8339130c96d282a80f87ca1606caf.tar.gz -sha256 5808e89f4b9a30afc59f335bfa8219ecf2dacb89a81d16b322bc6d92993a48fa COPYING +sha256 11f48628d2b1f495446c49df93de40569ced664c6fdbd5d3f8f7a863e4a1124c xdriver_xf86-video-intel-31486f40f8e8f8923ca0799aea84b58799754564-br1.tar.gz +sha256 5808e89f4b9a30afc59f335bfa8219ecf2dacb89a81d16b322bc6d92993a48fa COPYING diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index fb74eb6ad5..d911234c92 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = f66d39544bb8339130c96d282a80f87ca1606caf +XDRIVER_XF86_VIDEO_INTEL_VERSION = 31486f40f8e8f8923ca0799aea84b58799754564 XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING @@ -21,6 +21,7 @@ XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS = \ --enable-sna \ --disable-xaa \ --disable-dga \ + --disable-tools \ --disable-async-swap XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \ diff --git a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash index b70728f9b7..336f29be46 100644 --- a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash +++ b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash @@ -1,7 +1,6 @@ -# From https://lists.freedesktop.org/archives/nouveau/2019-January/032053.html -md5 ecd9be89d853301167e3d564c49f7a8e xf86-video-nouveau-1.0.16.tar.bz2 -sha1 a2d19439ceed315079207a62c6888a12e8489995 xf86-video-nouveau-1.0.16.tar.bz2 -sha256 304060806415579cdb5c1f71f1c54d11cacb431b5552b170decbc883ed43bf06 xf86-video-nouveau-1.0.16.tar.bz2 -sha512 41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0 xf86-video-nouveau-1.0.16.tar.bz2 +# From https://lists.freedesktop.org/archives/nouveau/2021-January/037766.html +sha256 499322e27a55c8183166bf2dd1e47d085eb834143e0d7036baba8427b90c156b xf86-video-nouveau-1.0.17.tar.bz2 +sha512 adba58ba5298d1a5b3f9f8540f9ef2cb2e10e47bba8e374103ec2e1f92e915f5f4393ed0021168cd649646e12315135a1efcdf77e8fb1648e1295914d87279b2 xf86-video-nouveau-1.0.17.tar.bz2 + # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk index d85cbfe4a4..e63bc611bf 100644 --- a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk +++ b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.16 +XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.17 XDRIVER_XF86_VIDEO_NOUVEAU_SOURCE = xf86-video-nouveau-$(XDRIVER_XF86_VIDEO_NOUVEAU_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_NOUVEAU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE = MIT diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash index ee27690093..d179228a74 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-February/002837.html -md5 8134201beaf6f77150c7809c3cc802e6 xf86-video-vesa-2.4.0.tar.bz2 -sha1 99b69044c34292ba062e365c07dcd024462e794b xf86-video-vesa-2.4.0.tar.bz2 -sha256 bf443c94d7bf6cd4e248f8a3147f4647be04dc4c80250d9405006263bbdee38c xf86-video-vesa-2.4.0.tar.bz2 -sha512 4af5c0a7fd64eba503980198cf510688dff2f33482ceac446455d97255dcc828613387ac57828eb6dce080cb15a8644a2b2e278bf356705fdeaea873ab07c2de xf86-video-vesa-2.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-September/003060.html +sha256 1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659 xf86-video-vesa-2.5.0.tar.bz2 +sha512 36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b xf86-video-vesa-2.5.0.tar.bz2 # Locally computed -sha256 bda49ba1e860501c20fd444423bc790f6da4f769561b69acc0cbe5abff9409b6 COPYING +sha256 bda49ba1e860501c20fd444423bc790f6da4f769561b69acc0cbe5abff9409b6 COPYING diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk index 425280a119..b08bab4ec8 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VESA_VERSION = 2.4.0 +XDRIVER_XF86_VIDEO_VESA_VERSION = 2.5.0 XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_VESA_LICENSE = MIT diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk index bc05a2165c..2418769808 100644 --- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk index f77c1706cd..90e94d27cb 100644 --- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk index 1c157dd4cf..83157f5c67 100644 --- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk index cd60b34fce..ac3bf2e230 100644 --- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.hash b/package/x11r7/xfont_font-alias/xfont_font-alias.hash index ae679a0ade..5390d1c126 100644 --- a/package/x11r7/xfont_font-alias/xfont_font-alias.hash +++ b/package/x11r7/xfont_font-alias/xfont_font-alias.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2020-August/003054.html +sha256 f3111ae8bf2e980f5f56af400e8eefe5fc9f4207f4a412ea79637fd66c945276 font-alias-1.0.4.tar.bz2 +sha512 c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d font-alias-1.0.4.tar.bz2 # locally computed -sha256 8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a font-alias-1.0.3.tar.bz2 sha256 bdba5452fc080c0f1a56d66978ac4150d1d1a00a9cc0248bba4f0b76c80ad47e COPYING diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk index 8a37da44c0..7f8e4b2ea0 100644 --- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk +++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFONT_FONT_ALIAS_VERSION = 1.0.3 +XFONT_FONT_ALIAS_VERSION = 1.0.4 XFONT_FONT_ALIAS_SOURCE = font-alias-$(XFONT_FONT_ALIAS_VERSION).tar.bz2 XFONT_FONT_ALIAS_SITE = http://xorg.freedesktop.org/releases/individual/font XFONT_FONT_ALIAS_LICENSE = MIT diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk index e8f6f3d2e6..c867a60233 100644 --- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ARABIC_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk index d1176d54e5..cc15738692 100644 --- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BH_100DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk index 5b05f5f797..788a76a2b9 100644 --- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BH_75DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk index 4afec6ce69..2f055ddab9 100644 --- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk index 7a36c11053..4166b2d741 100644 --- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk index 9812ddc1b7..90d9e5bbb4 100644 --- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk index 91dfeb2ac8..deb99aa596 100644 --- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk index 28329a36bb..caca639c25 100644 --- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk @@ -12,6 +12,11 @@ XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk index 9e8852aeee..e752803086 100644 --- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_CURSOR_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk index f591b8b80b..f5bd941383 100644 --- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk @@ -11,6 +11,11 @@ XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk index 10d24c6c57..1642b41352 100644 --- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_DEC_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk index 721f93d80f..1393d67eae 100644 --- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ISAS_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk index 1736aed179..78a5bbbf8e 100644 --- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk @@ -11,6 +11,11 @@ XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_JIS_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk index 60105427df..b5da83f398 100644 --- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_MICRO_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk index 2263972084..8fa30ea314 100644 --- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk @@ -12,6 +12,11 @@ XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash index f806bf0898..45cf430018 100644 --- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash +++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2020-August/003055.html +sha256 698c0f6ddf9ca482250bdafa08293893148393bb9cb23e0a9ca313c6dbfc4ae0 font-misc-ethiopic-1.0.4.tar.bz2 +sha512 4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5 font-misc-ethiopic-1.0.4.tar.bz2 # locally computed -sha256 53cb1fd83afdbe7939c0eac34003676ee0e6023216892d98054db90b703c98a5 font-misc-ethiopic-1.0.3.tar.bz2 sha256 94835f274f1ddad34f8fd3a06b2c493222a68e4094f4097000d101f22ee0d0d5 COPYING diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk index 6f345df52c..9ded4b6ced 100644 --- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFONT_FONT_MISC_ETHIOPIC_VERSION = 1.0.3 +XFONT_FONT_MISC_ETHIOPIC_VERSION = 1.0.4 XFONT_FONT_MISC_ETHIOPIC_SOURCE = font-misc-ethiopic-$(XFONT_FONT_MISC_ETHIOPIC_VERSION).tar.bz2 XFONT_FONT_MISC_ETHIOPIC_SITE = http://xorg.freedesktop.org/releases/individual/font XFONT_FONT_MISC_ETHIOPIC_LICENSE = MIT diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk index dd62f05026..e03da6f1b5 100644 --- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_MISC_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk index 475fc68b2a..6fcaa5dadc 100644 --- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_MUTT_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk index b50ed57688..e07569d4b4 100644 --- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk index dd444594ed..a254d4a756 100644 --- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk @@ -12,6 +12,11 @@ XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk index ae4444e597..6e580fd922 100644 --- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_SONY_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk index c1e2dac72e..737cfb5c9b 100644 --- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_SUN_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk index 8e83d44665..e43cd1150f 100644 --- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk @@ -12,6 +12,11 @@ XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/package/x11r7/xkeyboard-config/Config.in b/package/x11r7/xkeyboard-config/Config.in index c941742421..17cfe738d4 100644 --- a/package/x11r7/xkeyboard-config/Config.in +++ b/package/x11r7/xkeyboard-config/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_XKEYBOARD_CONFIG help keyboard configuration database for X - http://xlibs.freedesktop.org/xkbdesc + https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/package/x11r7/xkeyboard-config/xkeyboard-config.hash index 5066a46885..fe80291557 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802 xkeyboard-config-2.29.tar.bz2 -sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING +sha256 1feee317ba39b91902b0cbd2987c0c73e6afbfc8f4c096367a5c86c216c036a8 xkeyboard-config-2.32.tar.bz2 +sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index f2fc8565c3..0fd681b59a 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -4,7 +4,7 @@ # ################################################################################ -XKEYBOARD_CONFIG_VERSION = 2.29 +XKEYBOARD_CONFIG_VERSION = 2.32 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 XKEYBOARD_CONFIG_SITE = https://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARD_CONFIG_LICENSE = MIT diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk index 9cc93e0fe1..9d9aecb74f 100644 --- a/package/x11r7/xlib_libFS/xlib_libFS.mk +++ b/package/x11r7/xlib_libFS/xlib_libFS.mk @@ -9,6 +9,8 @@ XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2 XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBFS_LICENSE = MIT XLIB_LIBFS_LICENSE_FILES = COPYING +XLIB_LIBFS_CPE_ID_VENDOR = x +XLIB_LIBFS_CPE_ID_PRODUCT = libfs XLIB_LIBFS_INSTALL_STAGING = YES XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xorgproto host-pkgconf XLIB_LIBFS_CONF_OPTS = --disable-malloc0returnsnull diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk index 0b1f8ade17..2b56aaab98 100644 --- a/package/x11r7/xlib_libICE/xlib_libICE.mk +++ b/package/x11r7/xlib_libICE/xlib_libICE.mk @@ -9,6 +9,8 @@ XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2 XLIB_LIBICE_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBICE_LICENSE = MIT XLIB_LIBICE_LICENSE_FILES = COPYING +XLIB_LIBICE_CPE_ID_VENDOR = freedesktop +XLIB_LIBICE_CPE_ID_PRODUCT = libice XLIB_LIBICE_INSTALL_STAGING = YES XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xorgproto host-pkgconf diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index defaa4c982..7aeef33446 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,7 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-October/003025.html -md5 55adbfb6d4370ecac5e70598c4e7eed2 libX11-1.6.9.tar.bz2 -sha1 62456536411f2540fbd4a3f59ed8af94967124c2 libX11-1.6.9.tar.bz2 -sha256 9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1 libX11-1.6.9.tar.bz2 -sha512 fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31 libX11-1.6.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-June/003092.html +sha256 1cfa35e37aaabbe4792e9bb690468efefbfbf6b147d9c69d6f90d13c3092ea6c libX11-1.7.2.tar.bz2 +sha512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7 libX11-1.7.2.tar.bz2 + # Locally computed -sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING +sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 18949c604d..aa3ebf1593 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,11 +4,13 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.6.9 +XLIB_LIBX11_VERSION = 1.7.2 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT XLIB_LIBX11_LICENSE_FILES = COPYING +XLIB_LIBX11_CPE_ID_VENDOR = x.org +XLIB_LIBX11_CPE_ID_PRODUCT = libx11 XLIB_LIBX11_INSTALL_STAGING = YES XLIB_LIBX11_DEPENDENCIES = \ libxcb \ diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.hash b/package/x11r7/xlib_libXaw/xlib_libXaw.hash index 159e007bc3..f289e66153 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.hash +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.hash @@ -1,4 +1,6 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002591.html -sha256 8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd libXaw-1.0.13.tar.bz2 +# 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 + # Locally calculated -sha256 9f5adb26952f93b3e4650285b94ec6c61a27aab5a21088bfb6694001be1b360d COPYING +sha256 9f5adb26952f93b3e4650285b94ec6c61a27aab5a21088bfb6694001be1b360d COPYING diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk index 17d51a9570..6b615a8de5 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXAW_VERSION = 1.0.13 +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_LICENSE = MIT diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk index 9bbd460c9d..79d9904010 100644 --- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk +++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk @@ -10,6 +10,8 @@ XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXCURSOR_LICENSE = MIT XLIB_LIBXCURSOR_LICENSE_FILES = COPYING XLIB_LIBXCURSOR_INSTALL_STAGING = YES +XLIB_LIBXCURSOR_CPE_ID_VENDOR = x +XLIB_LIBXCURSOR_CPE_ID_PRODUCT = libxcursor XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xorgproto HOST_XLIB_LIBXCURSOR_DEPENDENCIES = \ host-xlib_libX11 host-xlib_libXfixes host-xlib_libXrender \ diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk index 1182903e87..51db9908e5 100644 --- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk +++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk @@ -9,6 +9,8 @@ XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2 XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXDMCP_LICENSE = MIT XLIB_LIBXDMCP_LICENSE_FILES = COPYING +XLIB_LIBXDMCP_CPE_ID_VENDOR = x.org +XLIB_LIBXDMCP_CPE_ID_PRODUCT = libxdmcp XLIB_LIBXDMCP_INSTALL_STAGING = YES XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xorgproto host-pkgconf HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xorgproto host-pkgconf diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk index c63a3b23cc..6002e59e0d 100644 --- a/package/x11r7/xlib_libXext/xlib_libXext.mk +++ b/package/x11r7/xlib_libXext/xlib_libXext.mk @@ -9,6 +9,8 @@ XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2 XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXEXT_LICENSE = MIT XLIB_LIBXEXT_LICENSE_FILES = COPYING +XLIB_LIBXEXT_CPE_ID_VENDOR = x +XLIB_LIBXEXT_CPE_ID_PRODUCT = libxext XLIB_LIBXEXT_INSTALL_STAGING = YES XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xorgproto XLIB_LIBXEXT_CONF_OPTS = --disable-malloc0returnsnull diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash index d655be4f71..f40c522903 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash @@ -1,5 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002722.html -sha256 de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6 libXfixes-5.0.3.tar.bz2 +# 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 # Locally calculated sha256 d64e671ffeb483d4543f98c842788ab34c77427e27d83d6b082065a4438d4885 COPYING diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk index f563ba34ec..c0229b57d2 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk @@ -4,11 +4,13 @@ # ################################################################################ -XLIB_LIBXFIXES_VERSION = 5.0.3 +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_LICENSE = MIT XLIB_LIBXFIXES_LICENSE_FILES = COPYING +XLIB_LIBXFIXES_CPE_ID_VENDOR = x +XLIB_LIBXFIXES_CPE_ID_PRODUCT = libxfixes XLIB_LIBXFIXES_INSTALL_STAGING = YES XLIB_LIBXFIXES_DEPENDENCIES = xlib_libX11 xorgproto HOST_XLIB_LIBXFIXES_DEPENDENCIES = \ diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash index 634affdfdb..069f2fc616 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash @@ -1,8 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-September/003022.html -md5 00516bed7ec1453d56974560379fff2f libXfont2-2.0.4.tar.bz2 -sha1 9e00ae7589315656435efaf330128facad7c4a57 libXfont2-2.0.4.tar.bz2 -sha256 6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6 libXfont2-2.0.4.tar.bz2 -sha512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106 libXfont2-2.0.4.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2021-August/003103.html +sha256 aa7c6f211cf7215c0ab4819ed893dc98034363d7b930b844bb43603c2e10b53e libXfont2-2.0.5.tar.bz2 +sha512 64d0635d14676bb645d61932afb177eb3808a46525b26e7ee31abc975eca75207743e85523fdd82b08010ce124eb4802338b508ee7b126875d2a3c12f8ac4faa libXfont2-2.0.5.tar.bz2 # Locally calculated -sha256 97e413bb4962bbb5773085cd5405502bf1d4eadeaf98ff5be015eacacc840462 COPYING +sha256 97e413bb4962bbb5773085cd5405502bf1d4eadeaf98ff5be015eacacc840462 COPYING diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk index 611b8af548..6a71761f4e 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk @@ -4,11 +4,13 @@ # ################################################################################ -XLIB_LIBXFONT2_VERSION = 2.0.4 +XLIB_LIBXFONT2_VERSION = 2.0.5 XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 -XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXFONT2_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFONT2_LICENSE = MIT XLIB_LIBXFONT2_LICENSE_FILES = COPYING +XLIB_LIBXFONT2_CPE_ID_VENDOR = x +XLIB_LIBXFONT2_CPE_ID_PRODUCT = libxfont XLIB_LIBXFONT2_INSTALL_STAGING = YES # 0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch XLIB_LIBXFONT2_AUTORECONF = YES diff --git a/package/x11r7/xlib_libXft/xlib_libXft.hash b/package/x11r7/xlib_libXft/xlib_libXft.hash index bd0838b4dd..8743a9b7d1 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.hash +++ b/package/x11r7/xlib_libXft/xlib_libXft.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002976.html -md5 4a433c24627b4ff60a4dd403a0990796 libXft-2.3.3.tar.bz2 -sha1 48f543fe495f545df1794fa36a0a708558ae298c libXft-2.3.3.tar.bz2 -sha256 225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216 libXft-2.3.3.tar.bz2 -sha512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8 libXft-2.3.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-August/003104.html +sha256 57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd libXft-2.3.4.tar.bz2 +sha512 5bb019750982ed4643880efd7368bc226ad49cfa8c0c8c6d4614dfeed74f588c65e1ba69adcc12284ec07d841e5b58fc1c27f3fddf83fe1a2837b29dd9ecec51 libXft-2.3.4.tar.bz2 # Locally computed -sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING +sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index 489cfe4c56..b1640a6613 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXFT_VERSION = 2.3.3 +XLIB_LIBXFT_VERSION = 2.3.4 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2 -XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXFT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFT_LICENSE = MIT XLIB_LIBXFT_LICENSE_FILES = COPYING XLIB_LIBXFT_INSTALL_STAGING = YES diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk index de7f3a7d3c..ad4cf5f96f 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -9,6 +9,8 @@ XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 XLIB_LIBXI_SITE = https://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXI_LICENSE = MIT XLIB_LIBXI_LICENSE_FILES = COPYING +XLIB_LIBXI_CPE_ID_VENDOR = x.org +XLIB_LIBXI_CPE_ID_PRODUCT = libxi XLIB_LIBXI_INSTALL_STAGING = YES XLIB_LIBXI_DEPENDENCIES = \ host-pkgconf \ diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk index 405faefa46..48e32d55e2 100644 --- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk +++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk @@ -9,6 +9,8 @@ XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2 XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXINERAMA_LICENSE = MIT XLIB_LIBXINERAMA_LICENSE_FILES = COPYING +XLIB_LIBXINERAMA_CPE_ID_VENDOR = x +XLIB_LIBXINERAMA_CPE_ID_PRODUCT = libxinerama XLIB_LIBXINERAMA_INSTALL_STAGING = YES XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBXINERAMA_CONF_OPTS = --disable-malloc0returnsnull diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 455fb10bf2..7b645dc9e6 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -9,6 +9,8 @@ XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT +XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project +XLIB_LIBXPM_CPE_ID_PRODUCT = libxpm XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk index 23a0d974d0..aa2761330a 100644 --- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk +++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk @@ -9,6 +9,8 @@ XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2 XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXRANDR_LICENSE = MIT XLIB_LIBXRANDR_LICENSE_FILES = COPYING +XLIB_LIBXRANDR_CPE_ID_VENDOR = x.org +XLIB_LIBXRANDR_CPE_ID_PRODUCT = libxrandr XLIB_LIBXRANDR_INSTALL_STAGING = YES XLIB_LIBXRANDR_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXrender xorgproto XLIB_LIBXRANDR_CONF_OPTS = --disable-malloc0returnsnull diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk index 870f94386e..0ef0ec48d9 100644 --- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk +++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk @@ -9,6 +9,8 @@ XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2 XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXRENDER_LICENSE = MIT XLIB_LIBXRENDER_LICENSE_FILES = COPYING +XLIB_LIBXRENDER_CPE_ID_VENDOR = x.org +XLIB_LIBXRENDER_CPE_ID_PRODUCT = libxrender XLIB_LIBXRENDER_INSTALL_STAGING = YES XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xorgproto HOST_XLIB_LIBXRENDER_DEPENDENCIES = \ diff --git a/package/x11r7/xlib_libXres/xlib_libXres.hash b/package/x11r7/xlib_libXres/xlib_libXres.hash index ee4823c1a4..700590ad8c 100644 --- a/package/x11r7/xlib_libXres/xlib_libXres.hash +++ b/package/x11r7/xlib_libXres/xlib_libXres.hash @@ -1,8 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2017-October/002812.html -md5 5d6d443d1abc8e1f6fc1c57fb27729bb libXres-1.2.0.tar.bz2 -sha1 b6996ab05460a3b7311f02da23ddf117a5442fd9 libXres-1.2.0.tar.bz2 -sha256 ff75c1643488e64a7cfbced27486f0f944801319c84c18d3bd3da6bf28c812d4 libXres-1.2.0.tar.bz2 -sha512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172 libXres-1.2.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-March/003078.html +sha256 b6e6fb1ebb61610e56017edd928fb89a5f53b3f4f990078309877468663b2b11 libXres-1.2.1.tar.bz2 +sha512 c17d28406e17e305dc4976f095e88059735f5bd8c600adf2e556523c9e0dd7fa01dcbf7a9d28a642e77e49a5b30f54bb9b2fc34bfbedce467ee2a020bba5cdf1 libXres-1.2.1.tar.bz2 # Locally calculated -sha256 0d7300168f85833ea2564835f66a61e036ede90b33e76c06a7b4078096fedbcc COPYING +sha256 0d7300168f85833ea2564835f66a61e036ede90b33e76c06a7b4078096fedbcc COPYING diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk index 72f2ec4424..de3637a04a 100644 --- a/package/x11r7/xlib_libXres/xlib_libXres.mk +++ b/package/x11r7/xlib_libXres/xlib_libXres.mk @@ -4,11 +4,13 @@ # ################################################################################ -XLIB_LIBXRES_VERSION = 1.2.0 +XLIB_LIBXRES_VERSION = 1.2.1 XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2 XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXRES_LICENSE = MIT XLIB_LIBXRES_LICENSE_FILES = COPYING +XLIB_LIBXRES_CPE_ID_VENDOR = x +XLIB_LIBXRES_CPE_ID_PRODUCT = libxres XLIB_LIBXRES_INSTALL_STAGING = YES XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBXRES_CONF_OPTS = --disable-malloc0returnsnull diff --git a/package/x11r7/xlib_libXt/xlib_libXt.hash b/package/x11r7/xlib_libXt/xlib_libXt.hash index 7f457fb9bc..dcd4853d76 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.hash +++ b/package/x11r7/xlib_libXt/xlib_libXt.hash @@ -1,8 +1,5 @@ -# From https://lists.x.org/archives/xorg/2019-June/059825.html -md5 a9019421d3ee8b4937b6afd9025f018a libXt-1.2.0.tar.bz2 -sha1 f6b5ed799bc2e8d721e5407a09c2a8f570963f1b libXt-1.2.0.tar.bz2 -sha256 b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831 libXt-1.2.0.tar.bz2 -sha512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1 libXt-1.2.0.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2021-January/003070.html +sha256 679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60 libXt-1.2.1.tar.bz2 +sha512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c libXt-1.2.1.tar.bz2 # Locally calculated -sha256 a2866ccc0b1745149e4a2258d934314d40cbb43bd8318c6fa597f233995b0a81 COPYING +sha256 a2866ccc0b1745149e4a2258d934314d40cbb43bd8318c6fa597f233995b0a81 COPYING diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk index 01251c091b..9530262cf5 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -4,12 +4,14 @@ # ################################################################################ -XLIB_LIBXT_VERSION = 1.2.0 +XLIB_LIBXT_VERSION = 1.2.1 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXT_LICENSE = MIT XLIB_LIBXT_LICENSE_FILES = COPYING XLIB_LIBXT_INSTALL_STAGING = YES +XLIB_LIBXT_CPE_ID_VENDOR = x +XLIB_LIBXT_CPE_ID_PRODUCT = libxt XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xorgproto xcb-proto libxcb host-xorgproto XLIB_LIBXT_CONF_OPTS = --disable-malloc0returnsnull diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk index e0d7e8217c..c79301e064 100644 --- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk +++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk @@ -10,6 +10,8 @@ XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXTST_LICENSE = MIT XLIB_LIBXTST_LICENSE_FILES = COPYING XLIB_LIBXTST_INSTALL_STAGING = YES +XLIB_LIBXTST_CPE_ID_VENDOR = x +XLIB_LIBXTST_CPE_ID_PRODUCT = libxtst XLIB_LIBXTST_DEPENDENCIES = \ xlib_libX11 \ diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk index 0ff99b9380..1105b5925d 100644 --- a/package/x11r7/xlib_libXv/xlib_libXv.mk +++ b/package/x11r7/xlib_libXv/xlib_libXv.mk @@ -9,6 +9,8 @@ XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2 XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXV_LICENSE = ISC-like XLIB_LIBXV_LICENSE_FILES = COPYING +XLIB_LIBXV_CPE_ID_VENDOR = x.org +XLIB_LIBXV_CPE_ID_PRODUCT = libxv XLIB_LIBXV_INSTALL_STAGING = YES XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBXV_CONF_OPTS = --disable-malloc0returnsnull diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk index 02959c2305..7980f17493 100644 --- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk +++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk @@ -9,6 +9,8 @@ XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2 XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXVMC_LICENSE = MIT XLIB_LIBXVMC_LICENSE_FILES = COPYING +XLIB_LIBXVMC_CPE_ID_VENDOR = x.org +XLIB_LIBXVMC_CPE_ID_PRODUCT = libxvmc XLIB_LIBXVMC_INSTALL_STAGING = YES XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xorgproto XLIB_LIBXVMC_CONF_OPTS = --disable-malloc0returnsnull diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk index 62fe06c1a5..a5173fbc7c 100644 --- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk +++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk @@ -9,6 +9,8 @@ XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2 XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXXF86DGA_LICENSE = MIT XLIB_LIBXXF86DGA_LICENSE_FILES = COPYING +XLIB_LIBXXF86DGA_CPE_ID_VENDOR = x +XLIB_LIBXXF86DGA_CPE_ID_PRODUCT = libxxf86dga XLIB_LIBXXF86DGA_INSTALL_STAGING = YES XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBXXF86DGA_CONF_OPTS = --disable-malloc0returnsnull diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk index 2106451c74..8871bd507e 100644 --- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk +++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk @@ -9,6 +9,8 @@ XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2 XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXXF86VM_LICENSE = MIT XLIB_LIBXXF86VM_LICENSE_FILES = COPYING +XLIB_LIBXXF86VM_CPE_ID_VENDOR = x +XLIB_LIBXXF86VM_CPE_ID_PRODUCT = libxxf86vm XLIB_LIBXXF86VM_INSTALL_STAGING = YES XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBXXF86VM_CONF_OPTS = --disable-malloc0returnsnull diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk index c67593e9a4..429595b5d7 100644 --- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk +++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk @@ -9,6 +9,8 @@ XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2 XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBDMX_LICENSE = MIT XLIB_LIBDMX_LICENSE_FILES = COPYING +XLIB_LIBDMX_CPE_ID_VENDOR = x +XLIB_LIBDMX_CPE_ID_PRODUCT = libdmx XLIB_LIBDMX_INSTALL_STAGING = YES XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBDMX_CONF_OPTS = --disable-malloc0returnsnull diff --git a/package/x11r7/xlib_libxshmfence/Config.in b/package/x11r7/xlib_libxshmfence/Config.in index 710476b357..7823bda7c0 100644 --- a/package/x11r7/xlib_libxshmfence/Config.in +++ b/package/x11r7/xlib_libxshmfence/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_XLIB_LIBXSHMFENCE bool "libxshmfence" + # Due to use of SYS_futex - can be enabled again when upstream + # adds SYS_futex64 as an alternative + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_XORGPROTO help diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash index 17613db009..a88c129dd0 100644 --- a/package/x11r7/xorgproto/xorgproto.hash +++ b/package/x11r7/xorgproto/xorgproto.hash @@ -1,42 +1,41 @@ -# From https://lists.x.org/archives/xorg-announce/2019-October/003029.html -md5 a02dcaff48b4141b949ac99dfc344d86 xorgproto-2019.2.tar.bz2 -sha1 2dedbe3e4daccf0c3d675759ed82161a3e4cf1b5 xorgproto-2019.2.tar.bz2 -sha256 46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e xorgproto-2019.2.tar.bz2 -sha512 cbfdf6bb3d58d4d4e7788c9ed779402352715e9899f65594fbc527b3178f1dc5e03cebc8ba5a863b3c196a1a0f2026c2d0438207ca19f81f3c8b7da0c0667904 xorgproto-2019.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-April/003085.html +sha256 0f5157030162844b398e7ce69b8bb967c2edb8064b0a9c9bb5517eb621459fbf xorgproto-2021.4.tar.bz2 +sha512 0d905e5f135daf7005e23371cbdc41a62d99567e0a20784e71ead0092ffd1e7582733819f7198add1d97edcc9aa80012ae01d2be8367280d69b41d0c25349367 xorgproto-2021.4.tar.bz2 + # Locally computed -sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto -sha256 dabc025f93129a0eb2d17f37c719dbe5ecbcb5bc8f7bc7f4ce89fe04576cc0c2 COPYING-bigreqsproto -sha256 ab587ca94282c1e60797ffe4a77aea195418387db20ec7e0c24cedf2c844f8c1 COPYING-compositeproto -sha256 f67a18cb46c4c203c5122b4a901cfcc3178b2a62f83f31ca5fef5bdca3966094 COPYING-damageproto -sha256 819e8dcd3dd2a44850c350331aa492230f86bccb0983dd739dec5ba36d7d2b8e COPYING-dmxproto -sha256 0c306691492c4d7a8cda1ec3847668b797887dddcd7e986b4c166ae27619af7d COPYING-dri2proto -sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-dri3proto -sha256 0aa43d03da3cedbd9882c0ded621b0d855353eb9e551f9eed940d75c8a0b03c1 COPYING-evieproto -sha256 65cb0b867b00fb27f066a37353713b265645b3301146562570d7638ed2ddd548 COPYING-fixesproto -sha256 1ab381e978bff63d68be2e4f235d51935f3f16f3ba3bebf83afa99a70c0484a2 COPYING-fontcacheproto -sha256 f4af05774b02ae149357cc26f7bf5ef1116c2e09373c2492081a3a1892c58417 COPYING-fontsproto -sha256 823deb4673d3f26aa8c90e704888299648f00be3262f9363eaeecedcd65b936d COPYING-glproto -sha256 5e083a2ace0215a6084c877c023a6079952ba803d692488203ba4269196debe3 COPYING-inputproto -sha256 d397a67d4b28e897bc5fce79b2b917df9905b54f961fc3ad1f49c7fe3803f92c COPYING-kbproto -sha256 7a5dd5d4c989c167da50f15879959f42bbda960e06d0a0aea7197f61fe1dc846 COPYING-lg3dproto -sha256 8442b5f22f2fb13017a4302a906e7dedc899267b41f613558970941120170128 COPYING-pmproto -sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-presentproto -sha256 6b890b118261694865988378dbba876bcd9caa1a421c5c0d626116948bc0ae35 COPYING-printproto -sha256 41c13dcd09147ed2440286f2fb8151df8ebee06deee4ed78ddf094601c216d3d COPYING-randrproto -sha256 ee10aee0f1697ffdbe870a39f037361d4f7136f2976bb7919a41b3f66407caee COPYING-recordproto -sha256 9e48921a94da36d7a69fe71809223ee0bb46370db9842dccdeeb55b5a9946872 COPYING-renderproto -sha256 403e7be948674530ad40669b1e3a31adeddb656502f3b0ef810d5d3cc35d0b52 COPYING-resourceproto -sha256 fcbd3c628bf4d28ee3e6032054bf44bbe58f3b1a944dad856a8d3eb6b37ea412 COPYING-scrnsaverproto -sha256 d6d3513f5a7099748dc387f54498d799380b45f8a444f13aa98aa45a860ae55b COPYING-trapproto -sha256 f8f49bbad61967ebc890fb79fff5bfb7cfc1c341aa8f8dee13eb3fb534040b47 COPYING-videoproto -sha256 eb183a00c61bb47992f096b6993ed7ec17518bea9c285fe87efff7f622cc6c12 COPYING-windowswmproto -sha256 da4a28570230228b9bd80a701c5d8752f8609394de2e0d46d26d978bd07610db COPYING-x11proto -sha256 5531d18cfcc944dab39991f63f182cbbce3fe493ba0c7cf08a25c0d01ee84482 COPYING-xcmiscproto -sha256 fb42146c6c06a200a9b121220eb692ff9101ba0fbd0b224b9e16a016c59ae86a COPYING-xextproto -sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86bigfontproto -sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86dgaproto -sha256 4a05d06752388d9db71ee1006f371d4fb2c316a821fc2fc272db90b3ef978334 COPYING-xf86driproto -sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86miscproto -sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86rushproto -sha256 942bb46a3503a708948491699171b00b9e0dfb47818d9268b160bccc5f51a4b9 COPYING-xf86vidmodeproto -sha256 b2d8cda803e900915ce10f0ba735ff2c033b39c7cc5a8a436667ca583d4066fa COPYING-xineramaproto +sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto +sha256 dabc025f93129a0eb2d17f37c719dbe5ecbcb5bc8f7bc7f4ce89fe04576cc0c2 COPYING-bigreqsproto +sha256 ab587ca94282c1e60797ffe4a77aea195418387db20ec7e0c24cedf2c844f8c1 COPYING-compositeproto +sha256 f67a18cb46c4c203c5122b4a901cfcc3178b2a62f83f31ca5fef5bdca3966094 COPYING-damageproto +sha256 819e8dcd3dd2a44850c350331aa492230f86bccb0983dd739dec5ba36d7d2b8e COPYING-dmxproto +sha256 0c306691492c4d7a8cda1ec3847668b797887dddcd7e986b4c166ae27619af7d COPYING-dri2proto +sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-dri3proto +sha256 0aa43d03da3cedbd9882c0ded621b0d855353eb9e551f9eed940d75c8a0b03c1 COPYING-evieproto +sha256 65cb0b867b00fb27f066a37353713b265645b3301146562570d7638ed2ddd548 COPYING-fixesproto +sha256 1ab381e978bff63d68be2e4f235d51935f3f16f3ba3bebf83afa99a70c0484a2 COPYING-fontcacheproto +sha256 f4af05774b02ae149357cc26f7bf5ef1116c2e09373c2492081a3a1892c58417 COPYING-fontsproto +sha256 823deb4673d3f26aa8c90e704888299648f00be3262f9363eaeecedcd65b936d COPYING-glproto +sha256 5e083a2ace0215a6084c877c023a6079952ba803d692488203ba4269196debe3 COPYING-inputproto +sha256 d397a67d4b28e897bc5fce79b2b917df9905b54f961fc3ad1f49c7fe3803f92c COPYING-kbproto +sha256 7a5dd5d4c989c167da50f15879959f42bbda960e06d0a0aea7197f61fe1dc846 COPYING-lg3dproto +sha256 8442b5f22f2fb13017a4302a906e7dedc899267b41f613558970941120170128 COPYING-pmproto +sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-presentproto +sha256 6b890b118261694865988378dbba876bcd9caa1a421c5c0d626116948bc0ae35 COPYING-printproto +sha256 41c13dcd09147ed2440286f2fb8151df8ebee06deee4ed78ddf094601c216d3d COPYING-randrproto +sha256 ee10aee0f1697ffdbe870a39f037361d4f7136f2976bb7919a41b3f66407caee COPYING-recordproto +sha256 9e48921a94da36d7a69fe71809223ee0bb46370db9842dccdeeb55b5a9946872 COPYING-renderproto +sha256 403e7be948674530ad40669b1e3a31adeddb656502f3b0ef810d5d3cc35d0b52 COPYING-resourceproto +sha256 fcbd3c628bf4d28ee3e6032054bf44bbe58f3b1a944dad856a8d3eb6b37ea412 COPYING-scrnsaverproto +sha256 d6d3513f5a7099748dc387f54498d799380b45f8a444f13aa98aa45a860ae55b COPYING-trapproto +sha256 f8f49bbad61967ebc890fb79fff5bfb7cfc1c341aa8f8dee13eb3fb534040b47 COPYING-videoproto +sha256 eb183a00c61bb47992f096b6993ed7ec17518bea9c285fe87efff7f622cc6c12 COPYING-windowswmproto +sha256 3bd8e0c41497bfe6ab8d11c3c90c5e79edd0b2437f2bf81161575f54bae53f21 COPYING-x11proto +sha256 5531d18cfcc944dab39991f63f182cbbce3fe493ba0c7cf08a25c0d01ee84482 COPYING-xcmiscproto +sha256 fb42146c6c06a200a9b121220eb692ff9101ba0fbd0b224b9e16a016c59ae86a COPYING-xextproto +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86bigfontproto +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86dgaproto +sha256 4a05d06752388d9db71ee1006f371d4fb2c316a821fc2fc272db90b3ef978334 COPYING-xf86driproto +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86miscproto +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86rushproto +sha256 942bb46a3503a708948491699171b00b9e0dfb47818d9268b160bccc5f51a4b9 COPYING-xf86vidmodeproto +sha256 b2d8cda803e900915ce10f0ba735ff2c033b39c7cc5a8a436667ca583d4066fa COPYING-xineramaproto diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk index 979286b3c1..59f0640241 100644 --- a/package/x11r7/xorgproto/xorgproto.mk +++ b/package/x11r7/xorgproto/xorgproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XORGPROTO_VERSION = 2019.2 +XORGPROTO_VERSION = 2021.4 XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.bz2 XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 79968ea979..4dc15435a8 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -22,6 +22,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXFIXES + select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XLIB_LIBXFT select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXINERAMA @@ -42,47 +43,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER if BR2_PACKAGE_XSERVER_XORG_SERVER -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - bool - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - bool - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24 - bool - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI - int - default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - default 24 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24 - -choice - bool "X Window System server version" - -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 - bool "1.20.8" - select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24 - select BR2_PACKAGE_XLIB_LIBXFONT2 - -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 - bool "1.17.4" - select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - select BR2_PACKAGE_XLIB_LIBXFONT - -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 - bool "1.14.7" - select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - select BR2_PACKAGE_XLIB_LIBXFONT - -endchoice - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION - string - default "1.20.8" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 - default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 - default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 - choice prompt "X Window System server type" help @@ -93,7 +53,8 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBPCIACCESS - select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_TOOLCHAIN_HAS_SYNC_4 + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \ + (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) help This variant of the X.org server is the full-blown variant, as used by desktop GNU/Linux distributions. The drivers (for @@ -114,43 +75,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE endchoice -config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX - bool "Enable AIGLX Extension" - # AIGLX Extension removed in 1.19.0 - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 || BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 - help - Enable/Use AIGLX extension. - -if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE - -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV - bool "Enable KDrive/TinyX evdev input driver" - help - Enable evdev input driver in KDrive. This allows KDrive to - use input devices that are integrated in the Linux input - subsystem, i.e have a /dev/input/eventX device file. This is - most likely the input driver you want to use. - - This driver can then be enabled by running the X server - using: - - Xfbdev -keybd evdev,,device=/dev/input/eventX - -mouse evdev,,device=/dev/input/eventY - -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD - bool "Enable KDrive/TinyX kbd input driver" - help - Enable kbd input driver in KDrive. It uses the console - keyboard as input device. - -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE - bool "Enable KDrive/TinyX mouse input driver" - help - Enable mouse input driver in KDrive. It supports PS/2 mice - and serial port mice. - -endif - comment "Optional Servers" config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index f7b1bc14bf..8eb56ba027 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,11 +1,6 @@ -# From http://lists.x.org/archives/xorg-announce/2014-June/002440.html -sha1 7a95765e56b124758fcd7b609589e65b8870880b xorg-server-1.14.7.tar.bz2 -sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2015-October/002650.html -sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2020-March/003041.html -sha256 d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146 xorg-server-1.20.8.tar.bz2 -sha512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805 xorg-server-1.20.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-July/003100.html +sha256 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300 xorg-server-1.20.13.tar.xz +sha512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 xorg-server-1.20.13.tar.xz # Locally calculated -sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING +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 8ccc04224d..c326230be0 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,8 +4,8 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = $(call qstrip,$(BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION)) -XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 +XSERVER_XORG_SERVER_VERSION = 1.20.13 +XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING @@ -20,6 +20,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ xlib_libXdmcp \ xlib_libXext \ xlib_libXfixes \ + xlib_libXfont2 \ xlib_libXi \ xlib_libXrender \ xlib_libXres \ @@ -89,35 +90,11 @@ endif ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y) XSERVER_XORG_SERVER_CONF_OPTS += \ --enable-kdrive \ - --enable-xfbdev \ --disable-glx \ - --disable-dri \ - --disable-xsdl -define XSERVER_CREATE_X_SYMLINK - ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X -endef -XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-evdev -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-evdev -endif - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-kbd -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-kbd -endif - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-mouse -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-mouse -endif + --disable-dri else # modular -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev +XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive endif ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) @@ -127,18 +104,7 @@ else XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx endif -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-aiglx -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-aiglx -endif - # Optional packages -ifeq ($(BR2_PACKAGE_TSLIB),y) -XSERVER_XORG_SERVER_DEPENDENCIES += tslib -XSERVER_XORG_SERVER_CONF_OPTS += --enable-tslib LDFLAGS="-lts" -endif - ifeq ($(BR2_PACKAGE_HAS_UDEV),y) XSERVER_XORG_SERVER_DEPENDENCIES += udev XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev @@ -166,14 +132,6 @@ else XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2 -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont -endif - ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc endif @@ -224,9 +182,17 @@ XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1 XSERVER_XORG_SERVER_DEPENDENCIES += libsha1 endif +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 + +# init script conflicts with S90nodm +ifneq ($(BR2_PACKAGE_NODM),y) define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \ $(TARGET_DIR)/etc/init.d/S40xorg endef +endif $(eval $(autotools-package)) diff --git a/package/x11vnc/Config.in b/package/x11vnc/Config.in index 9e91a11ad1..d2639fce1e 100644 --- a/package/x11vnc/Config.in +++ b/package/x11vnc/Config.in @@ -7,6 +7,9 @@ config BR2_PACKAGE_X11VNC select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help VNC server for X11 display diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk index 9daf490581..1eda717c68 100644 --- a/package/x11vnc/x11vnc.mk +++ b/package/x11vnc/x11vnc.mk @@ -12,6 +12,9 @@ X11VNC_CONF_OPTS = --without-sdl X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst libvncserver X11VNC_LICENSE = GPL-2.0+ X11VNC_LICENSE_FILES = COPYING +X11VNC_CPE_ID_VENDOR = x11vnc_project +# 0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch +X11VNC_IGNORE_CVES += CVE-2020-29074 # Source coming from github, no configure included X11VNC_AUTORECONF = YES diff --git a/package/x264/x264.hash b/package/x264/x264.hash index 93242a46cc..f1396279f8 100644 --- a/package/x264/x264.hash +++ b/package/x264/x264.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0bb67d095513391e637b3b47e8efc3ba4603c3844f1b4c2690f4d36da7763055 x264-snapshot-20191217-2245.tar.bz2 -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 58f39bf23a4e38ac3dd841a3f9ccf2aa16d2b0c35df9aecd9f3b5062780e5d74 x264-35417dcd65a57321fbadf98c9a4cff1cb741db4b-br1.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/x264/x264.mk b/package/x264/x264.mk index 9d217d1912..9de618eb5e 100644 --- a/package/x264/x264.mk +++ b/package/x264/x264.mk @@ -4,9 +4,9 @@ # ################################################################################ -X264_VERSION = 20191217-2245 -X264_SITE = http://download.videolan.org/x264/snapshots -X264_SOURCE = x264-snapshot-$(X264_VERSION).tar.bz2 +X264_VERSION = 35417dcd65a57321fbadf98c9a4cff1cb741db4b +X264_SITE = https://code.videolan.org/videolan/x264.git +X264_SITE_METHOD = git X264_LICENSE = GPL-2.0+ X264_DEPENDENCIES = host-pkgconf X264_LICENSE_FILES = COPYING diff --git a/package/x265/x265.mk b/package/x265/x265.mk index ae9e0acb64..872753eea8 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -9,6 +9,7 @@ X265_SOURCE = x265_$(X265_VERSION).tar.gz X265_SITE = https://bitbucket.org/multicoreware/x265/downloads X265_LICENSE = GPL-2.0+ X265_LICENSE_FILES = COPYING +X265_CPE_ID_VENDOR = multicorewareinc X265_SUBDIR = source X265_INSTALL_STAGING = YES X265_MAKE = $(MAKE1) diff --git a/package/xapian/xapian.hash b/package/xapian/xapian.hash index 6e1ae3c423..192032e6db 100644 --- a/package/xapian/xapian.hash +++ b/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2020-February/009792.html -sha256 b168e95918a01e014fb6a6cbce26e535f80da4d4791bfa5a0e0051fcb6f950ea xapian-core-1.4.15.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2021-January/009856.html +sha256 196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77 xapian-core-1.4.18.tar.xz # locally computed -sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING +sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/xapian/xapian.mk b/package/xapian/xapian.mk index 9fbe0b36f8..4f40babcf9 100644 --- a/package/xapian/xapian.mk +++ b/package/xapian/xapian.mk @@ -4,11 +4,13 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.15 +XAPIAN_VERSION = 1.4.18 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ XAPIAN_LICENSE_FILES = COPYING +XAPIAN_CPE_ID_VENDOR = xapian +XAPIAN_CPE_ID_PRODUCT = xapian-core XAPIAN_INSTALL_STAGING = YES XAPIAN_DEPENDENCIES = zlib diff --git a/package/xen/Config.in b/package/xen/Config.in index 57ab40eba8..af6acd3530 100644 --- a/package/xen/Config.in +++ b/package/xen/Config.in @@ -28,6 +28,7 @@ config BR2_PACKAGE_XEN_TOOLS select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_SLIRP select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_YAJL diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 4224924652..e30db09516 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c69ae21b2ddeaf25532a81a448fcc6a218bc56f93c8907b2d416b2d4339c0afe xen-4.13.0.tar.gz -sha256 36b91794c6d4a678137c70c41e384c03b552c7efba82c0d73e6be842e41ab3d3 COPYING +sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz +sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING diff --git a/package/xen/xen.mk b/package/xen/xen.mk index fa49f5996b..b635996afb 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,10 +4,12 @@ # ################################################################################ -XEN_VERSION = 4.13.0 +XEN_VERSION = 4.14.3 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING +XEN_CPE_ID_VENDOR = xen +XEN_CPE_ID_PREFIX = cpe:2.3:o XEN_DEPENDENCIES = host-acpica host-python3 # Calculate XEN_ARCH @@ -18,6 +20,7 @@ XEN_ARCH = arm32 endif XEN_CONF_OPTS = \ + --disable-golang \ --disable-ocamltools \ --with-initddir=/etc/init.d @@ -40,7 +43,8 @@ XEN_CONF_OPTS += --disable-xen endif ifeq ($(BR2_PACKAGE_XEN_TOOLS),y) -XEN_DEPENDENCIES += dtc libaio libglib2 ncurses openssl pixman util-linux yajl +XEN_DEPENDENCIES += \ + dtc libaio libglib2 ncurses openssl pixman slirp util-linux yajl ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) XEN_DEPENDENCIES += argp-standalone endif diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in index 0cb0b343de..ec6d9e5d29 100644 --- a/package/xenomai/Config.in +++ b/package/xenomai/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS bool - default y - depends on BR2_i386 || BR2_x86_64 || (BR2_arm && !BR2_ARM_CPU_ARMV7M) || \ - BR2_powerpc + default y if BR2_i386 + default y if BR2_x86_64 + default y if BR2_powerpc + default y if BR2_arm && !BR2_ARM_CPU_ARMV7M && !BR2_ARM_CPU_ARMV8A comment "xenomai needs a glibc or uClibc toolchain w/ threads" depends on BR2_USE_MMU @@ -41,17 +42,43 @@ config BR2_PACKAGE_XENOMAI if BR2_PACKAGE_XENOMAI -config BR2_PACKAGE_XENOMAI_VERSION - string "Custom Xenomai version" +choice + bool "Xenomai version" help - Manually select Xenomai version. If left empty, the default - version will be used. - Make sure that the selected version has a patch for your - selected Linux kernel. If it does not, download and select - a patch manually with - BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux - Kernel -> Linux Kernel Extensions menu. + selected Linux kernel. If it does not, download and select a + patch manually with BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, + in the Linux Kernel -> Linux Kernel Extensions menu. + +config BR2_PACKAGE_XENOMAI_LATEST_VERSION + bool "Latest version (3.0.10)" + +config BR2_PACKAGE_XENOMAI_CUSTOM_VERSION + bool "Custom version" + +config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL + bool "Custom tarball" + +config BR2_PACKAGE_XENOMAI_CUSTOM_GIT + bool "Custom Git repository" + +endchoice + +config BR2_PACKAGE_XENOMAI_REPOSITORY + string "URL of custom repository" + default "https://gitlab.denx.de/Xenomai/xenomai.git" + depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT + +config BR2_PACKAGE_XENOMAI_VERSION + string "Custom Xenomai version" if \ + !BR2_PACKAGE_XENOMAI_LATEST_VERSION && \ + !BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL + default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION + default "custom" if BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL + +config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL + string "URL of custom tarball" + depends on BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL choice prompt "Xenomai core" @@ -84,6 +111,8 @@ endchoice config BR2_PACKAGE_XENOMAI_ENABLE_SMP bool "Enable SMP support" default y + # SMP not supported below armv6 + depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 help This option enables SMP support in Xenomai userspace. diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index 5f389ac851..c1ad0c5df6 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -5,14 +5,25 @@ ################################################################################ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) -ifeq ($(XENOMAI_VERSION),) -XENOMAI_VERSION = 3.0.10 +ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL),y) +XENOMAI_TARBALL = $(call qstrip,$(BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL)) +XENOMAI_SOURCE = $(notdir $(XENOMAI_TARBALL)) +XENOMAI_SITE = $(patsubst %/,%,$(dir $(XENOMAI_TARBALL))) +else ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_GIT),y) +XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY)) +XENOMAI_SITE_METHOD = git else +XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 +XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable +endif +# We're patching configure.ac +XENOMAI_AUTORECONF = YES + +# Exclude all from the hash check, but the latest version. +ifeq ($(BR2_PACKAGE_XENOMAI)$(BR2_PACKAGE_XENOMAI_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) endif -XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable -XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPL-2.1+ (libraries), GPL-2.0+ (kernel), GFDL-1.2+ (docs), GPL-2.0 (ipipe patch, can driver) # GFDL is not included but refers to gnu.org XENOMAI_LICENSE_FILES = debian/copyright include/COPYING kernel/cobalt/COPYING \ @@ -28,7 +39,10 @@ XENOMAI_INSTALL_STAGING = YES XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user -XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ --disable-doc-install +XENOMAI_CONF_OPTS += \ + --disable-demo \ + --disable-testsuite \ + --includedir=/usr/include/xenomai/ ifeq ($(BR2_PACKAGE_XENOMAI_MERCURY),y) XENOMAI_CONF_OPTS += --with-core=mercury diff --git a/package/xerces/Config.in b/package/xerces/Config.in index 2edc4346b5..20cd2ab1a6 100644 --- a/package/xerces/Config.in +++ b/package/xerces/Config.in @@ -1,10 +1,23 @@ config BR2_PACKAGE_XERCES bool "xerces-c++" - depends on BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR help Xerces-C++ is a validating XML parser written in portable C++. http://xerces.apache.org/xerces-c/ -comment "xerces-c++ needs a toolchain w/ C++, wchar" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR) +if BR2_PACKAGE_XERCES + +config BR2_PACKAGE_XERCES_ENABLE_NETWORK + bool "Enable network support" + default y + help + Enable network support in xerces + +endif + +comment "xerces-c++ needs a toolchain w/ C++, dynamic library, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_USE_WCHAR diff --git a/package/xerces/xerces.hash b/package/xerces/xerces.hash index 28db0c6062..c75ce860e8 100644 --- a/package/xerces/xerces.hash +++ b/package/xerces/xerces.hash @@ -1,5 +1,5 @@ -# From http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.2.tar.xz.sha256 -sha256 6daca3b23364d8d883dc77a73f681242f69389e3564543287ed3d073007e0a8e xerces-c-3.2.2.tar.xz +# From http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.3.tar.xz.sha256 +sha256 12fc99a9fc1d1a79bd0e927b8b5637a576d6656f45b0d5e70ee3694d379cc149 xerces-c-3.2.3.tar.xz # Hash for license file -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index c75a8b0d35..a3e5361b2e 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -4,11 +4,13 @@ # ################################################################################ -XERCES_VERSION = 3.2.2 +XERCES_VERSION = 3.2.3 XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.xz XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources XERCES_LICENSE = Apache-2.0 XERCES_LICENSE_FILES = LICENSE +XERCES_CPE_ID_VENDOR = apache +XERCES_CPE_ID_PRODUCT = xerces-c\+\+ XERCES_INSTALL_STAGING = YES define XERCES_DISABLE_SAMPLES @@ -17,11 +19,6 @@ endef XERCES_POST_PATCH_HOOKS += XERCES_DISABLE_SAMPLES -# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to -# disable a try_run() call in the FindThreads tests, which caused a -# build failure when cross-compiling. -XERCES_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_PACKAGE_ICU),y) XERCES_DEPENDENCIES += icu endif @@ -31,12 +28,16 @@ XERCES_CONF_ENV += LIBS=-liconv XERCES_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_XERCES_ENABLE_NETWORK),y) ifeq ($(BR2_PACKAGE_LIBCURL),y) XERCES_CONF_OPTS += -Dnetwork-accessor=curl XERCES_DEPENDENCIES += libcurl else XERCES_CONF_OPTS += -Dnetwork-accessor=socket endif +else +XERCES_CONF_OPTS += -Dnetwork=OFF +endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) XERCES_CONF_OPTS += -Dthreads=ON diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index 024cde9fe6..b8e07cc83d 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_XFSPROGS bool "xfsprogs" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_INIH select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index 629d6fcf9d..b379839e7e 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 7b500e148cebd08f99e37cf744c7843817b37e7be2a32c4dc57d6ea16e3019ae xfsprogs-5.2.1.tar.xz +sha256 e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9 xfsprogs-5.10.0.tar.xz # Hash for license files -sha256 7ae50a5344af14d6231aff6814632a220b3127da4099aea2c6070fd79c407c1a LICENSES/GPL-2.0 -sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 +sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 43c921aa17..71d02278e9 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,13 +4,13 @@ # ################################################################################ -XFSPROGS_VERSION = 5.2.1 +XFSPROGS_VERSION = 5.10.0 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) XFSPROGS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 -XFSPROGS_DEPENDENCIES = util-linux +XFSPROGS_DEPENDENCIES = inih util-linux XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes PLATFORM="linux" XFSPROGS_CONF_OPTS = \ diff --git a/package/xinetd/xinetd.hash b/package/xinetd/xinetd.hash index 1b7ee09b09..ce5a93f571 100644 --- a/package/xinetd/xinetd.hash +++ b/package/xinetd/xinetd.hash @@ -1,3 +1,3 @@ # locally computed -sha256 620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c xinetd-2-3-15.tar.gz +sha256 620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c xinetd-2.3.15.tar.gz sha256 2f3dd19831b1837f7360f80a7700a130c04a59e387d4359299d6df712308bbed COPYRIGHT diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk index a2ba10df74..f58c26f02a 100644 --- a/package/xinetd/xinetd.mk +++ b/package/xinetd/xinetd.mk @@ -4,10 +4,15 @@ # ################################################################################ -XINETD_VERSION = 2-3-15 -XINETD_SITE = $(call github,xinetd-org,xinetd,xinetd-$(XINETD_VERSION)) +XINETD_VERSION = 2.3.15 +XINETD_SITE = \ + $(call github,xinetd-org,xinetd,xinetd-$(subst .,-,$(XINETD_VERSION))) XINETD_LICENSE = xinetd license XINETD_LICENSE_FILES = COPYRIGHT +XINETD_CPE_ID_VENDOR = xinetd + +# 0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch +XINETD_IGNORE_CVES += CVE-2013-4342 XINETD_CFLAGS = $(TARGET_CFLAGS) diff --git a/package/xl2tp/xl2tp.hash b/package/xl2tp/xl2tp.hash index 8cf6522833..471657f0f2 100644 --- a/package/xl2tp/xl2tp.hash +++ b/package/xl2tp/xl2tp.hash @@ -1,3 +1,3 @@ # locally computed -sha256 0d149bf9d2f7d838806e6a36fd7a676d03bf246d2b7869e16c945330e13b922e xl2tp-1.3.15.tar.gz +sha256 c28608b315adb25c8bf9579c1d6ab52ab47c4c43b68a5ab63c5d039196fd180f xl2tp-1.3.16.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk index b40eb2fd18..ca404060a2 100644 --- a/package/xl2tp/xl2tp.mk +++ b/package/xl2tp/xl2tp.mk @@ -4,11 +4,12 @@ # ################################################################################ -XL2TP_VERSION = 1.3.15 +XL2TP_VERSION = 1.3.16 XL2TP_SITE = $(call github,xelerance,xl2tpd,v$(XL2TP_VERSION)) XL2TP_DEPENDENCIES = libpcap XL2TP_LICENSE = GPL-2.0 XL2TP_LICENSE_FILES = LICENSE +XL2TP_SELINUX_MODULES = l2tp ifeq ($(BR2_STATIC_LIBS),y) XL2TP_LDLIBS = LDLIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" diff --git a/package/xorriso/xorriso.hash b/package/xorriso/xorriso.hash index b594b91438..faaeab5fa0 100644 --- a/package/xorriso/xorriso.hash +++ b/package/xorriso/xorriso.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 a93fa7ae5bb1902198cddfec25201388156932f36f2f5da829bf4fcae9a6062b xorriso-1.5.0.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 72e99e72cd68f226415e5d898f3b38e24ae7991ed038ed72d789fff5b060f028 COPYRIGHT +sha256 3b69f5c93ae7c40c5bbe4a847fa3963f5efc9c565551622f77121c5792fc17e7 xorriso-1.5.2.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 72e99e72cd68f226415e5d898f3b38e24ae7991ed038ed72d789fff5b060f028 COPYRIGHT diff --git a/package/xorriso/xorriso.mk b/package/xorriso/xorriso.mk index 56bf39f764..7b38f268bb 100644 --- a/package/xorriso/xorriso.mk +++ b/package/xorriso/xorriso.mk @@ -4,7 +4,7 @@ # ################################################################################ -XORRISO_VERSION = 1.5.0 +XORRISO_VERSION = 1.5.2 XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso XORRISO_LICENSE = GPL-3.0+ XORRISO_LICENSE_FILES = COPYING COPYRIGHT @@ -14,7 +14,7 @@ XORRISO_LICENSE_FILES = COPYING COPYRIGHT HOST_XORRISO_CONF_OPTS = \ --disable-xattr-h-pref-attr \ --disable-zlib \ - --disable-bzip2 \ + --disable-libbz2 \ --disable-libcdio \ --disable-libreadline \ --disable-libedit \ diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 393780fb30..efff92ab7d 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2f61f2db78d46440819af2d8191f9b5ed2bb3e5404b739f68fb0af7917d0d222 xr819-xradio-aa01ba77b9360dd734b50f5b937960a50c5a0825.tar.gz +sha256 5900821a777b9008d7cf9b8128e0cb75a4623ecb608b45438e17c7a056cde1bf xr819-xradio-6bf0e2e21c80456e2a3d4ad1267caecde7165871.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index ae3e4fbd34..c1fe3295b6 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = aa01ba77b9360dd734b50f5b937960a50c5a0825 +XR819_XRADIO_VERSION = 6bf0e2e21c80456e2a3d4ad1267caecde7165871 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/xscreensaver/Config.in b/package/xscreensaver/Config.in index c1d6a03f5d..d773c69913 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -2,13 +2,15 @@ config BR2_PACKAGE_XSCREENSAVER bool "xscreensaver" depends on BR2_PACKAGE_XORG7 depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango - depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> glib2 - depends on BR2_USE_WCHAR # libgtk2 -> glib2 - depends on BR2_USE_MMU # libgtk2 -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2 + depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2 + depends on BR2_USE_MMU # gdk-pixbuf, libgtk2 -> glib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_LIBGLADE + select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXT diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash index e33413c76a..26ecd8bbbf 100644 --- a/package/xscreensaver/xscreensaver.hash +++ b/package/xscreensaver/xscreensaver.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 158f381d687e8360a6debb0d3af0148d279e853666244f02d628a5a482bce194 xscreensaver-5.43.tar.gz -sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h -sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h +sha256 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d xscreensaver-5.45.tar.gz +sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h +sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 642d65f0c6..c3c9ec89c3 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -4,15 +4,23 @@ # ################################################################################ -XSCREENSAVER_VERSION = 5.43 +XSCREENSAVER_VERSION = 5.45 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h +XSCREENSAVER_CPE_ID_VENDOR = xscreensaver_project -XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \ - $(TARGET_NLS_DEPENDENCIES) host-intltool +XSCREENSAVER_DEPENDENCIES = \ + gdk-pixbuf \ + jpeg \ + libgtk2 \ + libxml2 \ + xlib_libX11 \ + xlib_libXt \ + $(TARGET_NLS_DEPENDENCIES) \ + host-intltool # otherwise we end up with host include/library dirs passed to the # compiler/linker @@ -20,6 +28,62 @@ XSCREENSAVER_CONF_OPTS = \ --includedir=$(STAGING_DIR)/usr/include \ --libdir=$(STAGING_DIR)/usr/lib +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XSCREENSAVER_CONF_OPTS += --with-gl=yes +XSCREENSAVER_DEPENDENCIES += libgl libglu +else +XSCREENSAVER_CONF_OPTS += --with-gl=no +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +XSCREENSAVER_CONF_OPTS += --with-png=yes +XSCREENSAVER_DEPENDENCIES += libpng +else +XSCREENSAVER_CONF_OPTS += --with-png=no +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +XSCREENSAVER_CONF_OPTS += --with-systemd=yes +XSCREENSAVER_DEPENDENCIES += systemd +else +XSCREENSAVER_CONF_OPTS += --with-systemd=no +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) +XSCREENSAVER_CONF_OPTS += --with-xft=yes +XSCREENSAVER_DEPENDENCIES += xlib_libXft +else +XSCREENSAVER_CONF_OPTS += --with-xft=no +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) +XSCREENSAVER_CONF_OPTS += --with-xinput-ext=yes +XSCREENSAVER_DEPENDENCIES += xlib_libXi +else +XSCREENSAVER_CONF_OPTS += --with-xinput-ext=no +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) +XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes +XSCREENSAVER_DEPENDENCIES += xlib_libXinerama +else +XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=no +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) +XSCREENSAVER_CONF_OPTS += --with-randr-ext=yes +XSCREENSAVER_DEPENDENCIES += xlib_libXrandr +else +XSCREENSAVER_CONF_OPTS += --with-randr-ext=no +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) +XSCREENSAVER_CONF_OPTS += --with-xf86vmode-ext=yes +XSCREENSAVER_DEPENDENCIES += xlib_libXxf86vm +else +XSCREENSAVER_CONF_OPTS += --with-xf86vmode-ext=no +endif + XSCREENSAVER_INSTALL_TARGET_OPTS = install_prefix="$(TARGET_DIR)" install $(eval $(autotools-package)) diff --git a/package/xtables-addons/Config.in b/package/xtables-addons/Config.in index 39fafe72b7..36a42c7efc 100644 --- a/package/xtables-addons/Config.in +++ b/package/xtables-addons/Config.in @@ -16,4 +16,4 @@ config BR2_PACKAGE_XTABLES_ADDONS Likewise, it contains extensions that were not, or are not yet, accepted in the main kernel/iptables packages. - http://xtables-addons.sourceforge.net/ + https://inai.de/projects/xtables-addons/ diff --git a/package/xtables-addons/xtables-addons.hash b/package/xtables-addons/xtables-addons.hash index fea496d997..a103fa3b52 100644 --- a/package/xtables-addons/xtables-addons.hash +++ b/package/xtables-addons/xtables-addons.hash @@ -1,4 +1,3 @@ # Locally calculated -sha256 189ff57a0b8960969bd99141a6c79c345efa67e4461f450e2f162c9bd3d17da6 xtables-addons-3.5.tar.xz -sha256 045ee3fcfe5d6edb95483cf49e2446ff8cab4bb79411018b18354138b70c5eb5 xtables-addons-3.7.tar.xz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE +sha256 2a640535f209ec59467b8c8b4343b446801a21a112a3fc189818d6e2697f5cf1 xtables-addons-3.17.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 1a74b80f46..feed054e88 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -4,9 +4,9 @@ # ################################################################################ -XTABLES_ADDONS_VERSION = 3.7 +XTABLES_ADDONS_VERSION = 3.17 XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz -XTABLES_ADDONS_SITE = http://downloads.sourceforge.net/project/xtables-addons/Xtables-addons +XTABLES_ADDONS_SITE = https://inai.de/files/xtables-addons XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf XTABLES_ADDONS_LICENSE = GPL-2.0+ XTABLES_ADDONS_LICENSE_FILES = LICENSE @@ -30,4 +30,11 @@ define XTABLES_ADDONS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install endef +define XTABLES_ADDONS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_NAT) +endef + $(eval $(autotools-package)) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index 57d5a72b9a..d6d80ad977 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 39a6a3d3724f9a0a068f8cc353ab0c82831f0a43abb24470d933af299658475f xterm-349.tgz +sha256 27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f xterm-367.tgz # Locally calculated -sha256 b0d302c6d67f63122bbe8d622dd8a66cfadccc32853f606b7558103609201993 COPYING +sha256 dfb668cc977e24649500f3cc54de3e2b793928d210715a445ab1227930b07ba6 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 8cbfa070e2..e09d350a7d 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,12 +4,13 @@ # ################################################################################ -XTERM_VERSION = 349 +XTERM_VERSION = 367 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf XTERM_LICENSE = MIT XTERM_LICENSE_FILES = COPYING +XTERM_CPE_ID_VENDOR = invisible-island XTERM_CONF_OPTS = --enable-256-color \ --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib diff --git a/package/xutil_util-macros/xutil_util-macros.hash b/package/xutil_util-macros/xutil_util-macros.hash index 49c057fd21..3f28743e64 100644 --- a/package/xutil_util-macros/xutil_util-macros.hash +++ b/package/xutil_util-macros/xutil_util-macros.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002845.html -md5 58edef899364f78fbde9479ded20211e util-macros-1.19.2.tar.bz2 -sha1 e8b3a6f2bfde22440fca0974da53da18821a4ee6 util-macros-1.19.2.tar.bz2 -sha256 d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712 util-macros-1.19.2.tar.bz2 -sha512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619 util-macros-1.19.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-January/003069.html +sha256 0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971 util-macros-1.19.3.tar.bz2 +sha512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2 util-macros-1.19.3.tar.bz2 # Locally computed sha256 489b630a75e3255485732eae3d50ff4d29d3feb66760bb3acb04f897e4d9e375 COPYING diff --git a/package/xutil_util-macros/xutil_util-macros.mk b/package/xutil_util-macros/xutil_util-macros.mk index 6f66c76692..b0ce14ee5a 100644 --- a/package/xutil_util-macros/xutil_util-macros.mk +++ b/package/xutil_util-macros/xutil_util-macros.mk @@ -4,7 +4,7 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.19.2 +XUTIL_UTIL_MACROS_VERSION = 1.19.3 XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util XUTIL_UTIL_MACROS_LICENSE = MIT diff --git a/package/xvisor/xvisor.hash b/package/xvisor/xvisor.hash index dee1ef1d08..6938e20e7b 100644 --- a/package/xvisor/xvisor.hash +++ b/package/xvisor/xvisor.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 a0c9537bd7fb06084c3da663f71bf6f2b1709e34b3b2fca2473c8db1cdd3de1d xvisor-0.2.11.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 81660d26a0bc63979ba40872f10511df777185712eba2d0e19e816438388de05 xvisor-0.3.0.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index 6094370cc7..394ff7c80b 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -4,14 +4,14 @@ # ################################################################################ -XVISOR_VERSION = 0.2.11 +XVISOR_VERSION = 0.3.0 XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz XVISOR_SITE = http://www.xhypervisor.org/tarball XVISOR_LICENSE = GPL-2.0+ XVISOR_LICENSE_FILES = COPYING XVISOR_INSTALL_IMAGES = YES XVISOR_INSTALL_TARGET = NO -XVISOR_DEPENDENCIES = host-bison host-flex +XVISOR_DEPENDENCIES = host-bison host-dtc host-flex XVISOR_MAKE_TARGETS = all diff --git a/package/xvkbd/xvkbd.hash b/package/xvkbd/xvkbd.hash index dd6ed79b93..8f13ab7c50 100644 --- a/package/xvkbd/xvkbd.hash +++ b/package/xvkbd/xvkbd.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 eb54e440badc40299ba9a8f27fcea740cd3501310e8955651af7ade517a3ac82 xvkbd-4.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 af0d9b39a91d2779e9758d8dacc24d466bea124c1d401687bddc48543516cd68 README +sha256 952d07df0fe1e45286520b7c98b4fd00fd60dbf3e3e8ff61e12c259f76a3bef4 xvkbd-4.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 5dada320d6b4fb7c76ef110a027b019feaf1149576acf7ac5cacf0d0dcdc3671 README diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk index 1d056c1c4c..f65c02bc06 100644 --- a/package/xvkbd/xvkbd.mk +++ b/package/xvkbd/xvkbd.mk @@ -4,12 +4,10 @@ # ################################################################################ -XVKBD_VERSION = 4.0 +XVKBD_VERSION = 4.1 XVKBD_SITE = http://t-sato.in.coocan.jp/xvkbd XVKBD_LICENSE = GPL-2.0+ XVKBD_LICENSE_FILES = COPYING README -# We're patching Makefile.am -XVKBD_AUTORECONF = YES XVKBD_DEPENDENCIES = \ xlib_libICE \ diff --git a/package/xxhash/xxhash.hash b/package/xxhash/xxhash.hash index 097694364b..feb5000808 100644 --- a/package/xxhash/xxhash.hash +++ b/package/xxhash/xxhash.hash @@ -1,3 +1,3 @@ # locally computed -sha256 7e93d28e81c3e95ff07674a400001d0cdf23b7842d49b211e5582d00d8e3ac3e xxhash-0.7.2.tar.gz -sha256 94df5da58df6c83bcc2fc0c84aaad71a0b0fe94625060d6cac000121dda37730 LICENSE +sha256 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f xxhash-0.8.0.tar.gz +sha256 9da63520e9293d82c4b1613be5c84058cadb82b02f5972179bad13731d589910 LICENSE diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index bd51c9bd1b..c2ddbbd607 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -4,7 +4,7 @@ # ################################################################################ -XXHASH_VERSION = 0.7.2 +XXHASH_VERSION = 0.8.0 XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) XXHASH_LICENSE_FILES = LICENSE diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 69d1db2f4d..3dd0cbe459 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,8 +1,8 @@ # Locally calculated after checking pgp signature -sha256 3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf xz-5.2.4.tar.bz2 +sha256 5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df xz-5.2.5.tar.bz2 # Hash for license files -sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPLv3 -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 +sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPLv3 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/xz/xz.mk b/package/xz/xz.mk index dbf874e9b9..ffbae4c873 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,13 +4,14 @@ # ################################################################################ -XZ_VERSION = 5.2.4 +XZ_VERSION = 5.2.5 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 +XZ_CPE_ID_VENDOR = tukaani ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) XZ_CONF_OPTS = --enable-threads diff --git a/package/yaml-cpp/yaml-cpp.mk b/package/yaml-cpp/yaml-cpp.mk index 906e554ed7..895072ec45 100644 --- a/package/yaml-cpp/yaml-cpp.mk +++ b/package/yaml-cpp/yaml-cpp.mk @@ -9,10 +9,17 @@ YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,yaml-cpp-$(YAML_CPP_VERSION)) YAML_CPP_INSTALL_STAGING = YES YAML_CPP_LICENSE = MIT YAML_CPP_LICENSE_FILES = LICENSE +YAML_CPP_CPE_ID_VENDOR = yaml-cpp_project # Disable testing and parse tools YAML_CPP_CONF_OPTS += \ -DYAML_CPP_BUILD_TESTS=OFF \ -DYAML_CPP_BUILD_TOOLS=OFF +ifeq ($(BR2_STATIC_LIBS),y) +YAML_CPP_CONF_OPTS += -DYAML_BUILD_SHARED_LIBS=OFF +else +YAML_CPP_CONF_OPTS += -DYAML_BUILD_SHARED_LIBS=ON +endif + $(eval $(cmake-package)) diff --git a/package/yavta/Config.in b/package/yavta/Config.in index 6a42a944d6..8119133c33 100644 --- a/package/yavta/Config.in +++ b/package/yavta/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_YAVTA help Yet Another V4L2 Test Application - http://git.ideasonboard.org/yavta.git + https://git.ideasonboard.org/yavta.git diff --git a/package/yavta/yavta.mk b/package/yavta/yavta.mk index 4e3d76e3de..d16bee69b1 100644 --- a/package/yavta/yavta.mk +++ b/package/yavta/yavta.mk @@ -4,17 +4,11 @@ # ################################################################################ -YAVTA_VERSION = 82ff2efdb9787737b9f21b6f4759f077c827b238 -YAVTA_SITE = git://git.ideasonboard.org/yavta.git +YAVTA_VERSION = 583bedefc2a247d2cfd32d1b4a0abbe3e2015c70 +YAVTA_SITE = https://git.ideasonboard.org/git/yavta.git +YAVTA_SITE_METHOD = git YAVTA_LICENSE = GPL-2.0+ YAVTA_LICENSE_FILES = COPYING.GPL +YAVTA_CONF_OPTS = -Dwerror=false -define YAVTA_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define YAVTA_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/yavta $(TARGET_DIR)/usr/bin/yavta -endef - -$(eval $(generic-package)) +$(eval $(meson-package)) diff --git a/package/ytree/ytree.hash b/package/ytree/ytree.hash index 1e620e30e9..17d0d24c74 100644 --- a/package/ytree/ytree.hash +++ b/package/ytree/ytree.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e5bf41ab6bee59cf1e8fc0ca429e9a18e6aa83823f30f5807042b04c88a0e0ec ytree-2.02.tar.gz +sha256 583aa71552d1347e0eabe39a236fa5a174bf67dde98871853b9fe2a233bcaef1 ytree-2.03.tar.gz sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING diff --git a/package/ytree/ytree.mk b/package/ytree/ytree.mk index 48b3f7eff9..fdecc0b19b 100644 --- a/package/ytree/ytree.mk +++ b/package/ytree/ytree.mk @@ -4,7 +4,7 @@ # ################################################################################ -YTREE_VERSION = 2.02 +YTREE_VERSION = 2.03 YTREE_SITE = https://www.han.de/~werner YTREE_LICENSE = GPL-2.0+ YTREE_LICENSE_FILES = COPYING diff --git a/package/zbar/zbar.hash b/package/zbar/zbar.hash index eae5b7ebf5..4277091892 100644 --- a/package/zbar/zbar.hash +++ b/package/zbar/zbar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e99fb8f3be85a76fe24784ad67fecb2da3a02b1e432696b05eefe212d448ad2e zbar-0.23.tar.bz2 -sha256 44260f9252c7fe38ba8dfb645330504f4a375e3a5e9dd7d5d6b9f04adb4952f1 LICENSE.md +sha256 dad260b47ef887a639e840a89e5e6e132217b6bba2a8473565d1f459bcb97c1f zbar-0.23.1.tar.bz2 +sha256 44260f9252c7fe38ba8dfb645330504f4a375e3a5e9dd7d5d6b9f04adb4952f1 LICENSE.md diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index 0550f3e23f..f75741ded9 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -4,17 +4,17 @@ # ################################################################################ -ZBAR_VERSION = 0.23 +ZBAR_VERSION = 0.23.1 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_INSTALL_STAGING = YES -ZBAR_DEPENDENCIES = libv4l jpeg -# add host-gettext for AM_ICONV macro -ZBAR_DEPENDENCIES += host-gettext +ZBAR_DEPENDENCIES = libv4l jpeg $(TARGET_NLS_DEPENDENCIES) # uses C99 features -ZBAR_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" +ZBAR_CONF_ENV = \ + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ + LIBS=$(TARGET_NLS_LIBS) ZBAR_CONF_OPTS = \ --disable-doc \ --without-imagemagick \ diff --git a/package/zd1211-firmware/zd1211-firmware.hash b/package/zd1211-firmware/zd1211-firmware.hash index 2b59b8ac2a..14e2c710ae 100644 --- a/package/zd1211-firmware/zd1211-firmware.hash +++ b/package/zd1211-firmware/zd1211-firmware.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1 zd1211-firmware-1.4.tar.bz2 +sha256 f11d3810d7f72833997f634584a586dcced71a353f965abf81062ec431d02b12 zd1211-firmware-1.5.tar.bz2 sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/zd1211-firmware/zd1211-firmware.mk b/package/zd1211-firmware/zd1211-firmware.mk index 860aa76ce5..1836a9f7c5 100644 --- a/package/zd1211-firmware/zd1211-firmware.mk +++ b/package/zd1211-firmware/zd1211-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZD1211_FIRMWARE_VERSION = 1.4 +ZD1211_FIRMWARE_VERSION = 1.5 ZD1211_FIRMWARE_SITE = http://downloads.sourceforge.net/project/zd1211/zd1211-firmware/$(ZD1211_FIRMWARE_VERSION) ZD1211_FIRMWARE_SOURCE = zd1211-firmware-$(ZD1211_FIRMWARE_VERSION).tar.bz2 ZD1211_FIRMWARE_LICENSE = GPL-2.0 diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in index aeedff17b8..cf5c644c39 100644 --- a/package/zeromq/Config.in +++ b/package/zeromq/Config.in @@ -59,4 +59,9 @@ config BR2_PACKAGE_ZEROMQ_DRAFTS https://pyzmq.readthedocs.io/en/latest/draft.html +config BR2_PACKAGE_ZEROMQ_WEBSOCKET + bool "WebSocket support" + help + Enable WebSocket transport + endif diff --git a/package/zeromq/zeromq.hash b/package/zeromq/zeromq.hash index 689d960b28..5085fbca33 100644 --- a/package/zeromq/zeromq.hash +++ b/package/zeromq/zeromq.hash @@ -1,7 +1,7 @@ # From https://github.com/zeromq/libzmq/releases -md5 2047e917c2cc93505e2579bcba67a573 zeromq-4.3.2.tar.gz -sha1 e5253bff214f77621b3d29443f1aa6e5a106ffe5 zeromq-4.3.2.tar.gz +md5 c897d4005a3f0b8276b00b7921412379 zeromq-4.3.4.tar.gz +sha1 47277a64749049123d1401600e8cfbab10a3ae28 zeromq-4.3.4.tar.gz # Locally computed -sha256 ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763 zeromq-4.3.2.tar.gz -sha256 4fd86507c9b486764343065a9e035222869a27b5789efeb4fd93edc85412d7a3 COPYING -sha256 83f32abe61ee58ffb1b007412c08415168c052501dbf56d7a47aaaac52b03ef6 COPYING.LESSER +sha256 c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5 zeromq-4.3.4.tar.gz +sha256 4fd86507c9b486764343065a9e035222869a27b5789efeb4fd93edc85412d7a3 COPYING +sha256 83f32abe61ee58ffb1b007412c08415168c052501dbf56d7a47aaaac52b03ef6 COPYING.LESSER diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk index 04f7e7d3f2..182699403c 100644 --- a/package/zeromq/zeromq.mk +++ b/package/zeromq/zeromq.mk @@ -4,15 +4,15 @@ # ################################################################################ -ZEROMQ_VERSION = 4.3.2 +ZEROMQ_VERSION = 4.3.4 ZEROMQ_SITE = https://github.com/zeromq/libzmq/releases/download/v$(ZEROMQ_VERSION) ZEROMQ_INSTALL_STAGING = YES ZEROMQ_DEPENDENCIES = util-linux -ZEROMQ_CONF_OPTS = --without-documentation +ZEROMQ_CONF_OPTS = --disable-Werror --without-documentation ZEROMQ_LICENSE = LGPL-3.0+ with exceptions ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER -# We're patching acinclude.m4 -ZEROMQ_AUTORECONF = YES +ZEROMQ_CPE_ID_VENDOR = zeromq +ZEROMQ_CPE_ID_PRODUCT = libzmq # Assume these flags are always available. It is true, at least for # SOCK_CLOEXEC, since linux v2.6.27. @@ -55,6 +55,33 @@ else ZEROMQ_CONF_OPTS += --disable-drafts endif +ifeq ($(BR2_PACKAGE_ZEROMQ_WEBSOCKET),y) +ZEROMQ_CONF_OPTS += --enable-ws +else +ZEROMQ_CONF_OPTS += --disable-ws +endif + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +ZEROMQ_DEPENDENCIES += host-pkgconf gnutls +ZEROMQ_CONF_OPTS += --with-tls +else +ZEROMQ_CONF_OPTS += --without-tls +endif + +ifeq ($(BR2_PACKAGE_LIBBSD),y) +ZEROMQ_DEPENDENCIES += host-pkgconf libbsd +ZEROMQ_CONF_OPTS += --enable-libbsd +else +ZEROMQ_CONF_OPTS += --disable-libbsd +endif + +ifeq ($(BR2_PACKAGE_LIBNSS),y) +ZEROMQ_DEPENDENCIES += host-pkgconf libnss +ZEROMQ_CONF_OPTS += --with-nss +else +ZEROMQ_CONF_OPTS += --without-nss +endif + # ZeroMQ uses libsodium if it's available. ifeq ($(BR2_PACKAGE_LIBSODIUM),y) ZEROMQ_DEPENDENCIES += libsodium diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch index f4b2590525..193c263049 100644 --- a/package/zic/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -18,10 +18,10 @@ diff --git a/Makefile b/Makefile index 1b714a8..00d2c09 100644 --- a/Makefile +++ b/Makefile -@@ -437,7 +437,7 @@ INSTALL: ALL install date.1 - cp date $(DESTDIR)$(BINDIR)/. - cp -f date.1 $(DESTDIR)$(MANDIR)/man1/. - +@@ -587,7 +587,7 @@ INSTALL: ALL install date.1 + # Otherwise, use $(VERSION) unless it is "unknown" and there is already + # a 'version' file, in which case reuse the existing 'version' contents + # and append "-dirty" if the contents do not already end in "-dirty". -version: $(VERSION_DEPS) +version: { (type git) >/dev/null 2>&1 && \ diff --git a/package/zic/zic.hash b/package/zic/zic.hash index cb6300e855..3cee80bcdd 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2019-September/000057.html -sha512 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b tzcode2019c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html +sha512 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed tzcode2020f.tar.gz # Locally computed: -sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE +sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index baa6479154..7529b682a2 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2019c +ZIC_VERSION = 2020f 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/zip/zip.mk b/package/zip/zip.mk index ca52c74fb1..2d11e1c763 100644 --- a/package/zip/zip.mk +++ b/package/zip/zip.mk @@ -10,6 +10,8 @@ ZIP_SOURCE = zip$(subst .,,$(ZIP_VERSION)).tgz ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src ZIP_LICENSE = Info-ZIP ZIP_LICENSE_FILES = LICENSE +ZIP_CPE_ID_VENDOR = info-zip_project +ZIP_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_BZIP2),y) ZIP_DEPENDENCIES += bzip2 @@ -39,6 +41,11 @@ define ZIP_INSTALL_TARGET_CMDS prefix=$(TARGET_DIR)/usr endef +define ZIP_INSTALLING_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ + prefix=$(STAGING_DIR)/usr +endef + define HOST_ZIP_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \ diff --git a/package/zlib-ng/zlib-ng.hash b/package/zlib-ng/zlib-ng.hash index 2e89a8d7a6..3e1dba35ba 100644 --- a/package/zlib-ng/zlib-ng.hash +++ b/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2ec78c8c13530bffaebfc10be2f4695c47cf50fe2fbc2104606467703836fa0e zlib-ng-a17fefa147942edbf80ab22a16bcbc2419def12d.tar.gz -sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md +sha256 379723c0c954679a50d1d7df43084e2194dc51ecbc9987c889cb129d1f6734bc zlib-ng-1.9.9-b1.tar.gz +sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index 3d9651c08f..c56fa72d6f 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -4,15 +4,19 @@ # ################################################################################ -ZLIB_NG_VERSION = a17fefa147942edbf80ab22a16bcbc2419def12d -ZLIB_NG_SITE = $(call github,mtl1979,zlib-ng,$(ZLIB_NG_VERSION)) +ZLIB_NG_VERSION = 1.9.9-b1 +ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md ZLIB_NG_INSTALL_STAGING = YES ZLIB_NG_PROVIDES = zlib # Build with zlib compatible API, gzFile support and optimizations on -ZLIB_NG_CONF_OPTS += -DZLIB_COMPAT=1 -DWITH_GZFILEOP=1 -DWITH_OPTIM=1 -DCC=$(TARGET_CC) +ZLIB_NG_CONF_OPTS += \ + -DWITH_GZFILEOP=1 \ + -DWITH_OPTIM=1 \ + -DZLIB_COMPAT=1 \ + -DZLIB_ENABLE_TESTS=OFF # Enable NEON and ACLE on ARM ifeq ($(BR2_arm),y) diff --git a/package/zlib/Config.in b/package/zlib/Config.in index 0f6179f537..550c2efa93 100644 --- a/package/zlib/Config.in +++ b/package/zlib/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS default y if BR2_arm default y if BR2_aarch64 default y if BR2_i386 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x default y if BR2_x86_64 config BR2_PACKAGE_ZLIB @@ -35,7 +37,7 @@ config BR2_PACKAGE_ZLIB_NG Zlib replacement with optimizations for "next generation" systems. - https://github.com/mtl1979/zlib-ng/tree/renamelib + https://github.com/zlib-ng/zlib-ng endchoice diff --git a/package/zlog/zlog.hash b/package/zlog/zlog.hash index b9f254056b..c39505b2c6 100644 --- a/package/zlog/zlog.hash +++ b/package/zlog/zlog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 05a6533e32f313eeaf134a761481a5cbc586c5dc85ba9ee6771c7458daaeb031 zlog-1.2.14.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 00037ab8d52772a95d645f1dcfd2c292b7cea326b54e63e219a5b7fdcb7e6508 zlog-1.2.15.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/zlog/zlog.mk b/package/zlog/zlog.mk index d9aeae7c7f..e2410d3665 100644 --- a/package/zlog/zlog.mk +++ b/package/zlog/zlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLOG_VERSION = 1.2.14 +ZLOG_VERSION = 1.2.15 ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) ZLOG_LICENSE = LGPL-2.1 ZLOG_LICENSE_FILES = COPYING diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk index 3cd19d644a..32fabf26ef 100644 --- a/package/zmqpp/zmqpp.mk +++ b/package/zmqpp/zmqpp.mk @@ -19,7 +19,7 @@ ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread # -ffast-math -finline-functions -fomit-frame-pointer are disabled, # so only set CONFIG for the non-affected cases. ifneq ($(BR2_or1k):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:) -ZMQPP_CONFIG = $(if $(BR2_ENABLE_DEBUG),debug,release) +ZMQPP_CONFIG = $(if $(BR2_ENABLE_RUNTIME_DEBUG),buildroot,release) endif ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) diff --git a/package/znc/Config.in b/package/znc/Config.in index 4fc7bbb95b..915b5f632c 100644 --- a/package/znc/Config.in +++ b/package/znc/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_ZNC depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL help Advanced IRC bouncer diff --git a/package/znc/znc.hash b/package/znc/znc.hash index f704e388cb..e86171ba1f 100644 --- a/package/znc/znc.hash +++ b/package/znc/znc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a8941e1385c8654287a4428018d93459482e9d5eeedf86bef7b020ddc5f24721 znc-1.7.5.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 ff238aae3f2ae0e44e683c4aee17dc8e4fdd261ca9379d83b48a7d422488de0d znc-1.8.2.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/znc/znc.mk b/package/znc/znc.mk index 3932c98020..07fced8407 100644 --- a/package/znc/znc.mk +++ b/package/znc/znc.mk @@ -4,18 +4,14 @@ # ################################################################################ -ZNC_VERSION = 1.7.5 +ZNC_VERSION = 1.8.2 ZNC_SITE = http://znc.in/releases/archive ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE +ZNC_CPE_ID_VENDOR = znc ZNC_DEPENDENCIES = host-pkgconf ZNC_CONF_OPTS = -DWANT_CYRUS=OFF -DWANT_I18N=OFF -DWANT_PERL=OFF -# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to -# disable a try_run() call in the FindThreads tests, which caused a -# build failure when cross-compiling. -ZNC_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_PACKAGE_ICU),y) ZNC_DEPENDENCIES += icu ZNC_CONF_OPTS += -DWANT_ICU=ON diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index c3d9e52152..1a04833211 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -12,6 +12,7 @@ ZSH_CONF_OPTS = --bindir=/bin ZSH_CONF_ENV = zsh_cv_sys_nis=no zsh_cv_sys_nis_plus=no ZSH_LICENSE = MIT-like ZSH_LICENSE_FILES = LICENCE +ZSH_CPE_ID_VENDOR = zsh ifeq ($(BR2_PACKAGE_GDBM),y) ZSH_CONF_OPTS += --enable-gdbm diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index 8a69261314..2d7bf37b2a 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,6 +1,6 @@ -# Locally computed -sha256 5eda3502ecc285c3c92ee0cc8cd002234dee39d539b3f692997a0e80de1d33de zstd-1.4.3.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz.sha256 +sha256 5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94 zstd-1.5.0.tar.gz -# License files (locally computed as well) -sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE -sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING +# License files (locally computed) +sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE +sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 765fa6dd56..5a96c11309 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,18 +4,15 @@ # ################################################################################ -ZSTD_VERSION = 1.4.3 -ZSTD_SITE = $(call github,facebook,zstd,v$(ZSTD_VERSION)) +ZSTD_VERSION = 1.5.0 +ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 ZSTD_LICENSE_FILES = LICENSE COPYING +ZSTD_CPE_ID_VENDOR = facebook +ZSTD_CPE_ID_PRODUCT = zstandard -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -ZSTD_OPTS += HAVE_THREAD=1 -else -ZSTD_OPTS += HAVE_THREAD=0 -endif - +ZSTD_OPTS += ZSTD_LEGACY_SUPPORT=0 ifeq ($(BR2_PACKAGE_ZLIB),y) ZSTD_DEPENDENCIES += zlib ZSTD_OPTS += HAVE_ZLIB=1 @@ -37,17 +34,33 @@ else ZSTD_OPTS += HAVE_LZ4=0 endif +# zstd will append -O3 after $(CFLAGS), use MOREFLAGS to override again +ZSTD_OPTS += MOREFLAGS="$(TARGET_OPTIMIZATION)" + ifeq ($(BR2_STATIC_LIBS),y) ZSTD_BUILD_LIBS = libzstd.a ZSTD_INSTALL_LIBS = install-static else ifeq ($(BR2_SHARED_LIBS),y) -ZSTD_BUILD_LIBS = libzstd +ZSTD_BUILD_LIBS = lib ZSTD_INSTALL_LIBS = install-shared else -ZSTD_BUILD_LIBS = libzstd.a libzstd +ZSTD_BUILD_LIBS = lib ZSTD_INSTALL_LIBS = install-static install-shared endif +# The HAVE_THREAD flag is read by the 'programs' makefile but not by the 'lib' +# one. Building a multi-threaded binary with a static library (which defaults +# to single-threaded) gives a runtime error when compressing files. +# The 'lib' makefile provides specific '%-mt' and '%-nomt' targets for this +# purpose. +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ZSTD_OPTS += HAVE_THREAD=1 +ZSTD_BUILD_LIBS := $(addsuffix -mt,$(ZSTD_BUILD_LIBS)) +else +ZSTD_OPTS += HAVE_THREAD=0 +ZSTD_BUILD_LIBS := $(addsuffix -nomt,$(ZSTD_BUILD_LIBS)) +endif + define ZSTD_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ -C $(@D)/lib $(ZSTD_BUILD_LIBS) @@ -68,19 +81,16 @@ define ZSTD_INSTALL_TARGET_CMDS DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/lib $(ZSTD_INSTALL_LIBS) endef -# note: no 'HAVE_...' options for host library build only +HOST_ZSTD_OPTS += PREFIX=$(HOST_DIR) + define HOST_ZSTD_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - -C $(@D)/lib - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - -C $(@D) zstd + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ + -C $(@D) zstd-release lib-release endef define HOST_ZSTD_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - DESTDIR=$(HOST_DIR) PREFIX=/usr -C $(@D)/lib install - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - DESTDIR=$(HOST_DIR) PREFIX=/usr -C $(@D)/programs install + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ + -C $(@D) install endef $(eval $(generic-package)) diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index c138c925bb..e9c80b4453 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -16,8 +16,8 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) ZXING_CPP_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),y) -ZXING_CPP_DEPENDENCIES += opencv +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y) +ZXING_CPP_DEPENDENCIES += opencv3 ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON else ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF diff --git a/package/zyre/zyre.hash b/package/zyre/zyre.hash index 289341f494..d9d92d78f2 100644 --- a/package/zyre/zyre.hash +++ b/package/zyre/zyre.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b978a999947ddb6722d956db2427869b313225e50518c4fbbf960a68109e3e91 zyre-2.0.0.tar.gz +sha256 624d379dc880025144f58d3a7dc35ea1be4a57ba4e2a58c98ec15a60891be12d zyre-2.0.1.tar.gz sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENSE diff --git a/package/zyre/zyre.mk b/package/zyre/zyre.mk index 21224d6bb4..a726859adf 100644 --- a/package/zyre/zyre.mk +++ b/package/zyre/zyre.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZYRE_VERSION = 2.0.0 +ZYRE_VERSION = 2.0.1 ZYRE_SITE = $(call github,zeromq,zyre,v$(ZYRE_VERSION)) ZYRE_LICENSE = MPL-2.0 ZYRE_LICENSE_FILES = LICENSE diff --git a/package/zziplib/zziplib.hash b/package/zziplib/zziplib.hash index 88f618b7bf..b6a75ae0cb 100644 --- a/package/zziplib/zziplib.hash +++ b/package/zziplib/zziplib.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544 zziplib-0.13.69.tar.gz -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 docs/COPYING.LIB -sha256 c2aa7d58cebd24cb877bbf11d6b13a4bb7cd08b9d7db5d3037ca06c46bf4cfd8 docs/COPYING.MPL -sha256 1c6da11efe8c43ee853fe5b21501dd72b81831ae84d58ea376bddc0620a5c361 docs/copying.htm +sha256 93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc zziplib-0.13.72.tar.gz +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 docs/COPYING.LIB +sha256 c2aa7d58cebd24cb877bbf11d6b13a4bb7cd08b9d7db5d3037ca06c46bf4cfd8 docs/COPYING.MPL +sha256 1c6da11efe8c43ee853fe5b21501dd72b81831ae84d58ea376bddc0620a5c361 docs/copying.htm diff --git a/package/zziplib/zziplib.mk b/package/zziplib/zziplib.mk index 967cda033d..6b7b64cacc 100644 --- a/package/zziplib/zziplib.mk +++ b/package/zziplib/zziplib.mk @@ -4,23 +4,27 @@ # ################################################################################ -ZZIPLIB_VERSION = 0.13.69 +ZZIPLIB_VERSION = 0.13.72 ZZIPLIB_SITE = $(call github,gdraheim,zziplib,v$(ZZIPLIB_VERSION)) ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1 ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm +ZZIPLIB_CPE_ID_VENDOR = zziplib_project ZZIPLIB_INSTALL_STAGING = YES +ZZIPLIB_CONF_OPTS += \ + -DZZIPDOCS=OFF \ + -DZZIPTEST=OFF +ZZIPLIB_DEPENDENCIES = host-pkgconf zlib -# 0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch -# 0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch -# 0003-One-more-free-to-avoid-memory-leak.patch -ZZIPLIB_IGNORE_CVES += CVE-2018-16548 +define ZZIPLIB_POST_EXTRACT_FIXUP + rm $(@D)/GNUmakefile +endef +ZZIPLIB_POST_EXTRACT_HOOKS += ZZIPLIB_POST_EXTRACT_FIXUP -# 0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch -ZZIPLIB_IGNORE_CVES += CVE-2018-17828 +ifeq ($(BR2_PACKAGE_SDL2),y) +ZZIPLIB_CONF_OPTS += -DZZIPSDL=ON +ZZIPLIB_DEPENDENCIES += sdl2 +else +ZZIPLIB_CONF_OPTS += -DZZIPSDL=OFF +endif -ZZIPLIB_DEPENDENCIES = host-pkgconf host-python zlib - -# zziplib is not python3 friendly, so force the python interpreter -ZZIPLIB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 - -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/support/config-fragments/autobuild/br-arm-basic.config b/support/config-fragments/autobuild/br-arm-basic.config index c73aa782ca..fbbeaaa773 100644 --- a/support/config-fragments/autobuild/br-arm-basic.config +++ b/support/config-fragments/autobuild/br-arm-basic.config @@ -2,7 +2,7 @@ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/support/config-fragments/autobuild/br-arm-full-nothread.config b/support/config-fragments/autobuild/br-arm-full-nothread.config index 3b0267f6d3..71592d688a 100644 --- a/support/config-fragments/autobuild/br-arm-full-nothread.config +++ b/support/config-fragments/autobuild/br-arm-full-nothread.config @@ -3,9 +3,9 @@ BR2_arm1176jzf_s=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-arm-full-static.config b/support/config-fragments/autobuild/br-arm-full-static.config index 59e90f3371..f3a4d91fd1 100644 --- a/support/config-fragments/autobuild/br-arm-full-static.config +++ b/support/config-fragments/autobuild/br-arm-full-static.config @@ -3,8 +3,8 @@ BR2_STATIC_LIBS=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/support/config-fragments/autobuild/br-arm-internal-glibc.config b/support/config-fragments/autobuild/br-arm-internal-glibc.config index 7c9b465a88..fb930cbef7 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_32_X=y -BR2_GCC_VERSION_9_X=y +BR2_BINUTILS_VERSION_2_36_X=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config b/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config index 2f651dedfe..1b3c45fe9b 100644 --- a/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config +++ b/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config @@ -2,8 +2,8 @@ BR2_x86_pentium_mmx=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set diff --git a/support/config-fragments/autobuild/br-i386-pentium4-full.config b/support/config-fragments/autobuild/br-i386-pentium4-full.config index acc7c0942b..c680699288 100644 --- a/support/config-fragments/autobuild/br-i386-pentium4-full.config +++ b/support/config-fragments/autobuild/br-i386-pentium4-full.config @@ -2,8 +2,8 @@ BR2_x86_pentium4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/support/config-fragments/autobuild/br-mips64-n64-full.config b/support/config-fragments/autobuild/br-mips64-n64-full.config index 99ace7776a..b89b74e76f 100644 --- a/support/config-fragments/autobuild/br-mips64-n64-full.config +++ b/support/config-fragments/autobuild/br-mips64-n64-full.config @@ -3,8 +3,8 @@ BR2_MIPS_NABI64=y # BR2_MIPS_SOFT_FLOAT is not set BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_5=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config b/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config index 48ed24dacf..edf04c356f 100644 --- a/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config +++ b/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config @@ -5,8 +5,8 @@ BR2_MIPS_NABI64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config b/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config index f083462654..045428c1de 100644 --- a/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config +++ b/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config @@ -3,8 +3,8 @@ BR2_powerpc_603e=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config b/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config index 5d7171a067..a80047ea66 100644 --- a/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config +++ b/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config @@ -2,8 +2,8 @@ BR2_powerpc64=y BR2_powerpc_power7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 9b41e2173b..f5e9bd8cf9 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -4,16 +4,16 @@ # Toolchains used by default by test-pkg: # Test a regular uClibc toolchain -support/config-fragments/autobuild/br-arm-full.config,x86_64 +support/config-fragments/autobuild/bootlin-armv5-uclibc.config,x86_64 # Test a toolchain with glibc and a very recent gcc version -support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-armv7-glibc.config,x86_64 # Test a noMMU toolchain with no dynamic library support -support/config-fragments/autobuild/br-arm-cortex-m4-full.config,x86_64 +support/config-fragments/autobuild/bootlin-armv7m-uclibc.config,x86_64 # Test a musl toolchain -support/config-fragments/autobuild/br-x86-64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-x86-64-musl.config,x86_64 # Test a MMU toolchain without dynamic library support support/config-fragments/autobuild/br-arm-full-static.config,x86_64 @@ -24,41 +24,44 @@ support/config-fragments/autobuild/sourcery-arm.config,x86 # Toolchains used by test-pkg only when the '-a' option is passed: support/config-fragments/autobuild/andes-nds32.config,x86 support/config-fragments/autobuild/arm-aarch64.config,x86_64 -support/config-fragments/autobuild/br-aarch64-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-aarch64-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-arcle-hs38-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-armv7-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-m68k-68040-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-m68k-5208-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-microblazeel-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-mipsel-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-mipsel32r6-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-nios2-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-openrisc-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-powerpc64le-power8-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-riscv32-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-riscv64-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-riscv64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-x86-64-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-x86-64-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-xtensa-uclibc.config,x86_64 support/config-fragments/autobuild/br-arc-full-internal.config,any support/config-fragments/autobuild/br-arc-internal-glibc.config,any -support/config-fragments/autobuild/br-arcle-hs38.config,x86_64 support/config-fragments/autobuild/br-arm-basic.config,x86_64 -support/config-fragments/autobuild/br-arm-cortex-a9-musl.config,x86_64 support/config-fragments/autobuild/br-arm-full-nothread.config,x86_64 support/config-fragments/autobuild/br-arm-internal-full.config,any support/config-fragments/autobuild/br-arm-internal-glibc.config,any support/config-fragments/autobuild/br-arm-internal-musl.config,any support/config-fragments/autobuild/br-i386-pentium4-full.config,x86_64 support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config,x86_64 -support/config-fragments/autobuild/br-m68k-5208-full.config,x86_64 -support/config-fragments/autobuild/br-m68k-68040-full.config,x86_64 -support/config-fragments/autobuild/br-microblazeel-full.config,x86_64 support/config-fragments/autobuild/br-microblazeel-full-internal.config,any support/config-fragments/autobuild/br-mips64-n64-full.config,x86_64 -support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config,x86_64 support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config,x86_64 -support/config-fragments/autobuild/br-mipsel-o32-full.config,x86_64 -support/config-fragments/autobuild/br-nios2-glibc.config,x86_64 -support/config-fragments/autobuild/br-openrisc-uclibc.config,x86_64 support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config,x86_64 -support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config,x86_64 support/config-fragments/autobuild/br-powerpc64-power7-glibc.config,x86_64 -support/config-fragments/autobuild/br-powerpc-e500mc-full.config,x86_64 support/config-fragments/autobuild/br-powerpc-internal-full.config,any -support/config-fragments/autobuild/br-riscv32.config,x86_64 -support/config-fragments/autobuild/br-riscv64.config,x86_64 -support/config-fragments/autobuild/br-riscv64-internal-musl.config,any -support/config-fragments/autobuild/br-sh4-full.config,x86_64 -support/config-fragments/autobuild/br-sparc-uclibc.config,x86_64 -support/config-fragments/autobuild/br-sparc64-glibc.config,x86_64 -support/config-fragments/autobuild/br-x86-64-core2-full.config,x86_64 -support/config-fragments/autobuild/br-xtensa-full.config,x86_64 +support/config-fragments/autobuild/br-riscv64-full-internal.config,any +support/config-fragments/autobuild/br-s390x-z13-internal-glibc.config,any support/config-fragments/autobuild/br-xtensa-full-internal.config,any support/config-fragments/autobuild/linaro-aarch64.config,x86 support/config-fragments/autobuild/linaro-aarch64-be.config,x86 @@ -68,4 +71,3 @@ support/config-fragments/autobuild/sourcery-arm-thumb2.config,x86 support/config-fragments/autobuild/sourcery-mips64.config,x86 support/config-fragments/autobuild/sourcery-mips.config,x86 support/config-fragments/autobuild/sourcery-nios2.config,x86 -support/config-fragments/autobuild/sourcery-x86-64.config,x86 diff --git a/support/dependencies/check-host-bison-flex.mk b/support/dependencies/check-host-bison-flex.mk index 233b6c51cc..14a232fd44 100644 --- a/support/dependencies/check-host-bison-flex.mk +++ b/support/dependencies/check-host-bison-flex.mk @@ -1,5 +1,9 @@ # If the system lacks bison or flex, add # dependencies to suitable host packages +# +# BR2_{BISON,FLES}_HOST_DEPENDENCY should only be used to build code +# that runs on host, e.g. Kconfig. To build code for target use plain +# host-{bison,flex}. ifeq ($(shell which bison 2>/dev/null),) BR2_BISON_HOST_DEPENDENCY = host-bison diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk index 01f38da376..dfc252e919 100644 --- a/support/dependencies/check-host-cmake.mk +++ b/support/dependencies/check-host-cmake.mk @@ -1,9 +1,9 @@ -# Set this to either 3.10 or higher, depending on the highest minimum +# Set this to either 3.16 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. # -BR2_CMAKE_VERSION_MIN = 3.10 +BR2_CMAKE_VERSION_MIN = 3.16 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 934cb61299..b7d607a47a 100755 --- a/support/dependencies/check-host-tar.sh +++ b/support/dependencies/check-host-tar.sh @@ -33,14 +33,7 @@ fi major_min=1 minor_min=27 -# Maximal version = 1.29 (1.30 changed --numeric-owner output for -# filenames > 100 characters). This is really a fix for a bug in -# earlier tar versions regarding deterministic output so it is -# unlikely to be reverted in later versions. -major_max=1 -minor_max=29 - -if [ $major -lt $major_min -o $major -gt $major_max ]; then +if [ $major -lt $major_min ]; then # echo nothing: no suitable tar found exit 1 fi @@ -50,10 +43,5 @@ if [ $major -eq $major_min -a $minor -lt $minor_min ]; then exit 1 fi -if [ $major -eq $major_max -a $minor -gt $minor_max ]; then - # echo nothing: no suitable tar found - exit 1 -fi - # valid echo $tar diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 98469bd70c..c604a9efcc 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -2,6 +2,9 @@ # vi: set sw=4 ts=4: export LC_ALL=C +TAB="$(printf '\t')" +NL=" +" # Verify that grep works echo "WORKS" | grep "WORKS" >/dev/null 2>&1 @@ -35,9 +38,9 @@ case ":${PATH:-unset}:" in echo "PATH environment variable. This doesn't work." exit 1 ;; -(*" -"*) printf "\n" - printf "Your PATH contains a newline (\\\n) character.\n" +(*" "*|*"${TAB}"*|*"${NL}"*) + printf "\n" + printf "Your PATH contains spaces, TABs, and/or newline (\\\n) characters.\n" printf "This doesn't work. Fix you PATH.\n" exit 1 ;; @@ -160,7 +163,7 @@ fi # Check that a few mandatory programs are installed missing_progs="no" -for prog in patch perl tar wget cpio unzip rsync bc ${DL_TOOLS} ; do +for prog in perl tar wget cpio unzip rsync bc ${DL_TOOLS} ; do if ! which $prog > /dev/null ; then echo "You must install '$prog' on your build machine"; missing_progs="yes" @@ -180,6 +183,20 @@ if test "${missing_progs}" = "yes" ; then exit 1 fi +PATCH_VERSION="$(patch -v 2>/dev/null | sed -n 's/^GNU patch \(.*\)/\1/p')" +if [ -z "${PATCH_VERSION}" ] ; then + echo + echo "You must install GNU patch" + exit 1 +fi +PATCH_MAJOR="$(echo "${PATCH_VERSION}" | cut -d . -f 1)" +PATCH_MINOR="$(echo "${PATCH_VERSION}" | cut -d . -f 2)" +if [ "${PATCH_MAJOR}" -lt 2 ] || [ "${PATCH_MAJOR}" -eq 2 -a "${PATCH_MINOR}" -lt 7 ] ; then + echo + echo "You have GNU patch '${PATCH_VERSION}' installed. GNU patch >= 2.7 is required" + exit 1; +fi + if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then if ! which locale > /dev/null ; then echo @@ -240,6 +257,16 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then fi fi +if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then + if ! echo "#include " | $HOSTCXX_NOCCACHE -I$($HOSTCXX_NOCCACHE -print-file-name=plugin)/include -x c++ -c - -o /dev/null ; then + echo + echo "Your Buildroot configuration needs a host compiler capable of building gcc plugins." + echo "If you're running a Debian/Ubuntu distribution, install gcc-X-plugin-dev package." + echo "For other distributions, refer to their documentation." + exit 1 ; + fi +fi + # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index 03acde85d2..a9bacca3a0 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -36,10 +36,8 @@ RUN apt-get install -y --no-install-recommends \ libncurses5-dev \ locales \ mercurial \ - python-flake8 \ - python-nose2 \ - python-pexpect \ python3 \ + python3-flake8 \ python3-nose2 \ python3-pexpect \ qemu-system-arm \ diff --git a/support/download/bzr b/support/download/bzr index 5289a421cd..6f77bc286e 100755 --- a/support/download/bzr +++ b/support/download/bzr @@ -16,10 +16,10 @@ set -e # BZR : the bzr command to call -verbose= +quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in - q) verbose=-q;; + q) quiet=-q;; o) output="${OPTARG}";; u) uri="${OPTARG}";; c) cset="${OPTARG}";; @@ -34,6 +34,13 @@ shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _bzr() { + if [ -z "${quiet}" ]; then + printf '%s ' ${BZR} "${@}"; printf '\n' + fi + _plain_bzr "$@" +} +# Note: please keep command below aligned with what is printed above +_plain_bzr() { eval ${BZR} "${@}" } @@ -53,6 +60,6 @@ if [ ${bzr_version} -ge ${bzr_min_version} ]; then timestamp_opt="--per-file-timestamps" fi -_bzr export ${verbose} --root="'${basename}/'" --format=tgz \ +_bzr export ${quiet} --root="'${basename}/'" --format=tgz \ ${timestamp_opt} - "${@}" "'${uri}'" -r "'${cset}'" \ >"${output}" diff --git a/support/download/cvs b/support/download/cvs index 9d0dc3cb3a..0c079e2403 100755 --- a/support/download/cvs +++ b/support/download/cvs @@ -16,10 +16,10 @@ set -e # Environment: # CVS : the cvs command to call -verbose= +quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in - q) verbose=-Q;; + q) quiet=-Q;; o) output="${OPTARG}";; u) uri="${OPTARG#*://}";; c) rev="${OPTARG}";; @@ -39,6 +39,13 @@ shift $((OPTIND-1)) # Get rid of our options # ). Since nobody sane will put large code bases in CVS, a timeout of # 10 minutes should do the trick. _cvs() { + if [ -z "${quiet}" ]; then + printf '%s ' timeout 10m ${CVS} "${@}"; printf '\n' + fi + _plain_cvs "$@" +} +# Note: please keep command below aligned with what is printed above +_plain_cvs() { eval timeout 10m ${CVS} "${@}" } @@ -57,7 +64,7 @@ if [[ ! "${uri}" =~ ^: ]]; then fi export TZ=UTC -_cvs ${verbose} -z3 -d"'${uri}'" \ +_cvs ${quiet} -z3 -d"'${uri}'" \ co "${@}" -d "'${basename}'" ${select} "'${rev}'" -P "'${rawname}'" tar czf "${output}" "${basename}" diff --git a/support/download/file b/support/download/file index e52fcf2c8c..a893ca5cc3 100755 --- a/support/download/file +++ b/support/download/file @@ -36,6 +36,13 @@ shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _localfiles() { + if [ -n "${verbose}" ]; then + printf '%s ' ${LOCALFILES} "${@}"; printf '\n' + fi + _plain_localfiles "$@" +} +# Note: please keep command below aligned with what is printed above +_plain_localfiles() { eval ${LOCALFILES} "${@}" } diff --git a/support/download/git b/support/download/git index 075f665bbf..1e690d4444 100755 --- a/support/download/git +++ b/support/download/git @@ -1,5 +1,10 @@ #!/usr/bin/env bash +# NOTE: if the output of this backend has to change (e.g. we change what gets +# included in the archive (e.g. LFS), or we change the format of the archive +# (e.g. tar options, compression ratio or method)), we MUST update the format +# version in the variable BR_FMT_VERSION_git, in package/pkg-download.mk. + # We want to catch any unexpected failure, and exit immediately set -E @@ -16,6 +21,8 @@ set -E # Environment: # GIT : the git command to call +. "${0%/*}/helpers" + # Save our path and options in case we need to call ourselves again myname="${0}" declare -a OPTS=("${@}") @@ -43,11 +50,11 @@ _on_error() { exec "${myname}" "${OPTS[@]}" || exit ${ret} } -verbose= +quiet= recurse=0 while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in - q) verbose=-q; exec >/dev/null;; + q) quiet=-q; exec >/dev/null;; r) recurse=1;; o) output="${OPTARG}";; u) uri="${OPTARG}";; @@ -72,6 +79,13 @@ trap _on_error ERR # 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' + fi + _plain_git "$@" +} +# Note: please keep command below aligned with what is printed above +_plain_git() { eval GIT_DIR="${git_cache}/.git" ${GIT} "${@}" } @@ -105,7 +119,7 @@ _EOF_ _git init . # Ensure the repo has an origin (in case a previous run was killed). -if ! _git remote |grep -q -E '^origin$'; then +if ! _plain_git remote |grep -q -E '^origin$'; then _git remote add origin "'${uri}'" fi @@ -170,32 +184,33 @@ _git checkout -f -q "'${cset}'" _git clean -ffdx # Get date of commit to generate a reproducible archive. -# %cD is RFC2822, so it's fully qualified, with TZ and all. -date="$( _git log -1 --pretty=format:%cD )" +# %ci is ISO 8601, so it's fully qualified, with TZ and all. +date="$( _plain_git log -1 --pretty=format:%ci )" # There might be submodules, so fetch them. if [ ${recurse} -eq 1 ]; then _git submodule update --init --recursive + + # Older versions of git will store the absolute path of the git tree + # in the .git of submodules, while newer versions just use relative + # paths. Detect and fix the older variants to use relative paths, so + # 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. + 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" + done fi -# Generate the archive, sort with the C locale so that it is reproducible. +popd >/dev/null + +# Generate the archive. # We do not want the .git dir; we keep other .git files, in case they are the # only files in their directory. # The .git dir would generate non reproducible tarballs as it depends on # the state of the remote server. It also would generate large tarballs # (gigabytes for some linux trees) when a full clone took place. -find . -not -type d \ - -and -not -path "./.git/*" >"${output}.list" -LC_ALL=C sort <"${output}.list" >"${output}.list.sorted" - -# Create GNU-format tarballs, since that's the format of the tarballs on -# sources.buildroot.org and used in the *.hash files -tar cf - --transform="s#^\./#${basename}/#" \ - --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ - -T "${output}.list.sorted" >"${output}.tar" -gzip -6 -n <"${output}.tar" >"${output}" - -rm -f "${output}.list" -rm -f "${output}.list.sorted" - -popd >/dev/null +mk_tar_gz "${git_cache}" "${basename}" "${date}" "${output}" ".git/*" diff --git a/support/download/hg b/support/download/hg index efb515fca5..768a27e06f 100755 --- a/support/download/hg +++ b/support/download/hg @@ -15,10 +15,10 @@ set -e # Environment: # HG : the hg command to call -verbose= +quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in - q) verbose=-q;; + q) quiet=-q;; o) output="${OPTARG}";; u) uri="${OPTARG}";; c) cset="${OPTARG}";; @@ -33,11 +33,18 @@ shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _hg() { + if [ -z "${quiet}" ]; then + printf '%s ' ${HG} "${@}"; printf '\n' + fi + _plain_hg "$@" +} +# Note: please keep command below aligned with what is printed above +_plain_hg() { eval ${HG} "${@}" } -_hg clone ${verbose} "${@}" --noupdate "'${uri}'" "'${basename}'" +_hg clone ${quiet} "${@}" --noupdate "'${uri}'" "'${basename}'" -_hg archive ${verbose} --repository "'${basename}'" --type tgz \ +_plain_hg archive ${quiet} --repository "'${basename}'" --type tgz \ --prefix "'${basename}'" --rev "'${cset}'" \ - >"${output}" diff --git a/support/download/scp b/support/download/scp index 80cf495c4e..14e768b601 100755 --- a/support/download/scp +++ b/support/download/scp @@ -14,10 +14,10 @@ set -e # Environment: # SCP : the scp command to call -verbose= +quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in - q) verbose=-q;; + q) quiet=-q;; o) output="${OPTARG}";; f) filename="${OPTARG}";; u) uri="${OPTARG}";; @@ -31,10 +31,17 @@ shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _scp() { + if [ -z "${quiet}" ]; then + printf '%s ' ${SCP} "${@}"; printf '\n' + fi + _plain_scp "$@" +} +# Note: please keep command below aligned with what is printed above +_plain_scp() { eval ${SCP} "${@}" } # Remove any scheme prefix uri="${uri##scp://}" -_scp ${verbose} "${@}" "'${uri}/${filename}'" "'${output}'" +_scp ${quiet} "${@}" "'${uri}/${filename}'" "'${output}'" diff --git a/support/download/svn b/support/download/svn index 012f286dd9..b23b7773d3 100755 --- a/support/download/svn +++ b/support/download/svn @@ -1,5 +1,10 @@ #!/usr/bin/env bash +# NOTE: if the output of this backend has to change (e.g. we change what gets +# included in the archive, or we change the format of the archive (e.g. tar +# options, compression ratio or method)), we MUST update the format version +# in the variable BR_FTM_VERSION_svn, in package/pkg-download.mk. + # We want to catch any unexpected failure, and exit immediately set -e @@ -15,10 +20,12 @@ set -e # Environment: # SVN : the svn command to call -verbose= +. "${0%/*}/helpers" + +quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in - q) verbose=-q;; + q) quiet=-q;; o) output="${OPTARG}";; u) uri="${OPTARG}";; c) rev="${OPTARG}";; @@ -33,31 +40,28 @@ shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _svn() { + if [ -z "${quiet}" ]; then + printf '%s ' ${SVN} "${@}"; printf '\n' + fi + _plain_svn "$@" +} +# Note: please keep command below aligned with what is printed above +_plain_svn() { eval ${SVN} "${@}" } -_svn export ${verbose} "${@}" "'${uri}@${rev}'" "'${basename}'" +_svn export --ignore-keywords ${quiet} "${@}" "'${uri}@${rev}'" "'${basename}'" # Get the date of the revision, to generate reproducible archives. # The output format is YYYY-MM-DDTHH:MM:SS.mmmuuuZ (i.e. always in the # UTC timezone), which we can feed as-is to the --mtime option for tar. # In case there is a redirection (e.g. http -> https), just keep the # last line (svn outputs everything on stdout) -date="$( _svn info --show-item last-changed-date "'${uri}@${rev}'" |tail -n 1 )" +date="$( _plain_svn info "'${uri}@${rev}'" \ + |sed -r -e '/^Last Changed Date: /!d; s///' + )" -# Generate the archive, sort with the C locale so that it is reproducible. -# We do not want the .svn dir; we keep other .svn files, in case they are the -# only files in their directory. -find "${basename}" -not -type d \ - -and -not -path "./.svn/*" >"${output}.list" -LC_ALL=C sort <"${output}.list" >"${output}.list.sorted" - -# Create GNU-format tarballs, since that's the format of the tarballs on -# sources.buildroot.org and used in the *.hash files -tar cf - --transform="s#^\./#${basename}/#" \ - --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ - -T "${output}.list.sorted" >"${output}.tar" -gzip -6 -n <"${output}.tar" >"${output}" - -rm -f "${output}.list" -rm -f "${output}.list.sorted" +# Generate the archive. +# We did a 'svn export' above, so it's not a working copy (there is no .svn +# directory or file to ignore). +mk_tar_gz "${basename}" "${basename}" "${date}" "${output}" diff --git a/support/download/wget b/support/download/wget index c69e6071aa..68bd0b13c8 100755 --- a/support/download/wget +++ b/support/download/wget @@ -15,10 +15,10 @@ set -e # Environment: # WGET : the wget command to call -verbose= +quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in - q) verbose=-q;; + q) quiet=-q;; o) output="${OPTARG}";; f) filename="${OPTARG}";; u) url="${OPTARG}";; @@ -33,6 +33,13 @@ shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _wget() { + if [ -z "${quiet}" ]; then + printf '%s ' ${WGET} "${@}"; printf '\n' + fi + _plain_wget "$@" +} +# Note: please keep command below aligned with what is printed above +_plain_wget() { eval ${WGET} "${@}" } @@ -40,4 +47,4 @@ _wget() { # mirror [ -n "${encode}" ] && filename=${filename//\?/%3F} -_wget ${verbose} "${@}" -O "'${output}'" "'${url}/${filename}'" +_wget ${quiet} "${@}" -O "'${output}'" "'${url}/${filename}'" diff --git a/support/gnuconfig/README.buildroot b/support/gnuconfig/README.buildroot index 7ba2a332a4..952eea8b10 100644 --- a/support/gnuconfig/README.buildroot +++ b/support/gnuconfig/README.buildroot @@ -13,15 +13,9 @@ files of your package to be updated by using: _POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK --- UPDATE --- -GNU config is now managed in git, so to update: +Run the script 'update' in this directory, and commit the result. -# git clone git://git.savannah.gnu.org/config.git -# cp config/config.* . -# for p in $(ls patches/*.patch); do patch -p1 < $p; done -# rm -rf config +The current Buildroot version is based on this commit of the config.git +repository (leave alone on its own line, the script updates it): -Currently no patches are needed, but they may be needed again in the -future. - -The current Buildroot version is based on the Git commit -dafd8e767ec87b90aac62f0fcedd11944c84b50a of the config.git repository. +d7a4dee7cc25e332b990d0a6d9f0ddd42cb33cf5 diff --git a/support/gnuconfig/config.guess b/support/gnuconfig/config.guess index b40e17b137..8d70ec2b26 100755 --- a/support/gnuconfig/config.guess +++ b/support/gnuconfig/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2019 Free Software Foundation, Inc. +# Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2019-05-28' +timestamp='2020-09-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2020 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -99,6 +99,8 @@ tmp= trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 : "${TMPDIR=/tmp}" # shellcheck disable=SC2039 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || @@ -148,17 +150,15 @@ Linux|GNU|GNU/*) #elif defined(__dietlibc__) LIBC=dietlibc #else + #include + #ifdef __DEFINED_va_list + LIBC=musl + #else LIBC=gnu #endif + #endif EOF eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" - - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl - fi ;; esac @@ -262,6 +262,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:SolidBSD:*:*) echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; + *:OS108:*:*) + echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" + exit ;; macppc:MirBSD:*:*) echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; @@ -271,12 +274,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:Sortix:*:*) echo "$UNAME_MACHINE"-unknown-sortix exit ;; + *:Twizzler:*:*) + echo "$UNAME_MACHINE"-unknown-twizzler + exit ;; *:Redox:*:*) echo "$UNAME_MACHINE"-unknown-redox exit ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -396,7 +402,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -536,10 +542,10 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then echo m88k-dg-dgux"$UNAME_RELEASE" else @@ -572,7 +578,7 @@ EOF echo i386-ibm-aix exit ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" @@ -612,7 +618,7 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then + if test -x /usr/bin/lslpp ; then IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else @@ -647,7 +653,7 @@ EOF 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "$sc_cpu_version" in @@ -661,7 +667,7 @@ EOF esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then + if test "$HP_ARCH" = ""; then set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -700,7 +706,7 @@ EOF test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then set_cc_for_build @@ -774,7 +780,7 @@ EOF echo hppa1.0-hp-osf exit ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then + if test -x /usr/sbin/sysversion ; then echo "$UNAME_MACHINE"-unknown-osf1mk else echo "$UNAME_MACHINE"-unknown-osf1 @@ -918,7 +924,7 @@ EOF echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -1087,7 +1093,17 @@ EOF echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + set_cc_for_build + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + LIBCABI="$LIBC"x32 + fi + fi + echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -1276,7 +1292,7 @@ EOF echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then + if test -d /usr/nec; then echo mips-nec-sysv"$UNAME_RELEASE" else echo mips-unknown-sysv"$UNAME_RELEASE" @@ -1324,39 +1340,43 @@ EOF *:Rhapsody:*:*) echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; + arm64:Darwin:*:*) + echo aarch64-apple-darwin"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) - set_cc_for_build UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in unknown) UNAME_PROCESSOR=powerpc ;; esac - if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build + fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc fi elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE fi echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; @@ -1620,6 +1640,12 @@ copies of config.guess and config.sub with the latest versions from: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +EOF + +year=`echo $timestamp | sed 's,-.*,,'` +# shellcheck disable=SC2003 +if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then + cat >&2 <." version="\ GNU config.sub ($timestamp) -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2020 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,28 +124,27 @@ case $1 in ;; *-*-*-*) basic_machine=$field1-$field2 - os=$field3-$field4 + basic_os=$field3-$field4 ;; *-*-*) # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two # parts maybe_os=$field2-$field3 case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ - | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ + nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | storm-chaos* | os2-emx* | rtmk-nova*) basic_machine=$field1 - os=$maybe_os + basic_os=$maybe_os ;; android-linux) basic_machine=$field1-unknown - os=linux-android + basic_os=linux-android ;; *) basic_machine=$field1-$field2 - os=$field3 + basic_os=$field3 ;; esac ;; @@ -154,7 +153,7 @@ case $1 in case $field1-$field2 in decstation-3100) basic_machine=mips-dec - os= + basic_os= ;; *-*) # Second component is usually, but not always the OS @@ -162,7 +161,7 @@ case $1 in # Prevent following clause from handling this valid os sun*os*) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; # Manufacturers dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ @@ -175,11 +174,11 @@ case $1 in | microblaze* | sim | cisco \ | oki | wec | wrs | winbond) basic_machine=$field1-$field2 - os= + basic_os= ;; *) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; esac ;; @@ -191,450 +190,451 @@ case $1 in case $field1 in 386bsd) basic_machine=i386-pc - os=bsd + basic_os=bsd ;; a29khif) basic_machine=a29k-amd - os=udi + basic_os=udi ;; adobe68k) basic_machine=m68010-adobe - os=scout + basic_os=scout ;; alliant) basic_machine=fx80-alliant - os= + basic_os= ;; altos | altos3068) basic_machine=m68k-altos - os= + basic_os= ;; am29k) basic_machine=a29k-none - os=bsd + basic_os=bsd ;; amdahl) basic_machine=580-amdahl - os=sysv + basic_os=sysv ;; amiga) basic_machine=m68k-unknown - os= + basic_os= ;; amigaos | amigados) basic_machine=m68k-unknown - os=amigaos + basic_os=amigaos ;; amigaunix | amix) basic_machine=m68k-unknown - os=sysv4 + basic_os=sysv4 ;; apollo68) basic_machine=m68k-apollo - os=sysv + basic_os=sysv ;; apollo68bsd) basic_machine=m68k-apollo - os=bsd + basic_os=bsd ;; aros) basic_machine=i386-pc - os=aros + basic_os=aros ;; aux) basic_machine=m68k-apple - os=aux + basic_os=aux ;; balance) basic_machine=ns32k-sequent - os=dynix + basic_os=dynix ;; blackfin) basic_machine=bfin-unknown - os=linux + basic_os=linux ;; cegcc) basic_machine=arm-unknown - os=cegcc + basic_os=cegcc ;; convex-c1) basic_machine=c1-convex - os=bsd + basic_os=bsd ;; convex-c2) basic_machine=c2-convex - os=bsd + basic_os=bsd ;; convex-c32) basic_machine=c32-convex - os=bsd + basic_os=bsd ;; convex-c34) basic_machine=c34-convex - os=bsd + basic_os=bsd ;; convex-c38) basic_machine=c38-convex - os=bsd + basic_os=bsd ;; cray) basic_machine=j90-cray - os=unicos + basic_os=unicos ;; crds | unos) basic_machine=m68k-crds - os= + basic_os= ;; da30) basic_machine=m68k-da30 - os= + basic_os= ;; decstation | pmax | pmin | dec3100 | decstatn) basic_machine=mips-dec - os= + basic_os= ;; delta88) basic_machine=m88k-motorola - os=sysv3 + basic_os=sysv3 ;; dicos) basic_machine=i686-pc - os=dicos + basic_os=dicos ;; djgpp) basic_machine=i586-pc - os=msdosdjgpp + basic_os=msdosdjgpp ;; ebmon29k) basic_machine=a29k-amd - os=ebmon + basic_os=ebmon ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson - os=ose + basic_os=ose ;; gmicro) basic_machine=tron-gmicro - os=sysv + basic_os=sysv ;; go32) basic_machine=i386-pc - os=go32 + basic_os=go32 ;; h8300hms) basic_machine=h8300-hitachi - os=hms + basic_os=hms ;; h8300xray) basic_machine=h8300-hitachi - os=xray + basic_os=xray ;; h8500hms) basic_machine=h8500-hitachi - os=hms + basic_os=hms ;; harris) basic_machine=m88k-harris - os=sysv3 + basic_os=sysv3 ;; - hp300) + hp300 | hp300hpux) basic_machine=m68k-hp + basic_os=hpux ;; hp300bsd) basic_machine=m68k-hp - os=bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=hpux + basic_os=bsd ;; hppaosf) basic_machine=hppa1.1-hp - os=osf + basic_os=osf ;; hppro) basic_machine=hppa1.1-hp - os=proelf + basic_os=proelf ;; i386mach) basic_machine=i386-mach - os=mach - ;; - vsta) - basic_machine=i386-pc - os=vsta + basic_os=mach ;; isi68 | isi) basic_machine=m68k-isi - os=sysv + basic_os=sysv ;; m68knommu) basic_machine=m68k-unknown - os=linux + basic_os=linux ;; magnum | m3230) basic_machine=mips-mips - os=sysv + basic_os=sysv ;; merlin) basic_machine=ns32k-utek - os=sysv + basic_os=sysv ;; mingw64) basic_machine=x86_64-pc - os=mingw64 + basic_os=mingw64 ;; mingw32) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; mingw32ce) basic_machine=arm-unknown - os=mingw32ce + basic_os=mingw32ce ;; monitor) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; morphos) basic_machine=powerpc-unknown - os=morphos + basic_os=morphos ;; moxiebox) basic_machine=moxie-unknown - os=moxiebox + basic_os=moxiebox ;; msdos) basic_machine=i386-pc - os=msdos + basic_os=msdos ;; msys) basic_machine=i686-pc - os=msys + basic_os=msys ;; mvs) basic_machine=i370-ibm - os=mvs + basic_os=mvs ;; nacl) basic_machine=le32-unknown - os=nacl + basic_os=nacl ;; ncr3000) basic_machine=i486-ncr - os=sysv4 + basic_os=sysv4 ;; netbsd386) basic_machine=i386-pc - os=netbsd + basic_os=netbsd ;; netwinder) basic_machine=armv4l-rebel - os=linux + basic_os=linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony - os=newsos + basic_os=newsos ;; news1000) basic_machine=m68030-sony - os=newsos + basic_os=newsos ;; necv70) basic_machine=v70-nec - os=sysv + basic_os=sysv ;; nh3000) basic_machine=m68k-harris - os=cxux + basic_os=cxux ;; nh[45]000) basic_machine=m88k-harris - os=cxux + basic_os=cxux ;; nindy960) basic_machine=i960-intel - os=nindy + basic_os=nindy ;; mon960) basic_machine=i960-intel - os=mon960 + basic_os=mon960 ;; nonstopux) basic_machine=mips-compaq - os=nonstopux + basic_os=nonstopux ;; os400) basic_machine=powerpc-ibm - os=os400 + basic_os=os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson - os=ose + basic_os=ose ;; os68k) basic_machine=m68k-none - os=os68k + basic_os=os68k ;; paragon) basic_machine=i860-intel - os=osf + basic_os=osf ;; parisc) basic_machine=hppa-unknown - os=linux + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp ;; pw32) basic_machine=i586-unknown - os=pw32 + basic_os=pw32 ;; rdos | rdos64) basic_machine=x86_64-pc - os=rdos + basic_os=rdos ;; rdos32) basic_machine=i386-pc - os=rdos + basic_os=rdos ;; rom68k) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; sa29200) basic_machine=a29k-amd - os=udi + basic_os=udi ;; sei) basic_machine=mips-sei - os=seiux + basic_os=seiux ;; sequent) basic_machine=i386-sequent - os= + basic_os= ;; sps7) basic_machine=m68k-bull - os=sysv2 + basic_os=sysv2 ;; st2000) basic_machine=m68k-tandem - os= + basic_os= ;; stratus) basic_machine=i860-stratus - os=sysv4 + basic_os=sysv4 ;; sun2) basic_machine=m68000-sun - os= + basic_os= ;; sun2os3) basic_machine=m68000-sun - os=sunos3 + basic_os=sunos3 ;; sun2os4) basic_machine=m68000-sun - os=sunos4 + basic_os=sunos4 ;; sun3) basic_machine=m68k-sun - os= + basic_os= ;; sun3os3) basic_machine=m68k-sun - os=sunos3 + basic_os=sunos3 ;; sun3os4) basic_machine=m68k-sun - os=sunos4 + basic_os=sunos4 ;; sun4) basic_machine=sparc-sun - os= + basic_os= ;; sun4os3) basic_machine=sparc-sun - os=sunos3 + basic_os=sunos3 ;; sun4os4) basic_machine=sparc-sun - os=sunos4 + basic_os=sunos4 ;; sun4sol2) basic_machine=sparc-sun - os=solaris2 + basic_os=solaris2 ;; sun386 | sun386i | roadrunner) basic_machine=i386-sun - os= + basic_os= ;; sv1) basic_machine=sv1-cray - os=unicos + basic_os=unicos ;; symmetry) basic_machine=i386-sequent - os=dynix + basic_os=dynix ;; t3e) basic_machine=alphaev5-cray - os=unicos + basic_os=unicos ;; t90) basic_machine=t90-cray - os=unicos + basic_os=unicos ;; toad1) basic_machine=pdp10-xkl - os=tops20 + basic_os=tops20 ;; tpf) basic_machine=s390x-ibm - os=tpf + basic_os=tpf ;; udi29k) basic_machine=a29k-amd - os=udi + basic_os=udi ;; ultra3) basic_machine=a29k-nyu - os=sym1 + basic_os=sym1 ;; v810 | necv810) basic_machine=v810-nec - os=none + basic_os=none ;; vaxv) basic_machine=vax-dec - os=sysv + basic_os=sysv ;; vms) basic_machine=vax-dec - os=vms + basic_os=vms + ;; + vsta) + basic_machine=i386-pc + basic_os=vsta ;; vxworks960) basic_machine=i960-wrs - os=vxworks + basic_os=vxworks ;; vxworks68) basic_machine=m68k-wrs - os=vxworks + basic_os=vxworks ;; vxworks29k) basic_machine=a29k-wrs - os=vxworks + basic_os=vxworks ;; xbox) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; ymp) basic_machine=ymp-cray - os=unicos + basic_os=unicos ;; *) basic_machine=$1 - os= + basic_os= ;; esac ;; @@ -686,17 +686,17 @@ case $basic_machine in bluegene*) cpu=powerpc vendor=ibm - os=cnk + basic_os=cnk ;; decsystem10* | dec10*) cpu=pdp10 vendor=dec - os=tops10 + basic_os=tops10 ;; decsystem20* | dec20*) cpu=pdp10 vendor=dec - os=tops20 + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) @@ -706,7 +706,7 @@ case $basic_machine in dpx2*) cpu=m68k vendor=bull - os=sysv3 + basic_os=sysv3 ;; encore | umax | mmax) cpu=ns32k @@ -715,7 +715,7 @@ case $basic_machine in elxsi) cpu=elxsi vendor=elxsi - os=${os:-bsd} + basic_os=${basic_os:-bsd} ;; fx2800) cpu=i860 @@ -728,7 +728,7 @@ case $basic_machine in h3050r* | hiux*) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) cpu=hppa1.0 @@ -771,36 +771,36 @@ case $basic_machine in i*86v32) cpu=`echo "$1" | sed -e 's/86.*/86/'` vendor=pc - os=sysv32 + basic_os=sysv32 ;; i*86v4*) cpu=`echo "$1" | sed -e 's/86.*/86/'` vendor=pc - os=sysv4 + basic_os=sysv4 ;; i*86v) cpu=`echo "$1" | sed -e 's/86.*/86/'` vendor=pc - os=sysv + basic_os=sysv ;; i*86sol2) cpu=`echo "$1" | sed -e 's/86.*/86/'` vendor=pc - os=solaris2 + basic_os=solaris2 ;; j90 | j90-cray) cpu=j90 vendor=cray - os=${os:-unicos} + basic_os=${basic_os:-unicos} ;; iris | iris4d) cpu=mips vendor=sgi - case $os in + case $basic_os in irix*) ;; *) - os=irix4 + basic_os=irix4 ;; esac ;; @@ -811,26 +811,26 @@ case $basic_machine in *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) cpu=m68k vendor=atari - os=mint + basic_os=mint ;; news-3600 | risc-news) cpu=mips vendor=sony - os=newsos + basic_os=newsos ;; next | m*-next) cpu=m68k vendor=next - case $os in + case $basic_os in openstep*) ;; nextstep*) ;; ns2*) - os=nextstep2 + basic_os=nextstep2 ;; *) - os=nextstep3 + basic_os=nextstep3 ;; esac ;; @@ -841,12 +841,12 @@ case $basic_machine in op50n-* | op60c-*) cpu=hppa1.1 vendor=oki - os=proelf + basic_os=proelf ;; pa-hitachi) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; pbd) cpu=sparc @@ -883,12 +883,12 @@ case $basic_machine in sde) cpu=mipsisa32 vendor=sde - os=${os:-elf} + basic_os=${basic_os:-elf} ;; simso-wrs) cpu=sparclite vendor=wrs - os=vxworks + basic_os=vxworks ;; tower | tower-32) cpu=m68k @@ -905,7 +905,7 @@ case $basic_machine in w89k-*) cpu=hppa1.1 vendor=winbond - os=proelf + basic_os=proelf ;; none) cpu=none @@ -958,11 +958,11 @@ case $cpu-$vendor in # some cases the only manufacturer, in others, it is the most popular. craynv-unknown) vendor=cray - os=${os:-unicosmp} + basic_os=${basic_os:-unicosmp} ;; c90-unknown | c90-cray) vendor=cray - os=${os:-unicos} + basic_os=${Basic_os:-unicos} ;; fx80-unknown) vendor=alliant @@ -1006,7 +1006,7 @@ case $cpu-$vendor in dpx20-unknown | dpx20-bull) cpu=rs6000 vendor=bull - os=${os:-bosx} + basic_os=${basic_os:-bosx} ;; # Here we normalize CPU types irrespective of the vendor @@ -1015,7 +1015,7 @@ case $cpu-$vendor in ;; blackfin-*) cpu=bfin - os=linux + basic_os=linux ;; c54x-*) cpu=tic54x @@ -1028,7 +1028,7 @@ case $cpu-$vendor in ;; e500v[12]-*) cpu=powerpc - os=$os"spe" + basic_os=${basic_os}"spe" ;; mips3*-*) cpu=mips64 @@ -1038,7 +1038,7 @@ case $cpu-$vendor in ;; m68knommu-*) cpu=m68k - os=linux + basic_os=linux ;; m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) cpu=s12z @@ -1048,7 +1048,7 @@ case $cpu-$vendor in ;; parisc-*) cpu=hppa - os=linux + basic_os=linux ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 @@ -1104,11 +1104,14 @@ case $cpu-$vendor in xscale-* | xscalee[bl]-*) cpu=`echo "$cpu" | sed 's/^xscale/arm/'` ;; + arm64-*) + cpu=aarch64 + ;; # Recognize the canonical CPU Types that limit and/or modify the # company names they are paired with. cr16-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; crisv32-* | etraxfs*-*) cpu=crisv32 @@ -1119,7 +1122,7 @@ case $cpu-$vendor in vendor=axis ;; crx-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; neo-tandem) cpu=neo @@ -1141,16 +1144,12 @@ case $cpu-$vendor in cpu=nsx vendor=tandem ;; - s390-*) - cpu=s390 - vendor=ibm - ;; - s390x-*) - cpu=s390x - vendor=ibm + mipsallegrexel-sony) + cpu=mipsallegrexel + vendor=sony ;; tile*-*) - os=${os:-linux-gnu} + basic_os=${basic_os:-linux-gnu} ;; *) @@ -1167,7 +1166,7 @@ case $cpu-$vendor in | am33_2.0 \ | amdgcn \ | arc | arceb \ - | arm | arm[lb]e | arme[lb] | armv* \ + | arm | arm[lb]e | arme[lb] | armv* \ | avr | avr32 \ | asmjs \ | ba \ @@ -1232,6 +1231,7 @@ case $cpu-$vendor in | pyramid \ | riscv | riscv32 | riscv64 \ | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ | score \ | sh | shl \ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ @@ -1278,8 +1278,43 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x$os != x ] +if test x$basic_os != x then + +# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'` + ;; + nto-qnx*) + kernel=nto + os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'` + ;; + *-*) + # shellcheck disable=SC2162 + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1533,6 +1493,7 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. +kernel= case $cpu-$vendor in score-*) os=elf @@ -1544,7 +1505,8 @@ case $cpu-$vendor in os=riscix1.2 ;; arm*-rebel) - os=linux + kernel=linux + os=gnu ;; arm*-semi) os=aout @@ -1710,84 +1672,171 @@ case $cpu-$vendor in os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-abi", so those need to count as OSes. + musl* | newlib* | uclibc*) + ;; + # Likewise for "kernel-libc" + eabi | eabihf | gnueabi | gnueabihf) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* ) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + nto-qnx*) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. case $vendor in unknown) - case $os in - riscix*) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - sunos*) + *-sunos*) vendor=sun ;; - cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - beos*) + *-beos*) vendor=be ;; - hpux*) + *-hpux*) vendor=hp ;; - mpeix*) + *-mpeix*) vendor=hp ;; - hiux*) + *-hiux*) vendor=hitachi ;; - unos*) + *-unos*) vendor=crds ;; - dgux*) + *-dgux*) vendor=dg ;; - luna*) + *-luna*) vendor=omron ;; - genix*) + *-genix*) vendor=ns ;; - clix*) + *-clix*) vendor=intergraph ;; - mvs* | opened*) + *-mvs* | *-opened*) vendor=ibm ;; - os400*) + *-os400*) vendor=ibm ;; - ptx*) + s390-* | s390x-*) + vendor=ibm + ;; + *-ptx*) vendor=sequent ;; - tpf*) + *-tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - aux*) + *-aux*) vendor=apple ;; - hms*) + *-hms*) vendor=hitachi ;; - mpw* | macos*) + *-mpw* | *-macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - vos*) + *-vos*) vendor=stratus ;; esac ;; esac -echo "$cpu-$vendor-$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: diff --git a/support/kconfig/confdata.c b/support/kconfig/confdata.c index 892da74fdc..9ab980edd8 100644 --- a/support/kconfig/confdata.c +++ b/support/kconfig/confdata.c @@ -744,7 +744,7 @@ int conf_write(const char *name) struct menu *menu; const char *basename; const char *str; - char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; + char dirname[PATH_MAX+1], tmpname[PATH_MAX+20], newname[PATH_MAX+1]; char *env; if (!name) @@ -974,7 +974,7 @@ int conf_write_autoconf(void) const char *name; FILE *out, *tristate, *out_h; int i; - char dir[PATH_MAX+1], buf[PATH_MAX+1]; + char dir[PATH_MAX+1], buf[PATH_MAX+20]; char *s; strcpy(dir, conf_get_configname()); diff --git a/support/kconfig/util.c b/support/kconfig/util.c index 18a8e52391..8665f5bb89 100644 --- a/support/kconfig/util.c +++ b/support/kconfig/util.c @@ -35,7 +35,7 @@ struct file *file_lookup(const char *name) int file_write_dep(const char *name) { char *str; - char buf[PATH_MAX+1], buf2[PATH_MAX+1], dir[PATH_MAX+1]; + char buf[PATH_MAX+20], buf2[PATH_MAX+1], dir[PATH_MAX+1]; struct symbol *sym, *env_sym; struct expr *e; struct file *file; diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index bbb66a5c24..54ee9c8fbe 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2020.02' +RELEASE='2021.08.2' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index b25031a656..be575566a4 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -29,9 +29,7 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) # if the project forces some of these flag variables, Buildroot is # screwed up and there is nothing Buildroot can do about that :( set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") -set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") -set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") # Build type from the Buildroot configuration set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") @@ -44,7 +42,6 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur # * and make sure the project's CMake code extends them like this if needed: # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") -set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") @@ -62,7 +59,12 @@ set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") # This toolchain file can be used both inside and outside Buildroot. set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") -set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") +if(@@TOOLCHAIN_HAS_CXX@@) + set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") + set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") + set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") + set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") +endif() if(@@TOOLCHAIN_HAS_FORTRAN@@) set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") diff --git a/support/misc/utils.mk b/support/misc/utils.mk index 2f00ccfdb7..dc60cad979 100644 --- a/support/misc/utils.mk +++ b/support/misc/utils.mk @@ -88,6 +88,10 @@ notfirstword = $(wordlist 2,$(words $(1)),$(1)) # list of unquoted items: a b c d --> "a", "b", "c", "d" make-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,"%",$(strip $(1)))) +# build a comma-separated list of single quoted items, from a space-separated +# list of unquoted items: a b c d --> 'a', 'b', 'c', 'd' +make-sq-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,'%',$(strip $(1)))) + # Needed for the foreach loops to loop over the list of hooks, so that # each hook call is properly separated by a newline. define sep diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 66fef262ee..e5a2fdd09e 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -113,13 +113,8 @@ function apply_patch { echo " to be applied : ${path}/${patch}" exit 1 fi - if grep -q "^rename from" ${path}/${patch} && \ - grep -q "^rename to" ${path}/${patch} ; then - echo "Error: patch contains some renames, not supported by old patch versions" - exit 1 - fi echo "${path}/${patch}" >> ${builddir}/.applied_patches_list - ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t -N $silent + ${uncomp} "${path}/$patch" | patch -g0 -p1 -E --no-backup-if-mismatch -d "${builddir}" -t -N $silent if [ $? != 0 ] ; then echo "Patch failed! Please fix ${patch}!" exit 1 @@ -168,6 +163,3 @@ if [ "`find $builddir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then echo "Aborting. Reject files found." exit 1 fi - -# Remove backup files -find $builddir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \; diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 171526f8c8..56dc6f53ca 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -33,9 +33,8 @@ main() { # Trap any unexpected error to generate a meaningful error message trap "error 'unexpected error while generating ${ofile}\n'" ERR - do_validate ${@//:/ } - mkdir -p "${outputdir}" + do_validate "${outputdir}" ${@//:/ } do_mk "${outputdir}" do_kconfig "${outputdir}" } @@ -51,7 +50,9 @@ main() { # snippet means that there were no error. # do_validate() { + local outputdir="${1}" local br2_ext + shift if [ ${#} -eq 0 ]; then # No br2-external tree is valid @@ -60,7 +61,7 @@ do_validate() { for br2_ext in "${@}"; do do_validate_one "${br2_ext}" - done + done >"${outputdir}/.br2-external.mk" } do_validate_one() { @@ -74,7 +75,7 @@ do_validate_one() { error "'%s': permission denied\n" "${br2_ext}" fi if [ ! -f "${br2_ext}/external.desc" ]; then - error "'%s': does not have a name (in 'external.desc'). See %s\n" \ + error "'%s': does not have an 'external.desc'. See %s\n" \ "${br2_ext}" "${MANUAL_URL}" fi br2_name="$(sed -r -e '/^name: +(.*)$/!d; s//\1/' "${br2_ext}/external.desc")" @@ -160,6 +161,8 @@ do_kconfig() { toolchains jpeg openssl + skeleton + init ) for br2 in "${items[@]}"; do @@ -223,6 +226,22 @@ do_kconfig() { else printf '# No openssl from: %s\n\n' "${br2_desc}" fi >>"${outputdir}/.br2-external.in.openssl" + + if [ -f "${br2_ext}/provides/skeleton.in" ]; then + printf 'comment "skeleton from: %s"\n' "${br2_desc}" + printf 'source "%s/provides/skeleton.in"\n' "${br2_ext}" + printf '\n' + else + printf '# No skeleton from: %s\n\n' "${br2_desc}" + fi >>"${outputdir}/.br2-external.in.skeleton" + + if [ -f "${br2_ext}/provides/init.in" ]; then + printf 'comment "init from: %s"\n' "${br2_desc}" + printf 'source "%s/provides/init.in"\n' "${br2_ext}" + printf '\n' + else + printf '# No init from: %s\n\n' "${br2_desc}" + fi >>"${outputdir}/.br2-external.in.init" done printf 'endmenu\n' >>"${outputdir}/.br2-external.in.menus" diff --git a/support/scripts/check-bin-arch b/support/scripts/check-bin-arch index 3449bd1aeb..27cc59bca0 100755 --- a/support/scripts/check-bin-arch +++ b/support/scripts/check-bin-arch @@ -25,6 +25,9 @@ declare -a IGNORES=( # it for a different architecture (e.g. i386 grub on x86_64). "/lib/grub" "/usr/lib/grub" + + # Guile modules are ELF files, with a "None" machine + "/usr/lib/guile" ) while getopts p:l:r:a:i: OPT ; do diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index 262a7649b2..69c3fb275f 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -2,16 +2,109 @@ set -e set -o pipefail -input="${1}" +main() { + local template="${1}" -cat "${input}" + preamble "${template}" + gen_tests +} -( - cd configs - LC_ALL=C ls -1 *_defconfig -) \ - | sed 's/$/: { extends: .defconfig }/' +preamble() { + local template="${1}" -./support/testing/run-tests -l 2>&1 \ - | sed -r -e '/^test_run \((.*)\).*/!d; s//\1: { extends: .runtime_test }/' \ - | LC_ALL=C sort + cat - "${template}" <<-_EOF_ + # This file is generated; do not edit! + # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines + + image: ${CI_JOB_IMAGE} + +_EOF_ +} + +gen_tests() { + local -a basics defconfigs runtimes + local do_basics do_defconfigs do_runtime + local defconfigs_ext cfg tst + + basics=( DEVELOPERS flake8 package ) + + defconfigs=( $(cd configs; LC_ALL=C ls -1 *_defconfig) ) + + runtimes=( $(./support/testing/run-tests -l 2>&1 \ + | sed -r -e '/^test_run \((.*)\).*/!d; s//\1/' \ + | LC_ALL=C sort) + ) + + if [ -n "${CI_COMMIT_TAG}" ]; then + do_basics=true + do_defconfigs=base + do_runtime=true + elif [ "${CI_PIPELINE_SOURCE}" = "trigger" ]; then + case "${BR_SCHEDULE_JOBS}" in + (basic) + do_basics=true + do_defconfigs=check + defconfigs_ext=_check + ;; + (defconfig) + do_defconfigs=base + ;; + (runtime) + do_runtime=true + ;; + esac + else + case "${CI_COMMIT_REF_NAME}" in + (*-basics) + do_basics=true + do_defconfigs=check + defconfigs_ext=_check + ;; + (*-defconfigs) + do_defconfigs=base + ;; + (*-*_defconfig) + defconfigs=( "${CI_COMMIT_REF_NAME##*-}" ) + do_defconfigs=base + ;; + (*-runtime-tests) + do_runtime=true + ;; + (*-tests.*) + runtimes=( $(./support/testing/run-tests -l 2>&1 \ + | sed -r -e '/^test_run \((.*)\).*/!d; s//\1/' \ + | LC_ALL=C sort \ + | grep "^${CI_COMMIT_REF_NAME##*-}") + ) + do_runtime=true + ;; + esac + fi + + # If nothing else, at least do the basics to generate a valid pipeline + if [ -z "${do_defconfigs}" \ + -a -z "${do_runtime}" \ + ] + then + do_basics=true + fi + + if ${do_basics:-false}; then + for tst in "${basics[@]}"; do + printf 'check-%s: { extends: .check-%s_base }\n' "${tst}" "${tst}" + done + fi + + if [ -n "${do_defconfigs}" ]; then + for cfg in "${defconfigs[@]}"; do + printf '%s%s: { extends: .defconfig_%s }\n' \ + "${cfg}" "${defconfigs_ext}" "${do_defconfigs}" + done + fi + + if ${do_runtime:-false}; then + printf '%s: { extends: .runtime_test_base }\n' "${runtimes[@]}" + fi +} + +main "${@}" diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 5adda6df08..65ffa05f17 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2009 by Thomas Petazzoni # @@ -16,31 +16,23 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +import aiohttp import argparse +import asyncio import datetime import fnmatch import os from collections import defaultdict import re import subprocess -import requests # URL checking import json -import ijson -import certifi -import distutils.version -import time -import gzip import sys -from urllib3 import HTTPSConnectionPool -from urllib3.exceptions import HTTPError -from multiprocessing import Pool -sys.path.append('utils/') +brpath = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")) + +sys.path.append(os.path.join(brpath, "utils")) from getdeveloperlib import parse_developers # noqa: E402 - -NVD_START_YEAR = 2002 -NVD_JSON_VERSION = "1.0" -NVD_BASE_URL = "https://nvd.nist.gov/feeds/json/cve/" + NVD_JSON_VERSION +from cpedb import CPEDB # noqa: E402 INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)") URL_RE = re.compile(r"\s*https?://\S*\s*$") @@ -50,10 +42,6 @@ RM_API_STATUS_FOUND_BY_DISTRO = 2 RM_API_STATUS_FOUND_BY_PATTERN = 3 RM_API_STATUS_NOT_FOUND = 4 -# Used to make multiple requests to the same host. It is global -# because it's used by sub-processes. -http_pool = None - class Defconfig: def __init__(self, name, path): @@ -79,7 +67,7 @@ def get_defconfig_list(): """ return [ Defconfig(name[:-len('_defconfig')], os.path.join('configs', name)) - for name in os.listdir('configs') + for name in os.listdir(os.path.join(brpath, 'configs')) if name.endswith('_defconfig') ] @@ -89,6 +77,7 @@ class Package: all_license_files = list() all_versions = dict() all_ignored_cves = dict() + all_cpeids = dict() # This is the list of all possible checks. Add new checks to this list so # a tool that post-processeds the json output knows the checks before # iterating over the packages. @@ -109,7 +98,9 @@ class Package: self.current_version = None self.url = None self.url_worker = None + self.cpeid = None self.cves = list() + self.ignored_cves = list() self.latest_version = {'status': RM_API_STATUS_ERROR, 'version': None, 'id': None} self.status = {} @@ -121,9 +112,10 @@ class Package: Fills in the .url field """ self.status['url'] = ("warning", "no Config.in") - for filename in os.listdir(os.path.dirname(self.path)): + pkgdir = os.path.dirname(os.path.join(brpath, self.path)) + for filename in os.listdir(pkgdir): if fnmatch.fnmatch(filename, 'Config.*'): - fp = open(os.path.join(os.path.dirname(self.path), filename), "r") + fp = open(os.path.join(pkgdir, filename), "r") for config_line in fp: if URL_RE.match(config_line): self.url = config_line.strip() @@ -139,7 +131,15 @@ class Package: @property def has_valid_infra(self): + if self.infras is None: + return False + return len(self.infras) > 0 + + @property + def is_actual_package(self): try: + if not self.has_valid_infra: + return False if self.infras[0][1] == 'virtual': return False except IndexError: @@ -151,10 +151,10 @@ class Package: Fills in the .infras field """ self.infras = list() - with open(self.path, 'r') as f: + with open(os.path.join(brpath, self.path), 'r') as f: lines = f.readlines() - for l in lines: - match = INFRA_RE.match(l) + for line in lines: + match = INFRA_RE.match(line) if not match: continue infra = match.group(1) @@ -167,7 +167,7 @@ class Package: """ Fills in the .status['license'] and .status['license-files'] fields """ - if not self.has_valid_infra: + if not self.is_actual_package: self.status['license'] = ("na", "no valid package infra") self.status['license-files'] = ("na", "no valid package infra") return @@ -185,13 +185,13 @@ class Package: """ Fills in the .status['hash'] field """ - if not self.has_valid_infra: + if not self.is_actual_package: self.status['hash'] = ("na", "no valid package infra") self.status['hash-license'] = ("na", "no valid package infra") return hashpath = self.path.replace(".mk", ".hash") - if os.path.exists(hashpath): + if os.path.exists(os.path.join(brpath, hashpath)): self.status['hash'] = ("ok", "found") else: self.status['hash'] = ("error", "missing") @@ -200,11 +200,11 @@ class Package: """ Fills in the .patch_count, .patch_files and .status['patches'] fields """ - if not self.has_valid_infra: + if not self.is_actual_package: self.status['patches'] = ("na", "no valid package infra") return - pkgdir = os.path.dirname(self.path) + pkgdir = os.path.dirname(os.path.join(brpath, self.path)) for subdir, _, _ in os.walk(pkgdir): self.patch_files = fnmatch.filter(os.listdir(subdir), '*.patch') @@ -223,12 +223,31 @@ class Package: if var in self.all_versions: self.current_version = self.all_versions[var] + def set_cpeid(self): + """ + Fills in the .cpeid field + """ + var = self.pkgvar() + if not self.is_actual_package: + self.status['cpe'] = ("na", "N/A - virtual pkg") + return + if not self.current_version: + self.status['cpe'] = ("na", "no version information available") + return + + if var in self.all_cpeids: + self.cpeid = self.all_cpeids[var] + # Set a preliminary status, it might be overridden by check_package_cpes() + self.status['cpe'] = ("warning", "not checked against CPE dictionnary") + else: + self.status['cpe'] = ("error", "no verified CPE identifier") + def set_check_package_warnings(self): """ Fills in the .warnings and .status['pkg-check'] fields """ - cmd = ["./utils/check-package"] - pkgdir = os.path.dirname(self.path) + cmd = [os.path.join(brpath, "utils/check-package")] + pkgdir = os.path.dirname(os.path.join(brpath, self.path)) self.status['pkg-check'] = ("error", "Missing") for root, dirs, files in os.walk(pkgdir): for f in files: @@ -246,11 +265,11 @@ class Package: self.status['pkg-check'] = ("error", "{} warnings".format(self.warnings)) return - def is_cve_ignored(self, cve): + def set_ignored_cves(self): """ - Tells if the CVE is ignored by the package + Give the list of CVEs ignored by the package """ - return cve in self.all_ignored_cves.get(self.pkgvar(), []) + self.ignored_cves = list(self.all_ignored_cves.get(self.pkgvar(), [])) def set_developers(self, developers): """ @@ -268,7 +287,13 @@ class Package: self.status['developers'] = ("warning", "no developers") def is_status_ok(self, name): - return self.status[name][0] == 'ok' + return name in self.status and self.status[name][0] == 'ok' + + def is_status_error(self, name): + return name in self.status and self.status[name][0] == 'error' + + def is_status_na(self, name): + return name in self.status and self.status[name][0] == 'na' def __eq__(self, other): return self.path == other.path @@ -282,113 +307,6 @@ class Package: self.is_status_ok('license-files'), self.status['hash'], self.patch_count) -class CVE: - """An accessor class for CVE Items in NVD files""" - def __init__(self, nvd_cve): - """Initialize a CVE from its NVD JSON representation""" - self.nvd_cve = nvd_cve - - @staticmethod - def download_nvd_year(nvd_path, year): - metaf = "nvdcve-%s-%s.meta" % (NVD_JSON_VERSION, year) - path_metaf = os.path.join(nvd_path, metaf) - jsonf_gz = "nvdcve-%s-%s.json.gz" % (NVD_JSON_VERSION, year) - path_jsonf_gz = os.path.join(nvd_path, jsonf_gz) - - # If the database file is less than a day old, we assume the NVD data - # locally available is recent enough. - if os.path.exists(path_jsonf_gz) and os.stat(path_jsonf_gz).st_mtime >= time.time() - 86400: - return path_jsonf_gz - - # If not, we download the meta file - url = "%s/%s" % (NVD_BASE_URL, metaf) - print("Getting %s" % url) - page_meta = requests.get(url) - page_meta.raise_for_status() - - # If the meta file already existed, we compare the existing - # one with the data newly downloaded. If they are different, - # we need to re-download the database. - # If the database does not exist locally, we need to redownload it in - # any case. - if os.path.exists(path_metaf) and os.path.exists(path_jsonf_gz): - meta_known = open(path_metaf, "r").read() - if page_meta.text == meta_known: - return path_jsonf_gz - - # Grab the compressed JSON NVD, and write files to disk - url = "%s/%s" % (NVD_BASE_URL, jsonf_gz) - print("Getting %s" % url) - page_json = requests.get(url) - page_json.raise_for_status() - open(path_jsonf_gz, "wb").write(page_json.content) - open(path_metaf, "w").write(page_meta.text) - return path_jsonf_gz - - @classmethod - def read_nvd_dir(cls, nvd_dir): - """ - Iterate over all the CVEs contained in NIST Vulnerability Database - feeds since NVD_START_YEAR. If the files are missing or outdated in - nvd_dir, a fresh copy will be downloaded, and kept in .json.gz - """ - for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): - filename = CVE.download_nvd_year(nvd_dir, year) - try: - content = ijson.items(gzip.GzipFile(filename), 'CVE_Items.item') - except: # noqa: E722 - print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) - raise - for cve in content: - yield cls(cve['cve']) - - def each_product(self): - """Iterate over each product section of this cve""" - for vendor in self.nvd_cve['affects']['vendor']['vendor_data']: - for product in vendor['product']['product_data']: - yield product - - @property - def identifier(self): - """The CVE unique identifier""" - return self.nvd_cve['CVE_data_meta']['ID'] - - @property - def pkg_names(self): - """The set of package names referred by this CVE definition""" - return set(p['product_name'] for p in self.each_product()) - - def affects(self, br_pkg): - """ - True if the Buildroot Package object passed as argument is affected - by this CVE. - """ - if br_pkg.is_cve_ignored(self.identifier): - return False - - for product in self.each_product(): - if product['product_name'] != br_pkg.name: - continue - - for v in product['version']['version_data']: - if v["version_affected"] == "=": - if br_pkg.current_version == v["version_value"]: - return True - elif v["version_affected"] == "<=": - pkg_version = distutils.version.LooseVersion(br_pkg.current_version) - if not hasattr(pkg_version, "version"): - print("Cannot parse package '%s' version '%s'" % (br_pkg.name, br_pkg.current_version)) - continue - cve_affected_version = distutils.version.LooseVersion(v["version_value"]) - if not hasattr(cve_affected_version, "version"): - print("Cannot parse CVE affected version '%s'" % v["version_value"]) - continue - return pkg_version <= cve_affected_version - else: - print("version_affected: %s" % v['version_affected']) - return False - - def get_pkglist(npackages, package_list): """ Builds the list of Buildroot packages, returning a list of Package @@ -412,7 +330,6 @@ def get_pkglist(npackages, package_list): "package/x11r7/x11r7.mk", "package/doc-asciidoc.mk", "package/pkg-.*.mk", - "package/nvidia-tegra23/nvidia-tegra23.mk", "toolchain/toolchain-external/pkg-toolchain-external.mk", "toolchain/toolchain-external/toolchain-external.mk", "toolchain/toolchain.mk", @@ -420,11 +337,12 @@ def get_pkglist(npackages, package_list): "toolchain/toolchain-wrapper.mk"] packages = list() count = 0 - for root, dirs, files in os.walk("."): + for root, dirs, files in os.walk(brpath): + root = os.path.relpath(root, brpath) rootdir = root.split("/") - if len(rootdir) < 2: + if len(rootdir) < 1: continue - if rootdir[1] not in WALK_USEFUL_SUBDIRS: + if rootdir[0] not in WALK_USEFUL_SUBDIRS: continue for f in files: if not f.endswith(".mk"): @@ -436,8 +354,7 @@ def get_pkglist(npackages, package_list): pkgpath = os.path.join(root, f) skip = False for exclude in WALK_EXCLUDES: - # pkgpath[2:] strips the initial './' - if re.match(exclude, pkgpath[2:]): + if re.match(exclude, pkgpath): skip = True continue if skip: @@ -450,10 +367,16 @@ def get_pkglist(npackages, package_list): return packages +def get_config_packages(): + cmd = ["make", "--no-print-directory", "show-info"] + js = json.loads(subprocess.check_output(cmd)) + return set([v["name"] for v in js.values()]) + + def package_init_make_info(): # Fetch all variables at once variables = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", "-s", "printvars", - "VARS=%_LICENSE %_LICENSE_FILES %_VERSION %_IGNORE_CVES"]) + "VARS=%_LICENSE %_LICENSE_FILES %_VERSION %_IGNORE_CVES %_CPE_ID"]) variable_list = variables.decode().splitlines() # We process first the host package VERSION, and then the target @@ -463,9 +386,9 @@ def package_init_make_info(): variable_list = [x[5:] for x in variable_list if x.startswith("HOST_")] + \ [x for x in variable_list if not x.startswith("HOST_")] - for l in variable_list: + for item in variable_list: # Get variable name and value - pkgvar, value = l.split("=") + pkgvar, value = item.split("=") # Strip the suffix according to the variable if pkgvar.endswith("_LICENSE"): @@ -491,77 +414,140 @@ def package_init_make_info(): pkgvar = pkgvar[:-12] Package.all_ignored_cves[pkgvar] = value.split() - -def check_url_status_worker(url, url_status): - if url_status[0] == 'ok': - try: - url_status_code = requests.head(url, timeout=30).status_code - if url_status_code >= 400: - return ("error", "invalid {}".format(url_status_code)) - except requests.exceptions.RequestException: - return ("error", "invalid (err)") - return ("ok", "valid") - return url_status + elif pkgvar.endswith("_CPE_ID"): + pkgvar = pkgvar[:-7] + Package.all_cpeids[pkgvar] = value -def check_package_urls(packages): - pool = Pool(processes=64) - for pkg in packages: - pkg.url_worker = pool.apply_async(check_url_status_worker, (pkg.url, pkg.status['url'])) - for pkg in packages: - pkg.status['url'] = pkg.url_worker.get(timeout=3600) - del pkg.url_worker - pool.terminate() +check_url_count = 0 -def release_monitoring_get_latest_version_by_distro(pool, name): +async def check_url_status(session, pkg, npkgs, retry=True): + global check_url_count + try: - req = pool.request('GET', "/api/project/Buildroot/%s" % name) - except HTTPError: - return (RM_API_STATUS_ERROR, None, None) + async with session.get(pkg.url) as resp: + if resp.status >= 400: + pkg.status['url'] = ("error", "invalid {}".format(resp.status)) + check_url_count += 1 + print("[%04d/%04d] %s" % (check_url_count, npkgs, pkg.name)) + return + except (aiohttp.ClientError, asyncio.TimeoutError): + if retry: + return await check_url_status(session, pkg, npkgs, retry=False) + else: + pkg.status['url'] = ("error", "invalid (err)") + check_url_count += 1 + print("[%04d/%04d] %s" % (check_url_count, npkgs, pkg.name)) + return - if req.status != 200: - return (RM_API_STATUS_NOT_FOUND, None, None) + pkg.status['url'] = ("ok", "valid") + check_url_count += 1 + print("[%04d/%04d] %s" % (check_url_count, npkgs, pkg.name)) - data = json.loads(req.data) - if 'version' in data: - return (RM_API_STATUS_FOUND_BY_DISTRO, data['version'], data['id']) +async def check_package_urls(packages): + tasks = [] + connector = aiohttp.TCPConnector(limit_per_host=5) + async with aiohttp.ClientSession(connector=connector, trust_env=True) as sess: + packages = [p for p in packages if p.status['url'][0] == 'ok'] + for pkg in packages: + tasks.append(asyncio.ensure_future(check_url_status(sess, pkg, len(packages)))) + await asyncio.wait(tasks) + + +def check_package_latest_version_set_status(pkg, status, version, identifier): + pkg.latest_version = { + "status": status, + "version": version, + "id": identifier, + } + + if pkg.latest_version['status'] == RM_API_STATUS_ERROR: + pkg.status['version'] = ('warning', "Release Monitoring API error") + elif pkg.latest_version['status'] == RM_API_STATUS_NOT_FOUND: + pkg.status['version'] = ('warning', "Package not found on Release Monitoring") + + if pkg.latest_version['version'] is None: + pkg.status['version'] = ('warning', "No upstream version available on Release Monitoring") + elif pkg.latest_version['version'] != pkg.current_version: + pkg.status['version'] = ('error', "The newer version {} is available upstream".format(pkg.latest_version['version'])) else: - return (RM_API_STATUS_FOUND_BY_DISTRO, None, data['id']) + pkg.status['version'] = ('ok', 'up-to-date') -def release_monitoring_get_latest_version_by_guess(pool, name): +async def check_package_get_latest_version_by_distro(session, pkg, retry=True): + url = "https://release-monitoring.org//api/project/Buildroot/%s" % pkg.name try: - req = pool.request('GET', "/api/projects/?pattern=%s" % name) - except HTTPError: - return (RM_API_STATUS_ERROR, None, None) + async with session.get(url) as resp: + if resp.status != 200: + return False - if req.status != 200: - return (RM_API_STATUS_NOT_FOUND, None, None) + data = await resp.json() + version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + check_package_latest_version_set_status(pkg, + RM_API_STATUS_FOUND_BY_DISTRO, + version, + data['id']) + return True - data = json.loads(req.data) - - projects = data['projects'] - projects.sort(key=lambda x: x['id']) - - for p in projects: - if p['name'] == name and 'version' in p: - return (RM_API_STATUS_FOUND_BY_PATTERN, p['version'], p['id']) - - return (RM_API_STATUS_NOT_FOUND, None, None) + except (aiohttp.ClientError, asyncio.TimeoutError): + if retry: + return await check_package_get_latest_version_by_distro(session, pkg, retry=False) + else: + return False -def check_package_latest_version_worker(name): - """Wrapper to try both by name then by guess""" - print(name) - res = release_monitoring_get_latest_version_by_distro(http_pool, name) - if res[0] == RM_API_STATUS_NOT_FOUND: - res = release_monitoring_get_latest_version_by_guess(http_pool, name) - return res +async def check_package_get_latest_version_by_guess(session, pkg, retry=True): + url = "https://release-monitoring.org/api/projects/?pattern=%s" % pkg.name + try: + async with session.get(url) as resp: + if resp.status != 200: + return False + + data = await resp.json() + # filter projects that have the right name and a version defined + projects = [p for p in data['projects'] if p['name'] == pkg.name and 'stable_versions' in p] + projects.sort(key=lambda x: x['id']) + + if len(projects) > 0: + check_package_latest_version_set_status(pkg, + RM_API_STATUS_FOUND_BY_PATTERN, + projects[0]['stable_versions'][0], + projects[0]['id']) + return True + + except (aiohttp.ClientError, asyncio.TimeoutError): + if retry: + return await check_package_get_latest_version_by_guess(session, pkg, retry=False) + else: + return False -def check_package_latest_version(packages): +check_latest_count = 0 + + +async def check_package_latest_version_get(session, pkg, npkgs): + global check_latest_count + + if await check_package_get_latest_version_by_distro(session, pkg): + check_latest_count += 1 + print("[%04d/%04d] %s" % (check_latest_count, npkgs, pkg.name)) + return + + if await check_package_get_latest_version_by_guess(session, pkg): + check_latest_count += 1 + print("[%04d/%04d] %s" % (check_latest_count, npkgs, pkg.name)) + return + + check_package_latest_version_set_status(pkg, + RM_API_STATUS_NOT_FOUND, + None, None) + check_latest_count += 1 + print("[%04d/%04d] %s" % (check_latest_count, npkgs, pkg.name)) + + +async def check_package_latest_version(packages): """ Fills in the .latest_version field of all Package objects @@ -575,43 +561,67 @@ def check_package_latest_version(packages): - id: string containing the id of the project corresponding to this package, as known by release-monitoring.org """ - global http_pool - http_pool = HTTPSConnectionPool('release-monitoring.org', port=443, - cert_reqs='CERT_REQUIRED', ca_certs=certifi.where(), - timeout=30) - worker_pool = Pool(processes=64) - results = worker_pool.map(check_package_latest_version_worker, (pkg.name for pkg in packages)) - for pkg, r in zip(packages, results): - pkg.latest_version = dict(zip(['status', 'version', 'id'], r)) - if not pkg.has_valid_infra: - pkg.status['version'] = ("na", "no valid package infra") + for pkg in [p for p in packages if not p.is_actual_package]: + pkg.status['version'] = ("na", "no valid package infra") + + tasks = [] + connector = aiohttp.TCPConnector(limit_per_host=5) + async with aiohttp.ClientSession(connector=connector, trust_env=True) as sess: + packages = [p for p in packages if p.is_actual_package] + for pkg in packages: + tasks.append(asyncio.ensure_future(check_package_latest_version_get(sess, pkg, len(packages)))) + await asyncio.wait(tasks) + + +def check_package_cve_affects(cve, cpe_product_pkgs): + for product in cve.affected_products: + if product not in cpe_product_pkgs: continue - - if pkg.latest_version['status'] == RM_API_STATUS_ERROR: - pkg.status['version'] = ('warning', "Release Monitoring API error") - elif pkg.latest_version['status'] == RM_API_STATUS_NOT_FOUND: - pkg.status['version'] = ('warning', "Package not found on Release Monitoring") - - if pkg.latest_version['version'] is None: - pkg.status['version'] = ('warning', "No upstream version available on Release Monitoring") - elif pkg.latest_version['version'] != pkg.current_version: - pkg.status['version'] = ('error', "The newer version {} is available upstream".format(pkg.latest_version['version'])) - else: - pkg.status['version'] = ('ok', 'up-to-date') - - worker_pool.terminate() - del http_pool + for pkg in cpe_product_pkgs[product]: + if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) == cve.CVE_AFFECTS: + pkg.cves.append(cve.identifier) def check_package_cves(nvd_path, packages): if not os.path.isdir(nvd_path): os.makedirs(nvd_path) - for cve in CVE.read_nvd_dir(nvd_path): - for pkg_name in cve.pkg_names: - if pkg_name in packages and cve.affects(packages[pkg_name]): - packages[pkg_name].cves.append(cve.identifier) + cpe_product_pkgs = defaultdict(list) + for pkg in packages: + if not pkg.is_actual_package: + pkg.status['cve'] = ("na", "N/A") + continue + if not pkg.current_version: + pkg.status['cve'] = ("na", "no version information available") + continue + if pkg.cpeid: + cpe_product = cvecheck.cpe_product(pkg.cpeid) + cpe_product_pkgs[cpe_product].append(pkg) + else: + cpe_product_pkgs[pkg.name].append(pkg) + + for cve in cvecheck.CVE.read_nvd_dir(nvd_path): + check_package_cve_affects(cve, cpe_product_pkgs) + + for pkg in packages: + if 'cve' not in pkg.status: + if pkg.cves: + pkg.status['cve'] = ("error", "affected by CVEs") + else: + pkg.status['cve'] = ("ok", "not affected by CVEs") + + +def check_package_cpes(nvd_path, packages): + cpedb = CPEDB(nvd_path) + cpedb.get_xml_dict() + for p in packages: + if not p.cpeid: + continue + if cpedb.find(p.cpeid): + p.status['cpe'] = ("ok", "verified CPE identifier") + else: + p.status['cpe'] = ("error", "CPE version unknown in CPE database") def calculate_stats(packages): @@ -653,6 +663,10 @@ def calculate_stats(packages): stats["total-cves"] += len(pkg.cves) if len(pkg.cves) != 0: stats["pkg-cves"] += 1 + if pkg.cpeid: + stats["cpe-id"] += 1 + else: + stats["no-cpe-id"] += 1 return stats @@ -708,6 +722,34 @@ td.version-error { background: #ccc; } +td.cpe-ok { + background: #d2ffc4; +} + +td.cpe-nok { + background: #ff9a69; +} + +td.cpe-unknown { + background: #ffd870; +} + +td.cve-ok { + background: #d2ffc4; +} + +td.cve-nok { + background: #ff9a69; +} + +td.cve-unknown { + background: #ffd870; +} + +td.cve_ignored { + background: #ccc; +} + Statistics of Buildroot packages @@ -753,7 +795,7 @@ def boolean_str(b): def dump_html_pkg(f, pkg): f.write(" \n") - f.write(" %s\n" % pkg.path[2:]) + f.write(" %s\n" % pkg.path) # Patch count td_class = ["centered"] @@ -866,13 +908,57 @@ def dump_html_pkg(f, pkg): # CVEs td_class = ["centered"] - if len(pkg.cves) == 0: - td_class.append("correct") + if pkg.is_status_ok("cve"): + td_class.append("cve-ok") + elif pkg.is_status_error("cve"): + td_class.append("cve-nok") + elif pkg.is_status_na("cve") and not pkg.is_actual_package: + td_class.append("cve-ok") else: - td_class.append("wrong") + td_class.append("cve-unknown") f.write(" \n" % " ".join(td_class)) - for cve in pkg.cves: - f.write(" %s
\n" % (cve, cve)) + if pkg.is_status_error("cve"): + for cve in pkg.cves: + f.write(" %s
\n" % (cve, cve)) + elif pkg.is_status_na("cve"): + f.write(" %s" % pkg.status['cve'][1]) + else: + f.write(" N/A\n") + f.write(" \n") + + # CVEs Ignored + td_class = ["centered"] + if pkg.ignored_cves: + td_class.append("cve_ignored") + f.write(" \n" % " ".join(td_class)) + for ignored_cve in pkg.ignored_cves: + f.write(" %s
\n" % (ignored_cve, ignored_cve)) + f.write(" \n") + + # CPE ID + td_class = ["left"] + if pkg.is_status_ok("cpe"): + td_class.append("cpe-ok") + elif pkg.is_status_error("cpe"): + td_class.append("cpe-nok") + elif pkg.is_status_na("cpe") and not pkg.is_actual_package: + td_class.append("cpe-ok") + else: + td_class.append("cpe-unknown") + f.write(" \n" % " ".join(td_class)) + if pkg.cpeid: + f.write(" %s\n" % pkg.cpeid) + if not pkg.is_status_ok("cpe"): + if pkg.is_actual_package and pkg.current_version: + if pkg.cpeid: + f.write("
%s (Search)\n" % # noqa: E501 + (pkg.status['cpe'][1], ":".join(pkg.cpeid.split(":")[0:5]))) + else: + f.write(" %s (Search)\n" % # noqa: E501 + (pkg.status['cpe'][1], pkg.name)) + else: + f.write(" %s\n" % pkg.status['cpe'][1]) + f.write(" \n") f.write(" \n") @@ -893,6 +979,8 @@ def dump_html_all_pkgs(f, packages): Warnings Upstream URL CVEs +CVEs Ignored +CPE ID """) for pkg in sorted(packages): @@ -935,6 +1023,10 @@ def dump_html_stats(f, stats): stats["pkg-cves"]) f.write("Total number of CVEs affecting all packages%s\n" % stats["total-cves"]) + f.write("Packages with CPE ID%s\n" % + stats["cpe-id"]) + f.write("Packages without CPE ID%s\n" % + stats["no-cpe-id"]) f.write("\n") @@ -989,20 +1081,26 @@ def dump_json(packages, defconfigs, stats, date, commit, output): f.write('\n') +def resolvepath(path): + return os.path.abspath(os.path.expanduser(path)) + + def parse_args(): parser = argparse.ArgumentParser() output = parser.add_argument_group('output', 'Output file(s)') - output.add_argument('--html', dest='html', action='store', + output.add_argument('--html', dest='html', type=resolvepath, help='HTML output file') - output.add_argument('--json', dest='json', action='store', + output.add_argument('--json', dest='json', type=resolvepath, help='JSON output file') packages = parser.add_mutually_exclusive_group() + packages.add_argument('-c', dest='configpackages', action='store_true', + help='Apply to packages enabled in current configuration') packages.add_argument('-n', dest='npackages', type=int, action='store', help='Number of packages') packages.add_argument('-p', dest='packages', action='store', help='List of packages (comma separated)') parser.add_argument('--nvd-path', dest='nvd_path', - help='Path to the local NVD database') + help='Path to the local NVD database', type=resolvepath) args = parser.parse_args() if not args.html and not args.json: parser.error('at least one of --html or --json (or both) is required') @@ -1010,13 +1108,22 @@ def parse_args(): def __main__(): + global cvecheck + args = parse_args() + + if args.nvd_path: + import cve as cvecheck + if args.packages: package_list = args.packages.split(",") + elif args.configpackages: + package_list = get_config_packages() else: package_list = None date = datetime.datetime.utcnow() - commit = subprocess.check_output(['git', 'rev-parse', + commit = subprocess.check_output(['git', '-C', brpath, + 'rev-parse', 'HEAD']).splitlines()[0].decode() print("Build package list ...") packages = get_pkglist(args.npackages, package_list) @@ -1036,15 +1143,20 @@ def __main__(): pkg.set_patch_count() pkg.set_check_package_warnings() pkg.set_current_version() + pkg.set_cpeid() pkg.set_url() + pkg.set_ignored_cves() pkg.set_developers(developers) print("Checking URL status") - check_package_urls(packages) + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_urls(packages)) print("Getting latest versions ...") - check_package_latest_version(packages) + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_latest_version(packages)) if args.nvd_path: print("Checking packages CVEs") - check_package_cves(args.nvd_path, {p.name: p for p in packages}) + check_package_cves(args.nvd_path, packages) + check_package_cpes(args.nvd_path, packages) print("Calculate stats") stats = calculate_stats(packages) if args.html: diff --git a/support/scripts/pycompile.py b/support/scripts/pycompile.py index 9192a7016a..b8cd3cee6c 100644 --- a/support/scripts/pycompile.py +++ b/support/scripts/pycompile.py @@ -1,69 +1,93 @@ #!/usr/bin/env python -'''Wrapper for python2 and python3 around compileall to raise exception -when a python byte code generation failed. +""" +Byte compile all .py files from provided directories. This script is an +alternative implementation of compileall.compile_dir written with +cross-compilation in mind. +""" -Inspired from: - http://stackoverflow.com/questions/615632/how-to-detect-errors-from-compileall-compile-dir -''' from __future__ import print_function -import sys -import py_compile -import compileall + import argparse +import os +import py_compile +import re +import sys -def check_for_errors(comparison): - '''Wrap comparison operator with code checking for PyCompileError. - If PyCompileError was raised, re-raise it again to abort execution, - otherwise perform comparison as expected. - ''' - def operator(self, other): - exc_type, value, traceback = sys.exc_info() - if exc_type is not None and issubclass(exc_type, - py_compile.PyCompileError): - print("Cannot compile %s" % value.file) - raise value +def compile_one(host_path, strip_root=None, verbose=False): + """ + Compile a .py file into a .pyc file located next to it. - return comparison(self, other) + :arg host_path: + Absolute path to the file to compile on the host running the build. + :arg strip_root: + Prefix to remove from the original source paths encoded in compiled + files. + :arg verbose: + Print compiled file paths. + """ + if os.path.islink(host_path) or not os.path.isfile(host_path): + return # only compile real files - return operator + if not re.match(r"^[_A-Za-z][_A-Za-z0-9]*\.py$", + os.path.basename(host_path)): + return # only compile "importable" python modules + + if strip_root is not None: + # determine the runtime path of the file (i.e.: relative path to root + # dir prepended with "/"). + runtime_path = os.path.join("/", os.path.relpath(host_path, strip_root)) + else: + runtime_path = host_path + + if verbose: + print(" PYC {}".format(runtime_path)) + + # will raise an error if the file cannot be compiled + py_compile.compile(host_path, cfile=host_path + "c", + dfile=runtime_path, doraise=True) -class ReportProblem(int): - '''Class that pretends to be an int() object but implements all of its - comparison operators such that it'd detect being called in - PyCompileError handling context and abort execution - ''' - VALUE = 1 - - def __new__(cls, *args, **kwargs): - return int.__new__(cls, ReportProblem.VALUE, **kwargs) - - @check_for_errors - def __lt__(self, other): - return ReportProblem.VALUE < other - - @check_for_errors - def __eq__(self, other): - return ReportProblem.VALUE == other - - def __ge__(self, other): - return not self < other - - def __gt__(self, other): - return not self < other and not self == other - - def __ne__(self, other): - return not self == other +def existing_dir_abs(arg): + """ + argparse type callback that checks that argument is a directory and returns + its absolute path. + """ + if not os.path.isdir(arg): + raise argparse.ArgumentTypeError('no such directory: {!r}'.format(arg)) + return os.path.abspath(arg) -parser = argparse.ArgumentParser(description='Compile Python source files in a directory tree.') -parser.add_argument("target", metavar='DIRECTORY', - help='Directory to scan') -parser.add_argument("--force", action='store_true', - help="Force compilation even if alread compiled") +def main(): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("dirs", metavar="DIR", nargs="+", type=existing_dir_abs, + help="Directory to recursively scan and compile") + parser.add_argument("--strip-root", metavar="ROOT", type=existing_dir_abs, + help=""" + Prefix to remove from the original source paths encoded + in compiled files + """) + parser.add_argument("--verbose", action="store_true", + help="Print compiled files") -args = parser.parse_args() + args = parser.parse_args() -compileall.compile_dir(args.target, force=args.force, quiet=ReportProblem()) + try: + for d in args.dirs: + if args.strip_root and ".." in os.path.relpath(d, args.strip_root): + parser.error("DIR: not inside ROOT dir: {!r}".format(d)) + for parent, _, files in os.walk(d): + for f in files: + compile_one(os.path.join(parent, f), args.strip_root, + args.verbose) + + except Exception as e: + print("error: {}".format(e)) + return 1 + + return 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/support/scripts/setlocalversion b/support/scripts/setlocalversion index b39b751f03..d492f2db2f 100755 --- a/support/scripts/setlocalversion +++ b/support/scripts/setlocalversion @@ -19,19 +19,14 @@ cd "${1:-.}" || usage # Check for git and a git repo. if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then - # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it, - # because this version is defined in the top level Makefile. - if [ -z "`git describe --exact-match 2>/dev/null`" ]; then + atag="`git describe 2>/dev/null`" - # If we are past a tagged commit (like "v2.6.30-rc5-302-g72357d5"), - # we pretty print it. - if atag="`git describe 2>/dev/null`"; then - echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' - - # If we don't have a tag at all we print -g{commitish}. - else - printf '%s%s' -g $head - fi + # Show -g if we have no tag, or just the tag + # otherwise. + if [ -z "${atag}" ] ; then + printf "%s%s" -g ${head} + else + printf ${atag} fi # Is this git on svn? @@ -53,13 +48,29 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then fi # Check for mercurial and a mercurial repo. +# In the git case, 'git describe' will show the latest tag, and unless we are +# exactly on that tag, the number of commits since then, and last commit id. +# Mimic something similar in the Mercurial case. if hgid=`HGRCPATH= hg id --id --tags 2>/dev/null`; then tag=`printf '%s' "$hgid" | cut -d' ' -f2 --only-delimited` # Do we have an untagged version? if [ -z "$tag" -o "$tag" = tip ]; then + # current revision is not tagged, determine latest tag + latesttag=`HGRCPATH= hg log -r. -T '{latesttag}' 2>/dev/null` + # In case there is more than one tag on the latest tagged commit, + # 'latesttag' will separate them by colon (:). We'll retain this. + # In case there is no tag at all, 'null' will be returned. + if [ "$latesttag" = "null" ]; then + latesttag='' + fi + + # add the commit id id=`printf '%s' "$hgid" | sed 's/[+ ].*//'` - printf '%s%s' -hg "$id" + printf '%s%s%s' "${latesttag}" -hg "$id" + else + # current revision is tagged, just print the tag + printf ${tag} fi # Are there uncommitted changes? diff --git a/support/testing/conf/docker-compose-kernel.config b/support/testing/conf/docker-compose-kernel.config index 9468ef8db8..4d30a578ec 100644 --- a/support/testing/conf/docker-compose-kernel.config +++ b/support/testing/conf/docker-compose-kernel.config @@ -1,16 +1,7 @@ # CONFIG_SWAP is not set CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_HIGH_RES_TIMERS=y -CONFIG_CGROUPS=y -CONFIG_MEMCG=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y # CONFIG_COMPAT_BRK is not set # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_IOSF_MBI=y @@ -38,33 +29,19 @@ CONFIG_IP_ADVANCED_ROUTER=y # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=y # CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CT_PROTO_DCCP is not set # CONFIG_NF_CT_PROTO_SCTP is not set # CONFIG_NF_CT_PROTO_UDPLITE is not set -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_IPVS=y CONFIG_IP_VS=y CONFIG_IP_VS_RR=y CONFIG_IP_VS_NFCT=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_BRIDGE=y # CONFIG_BRIDGE_IGMP_SNOOPING is not set # CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_MACVLAN=y -CONFIG_VXLAN=y -CONFIG_VETH=y CONFIG_VIRTIO_NET=y # CONFIG_ETHERNET is not set # CONFIG_WLAN is not set @@ -90,12 +67,9 @@ CONFIG_VIRTIO_PCI=y # CONFIG_X86_PLATFORM_DEVICES is not set # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT4_FS=y -CONFIG_OVERLAY_FS=y -CONFIG_OVERLAY_FS_REDIRECT_DIR=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set # CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_KEYS=y CONFIG_SECURITYFS=y # CONFIG_CRYPTO_ECHAINIV is not set # CONFIG_CRYPTO_HW is not set diff --git a/support/testing/conf/docker-compose.yml b/support/testing/conf/docker-compose.yml index 49ff2677da..ce89d79b59 100644 --- a/support/testing/conf/docker-compose.yml +++ b/support/testing/conf/docker-compose.yml @@ -2,3 +2,8 @@ version: '3' services: busybox: image: "busybox:latest" + command: httpd -f -h /www/ + ports: + - "80:80" + volumes: + - "/bin:/www" diff --git a/support/testing/conf/minimal-x86-qemu-kernel.config b/support/testing/conf/minimal-x86-qemu-kernel.config index cc8ee6a713..45994f804d 100644 --- a/support/testing/conf/minimal-x86-qemu-kernel.config +++ b/support/testing/conf/minimal-x86-qemu-kernel.config @@ -2,6 +2,7 @@ CONFIG_SYSVIPC=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_SMP=y +# CONFIG_RETPOLINE is not set CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y CONFIG_NET=y diff --git a/support/testing/infra/__init__.py b/support/testing/infra/__init__.py index 6392aa679b..b10a7601a3 100644 --- a/support/testing/infra/__init__.py +++ b/support/testing/infra/__init__.py @@ -78,7 +78,7 @@ def get_elf_arch_tag(builddir, prefix, fpath, tag): cmd = ["host/bin/{}-readelf".format(prefix), "-A", os.path.join("target", fpath)] out = run_cmd_on_host(builddir, cmd) - regexp = re.compile("^ {}: (.*)$".format(tag)) + regexp = re.compile(r"^ {}: (.*)$".format(tag)) for line in out.splitlines(): m = regexp.match(line) if not m: @@ -105,10 +105,22 @@ def get_elf_prog_interpreter(builddir, prefix, fpath): cmd = ["host/bin/{}-readelf".format(prefix), "-l", os.path.join("target", fpath)] out = run_cmd_on_host(builddir, cmd) - regexp = re.compile("^ *\[Requesting program interpreter: (.*)\]$") + regexp = re.compile(r"^ *\[Requesting program interpreter: (.*)\]$") for line in out.splitlines(): m = regexp.match(line) if not m: continue return m.group(1) return None + + +def img_round_power2(img): + """ + Rounds up the size of an image file to the next power of 2 + """ + sz = os.stat(img).st_size + pow2 = 1 + while pow2 < sz: + pow2 = pow2 << 1 + with open(img, 'ab') as f: + f.truncate(pow2) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 5611ec96e8..53876f828c 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -54,16 +54,16 @@ class Emulator(object): if arch == "armv7": kernel = infra.download(self.downloaddir, - "kernel-vexpress") + "kernel-vexpress-5.10.7") dtb = infra.download(self.downloaddir, - "vexpress-v2p-ca9.dtb") + "vexpress-v2p-ca9-5.10.7.dtb") qemu_cmd += ["-dtb", dtb] qemu_cmd += ["-M", "vexpress-a9"] elif arch == "armv5": kernel = infra.download(self.downloaddir, - "kernel-versatile-4.19") + "kernel-versatile-5.10.7") dtb = infra.download(self.downloaddir, - "versatile-pb-4.19.dtb") + "versatile-pb-5.10.7.dtb") qemu_cmd += ["-dtb", dtb] qemu_cmd += ["-M", "versatilepb"] qemu_cmd += ["-device", "virtio-rng-pci"] @@ -77,6 +77,7 @@ class Emulator(object): self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:], timeout=5 * self.timeout_multiplier, encoding='utf-8', + codec_errors='replace', env={"QEMU_AUDIO_DRV": "none"}) # We want only stdout into the log to avoid double echo self.qemu.logfile_read = self.logfile @@ -100,6 +101,8 @@ class Emulator(object): if index != 0: raise SystemError("Cannot login") self.run("dmesg -n 1") + # Prevent the shell from wrapping the commands at 80 columns. + self.run("stty columns 29999") # Run the given 'cmd' with a 'timeout' on the target # return a tuple (output, exit_code) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index 21c3ec314e..4fcb9b241c 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -10,14 +10,15 @@ class TestATFVexpress(infra.basetest.BRTest): BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="vexpress_aemv8a_juno" BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.03" + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" BR2_TARGET_VEXPRESS_FIRMWARE=y """ @@ -32,49 +33,23 @@ class TestATFAllwinner(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" + # BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64" BR2_TARGET_UBOOT_NEEDS_DTC=y + BR2_TARGET_UBOOT_NEEDS_PYTHON3=y + BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y - BR2_TARGET_UBOOT_FORMAT_CUSTOM=y - BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y - BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" - """ - - def test_run(self): - pass - - -class TestATFMarvell(infra.basetest.BRTest): - config = \ - """ - BR2_aarch64=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="711ecd32afe465b38052b5ba374c825b158eea18" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" - BR2_TARGET_BINARIES_MARVELL=y - BR2_TARGET_MV_DDR_MARVELL=y - BR2_TARGET_UBOOT=y - BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040" - BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" - BR2_TARGET_UBOOT_NEEDS_DTC=y + BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" + BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" """ def test_run(self): diff --git a/support/testing/tests/boot/test_syslinux.py b/support/testing/tests/boot/test_syslinux.py index f25cddfb6c..467d564e18 100644 --- a/support/testing/tests/boot/test_syslinux.py +++ b/support/testing/tests/boot/test_syslinux.py @@ -6,6 +6,7 @@ class TestSysLinuxBase(infra.basetest.BRTest): """ BR2_x86_i686=y BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2018.11-1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y diff --git a/support/testing/tests/core/test_file_capabilities.py b/support/testing/tests/core/test_file_capabilities.py index 945b48a4c3..fe21d76c94 100644 --- a/support/testing/tests/core/test_file_capabilities.py +++ b/support/testing/tests/core/test_file_capabilities.py @@ -1,5 +1,4 @@ import os -import subprocess import infra.basetest @@ -14,7 +13,7 @@ class TestFileCapabilities(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.11.3" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -28,7 +27,7 @@ class TestFileCapabilities(infra.basetest.BRTest): def test_run(self): img = os.path.join(self.builddir, "images", "rootfs.squashfs") - subprocess.call(["truncate", "-s", "%1M", img]) + infra.img_round_power2(img) self.emulator.boot(arch="armv7", kernel=os.path.join(self.builddir, "images", "zImage"), @@ -44,4 +43,4 @@ class TestFileCapabilities(infra.basetest.BRTest): self.assertIn("cap_kill", output[0]) self.assertIn("cap_sys_nice", output[0]) self.assertIn("cap_sys_time", output[0]) - self.assertIn("+eip", output[0]) + self.assertIn("=eip", output[0]) diff --git a/support/testing/tests/core/test_hardening.py b/support/testing/tests/core/test_hardening.py index edfb3315db..e9d30f3a38 100644 --- a/support/testing/tests/core/test_hardening.py +++ b/support/testing/tests/core/test_hardening.py @@ -10,6 +10,7 @@ class TestHardeningBase(infra.basetest.BRTest): BR2_powerpc64=y BR2_powerpc_e5500=y BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2018.02-2.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y @@ -51,6 +52,7 @@ class TestRelroPartial(TestHardeningBase): config = TestHardeningBase.config + \ """ BR2_RELRO_PARTIAL=y + # BR2_PIC_PIE is not set """ def test_run(self): diff --git a/support/testing/tests/core/test_timezone.py b/support/testing/tests/core/test_timezone.py index 050624e0aa..f661519196 100644 --- a/support/testing/tests/core/test_timezone.py +++ b/support/testing/tests/core/test_timezone.py @@ -4,10 +4,10 @@ import infra.basetest def boot_armv5_cpio(emulator, builddir): - img = os.path.join(builddir, "images", "rootfs.cpio") - emulator.boot(arch="armv5", kernel="builtin", - options=["-initrd", img]) - emulator.login() + img = os.path.join(builddir, "images", "rootfs.cpio") + emulator.boot(arch="armv5", kernel="builtin", + options=["-initrd", img]) + emulator.login() class TestNoTimezone(infra.basetest.BRTest): diff --git a/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash b/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash index b9e1baec84..b44b1f8255 100644 --- a/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash +++ b/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash @@ -1 +1 @@ -sha256 0000000000000000000000000000000000000000000000000000000000000000 bad-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz +sha256 0000000000000000000000000000000000000000000000000000000000000000 bad-a238b1dfcd825d47d834af3c5223417c8411d90d-br1.tar.gz diff --git a/support/testing/tests/download/br2-external/git-hash/package/good/good.hash b/support/testing/tests/download/br2-external/git-hash/package/good/good.hash index 9e92ab8ab9..fc3f60dafd 100644 --- a/support/testing/tests/download/br2-external/git-hash/package/good/good.hash +++ b/support/testing/tests/download/br2-external/git-hash/package/good/good.hash @@ -1 +1 @@ -sha256 d00ae598e9e770d607621a86766030b42eaa58156cb8d482b043969da7963c23 good-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz +sha256 682ad1f39f258bfb35e26f213f3798f44bb8105bb55fad47bdc003113765b650 good-a238b1dfcd825d47d834af3c5223417c8411d90d-br1.tar.gz diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash index 648bcceca0..26a6b358e2 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash @@ -1,2 +1,2 @@ -sha256 70b76187369e47db69dac02c5696e63b35199cd20490fa473d289dd377774613 git-partial-sha1-branch-head-68c197d0879d485f4f6c.tar.gz +sha256 c27041b3e874beb0d0218158e7d6507ad1515b684de5eed5fabd0f7205e9718e git-partial-sha1-branch-head-68c197d0879d485f4f6c-br1.tar.gz sha256 2c1126513651b0d346a4e6d1bb75ac1c9999217e18026302d27bea47b06c7fb2 file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash index d064362e2c..ab1edc73a8 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash @@ -1,2 +1,2 @@ -sha256 9db079b9e215799d59975db7b2b26671eff1932ee6cf1075296f2ace3e2cb746 git-partial-sha1-reachable-by-branch-317406308d9259e2231b.tar.gz +sha256 1bbba9bf2788bd789ed8da4e47cabbf3467b1f706875b3f6b62df38e08fb9aba git-partial-sha1-reachable-by-branch-317406308d9259e2231b-br1.tar.gz sha256 fabbc65c442bacb5e69b7adfea6d14fbbfc1327134322efd12771dc84387d507 file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash index 7696086690..e4a08342a9 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash @@ -1,2 +1,2 @@ -sha256 f2ef9772f13a9ef9a2c7cde0795e179defb12320d1747fc8d2408748ef5844c2 git-partial-sha1-reachable-by-tag-46bae5b639e5a18e2cc4.tar.gz +sha256 52d223f3b2d625216c259e9ff949ca8818452a531ba61557dd91f3889c7919d7 git-partial-sha1-reachable-by-tag-46bae5b639e5a18e2cc4-br1.tar.gz sha256 2de87d77a2f226813f2d9bda906e970e4195605cdba6680443c0c04d89c532b6 file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash index e627caf91e..6e83e637cf 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash @@ -1,2 +1,2 @@ -sha256 721143b41b8e56cfd9025833f1602e900a490627db2504e5b4907baa23e0019e git-partial-sha1-tag-itself-2b0e0d98a49c97da6a61.tar.gz +sha256 5cfc004b05f48b3fb419a5db4b7239223d670225fbbb91de2ae151c97910b36c git-partial-sha1-tag-itself-2b0e0d98a49c97da6a61-br1.tar.gz sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash index f957a0e23c..7d538e72df 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash @@ -1,2 +1,2 @@ -sha256 0fbf7fe935f962ceaafcf8e0ffd25dd2a83752c3f0fd055a942a53f8c9235fa7 git-partial-sha1-tag-points-to-516c9c5f64ec66534d4d.tar.gz +sha256 0f40d7f39bf2e389cc2ce03c73cc0cc9ded1119378aaa68e2a2ef8597f6fd2f3 git-partial-sha1-tag-points-to-516c9c5f64ec66534d4d-br1.tar.gz sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash index 3e8f76d31a..2fc4fbcb95 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash @@ -1,2 +1,2 @@ -sha256 a21a2507b6d94ad484e49e3a9ae698f672a57469aab8e1779da77df7c9d4d337 git-sha1-branch-head-68c197d0879d485f4f6cee85544722b79e68e59f.tar.gz +sha256 3ab67c485ce1825abbbf5db1d90d94dfadc89b30bb740041cfc75fc04021e218 git-sha1-branch-head-68c197d0879d485f4f6cee85544722b79e68e59f-br1.tar.gz sha256 2c1126513651b0d346a4e6d1bb75ac1c9999217e18026302d27bea47b06c7fb2 file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash index f8d7b5dc48..38f0578fd6 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash @@ -1,2 +1,2 @@ -sha256 8909e76d898e651af0bc23fae4103b87888bfe77448d71aaf1fbec3da97a3ce2 git-sha1-reachable-by-branch-317406308d9259e2231bd0d6ddad3de3832bce08.tar.gz +sha256 a5936d6d6022ea101a6076864a2afa918ab2776764012c4be589027001044041 git-sha1-reachable-by-branch-317406308d9259e2231bd0d6ddad3de3832bce08-br1.tar.gz sha256 fabbc65c442bacb5e69b7adfea6d14fbbfc1327134322efd12771dc84387d507 file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash index 0eb0ca0917..bd4673b15f 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash @@ -1,2 +1,2 @@ -sha256 9b20256a3058221a8e91031f11700d9945ea84e8f328fa8e42e1cb9f7a30e3b2 git-sha1-reachable-by-tag-46bae5b639e5a18e2cc4dc508f080d566baeff59.tar.gz +sha256 c203f968e358ca478d4c5344b1e4ae9bf13f9fb1120f2ed96a12154dd64195a6 git-sha1-reachable-by-tag-46bae5b639e5a18e2cc4dc508f080d566baeff59-br1.tar.gz sha256 2de87d77a2f226813f2d9bda906e970e4195605cdba6680443c0c04d89c532b6 file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash index 48c1348538..c6862da75e 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash @@ -1,2 +1,2 @@ -sha256 7d301c1a1054d6aee49193ca9e938f4da561ff73fb01719662865aa38bdc4361 git-sha1-tag-itself-2b0e0d98a49c97da6a618ab36337e2058eb733a2.tar.gz +sha256 57f08e9f3914e79a10e7fb5d346b26fef2773dd22eed0d61fd755e79e62cee93 git-sha1-tag-itself-2b0e0d98a49c97da6a618ab36337e2058eb733a2-br1.tar.gz sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash index 3dcafc2094..188cb6897b 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash @@ -1,2 +1,2 @@ -sha256 c1f9f5734529a31140a71c031534460811f001b4db37d26833f386358150ab47 git-sha1-tag-points-to-516c9c5f64ec66534d4d069c2e408d9ae4dce023.tar.gz +sha256 1d8b565827137aa21ba37cde382aa291e33a135c697e38dcd31f14e195386327 git-sha1-tag-points-to-516c9c5f64ec66534d4d069c2e408d9ae4dce023-br1.tar.gz sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash b/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash index 3bd0a44693..c0698e7b28 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash @@ -1,2 +1,2 @@ -sha256 f9d46ff8a1a344c6c31fa4211220f3085c446abd31626232540703158276f22c git-submodule-disabled-a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f.tar.gz +sha256 e8e0febc7f1408df22bce2d73d9a30081e03b45e152bc25effd14435ca8b3433 git-submodule-disabled-a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f-br1.tar.gz sha256 ba8b6ddc4726bfb6a05045ebfd8c43263c968ad1bc601bd46a25bc055008eddc file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash b/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash index 7f92c652d3..b95c51fe20 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash @@ -1 +1 @@ -sha256 139a34c3c844c844dee74b6746418cfa75fbcc4205794ac8c0b3cd7d55a76792 git-submodule-enabled-a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f.tar.gz +sha256 176c32f10ad11f290b6251d701835450292ba281eb59c7fb57b244407a55ceab git-submodule-enabled-a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f-br1.tar.gz diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash b/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash index 1cd0b15f27..c7ebcf0e04 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash @@ -1,2 +1,2 @@ -sha256 85dcb5bcf9bed496688d0eb01c7a3ce05c5b46b984cc1e9e76a6dbefd976e6b3 git-tag-mytag.tar.gz +sha256 c66b2366d8ccb1670951012334fe8d48de3358aef39b3da2912b339448fefcde git-tag-mytag-br1.tar.gz sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash b/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash index 47b2b8b7d7..453ffc0ab2 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash +++ b/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash @@ -1,2 +1,2 @@ - sha256 04715901977503d1df650e0959f4d31d8e7b105e2ac99a2182e0652b8f13baa1 git-wrong-content-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz + sha256 4a230e667227310289438cd7d899276a0d45ca8778abfd043dfc0a10ed2c9085 git-wrong-content-a238b1dfcd825d47d834af3c5223417c8411d90d-br1.tar.gz sha256 0000000000000000000000000000000000000000000000000000000000000000 file diff --git a/support/testing/tests/fs/test_ext.py b/support/testing/tests/fs/test_ext.py index 16b308cf6d..2a6e0c4274 100644 --- a/support/testing/tests/fs/test_ext.py +++ b/support/testing/tests/fs/test_ext.py @@ -31,7 +31,7 @@ def boot_img_and_check_fs_type(emulator, builddir, fs_type): kernel="builtin", kernel_cmdline=["root=/dev/mmcblk0", "rootfstype={}".format(fs_type)], - options=["-drive", "file={},if=sd".format(img)]) + options=["-drive", "file={},if=sd,format=raw".format(img)]) emulator.login() _, exit_code = emulator.run(CHECK_FS_TYPE_CMD.format(fs_type)) return exit_code @@ -43,6 +43,7 @@ class TestExt2(infra.basetest.BRTest): BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_2r0=y BR2_TARGET_ROOTFS_EXT2_LABEL="foobaz" + BR2_TARGET_ROOTFS_EXT2_SIZE="16384" # BR2_TARGET_ROOTFS_TAR is not set """ @@ -62,6 +63,7 @@ class TestExt2r1(infra.basetest.BRTest): BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_2r1=y BR2_TARGET_ROOTFS_EXT2_LABEL="foobar" + BR2_TARGET_ROOTFS_EXT2_SIZE="16384" # BR2_TARGET_ROOTFS_TAR is not set """ @@ -81,6 +83,7 @@ class TestExt3(infra.basetest.BRTest): """ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_3=y + BR2_TARGET_ROOTFS_EXT2_SIZE="16384" # BR2_TARGET_ROOTFS_TAR is not set """ diff --git a/support/testing/tests/fs/test_f2fs.py b/support/testing/tests/fs/test_f2fs.py index 950d4cf25b..2d05a86418 100644 --- a/support/testing/tests/fs/test_f2fs.py +++ b/support/testing/tests/fs/test_f2fs.py @@ -20,7 +20,7 @@ class TestF2FS(infra.basetest.BRTest): # BR2_TARGET_ROOTFS_TAR is not set 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.204" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" @@ -44,5 +44,4 @@ class TestF2FS(infra.basetest.BRTest): options=options) self.emulator.login() cmd = "mount | grep '/dev/root on / type f2fs'" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) diff --git a/support/testing/tests/fs/test_iso9660.py b/support/testing/tests/fs/test_iso9660.py index 68f4840852..412430318b 100644 --- a/support/testing/tests/fs/test_iso9660.py +++ b/support/testing/tests/fs/test_iso9660.py @@ -18,7 +18,7 @@ BASIC_CONFIG = \ BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" # BR2_TARGET_ROOTFS_TAR is not set diff --git a/support/testing/tests/fs/test_jffs2.py b/support/testing/tests/fs/test_jffs2.py index f5066ff01f..1806bd7e3c 100644 --- a/support/testing/tests/fs/test_jffs2.py +++ b/support/testing/tests/fs/test_jffs2.py @@ -16,7 +16,7 @@ class TestJffs2(infra.basetest.BRTest): """ BR2_TARGET_ROOTFS_JFFS2=y BR2_TARGET_ROOTFS_JFFS2_CUSTOM=y - BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x80000 + BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x40000 BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y BR2_TARGET_ROOTFS_JFFS2_PAD=y BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x4000000 @@ -41,5 +41,4 @@ class TestJffs2(infra.basetest.BRTest): options=["-drive", "file={},if=pflash".format(img)]) self.emulator.login() cmd = "mount | grep '/dev/root on / type jffs2'" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) diff --git a/support/testing/tests/fs/test_squashfs.py b/support/testing/tests/fs/test_squashfs.py index 234f4944be..a914f5aac7 100644 --- a/support/testing/tests/fs/test_squashfs.py +++ b/support/testing/tests/fs/test_squashfs.py @@ -1,5 +1,4 @@ import os -import subprocess import infra.basetest @@ -8,8 +7,7 @@ class TestSquashfs(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ """ BR2_TARGET_ROOTFS_SQUASHFS=y - # BR2_TARGET_ROOTFS_SQUASHFS4_GZIP is not set - BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y + BR2_TARGET_ROOTFS_SQUASHFS4_LZO=y # BR2_TARGET_ROOTFS_TAR is not set """ @@ -19,10 +17,10 @@ class TestSquashfs(infra.basetest.BRTest): out = out.splitlines() self.assertEqual(out[0], "Found a valid SQUASHFS 4:0 superblock on images/rootfs.squashfs.") - self.assertEqual(out[3], "Compression lz4") + self.assertEqual(out[3], "Compression lzo") img = os.path.join(self.builddir, "images", "rootfs.squashfs") - subprocess.call(["truncate", "-s", "%1M", img]) + infra.img_round_power2(img) self.emulator.boot(arch="armv7", kernel="builtin", @@ -32,5 +30,4 @@ class TestSquashfs(infra.basetest.BRTest): self.emulator.login() cmd = "mount | grep '/dev/root on / type squashfs'" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py index 7321f83da9..eeb55b1d59 100644 --- a/support/testing/tests/fs/test_ubi.py +++ b/support/testing/tests/fs/test_ubi.py @@ -25,14 +25,14 @@ class TestUbi(infra.basetest.BRTest): out = out.splitlines() self.assertIn("UBI image, version 1", out[0]) - subprocess.call(["truncate", "-s 128M", img]) + subprocess.call(["truncate", "-s 64M", img]) self.emulator.boot(arch="armv7", kernel="builtin", kernel_cmdline=["root=ubi0:rootfs", "ubi.mtd=0", "rootfstype=ubifs"], - options=["-drive", "file={},if=pflash".format(img)]) + options=["-drive", "file={},if=pflash,format=raw".format(img)]) self.emulator.login() cmd = "mount | grep 'ubi0:rootfs on / type ubifs'" _, exit_code = self.emulator.run(cmd) diff --git a/support/testing/tests/init/base.py b/support/testing/tests/init/base.py index 75cfbe9c59..7f12186b73 100644 --- a/support/testing/tests/init/base.py +++ b/support/testing/tests/init/base.py @@ -1,5 +1,4 @@ import os -import subprocess import infra.basetest @@ -7,7 +6,7 @@ class InitSystemBase(infra.basetest.BRTest): def start_emulator(self, fs_type, kernel=None, dtb=None, init=None): img = os.path.join(self.builddir, "images", "rootfs.{}".format(fs_type)) - subprocess.call(["truncate", "-s", "%1M", img]) + infra.img_round_power2(img) options = ["-drive", "file={},if=sd,format=raw".format(img), @@ -39,8 +38,7 @@ class InitSystemBase(infra.basetest.BRTest): def check_init(self, path): cmd = "cmp /proc/1/exe {}".format(path) - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) def check_network(self, interface, exitCode=0): cmd = "ip addr show {} |grep inet".format(interface) diff --git a/support/testing/tests/init/test_none.py b/support/testing/tests/init/test_none.py index 5b9b4e43f1..fc4a46efd9 100644 --- a/support/testing/tests/init/test_none.py +++ b/support/testing/tests/init/test_none.py @@ -27,7 +27,6 @@ class TestInitSystemNone(InitSystemBase): self.assertEqual(exit_code, 0) self.assertEqual(out[0], "1") - _, exit_code = self.emulator.run("mount -t proc none /proc") - self.assertEqual(exit_code, 0) + self.assertRunOk("mount -t proc none /proc") self.check_init("/bin/sh") diff --git a/support/testing/tests/init/test_openrc.py b/support/testing/tests/init/test_openrc.py index 14839434ef..c6ade7676d 100644 --- a/support/testing/tests/init/test_openrc.py +++ b/support/testing/tests/init/test_openrc.py @@ -5,15 +5,11 @@ class InitSystemOpenrcBase(InitSystemBase): config = \ """ BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_INIT_OPENRC=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - BR2_LINUX_KERNEL=y - BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.7" - BR2_LINUX_KERNEL_DEFCONFIG="vexpress" - BR2_LINUX_KERNEL_DTS_SUPPORT=y - BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" # BR2_TARGET_ROOTFS_TAR is not set """ @@ -34,7 +30,7 @@ class TestInitSystemOpenrcRoFull(InitSystemOpenrcBase): """ def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") + self.start_emulator("squashfs") self.check_init() @@ -46,5 +42,5 @@ class TestInitSystemOpenrcRwFull(InitSystemOpenrcBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") + self.start_emulator("ext2") self.check_init() diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index 371be4ad7d..f0cc52bac8 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -13,7 +13,7 @@ class InitSystemSystemdBase(InitSystemBase): BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -29,8 +29,7 @@ class InitSystemSystemdBase(InitSystemBase): self.assertEqual(len(output), 0) # Test we can reach the DBus daemon - _, exit_code = self.emulator.run("busctl --no-pager") - self.assertEqual(exit_code, 0) + self.assertRunOk("busctl --no-pager") # Test we can read at least one line from the journal output, _ = self.emulator.run("journalctl --no-pager --lines 1 --quiet") @@ -91,7 +90,6 @@ class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): """ BR2_SYSTEM_DHCP="eth0" # BR2_PACKAGE_SYSTEMD_NETWORKD is not set - # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set BR2_TARGET_ROOTFS_EXT2=y """ @@ -106,7 +104,7 @@ class TestInitSystemSystemdRoFull(InitSystemSystemdBase): """ BR2_SYSTEM_DHCP="eth0" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set - BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY=y + BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y BR2_PACKAGE_SYSTEMD_BACKLIGHT=y BR2_PACKAGE_SYSTEMD_BINFMT=y BR2_PACKAGE_SYSTEMD_COREDUMP=y @@ -136,7 +134,7 @@ class TestInitSystemSystemdRwFull(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \ """ BR2_SYSTEM_DHCP="eth0" - BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY=y + BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y BR2_PACKAGE_SYSTEMD_BACKLIGHT=y BR2_PACKAGE_SYSTEMD_BINFMT=y BR2_PACKAGE_SYSTEMD_COREDUMP=y diff --git a/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk b/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk index 998117b8e2..ddd5e38884 100644 --- a/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk +++ b/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk @@ -8,7 +8,7 @@ OPENJDK_HELLO_WORLD_DEPENDENCIES = openjdk define OPENJDK_HELLO_WORLD_BUILD_CMDS $(INSTALL) -D $(OPENJDK_HELLO_WORLD_PKGDIR)/HelloWorld.java $(@D)/HelloWorld.java - $(HOST_DIR)/bin/javac $(@D)/HelloWorld.java + $(JAVAC) $(@D)/HelloWorld.java endef define OPENJDK_HELLO_WORLD_INSTALL_TARGET_CMDS diff --git a/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk b/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk index f279e5cd70..2028ad40c7 100644 --- a/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk +++ b/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk @@ -10,7 +10,7 @@ JNI_INCLUDE_PATH = $(BUILD_DIR)/openjdk-$(OPENJDK_VERSION)/build/linux-aarch64-s define OPENJDK_JNI_TEST_BUILD_CMDS # Compile Java classes and generate native headers - $(HOST_DIR)/bin/javac -d $(@D) -h $(@D) \ + $(JAVAC) -d $(@D) -h $(@D) \ $(OPENJDK_JNI_TEST_PKGDIR)/JniTest.java \ $(OPENJDK_JNI_TEST_PKGDIR)/JniWrapper.java \ $(OPENJDK_JNI_TEST_PKGDIR)/JniHelper.java diff --git a/support/testing/tests/package/test_atop.py b/support/testing/tests/package/test_atop.py index 1da1ac7cc4..5a96684799 100644 --- a/support/testing/tests/package/test_atop.py +++ b/support/testing/tests/package/test_atop.py @@ -33,9 +33,7 @@ class TestAtop(infra.basetest.BRTest): self.emulator.login() cmd = "atop -V | grep '^Version'" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) cmd = "atop -a 1 2 | grep '% *atop *$'" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py index f12e2a6a3d..1ce132c242 100644 --- a/support/testing/tests/package/test_docker_compose.py +++ b/support/testing/tests/package/test_docker_compose.py @@ -7,20 +7,18 @@ class TestDockerCompose(infra.basetest.BRTest): config = \ """ BR2_x86_64=y - BR2_x86_core2=y - BR2_TOOLCHAIN_BUILDROOT_GLIBC=y - BR2_KERNEL_HEADERS_4_19=y - BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="{}" BR2_ROOTFS_POST_SCRIPT_ARGS="{}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" BR2_PACKAGE_CA_CERTIFICATES=y - BR2_PACKAGE_CGROUPFS_MOUNT=y BR2_PACKAGE_DOCKER_CLI=y BR2_PACKAGE_DOCKER_COMPOSE=y BR2_PACKAGE_DOCKER_ENGINE=y @@ -38,13 +36,15 @@ class TestDockerCompose(infra.basetest.BRTest): def docker_test(self): # will download container if not available, which may take some time - _, exit_code = self.emulator.run('docker run --rm busybox:latest /bin/true', 120) - self.assertEqual(exit_code, 0) + self.assertRunOk('docker run --rm -p 8888:8888 busybox:latest /bin/true', 120) def docker_compose_test(self): # will download container if not available, which may take some time - _, exit_code = self.emulator.run('docker-compose up', 120) - self.assertEqual(exit_code, 0) + self.assertRunOk('docker-compose up -d', 120) + # container may take some time to start + self.assertRunOk('while ! docker inspect root_busybox_1 2>&1 >/dev/null; do sleep 1; done', 120) + self.assertRunOk('wget -O /tmp/busybox http://127.0.0.1/busybox', 120) + self.assertRunOk('cmp /bin/busybox /tmp/busybox', 120) def test_run(self): kernel = os.path.join(self.builddir, "images", "bzImage") @@ -52,7 +52,7 @@ class TestDockerCompose(infra.basetest.BRTest): self.emulator.boot(arch="x86_64", kernel=kernel, kernel_cmdline=["root=/dev/vda", "console=ttyS0"], - options=["-cpu", "core2duo", + options=["-cpu", "Nehalem", "-m", "512M", "-device", "virtio-rng-pci", "-drive", "file={},format=raw,if=virtio".format(rootfs), diff --git a/support/testing/tests/package/test_dropbear.py b/support/testing/tests/package/test_dropbear.py index bfec8701f2..2dd9070231 100644 --- a/support/testing/tests/package/test_dropbear.py +++ b/support/testing/tests/package/test_dropbear.py @@ -24,9 +24,7 @@ class TestDropbear(infra.basetest.BRTest): "-net", "user"]) self.emulator.login(self.passwd) cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:22" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) cmd = "sshpass -p {} ssh -y localhost /bin/true".format(self.passwd) - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py index f37236d161..79be596635 100644 --- a/support/testing/tests/package/test_glxinfo.py +++ b/support/testing/tests/package/test_glxinfo.py @@ -20,19 +20,21 @@ class TestGlxinfo(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y 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.204" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" BR2_PACKAGE_MESA3D_DEMOS=y BR2_PACKAGE_MESA3D=y - BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set - """ + BR2_ROOTFS_OVERLAY="{}" + """.format( + infra.filepath("tests/package/test_glxinfo/rootfs-overlay")) def wait_for_xserver(self): # xserver takes some time to start up diff --git a/support/testing/tests/package/test_lua.py b/support/testing/tests/package/test_lua.py index 66ae85c999..573ae01005 100644 --- a/support/testing/tests/package/test_lua.py +++ b/support/testing/tests/package/test_lua.py @@ -31,8 +31,7 @@ class TestLuaBase(infra.basetest.BRTest): def module_test(self, module, script="a=1"): cmd = "lua -l {} -e '{}'".format(module, script) - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) class TestLua(TestLuaBase): diff --git a/support/testing/tests/package/test_lua_utf8.py b/support/testing/tests/package/test_lua_utf8.py index 3eab19dd4d..5946a439cf 100644 --- a/support/testing/tests/package/test_lua_utf8.py +++ b/support/testing/tests/package/test_lua_utf8.py @@ -10,7 +10,7 @@ class TestLuaUtf8(TestLuaBase): def test_run(self): self.login() - self.module_test("utf8") + self.module_test("lua-utf8") class TestLuajitUtf8(TestLuaBase): @@ -22,4 +22,4 @@ class TestLuajitUtf8(TestLuaBase): def test_run(self): self.login() - self.module_test("utf8") + self.module_test("lua-utf8") diff --git a/support/testing/tests/package/test_lxc.py b/support/testing/tests/package/test_lxc.py index b32b7a20c4..d98bed8761 100644 --- a/support/testing/tests/package/test_lxc.py +++ b/support/testing/tests/package/test_lxc.py @@ -12,7 +12,7 @@ class TestLxc(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.79" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/support/testing/tests/package/test_netdata.py b/support/testing/tests/package/test_netdata.py index 7418b762a4..6b616398d3 100644 --- a/support/testing/tests/package/test_netdata.py +++ b/support/testing/tests/package/test_netdata.py @@ -19,5 +19,4 @@ class TestNetdata(infra.basetest.BRTest): self.emulator.login() cmd = "wget localhost:19999 -O - | grep 'netdata dashboard'" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_openjdk.py b/support/testing/tests/package/test_openjdk.py index 3a1d1a9b09..26b7f9ee92 100644 --- a/support/testing/tests/package/test_openjdk.py +++ b/support/testing/tests/package/test_openjdk.py @@ -12,7 +12,7 @@ class TestOpenJdk(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="5.10.34" 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_opkg.py b/support/testing/tests/package/test_opkg.py index aa93708223..e47879cad6 100644 --- a/support/testing/tests/package/test_opkg.py +++ b/support/testing/tests/package/test_opkg.py @@ -33,23 +33,19 @@ class TestOpkg(infra.basetest.BRTest): # and prerm scripting provided in the package archive. cmd = "opkg install example-snmpd-package_1.0_arm.ipk" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) cmd = "opkg list-installed | grep example-snmpd-package" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) # Check that postinst script ran to start the services cmd = "ps aux | grep [s]nmpd" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) # If successful, the prerm script ran to stop the service prior to # the removal of the service scripting and files cmd = "opkg remove example-snmpd-package" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) # Verify after package removal that the services is not # running, but let's give it some time to really stop diff --git a/support/testing/tests/package/test_perl.py b/support/testing/tests/package/test_perl.py index 37e7390a4b..ae3f105919 100644 --- a/support/testing/tests/package/test_perl.py +++ b/support/testing/tests/package/test_perl.py @@ -19,8 +19,7 @@ class TestPerlBase(infra.basetest.BRTest): def module_test(self, module, script="1"): cmd = "perl -M{} -e '{}'".format(module, script) - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) class TestPerl(TestPerlBase): diff --git a/support/testing/tests/package/test_perl_io_socket_ssl.py b/support/testing/tests/package/test_perl_io_socket_ssl.py index 51663e837c..80835fdcc1 100644 --- a/support/testing/tests/package/test_perl_io_socket_ssl.py +++ b/support/testing/tests/package/test_perl_io_socket_ssl.py @@ -6,6 +6,7 @@ class TestPerlIOSocketSSL(TestPerlBase): package: IO-Socket-SSL direct dependencies: + Mozilla-CA Net-SSLeay XS """ diff --git a/support/testing/tests/package/test_perl_libwww_perl.py b/support/testing/tests/package/test_perl_libwww_perl.py index 7b30e4b94c..4dcfa06f15 100644 --- a/support/testing/tests/package/test_perl_libwww_perl.py +++ b/support/testing/tests/package/test_perl_libwww_perl.py @@ -10,7 +10,6 @@ class TestPerllibwwwperl(TestPerlBase): File-Listing HTML-Parser XS HTTP-Cookies - HTTP-Daemon HTTP-Date HTTP-Message HTTP-Negotiate @@ -38,5 +37,4 @@ class TestPerllibwwwperl(TestPerlBase): self.module_test("LWP::Authen::Digest") self.module_test("HTML::Parser") self.module_test("HTTP::Message") - self.module_test("HTTP::Daemon") self.module_test("WWW::RobotRules") diff --git a/support/testing/tests/package/test_python.py b/support/testing/tests/package/test_python.py index bcd363ad1e..60da8765c4 100644 --- a/support/testing/tests/package/test_python.py +++ b/support/testing/tests/package/test_python.py @@ -20,21 +20,18 @@ class TestPythonBase(infra.basetest.BRTest): def version_test(self, version, timeout=-1): cmd = self.interpreter + " --version 2>&1 | grep '^{}'".format(version) - _, exit_code = self.emulator.run(cmd, timeout) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd, timeout) def math_floor_test(self, timeout=-1): cmd = self.interpreter + " -c 'import math; math.floor(12.3)'" - _, exit_code = self.emulator.run(cmd, timeout) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd, timeout) def libc_time_test(self, timeout=-1): cmd = self.interpreter + " -c 'from __future__ import print_function;" cmd += "import ctypes;" cmd += "libc = ctypes.cdll.LoadLibrary(\"libc.so.1\");" cmd += "print(libc.time(None))'" - _, exit_code = self.emulator.run(cmd, timeout) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd, timeout) def zlib_test(self, timeout=-1): cmd = self.interpreter + " -c 'import zlib'" @@ -116,8 +113,7 @@ class TestPythonPackageBase(TestPythonBase): """Run each script previously added to the image.""" for script in self.sample_scripts: cmd = self.interpreter + " " + os.path.basename(script) - _, exit_code = self.emulator.run(cmd, timeout=self.timeout) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd, timeout=self.timeout) def test_run(self): self.login() diff --git a/support/testing/tests/package/test_python_cryptography.py b/support/testing/tests/package/test_python_cryptography.py index 14515fcd2d..62f0ca0def 100644 --- a/support/testing/tests/package/test_python_cryptography.py +++ b/support/testing/tests/package/test_python_cryptography.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Cryptography(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y - """ - sample_scripts = ["tests/package/sample_python_cryptography.py"] - timeout = 40 - - class TestPythonPy3Cryptography(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py index 6b31833a0f..0b7d35bb6a 100644 --- a/support/testing/tests/package/test_python_django.py +++ b/support/testing/tests/package/test_python_django.py @@ -6,18 +6,20 @@ class TestPythonDjango(TestPythonPackageBase): sample_scripts = ["tests/package/sample_python_django.py"] def run_sample_scripts(self): + timeout = 35 * self.emulator.timeout_multiplier + cmd = "cd /opt && /usr/bin/django-admin startproject testsite" - self.assertRunOk(cmd, timeout=30) + self.assertRunOk(cmd, timeout=timeout) cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py migrate" - output, exit_code = self.emulator.run(cmd, timeout=30) + output, exit_code = self.emulator.run(cmd, timeout=timeout) self.assertIn("Operations to perform:", output[0]) self.assertEqual(exit_code, 0) cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " # give some time to setup the server - cmd += "sleep 30" - self.assertRunOk(cmd, timeout=35) + cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) + self.assertRunOk(cmd, timeout=timeout) cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_python_service_identity.py b/support/testing/tests/package/test_python_service_identity.py index 6aeb77de8c..09cfbe0a26 100644 --- a/support/testing/tests/package/test_python_service_identity.py +++ b/support/testing/tests/package/test_python_service_identity.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2ServiceIdentity(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_SERVICE_IDENTITY=y - """ - sample_scripts = ["tests/package/sample_python_service_identity.py"] - timeout = 30 - - class TestPythonPy3ServiceIdentity(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_treq.py b/support/testing/tests/package/test_python_treq.py index e24ae845be..d7a23829ea 100644 --- a/support/testing/tests/package/test_python_treq.py +++ b/support/testing/tests/package/test_python_treq.py @@ -12,15 +12,6 @@ class TestPythonTreq(TestPythonPackageBase): self.assertEqual(exit_code, 0) -class TestPythonPy2Treq(TestPythonTreq): - __test__ = True - config = TestPythonTreq.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TREQ=y - """ - - class TestPythonPy3Treq(TestPythonTreq): __test__ = True config = TestPythonTreq.config + \ diff --git a/support/testing/tests/package/test_python_twisted.py b/support/testing/tests/package/test_python_twisted.py index a458ee45dd..e87312db13 100644 --- a/support/testing/tests/package/test_python_twisted.py +++ b/support/testing/tests/package/test_python_twisted.py @@ -21,15 +21,6 @@ class TestPythonTwisted(TestPythonPackageBase): self.assertEqual(exit_code, 0) -class TestPythonPy2Twisted(TestPythonTwisted): - __test__ = True - config = TestPythonTwisted.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TWISTED=y - """ - - class TestPythonPy3Twisted(TestPythonTwisted): __test__ = True config = TestPythonTwisted.config + \ diff --git a/support/testing/tests/package/test_python_txaio.py b/support/testing/tests/package/test_python_txaio.py index 7bff1bc23c..f1bb2c79a6 100644 --- a/support/testing/tests/package/test_python_txaio.py +++ b/support/testing/tests/package/test_python_txaio.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Txaio(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TXAIO=y - BR2_PACKAGE_PYTHON_TWISTED=y - """ - sample_scripts = ["tests/package/sample_python_txaio_twisted.py"] - - class TestPythonPy3Txaio(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_txtorcon.py b/support/testing/tests/package/test_python_txtorcon.py index 1ac2f6919a..8e74190ee1 100644 --- a/support/testing/tests/package/test_python_txtorcon.py +++ b/support/testing/tests/package/test_python_txtorcon.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Txtorcon(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TXTORCON=y - """ - sample_scripts = ["tests/package/sample_python_txtorcon.py"] - timeout = 30 - - class TestPythonPy3Txtorcon(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 9854c3692e..884b40a4a3 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -65,23 +65,15 @@ class TestRustBin(TestRustBase): BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_SYSTEM_DHCP="eth0" - BR2_LINUX_KERNEL=y - BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" - BR2_LINUX_KERNEL_DEFCONFIG="vexpress" - BR2_LINUX_KERNEL_DTS_SUPPORT=y - BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y BR2_PACKAGE_HOST_RUSTC=y """ def test_run(self): self.build_test_prog() self.login() - _, exit_code = self.emulator.run(self.crate) - self.assertEqual(exit_code, 0) + self.assertRunOk(self.crate) class TestRust(TestRustBase): @@ -94,15 +86,8 @@ class TestRust(TestRustBase): BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_SYSTEM_DHCP="eth0" - BR2_LINUX_KERNEL=y - BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" - BR2_LINUX_KERNEL_DEFCONFIG="vexpress" - BR2_LINUX_KERNEL_DTS_SUPPORT=y - BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y """ @@ -110,5 +95,4 @@ class TestRust(TestRustBase): def test_run(self): self.build_test_prog() self.login() - _, exit_code = self.emulator.run(self.crate) - self.assertEqual(exit_code, 0) + self.assertRunOk(self.crate) diff --git a/support/testing/tests/package/test_syslog_ng.py b/support/testing/tests/package/test_syslog_ng.py index 3fb0be5fb8..153c9f73e5 100644 --- a/support/testing/tests/package/test_syslog_ng.py +++ b/support/testing/tests/package/test_syslog_ng.py @@ -20,19 +20,17 @@ class TestSyslogNg(infra.basetest.BRTest): self.emulator.login() cmd = "grep 'syslog-ng starting' /var/log/messages" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) cmd = "logger my-message && " cmd += "sleep 1 && " cmd += "grep my-message /var/log/messages" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) cmd = "syslog-ng-ctl reload && " cmd += "sleep 1" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) + cmd = "grep -i 'syslog-ng.*warning' /var/log/messages" _, exit_code = self.emulator.run(cmd) self.assertEqual(exit_code, 1) diff --git a/support/testing/tests/package/test_tmux.py b/support/testing/tests/package/test_tmux.py index b31854cab3..7a10b7a2b0 100644 --- a/support/testing/tests/package/test_tmux.py +++ b/support/testing/tests/package/test_tmux.py @@ -19,20 +19,16 @@ class TestTmux(infra.basetest.BRTest): self.emulator.login() cmd = "tmux -V" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + self.assertRunOk(cmd) cmd = "tmux -C = 3.10, host and target gcc >= 5" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS @@ -138,11 +143,15 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and targe config BR2_INIT_NONE bool "None" + select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT help Buildroot will not install any init system. You will have to provide your own, either with a new package or with a rootfs-overlay. +# Init systems from br2-external trees, if any +source "$BR2_BASE_DIR/.br2-external.in.init" + endchoice choice @@ -402,7 +411,8 @@ endif # BR2_ROOTFS_SKELETON_DEFAULT config BR2_SYSTEM_DEFAULT_PATH string "Set the system's default PATH" - default "/bin:/sbin:/usr/bin:/usr/sbin" + default "/usr/bin:/usr/sbin" if BR2_ROOTFS_MERGED_USR + default "/bin:/sbin:/usr/bin:/usr/sbin" if !BR2_ROOTFS_MERGED_USR help Sets the system's default PATH. It is being used in /etc/profile in the skeleton-init-common package and by some diff --git a/system/skeleton/etc/group b/system/skeleton/etc/group index 76346b35f2..6822a277bf 100644 --- a/system/skeleton/etc/group +++ b/system/skeleton/etc/group @@ -23,4 +23,4 @@ staff:x:50: lock:x:54: netdev:x:82: users:x:100: -nogroup:x:65534: +nobody:x:65534: diff --git a/toolchain/Config.in b/toolchain/Config.in index b6bcde4a95..3ea3fbb097 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -71,15 +71,17 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" -# https://sourceware.org/bugzilla/show_bug.cgi?id=19615 -# Affect toolchains built with binutils 2.26 (fixed in binutils 2.26.1). -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615 +# https://sourceware.org/bugzilla/show_bug.cgi?id=21464 +# Affect toolchains built with binutils 2.31.1, still not fixed. +config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 bool + default y if BR2_or1k -# https://sourceware.org/bugzilla/show_bug.cgi?id=20006 -# Affect toolchains built with binutils 2.26 (fixed in binutils 2.26.1). -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_20006 +# https://sourceware.org/bugzilla/show_bug.cgi?id=27597 +# Affect toolchains built with binutils 2.36.1, still not fixed. +config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 bool + default y if BR2_nios2 # Atomic types can be: # - never lock-free @@ -137,6 +139,15 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_68485 bool default y if BR2_microblaze +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143 +# Error: invalid operands (*UND* and .text sections) for `-' on sh4. +# This bug no longer exists in gcc 10.x but reappeared on gcc 11.x and +# it still not been fixed yet. +config BR2_TOOLCHAIN_HAS_GCC_BUG_83143 + bool + default y if BR2_sh + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || BR2_TOOLCHAIN_GCC_AT_LEAST_11 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180. This bug no # longer exists in gcc 8.x. config BR2_TOOLCHAIN_HAS_GCC_BUG_85180 @@ -154,10 +165,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90620 # ICE: in do_output_reload, at reload1.c:7978 on microblaze. -# It's still not fixed in gcc 9.x +# This bug no longer exists in gcc 10.x config BR2_TOOLCHAIN_HAS_GCC_BUG_90620 bool default y if BR2_microblaze + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93847 # ICE: compiler error: Segmentation fault on Nios II. This bug @@ -166,6 +178,44 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 bool default y if BR2_nios2 && !BR2_TOOLCHAIN_GCC_AT_LEAST_9 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 +# Error: branch offset out of range on Nios II. This bug +# no longer exists in gcc 8.x but reappeared on gcc 9.x and has been +# fixed on gcc 10.x. +config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 + bool + default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 + depends on BR2_nios2 + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 +# ICE: SH4 -Os causes internal compiler error. This bug +# still exists in gcc = 11.1.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_101737 + bool + default y if BR2_sh4 + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101915 +# ICE: in extract_insn, at recog.c:2294 on microblaze. +# This bug still exists in gcc = 11.1.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_101915 + bool + default y if BR2_microblaze + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101916 +# ICE: on SH4: Segmentation fault signal terminated program cc1. +# This bug still exists in gcc = 11.1.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_101916 + bool + default y if BR2_sh4 + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101952 +# ICE: on SH4: unaligned opcodes detected in executable segment. +# This bug still exists in gcc = 11.1.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_101952 + bool + default y if BR2_sh4 + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool @@ -476,6 +526,34 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -489,6 +567,13 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "5.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13 + default "5.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12 + default "5.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 + default "5.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + default "5.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 + default "5.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + default "5.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 default "5.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 default "5.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 default "5.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -586,10 +671,20 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_9 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_8 +config BR2_TOOLCHAIN_GCC_AT_LEAST_10 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + +config BR2_TOOLCHAIN_GCC_AT_LEAST_11 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_GCC_AT_LEAST string + default "11" if BR2_TOOLCHAIN_GCC_AT_LEAST_11 + default "10" if BR2_TOOLCHAIN_GCC_AT_LEAST_10 default "9" if BR2_TOOLCHAIN_GCC_AT_LEAST_9 default "8" if BR2_TOOLCHAIN_GCC_AT_LEAST_8 default "7" if BR2_TOOLCHAIN_GCC_AT_LEAST_7 @@ -677,6 +772,7 @@ config BR2_TOOLCHAIN_HAS_SYNC_8 config BR2_TOOLCHAIN_HAS_LIBATOMIC bool default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 && \ + !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 && \ BR2_TOOLCHAIN_HAS_THREADS && \ !BR2_BINFMT_FLAT diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 44d0c83d1e..5c494d3dde 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -184,7 +184,7 @@ check_gcc_version = \ exit 0 ; \ fi; \ real_version=`$(1) -dumpversion` ; \ - if [[ ! "$${real_version}" =~ ^$${expected_version}\. ]] ; then \ + if [[ ! "$${real_version}." =~ ^$${expected_version}\. ]] ; then \ printf "Incorrect selection of gcc version: expected %s.x, got %s\n" \ "$${expected_version}" "$${real_version}" ; \ exit 1 ; \ @@ -483,7 +483,8 @@ check_toolchain_ssp = \ # gen_gdbinit_file = \ mkdir -p $(STAGING_DIR)/usr/share/buildroot/ ; \ - echo "set sysroot $(STAGING_DIR)" > $(STAGING_DIR)/usr/share/buildroot/gdbinit + echo "add-auto-load-safe-path $(STAGING_DIR)" > $(STAGING_DIR)/usr/share/buildroot/gdbinit ; \ + echo "set sysroot $(STAGING_DIR)" >> $(STAGING_DIR)/usr/share/buildroot/gdbinit # Given a path, determine the relative prefix (../) needed to return to the # root level. Note that the last component is treated as a file component; use a diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index a980f766ac..4004c0edf8 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -31,8 +31,9 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC BR2_arm || BR2_armeb || \ BR2_i386 || BR2_m68k || BR2_microblaze || \ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_or1k || BR2_powerpc || BR2_sh2a || BR2_sh4 || \ - BR2_sh4eb || BR2_sparc || BR2_xtensa || BR2_x86_64 + BR2_or1k || BR2_powerpc || BR2_RISCV_64 || BR2_sh2a || \ + BR2_sh4 || BR2_sh4eb || BR2_sparc || BR2_xtensa || \ + BR2_x86_64 select BR2_TOOLCHAIN_USES_UCLIBC help This option selects uClibc-ng as the C library for the @@ -46,19 +47,19 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC BR2_aarch64_be || BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_mips64 || BR2_mips64el|| \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_riscv || BR2_sh || BR2_sparc64 || \ - BR2_x86_64 || BR2_microblaze || BR2_nios2 || \ - (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky + BR2_riscv || BR2_s390x || BR2_sh || \ + BR2_sparc64 || BR2_x86_64 || BR2_microblaze || \ + BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_powerpc64le depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 || !BR2_MIPS_NAN_2008 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_RISCV_64 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 || !BR2_arc depends on !BR2_powerpc_SPE depends on BR2_RISCV_ISA_RVA || !BR2_riscv select BR2_TOOLCHAIN_USES_GLIBC - # our glibc.mk enables RPC support - select BR2_TOOLCHAIN_HAS_NATIVE_RPC help This option selects glibc as the C library for the cross-compilation toolchain. @@ -86,6 +87,7 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL BR2_mips64el || BR2_or1k || BR2_powerpc || BR2_powerpc64 || \ BR2_powerpc64le || BR2_RISCV_64 || BR2_sh || BR2_x86_64 depends on !BR2_powerpc_SPE # not supported, build breaks + depends on !(BR2_powerpc64 || BR2_powerpc64le) || BR2_POWERPC_CPU_HAS_ALTIVEC # sh2 nommu is supported by musl, but we don't have support # for it in Buildroot. depends on BR2_USE_MMU diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 128bea257e..2177e6a678 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -42,8 +42,8 @@ source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Confi # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in" -# x86_64 -source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in" +# Bootlin toolchains, available for virtually all architectures +source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in" # Kept last, so it remains the non-default choice, unless there isn't # any available toolchain profile for the currently selected @@ -149,8 +149,8 @@ source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Confi # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options" -# x86_64 -source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options" +# Bootlin toolchains +source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options" # Custom toolchains source "toolchain/toolchain-external/toolchain-external-custom/Config.in.options" diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 8667d7ddf6..68d7a3fe21 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -485,6 +485,26 @@ define TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT fi endef +# GCC installs a libstdcxx-...so-gdb.py file that gdb will load automatically, +# but it contains hardcoded paths referring to the location where the (external) +# toolchain was built. Fix up these paths so that the pretty printers can be +# loaded automatically. +# By default, the pretty printers are installed in +# $(datadir)/gcc-$(gcc_version)/python but this could have been overwritten with +# the gcc configure option: --with-python-dir. We thus have to search the +# correct path first. +define TOOLCHAIN_EXTERNAL_FIXUP_PRETTY_PRINTER_LOADER + $(Q)loadfiles=$$(find $(STAGING_DIR) -name 'libstdc++.so*-gdb.py' 2>/dev/null); \ + pythondir=$$(find $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) -path '*/libstdcxx/__init__.py' 2>/dev/null | sed 's%/libstdcxx/__init__.py%%' | head -n1); \ + if [ -n "$$loadfiles" ] && [ -n "$$pythondir" ]; then \ + echo "Fixing up hardcoded paths in GDB pretty-printer auto-load file(s) for libstdcxx: $$loadfiles"; \ + sed -ri \ + -e 's%^libdir\s*=.*%libdir = "$(STAGING_DIR)/lib"%' \ + -e "s%^pythondir\s*=.*%pythondir = '$$pythondir'%" \ + $$loadfiles; \ + fi +endef + # uClibc-ng dynamic loader is called ld-uClibc.so.1, but gcc is not # patched specifically for uClibc-ng, so it continues to generate # binaries that expect the dynamic loader to be named ld-uClibc.so.0, @@ -499,6 +519,12 @@ define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO fi endef +define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDD + $(Q)if test -f $(STAGING_DIR)/usr/bin/ldd ; then \ + $(INSTALL) -D $(STAGING_DIR)/usr/bin/ldd $(TARGET_DIR)/usr/bin/ldd ; \ + $(SED) 's:.*/bin/bash:#!/bin/sh:' $(TARGET_DIR)/usr/bin/ldd ; \ + fi +endef ################################################################################ # inner-toolchain-external-package -- defines the generic installation rules @@ -583,6 +609,7 @@ define $(2)_INSTALL_STAGING_CMDS $$(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS) $$(TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER) $$(TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT) + $$(TOOLCHAIN_EXTERNAL_FIXUP_PRETTY_PRINTER_LOADER) endef # Even though we're installing things in both the staging, the host @@ -593,6 +620,7 @@ define $(2)_INSTALL_TARGET_CMDS $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS) $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER) $$(TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO) + $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDD) endef # Call the generic package infrastructure to generate the necessary diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in index ea63687c5b..bbd6a0703d 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE - bool "Arm AArch64 BE 2019.12" + bool "Arm AArch64 BE 2020.11" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" depends on !BR2_STATIC_LIBS @@ -8,7 +8,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash index a82c2ba483..8e67a96599 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64_be-none-linux-gnu.tar.xz.asc -md5 f9885977e7f949f35bc0820f4bf99ab2 gcc-arm-9.2-2019.12-x86_64-aarch64_be-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-x86_64-aarch64_be-none-linux-gnu.tar.xz.asc +md5 5da75bca337de5adade5b339709f8b16 gcc-arm-10.2-2020.11-x86_64-aarch64_be-none-linux-gnu.tar.xz # locally calculated -sha256 55fc54a63567a35fb8280dfef91d50c0b5ad65aaea267f34fe7647b02d912f56 gcc-arm-9.2-2019.12-x86_64-aarch64_be-none-linux-gnu.tar.xz +sha256 78a472aeb80f6ff56bfdef57ce165b233bac4af7aa2e12f454900518a30ddf20 gcc-arm-10.2-2020.11-x86_64-aarch64_be-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk index e06f122991..384fc2efc5 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 2019.12 -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 2020.11 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = gcc-arm-9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = gcc-arm-10.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz $(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in index 52dcb2825e..b6062846a4 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 - bool "Arm AArch64 2019.12" + bool "Arm AArch64 2020.11" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" depends on !BR2_STATIC_LIBS @@ -8,7 +8,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash index edc30a2805..90abe56d64 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.asc -md5 23ecc1dc528253c43e43365c6d923ec3 gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz.asc +md5 d6e6676d31c51405ae0fc7687ef0a224 gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz # locally calculated -sha256 8dfe681531f0bd04fb9c53cf3c0a3368c616aa85d48938eebe2b516376e06a66 gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz +sha256 fe7f72330216612de44891ebe5e228eed7c0c051ac090c395b2b33115c6f5408 gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk index 51a81ec982..583e4a763d 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 2019.12 -TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 2020.11 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = gcc-arm-9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = gcc-arm-10.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz $(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index 4748ab53ae..e3bac38baa 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in @@ -1,12 +1,13 @@ -comment "Arm toolchains available for Cortex-A + EABIhf" +comment "Arm toolchains available for Cortex-A with NEON + EABIhf" depends on BR2_arm - depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF + depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF || !BR2_ARM_CPU_HAS_NEON depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM - bool "Arm ARM 2019.12" + bool "Arm ARM 2020.11" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A + depends on BR2_ARM_CPU_HAS_NEON depends on BR2_HOSTARCH = "x86_64" depends on BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS @@ -15,15 +16,15 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help - Arm toolchain for the ARM architecture. It uses GCC 9.2.1, - GDB 8.3.0, glibc 2.30, Binutils 2.33.1. It generates code that - runs on all Cortex-A profile devices, but tuned for the - Cortex-A9. The code generated uses the hard floating point - calling convention, and uses the VFPv3-D16 FPU instructions. + Arm toolchain for the ARM architecture. It uses GCC 10.2, + GDB 10.1, glibc 2.31, Binutils 2.35.1. It generates code + that runs on all Cortex-A profile devices. The code + generated uses the hard floating point calling convention, + and uses the NEON FPU instructions. This is the same toolchain that was previously distributed by Linaro. diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash index 0a28cf0d59..a46ed4e40c 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.asc -md5 ae539d09dadacf7f22fcd6f54870e5ad gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-x86_64-arm-none-linux-gnueabihf.tar.xz.asc +md5 14f706db78cfb43aafed9056174572b0 gcc-arm-10.2-2020.11-x86_64-arm-none-linux-gnueabihf.tar.xz # locally calculated -sha256 51bbaf22a4d3e7a393264c4ef1e45566701c516274dde19c4892c911caa85617 gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz +sha256 102825ae56c9e00142d06f35d2bdd3299edb6060e84a275a25b095e66fd3fc2a gcc-arm-10.2-2020.11-x86_64-arm-none-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk index 798573a474..88b6ae3403 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2019.12 -TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2020.11 +TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-9.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-x86_64-arm-none-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-10.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-x86_64-arm-none-linux-gnueabihf.tar.xz $(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 9a8078d314..bc4561f3f7 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -31,6 +31,14 @@ choice Set to the gcc version that is used by your external toolchain. +config BR2_TOOLCHAIN_EXTERNAL_GCC_11 + bool "11.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + +config BR2_TOOLCHAIN_EXTERNAL_GCC_10 + bool "10.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + config BR2_TOOLCHAIN_EXTERNAL_GCC_9 bool "9.x" select BR2_TOOLCHAIN_GCC_AT_LEAST_9 @@ -115,8 +123,36 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_13 + bool "5.13.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_12 + bool "5.12.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_11 + bool "5.11" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_10 + bool "5.10.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9 + bool "5.9.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_8 + bool "5.8.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_7 + bool "5.7.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_6 - bool "5.6.x or later" + bool "5.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5 diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 8cfc963ccd..0fb6064b1c 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -129,6 +129,8 @@ static const struct str_len_s unsafe_paths[] = { STR_LEN(/usr/lib), STR_LEN(/usr/local/include), STR_LEN(/usr/local/lib), + STR_LEN(/usr/X11R6/include), + STR_LEN(/usr/X11R6/lib), { NULL, 0 }, }; @@ -177,6 +179,7 @@ static void check_unsafe_path(const char *arg, } } +#ifdef BR_NEED_SOURCE_DATE_EPOCH /* Returns false if SOURCE_DATE_EPOCH was not defined in the environment. * * Returns true if SOURCE_DATE_EPOCH is in the environment and represent @@ -230,6 +233,15 @@ bool parse_source_date_epoch_from_env(void) } return true; } +#else +bool parse_source_date_epoch_from_env(void) +{ + /* The compiler is recent enough to handle SOURCE_DATE_EPOCH itself + * so we do not need to do anything here. + */ + return false; +} +#endif int main(int argc, char **argv) { diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index 09dda17890..8b551e3a18 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -28,6 +28,17 @@ TOOLCHAIN_WRAPPER_OPTS += -ffile-prefix-map=$(BASE_DIR)=buildroot else TOOLCHAIN_WRAPPER_OPTS += -D__FILE__=\"\" -D__BASE_FILE__=\"\" -Wno-builtin-macro-redefined endif +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),) +TOOLCHAIN_WRAPPER_OPTS += -DBR_NEED_SOURCE_DATE_EPOCH +endif +endif + +# Disable -ftree-loop-distribute-patterns on microblaze to +# workaround a compiler bug with gcc 10 and -O2, -Os or -O3. +# https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=5879ab5fafedc8f6f9bfe95a4cf8501b0df90edd +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97208 +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10)$(BR2_microblaze),yy) +TOOLCHAIN_WRAPPER_OPTS += -fno-tree-loop-distribute-patterns endif # We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each flag is a diff --git a/utils/check-package b/utils/check-package index 52317e02f4..dd18d19c25 100755 --- a/utils/check-package +++ b/utils/check-package @@ -46,24 +46,24 @@ def parse_args(): return parser.parse_args() -CONFIG_IN_FILENAME = re.compile("Config\.\S*$") -DO_CHECK_INTREE = re.compile("|".join([ - "Config.in", - "arch/", - "boot/", - "fs/", - "linux/", - "package/", - "system/", - "toolchain/", +CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") +DO_CHECK_INTREE = re.compile(r"|".join([ + r"Config.in", + r"arch/", + r"boot/", + r"fs/", + r"linux/", + r"package/", + r"system/", + r"toolchain/", ])) -DO_NOT_CHECK_INTREE = re.compile("|".join([ - "boot/barebox/barebox\.mk$", - "fs/common\.mk$", - "package/doc-asciidoc\.mk$", - "package/pkg-\S*\.mk$", - "toolchain/helpers\.mk$", - "toolchain/toolchain-external/pkg-toolchain-external\.mk$", +DO_NOT_CHECK_INTREE = re.compile(r"|".join([ + r"boot/barebox/barebox\.mk$", + r"fs/common\.mk$", + r"package/doc-asciidoc\.mk$", + r"package/pkg-\S*\.mk$", + r"toolchain/helpers\.mk$", + r"toolchain/toolchain-external/pkg-toolchain-external\.mk$", ])) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 55c8589d71..c348eec399 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -152,8 +152,8 @@ class CommentsMenusPackagesOrder(_CheckFunction): class HelpText(_CheckFunction): - HELP_TEXT_FORMAT = re.compile("^\t .{,62}$") - URL_ONLY = re.compile("^(http|https|git)://\S*$") + HELP_TEXT_FORMAT = re.compile(r"^\t .{,62}$") + URL_ONLY = re.compile(r"^(http|https|git)://\S*$") def before(self): self.help_text = False diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index a0caf84636..0278354434 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -16,16 +16,17 @@ from checkpackagelib.lib import Utf8Characters # noqa: F401 # used in more than one check start_conditional = ["ifdef", "ifeq", "ifndef", "ifneq"] +continue_conditional = ["elif", "else"] end_conditional = ["endif"] class Indent(_CheckFunction): - COMMENT = re.compile("^\s*#") - CONDITIONAL = re.compile("^\s*({})\s".format("|".join(start_conditional + end_conditional))) + COMMENT = re.compile(r"^\s*#") + CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional))) ENDS_WITH_BACKSLASH = re.compile(r"^[^#].*\\$") - END_DEFINE = re.compile("^\s*endef\s") - MAKEFILE_TARGET = re.compile("^[^# \t]+:\s") - START_DEFINE = re.compile("^\s*define\s") + END_DEFINE = re.compile(r"^\s*endef\s") + MAKEFILE_TARGET = re.compile(r"^[^# \t]+:\s") + START_DEFINE = re.compile(r"^\s*define\s") def before(self): self.define = False @@ -43,7 +44,7 @@ class Indent(_CheckFunction): expect_tabs = False if self.define or self.backslash or self.makefile_target: expect_tabs = True - if self.CONDITIONAL.search(text): + if not self.backslash and self.CONDITIONAL.search(text): expect_tabs = False # calculate for next line @@ -76,17 +77,17 @@ class Indent(_CheckFunction): class OverriddenVariable(_CheckFunction): - CONCATENATING = re.compile("^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") - END_CONDITIONAL = re.compile("^\s*({})".format("|".join(end_conditional))) + CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") + END_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(end_conditional))) OVERRIDING_ASSIGNMENTS = [':=', "="] - START_CONDITIONAL = re.compile("^\s*({})".format("|".join(start_conditional))) - VARIABLE = re.compile("^([A-Z0-9_]+)\s*((\+|:|)=)") - USUALLY_OVERRIDDEN = re.compile("^[A-Z0-9_]+({})".format("|".join([ - "_ARCH\s*=\s*", - "_CPU\s*=\s*", - "_SITE\s*=\s*", - "_SOURCE\s*=\s*", - "_VERSION\s*=\s*"]))) + START_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(start_conditional))) + VARIABLE = re.compile(r"^([A-Z0-9_]+)\s*((\+|:|)=)") + USUALLY_OVERRIDDEN = re.compile(r"^[A-Z0-9_]+({})".format("|".join([ + r"_ARCH\s*=\s*", + r"_CPU\s*=\s*", + r"_SITE\s*=\s*", + r"_SOURCE\s*=\s*", + r"_VERSION\s*=\s*"]))) def before(self): self.conditional = 0 @@ -174,7 +175,7 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction): package_upper = package.replace("-", "_").upper() self.package = package self.FIND_SOURCE = re.compile( - "^{}_SOURCE\s*=\s*{}-\$\({}_VERSION\)\.tar\.gz" + r"^{}_SOURCE\s*=\s*{}-\$\({}_VERSION\)\.tar\.gz" .format(package_upper, package, package_upper)) def check_line(self, lineno, text): @@ -222,7 +223,7 @@ class TrailingBackslash(_CheckFunction): class TypoInPackageVariable(_CheckFunction): - ALLOWED = re.compile("|".join([ + ALLOWED = re.compile(r"|".join([ "ACLOCAL_DIR", "ACLOCAL_HOST_DIR", "ACLOCAL_PATH", @@ -241,7 +242,7 @@ class TypoInPackageVariable(_CheckFunction): "TARGET_FINALIZE_HOOKS", "TARGETS_ROOTFS", "XTENSA_CORE_NAME"])) - VARIABLE = re.compile("^([A-Z0-9_]+_[A-Z0-9_]+)\s*(\+|)=") + VARIABLE = re.compile(r"^([A-Z0-9_]+_[A-Z0-9_]+)\s*(\+|)=") def before(self): package, _ = os.path.splitext(os.path.basename(self.filename)) @@ -251,9 +252,9 @@ class TypoInPackageVariable(_CheckFunction): # linux extensions do not use LINUX_EXT_ prefix for variables package = package.replace("LINUX_EXT_", "") self.package = package - self.REGEX = re.compile("^(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package)) + self.REGEX = re.compile(r"^(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package)) self.FIND_VIRTUAL = re.compile( - "^{}_PROVIDES\s*(\+|)=\s*(.*)".format(package)) + r"^{}_PROVIDES\s*(\+|)=\s*(.*)".format(package)) self.virtual = [] def check_line(self, lineno, text): @@ -281,16 +282,16 @@ class TypoInPackageVariable(_CheckFunction): class UselessFlag(_CheckFunction): - DEFAULT_AUTOTOOLS_FLAG = re.compile("^.*{}".format("|".join([ - "_AUTORECONF\s*=\s*NO", - "_LIBTOOL_PATCH\s*=\s*YES"]))) - DEFAULT_GENERIC_FLAG = re.compile("^.*{}".format("|".join([ - "_INSTALL_IMAGES\s*=\s*NO", - "_INSTALL_REDISTRIBUTE\s*=\s*YES", - "_INSTALL_STAGING\s*=\s*NO", - "_INSTALL_TARGET\s*=\s*YES"]))) - END_CONDITIONAL = re.compile("^\s*({})".format("|".join(end_conditional))) - START_CONDITIONAL = re.compile("^\s*({})".format("|".join(start_conditional))) + DEFAULT_AUTOTOOLS_FLAG = re.compile(r"^.*{}".format("|".join([ + r"_AUTORECONF\s*=\s*NO", + r"_LIBTOOL_PATCH\s*=\s*YES"]))) + DEFAULT_GENERIC_FLAG = re.compile(r"^.*{}".format("|".join([ + r"_INSTALL_IMAGES\s*=\s*NO", + r"_INSTALL_REDISTRIBUTE\s*=\s*YES", + r"_INSTALL_STAGING\s*=\s*NO", + r"_INSTALL_TARGET\s*=\s*YES"]))) + END_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(end_conditional))) + START_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(start_conditional))) def before(self): self.conditional = 0 diff --git a/utils/checkpackagelib/lib_patch.py b/utils/checkpackagelib/lib_patch.py index 438353ad3b..e4e914b7f0 100644 --- a/utils/checkpackagelib/lib_patch.py +++ b/utils/checkpackagelib/lib_patch.py @@ -11,7 +11,7 @@ from checkpackagelib.lib import NewlineAtEof # noqa: F401 class ApplyOrder(_CheckFunction): - APPLY_ORDER = re.compile("\d{1,4}-[^/]*$") + APPLY_ORDER = re.compile(r"\d{1,4}-[^/]*$") def before(self): if not self.APPLY_ORDER.match(os.path.basename(self.filename)): @@ -21,7 +21,7 @@ class ApplyOrder(_CheckFunction): class NumberedSubject(_CheckFunction): - NUMBERED_PATCH = re.compile("Subject:\s*\[PATCH\s*\d+/\d+\]") + NUMBERED_PATCH = re.compile(r"Subject:\s*\[PATCH\s*\d+/\d+\]") def before(self): self.git_patch = False @@ -44,7 +44,7 @@ class NumberedSubject(_CheckFunction): class Sob(_CheckFunction): - SOB_ENTRY = re.compile("^Signed-off-by: .*$") + SOB_ENTRY = re.compile(r"^Signed-off-by: .*$") def before(self): self.found = False diff --git a/utils/genrandconfig b/utils/genrandconfig index 63ff32cbfb..3db5da442b 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -301,6 +301,22 @@ def fixup_config(sysinfo, configfile): 'BR2_PACKAGE_FLANN=y\n' in configlines: return False + if 'BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y\n' in configlines: + bootenv = os.path.join(args.outputdir, "boot_env.txt") + with open(bootenv, "w+") as bootenvf: + bootenvf.write("prop=value") + configlines.remove('BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE=""\n') + configlines.append('BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="%s"\n' % bootenv) + configlines.remove('BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE=""\n') + configlines.append('BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x1000"\n') + + if 'BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y\n' in configlines: + bootscr = os.path.join(args.outputdir, "boot_script.txt") + with open(bootscr, "w+") as bootscrf: + bootscrf.write("prop=value") + configlines.remove('BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE=""\n') + configlines.append('BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="%s"\n' % bootscr) + with open(configfile, "w+") as configf: configf.writelines(configlines) @@ -341,6 +357,8 @@ def gen_config(args): # Amend the configuration with a few things. if randint(0, 20) == 0: configlines.append("BR2_ENABLE_DEBUG=y\n") + if randint(0, 20) == 0: + configlines.append("BR2_ENABLE_RUNTIME_DEBUG=y\n") if randint(0, 1) == 0: configlines.append("BR2_INIT_BUSYBOX=y\n") elif randint(0, 15) == 0: @@ -351,26 +369,14 @@ def gen_config(args): configlines.append("BR2_STATIC_LIBS=y\n") if randint(0, 20) == 0: configlines.append("BR2_PACKAGE_PYTHON_PY_ONLY=y\n") + if randint(0, 20) == 0: + configlines.append("BR2_PACKAGE_PYTHON3_PY_ONLY=y\n") if randint(0, 5) == 0: configlines.append("BR2_OPTIMIZE_2=y\n") if randint(0, 4) == 0: configlines.append("BR2_SYSTEM_ENABLE_NLS=y\n") - if randint(0, 4) == 0: - configlines.append("BR2_PIC_PIE=y\n") - if randint(0, 4) == 0: - configlines.append("BR2_RELRO_FULL=y\n") - elif randint(0, 4) == 0: - configlines.append("BR2_RELRO_PARTIAL=y\n") - if randint(0, 4) == 0: - configlines.append("BR2_SSP_ALL=y\n") - elif randint(0, 4) == 0: - configlines.append("BR2_SSP_REGULAR=y\n") - elif randint(0, 4) == 0: - configlines.append("BR2_SSP_STRONG=y\n") if randint(0, 4) == 0: configlines.append("BR2_FORTIFY_SOURCE_2=y\n") - elif randint(0, 4) == 0: - configlines.append("BR2_FORTIFY_SOURCE_1=y\n") # Randomly enable BR2_REPRODUCIBLE 10% of times # also enable tar filesystem images for testing diff --git a/utils/get-developers b/utils/get-developers index 750fc556dc..9182b2d85f 100755 --- a/utils/get-developers +++ b/utils/get-developers @@ -3,7 +3,6 @@ import argparse import getdeveloperlib import sys -import os def parse_args(): @@ -45,10 +44,6 @@ def __main__(): print("No action specified") return - # getdeveloperlib expects to be executed from the toplevel buildroot - # directory, which is one level up from this script - os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..')) - devs = getdeveloperlib.parse_developers() if devs is None: sys.exit(1) @@ -75,11 +70,9 @@ def __main__(): # Handle the files action if args.files is not None: - args.files = [os.path.abspath(f) for f in args.files] for dev in devs: - for devfile in dev.files: - commonfiles = [f for f in args.files if f.startswith(devfile)] - if commonfiles: + for f in args.files: + if dev.hasfile(f): print(dev.name) break diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index 239ffa340b..e686bc793f 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -1,4 +1,5 @@ from __future__ import print_function +from io import open import os import re import glob @@ -6,11 +7,13 @@ import subprocess import sys import unittest +brpath = os.path.normpath(os.path.join(os.path.dirname(__file__), "..")) + # # Patch parsing functions # -FIND_INFRA_IN_PATCH = re.compile("^\+\$\(eval \$\((host-)?([^-]*)-package\)\)$") +FIND_INFRA_IN_PATCH = re.compile(r"^\+\$\(eval \$\((host-)?([^-]*)-package\)\)$") def analyze_patch(patch): @@ -33,7 +36,7 @@ def analyze_patch(patch): return (files, infras) -FIND_INFRA_IN_MK = re.compile("^\$\(eval \$\((host-)?([^-]*)-package\)\)$") +FIND_INFRA_IN_MK = re.compile(r"^\$\(eval \$\((host-)?([^-]*)-package\)\)$") def fname_get_package_infra(fname): @@ -54,17 +57,6 @@ def fname_get_package_infra(fname): return None -def get_infras(files): - """Search in the list of files for .mk files, and collect the package - infrastructures used by those .mk files.""" - infras = set() - for fname in files: - infra = fname_get_package_infra(fname) - if infra: - infras.add(infra) - return infras - - def analyze_patches(patches): """Parse a list of patches and returns the list of files modified, added or removed by the patches, as well as the list of package @@ -75,7 +67,6 @@ def analyze_patches(patches): (files, infras) = analyze_patch(patch) allfiles = allfiles | files allinfras = allinfras | infras - allinfras = allinfras | get_infras(allfiles) return (allfiles, allinfras) @@ -94,14 +85,14 @@ def get_all_test_cases(suite): yield (suite.__module__, suite.__class__.__name__) -def list_unittests(path): +def list_unittests(): """Use the unittest module to retreive all test cases from a given directory""" loader = unittest.TestLoader() - suite = loader.discover(path) + suite = loader.discover(os.path.join(brpath, "support", "testing")) tests = {} for module, test in get_all_test_cases(suite): - module_path = os.path.join(path, *module.split('.')) + module_path = os.path.join("support", "testing", *module.split('.')) tests.setdefault(module_path, []).append('%s.%s' % (module, test)) return tests @@ -124,7 +115,6 @@ class Developer: self.defconfigs = parse_developer_defconfigs(files) def hasfile(self, f): - f = os.path.abspath(f) for fs in self.files: if f.startswith(fs): return True @@ -157,7 +147,7 @@ def parse_developer_packages(fnames): patterns, and return a list of those packages.""" packages = set() for fname in fnames: - for root, dirs, files in os.walk(fname): + for root, dirs, files in os.walk(os.path.join(brpath, fname)): for f in files: path = os.path.join(root, f) if fname_get_package_infra(path): @@ -178,7 +168,7 @@ def parse_arches_from_config_in(fname): parsing_arches = True continue if parsing_arches: - m = re.match("^\s*default \"([^\"]*)\".*", line) + m = re.match(r"^\s*default \"([^\"]*)\".*", line) if m: arches.add(m.group(1)) else: @@ -192,7 +182,7 @@ def parse_developer_architectures(fnames): developer is working on.""" arches = set() for fname in fnames: - if not re.match("^.*/arch/Config\.in\..*$", fname): + if not re.match(r"^.*/arch/Config\.in\..*$", fname): continue arches = arches | parse_arches_from_config_in(fname) return arches @@ -201,7 +191,7 @@ def parse_developer_architectures(fnames): def parse_developer_infras(fnames): infras = set() for fname in fnames: - m = re.match("^package/pkg-([^.]*).mk$", fname) + m = re.match(r"^package/pkg-([^.]*).mk$", fname) if m: infras.add(m.group(1)) return infras @@ -222,7 +212,7 @@ def parse_developer_runtime_tests(fnames): # List all files recursively for fname in fnames: if os.path.isdir(fname): - for root, _dirs, files in os.walk(fname): + for root, _dirs, files in os.walk(os.path.join(brpath, fname)): all_files += [os.path.join(root, f) for f in files] else: all_files.append(fname) @@ -236,15 +226,14 @@ def parse_developer_runtime_tests(fnames): return runtimes -def parse_developers(basepath=None): +def parse_developers(): """Parse the DEVELOPERS file and return a list of Developer objects.""" developers = [] linen = 0 - if basepath is None: - basepath = os.getcwd() global unittests - unittests = list_unittests(os.path.join(basepath, 'support/testing')) - with open(os.path.join(basepath, "DEVELOPERS"), "r") as f: + unittests = list_unittests() + developers_fname = os.path.join(brpath, 'DEVELOPERS') + with open(developers_fname, mode='r', encoding='utf_8') as f: files = [] name = None for line in f: @@ -258,11 +247,14 @@ def parse_developers(basepath=None): name = line[2:].strip() elif line.startswith("F:"): fname = line[2:].strip() - dev_files = glob.glob(os.path.join(basepath, fname)) + dev_files = glob.glob(os.path.join(brpath, fname)) if len(dev_files) == 0: print("WARNING: '%s' doesn't match any file" % fname, file=sys.stderr) - files += dev_files + for f in dev_files: + dev_file = os.path.relpath(f, brpath) + dev_file = dev_file.replace(os.sep, '/') # force unix sep + files.append(dev_file) elif line == "": if not name: continue @@ -286,12 +278,12 @@ def check_developers(developers, basepath=None): if basepath is None: basepath = os.getcwd() cmd = ["git", "--git-dir", os.path.join(basepath, ".git"), "ls-files"] - files = subprocess.check_output(cmd).strip().split("\n") + files = subprocess.check_output(cmd).decode(sys.stdout.encoding).strip().split("\n") unhandled_files = [] for f in files: handled = False for d in developers: - if d.hasfile(os.path.join(basepath, f)): + if d.hasfile(f): handled = True break if not handled: diff --git a/utils/scancpan b/utils/scancpan index 327a58fc78..075f193563 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -488,9 +488,9 @@ use Digest::SHA qw(sha256_hex); use Text::Wrap; $Text::Wrap::columns = 62; -# Below, 5.030 should be aligned with the version of perl actually +# Below, 5.032 should be aligned with the version of perl actually # bundled in Buildroot: -die <<"MSG" if $] < 5.030; +die <<"MSG" if $] < 5.032; This script needs a host perl with the same major version as Buildroot target perl. Your current host perl is: @@ -498,7 +498,7 @@ Your current host perl is: version $] You may install a local one by running: - perlbrew install perl-5.30.0 + perlbrew install perl-5.32.0 MSG my ($help, $man, $quiet, $force, $recommend, $test, $host); @@ -567,7 +567,7 @@ sub find_license_files { foreach (split /\n/, $manifest) { next if m|/|; s|\s+.*$||; - push @license_files, $_ if m/(ARTISTIC|COPYING|COPYRIGHT|LICENSE|LICENCE)/i; + push @license_files, $_ if m/(ARTISTIC|COPYING|COPYRIGHT|GPL\S*|LICENSE|LICENCE)/i; } if (scalar @license_files == 0 && $manifest =~ m/(README)[\n\s]/i) { @license_files = ($1); @@ -575,6 +575,9 @@ sub find_license_files { if (scalar @license_files == 0 && $manifest =~ m/(README\.md)[\n\s]/i) { @license_files = ($1); } + if (scalar @license_files == 0 && $manifest =~ m/(README\.pod)[\n\s]/i) { + @license_files = ($1); + } return @license_files; } @@ -964,7 +967,7 @@ in order to work with the right CoreList data. =head1 LICENSE -Copyright (C) 2013-2019 by Francois Perrad +Copyright (C) 2013-2020 by Francois Perrad This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/utils/scanpypi b/utils/scanpypi index 212dbea85e..1f3326cf4d 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Utility for building Buildroot packages for existing PyPI packages @@ -6,8 +6,6 @@ Utility for building Buildroot packages for existing PyPI packages Any package built by scanpypi should be manually checked for errors. """ -from __future__ import print_function -from __future__ import absolute_import import argparse import json import sys @@ -96,10 +94,10 @@ def pkg_buildroot_name(pkg_name): Keyword arguments: pkg_name -- String to rename """ - name = re.sub('[^\w-]', '', pkg_name.lower()) + name = re.sub(r'[^\w-]', '', pkg_name.lower()) name = name.replace('_', '-') prefix = 'python-' - pattern = re.compile('^(?!' + prefix + ')(.+?)$') + pattern = re.compile(r'^(?!' + prefix + ')(.+?)$') name = pattern.sub(r'python-\1', name) return name @@ -297,9 +295,9 @@ class BuildrootPackage(): """ current_dir = os.getcwd() os.chdir(self.tmp_extract) - sys.path.append(self.tmp_extract) + sys.path.insert(0, self.tmp_extract) s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) - setup = imp.load_module('setup', s_file, s_path, s_desc) + imp.load_module('__main__', s_file, s_path, s_desc) if self.metadata_name in self.setup_args: pass elif self.metadata_name.replace('_', '-') in self.setup_args: @@ -309,19 +307,10 @@ class BuildrootPackage(): try: self.setup_metadata = self.setup_args[self.metadata_name] except KeyError: - # This means setup was not called which most likely mean that it is - # called through the if __name__ == '__main__' directive. - # In this case, we can only pray that it is called through a - # function called main() in setup.py. - setup.main() # Will raise AttributeError if not found - self.setup_metadata = self.setup_args[self.metadata_name] - # Here we must remove the module the hard way. - # We must do this because of a very specific case: if a package calls - # setup from the __main__ but does not come with a 'main()' function, - # for some reason setup.main() will successfully call the main - # function of a previous package... - sys.modules.pop('setup', None) - del setup + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise os.chdir(current_dir) sys.path.remove(self.tmp_extract) @@ -337,7 +326,7 @@ class BuildrootPackage(): self.pkg_req = None return set() self.pkg_req = self.setup_metadata['install_requires'] - self.pkg_req = [re.sub('([-.\w]+).*', r'\1', req) + self.pkg_req = [re.sub(r'([-.\w]+).*', r'\1', req) for req in self.pkg_req] # get rid of commented lines and also strip the package strings @@ -451,7 +440,7 @@ class BuildrootPackage(): "Mozilla Public License 2.0": "MPL-2.0", "Zope Public License": "ZPL" } - regexp = re.compile('^License :* *.* *:+ (.*)( \(.*\))?$') + regexp = re.compile(r'^License :* *.* *:+ (.*)( \(.*\))?$') classifiers_licenses = [regexp.sub(r"\1", lic) for lic in self.metadata['info']['classifiers'] if regexp.match(lic)] @@ -495,8 +484,8 @@ class BuildrootPackage(): """ lines = [] - filenames = ['LICENCE', 'LICENSE', 'LICENSE.RST', 'LICENSE.TXT', - 'COPYING', 'COPYING.TXT'] + filenames = ['LICENCE', 'LICENSE', 'LICENSE.MD', 'LICENSE.RST', + 'LICENSE.TXT', 'COPYING', 'COPYING.TXT'] self.license_files = list(find_file_upper_case(filenames, self.tmp_extract)) lines.append(self.__get_license_names(self.license_files)) @@ -706,7 +695,7 @@ def main(): else: raise continue - except AttributeError as error: + except (AttributeError, KeyError) as error: print('Error: Could not install package {pkg}: {error}'.format( pkg=package.real_name, error=error)) continue