[pull] master from void-linux:master

common/shlibs

@@ -3974,7 +3974,7 @@ libosdGPU.so.3.6.0 OpenSubdiv-3.6.0_1
 libosdCPU.so.3.6.0 OpenSubdiv-3.6.0_1
 libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
-libcbor.so.0.13 libcbor-0.13.0_1
+libcbor.so.0.14 libcbor-0.14.0_1
 libfido2.so.1 libfido2-1.6.0_2
 libOpenImageDenoise.so.2 openimagedenoise-2.3.0_1
 libcbang0.so cbang-1.6.0_3

srcpkgs/libcbor/template

@@ -1,6 +1,6 @@
 # Template file for 'libcbor'
 pkgname=libcbor
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/PJK/libcbor"
 distfiles="https://github.com/PJK/libcbor/archive/v${version}.tar.gz"
-checksum=95a7f0dd333fd1dce3e4f92691ca8be38227b27887599b21cd3c4f6d6a7abb10
+checksum=a8c1516e741562cf95aa4479c64916c3d4d2623e24fdc35e414e2320e7300aae
 
 post_install() {
 	vlicense LICENSE.md

srcpkgs/libfido2/template

@@ -1,7 +1,7 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.16.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"

srcpkgs/logrotate/files/logrotate.conf

@@ -29,6 +29,12 @@ missingok
 
 include /etc/logrotate.d
 
+/var/log/btmp {
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
+
 /var/log/wtmp {
     monthly
     create 0664 root utmp

srcpkgs/logrotate/template

@@ -1,7 +1,7 @@
 # Template file for 'logrotate'
 pkgname=logrotate
 version=3.22.0
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="acl-devel popt-devel"
 conf_files="/etc/logrotate.conf"

srcpkgs/qemu/template

@@ -2,7 +2,7 @@
 # This package should be updated together with qemu-user
 pkgname=qemu
 version=10.2.0
-revision=1
+revision=2
 build_style=configure
 metapackage=yes
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec

srcpkgs/sway/template

@@ -1,14 +1,15 @@
 # Template file for 'sway'
 pkgname=sway
 version=1.11
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="wlroots0.19-devel pcre2-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel libevdev-devel"
-depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
+depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1
+ virtual?font:sans-serif"
 short_desc="Tiling Wayland compositor compatible with i3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

srcpkgs/swayfx/template

@@ -1,14 +1,15 @@
 # Template file for 'swayfx'
 pkgname=swayfx
 version=0.5.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="wlroots0.19-devel pcre2-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel libevdev-devel scenefx-devel"
-depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
+depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1
+ virtual?font:sans-serif"
 short_desc="Sway, but with eye candy!"
 maintainer="Till Mahlburg <mahlburg@posteo.de>"
 license="MIT"

srcpkgs/zellij/template

@@ -1,20 +1,20 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.44.0
+version=0.44.1
 revision=1
 build_style=cargo
 build_helper=qemu
 configure_args="--no-default-features --features=plugins_from_target,web_server_capability"
 hostmakedepends="pkg-config"
-makedepends="libcurl-devel openssl-devel sqlite-devel"
+makedepends="libcurl-devel sqlite-devel"
 checkdepends="libssh2-devel"
 short_desc="Terminal workspace with batteries included"
 maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
 license="MIT"
 homepage="https://zellij.dev"
 changelog="https://raw.githubusercontent.com/zellij-org/zellij/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/refs/tags/v${version}.tar.gz"
-checksum=be413dc49d7bff1be6502a1998664b015b77ad55636d72e0497cfc66d4a4cdf6
+checksum=a7fb97e7d32c7be977cdc977d4f03a3b6bdb054251b3f2c36bf143671e4a7f08
 make_check_pre="env LIBSSH2_SYS_USE_PKG_CONFIG=1"
 
 post_install() {