devel/libvirt: update to 12.1.0

Sponsored by:	The FreeBSD Foundation

4 files changed, 38 insertions, 14 deletions

diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 6e2f3a263770..9ef329749e89 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -1,13 +1,9 @@
 PORTNAME=	libvirt
-DISTVERSION=	12.0.0
+DISTVERSION=	12.1.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
 
-PATCH_SITES=	https://gitlab.com/libvirt/libvirt/-/commit/
-PATCHFILES+=	2c66b6d72cd48d3cf80f957f55cfb1548feb46c4.patch:-p1 \
-		864a70114fe1dc6c6f58d099f0f1664737cf26e7.patch:-p1
-
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Toolkit to interact with virtualization capabilities
 WWW=		https://libvirt.org/
@@ -147,7 +143,7 @@ USE_PERL5=	build
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
-SHLIB_VER=	0.12000.0
+SHLIB_VER=	0.12001.0
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
 PORTDOCS=	*
 BINARY_ALIAS=	python3=${PYTHON_CMD}
@@ -180,6 +176,7 @@ CONF_FILES=	\
 		libxl.conf \
 		network.conf \
 		qemu.conf \
+		secret.conf \
 		virtbhyved.conf \
 		virtlockd.conf \
 		virtlogd.conf \
diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo
index 4d16fb69e244..909b4d7cfaf8 100644
--- a/devel/libvirt/distinfo
+++ b/devel/libvirt/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1770138713
-SHA256 (libvirt-12.0.0.tar.xz) = bf4e680019c04c45b557dd4a7ef59e952887f74e3c47044fe035a961fb624726
-SIZE (libvirt-12.0.0.tar.xz) = 10272864
-SHA256 (2c66b6d72cd48d3cf80f957f55cfb1548feb46c4.patch) = 256228d4ce6a11588563b9ed211713fd6640c6f62a1308103bd4f47f1629bf09
-SIZE (2c66b6d72cd48d3cf80f957f55cfb1548feb46c4.patch) = 4443
-SHA256 (864a70114fe1dc6c6f58d099f0f1664737cf26e7.patch) = d2245525588788b24748f43a00d9f961d65251ee907984c4fb5ac2fdd09f56b7
-SIZE (864a70114fe1dc6c6f58d099f0f1664737cf26e7.patch) = 1630
+TIMESTAMP = 1772446232
+SHA256 (libvirt-12.1.0.tar.xz) = 3b60040a3670ec014d058ed021ae641e9fa6d3b5c4b56e63e8928f1804ef4b9b
+SIZE (libvirt-12.1.0.tar.xz) = 10450056
diff --git a/devel/libvirt/files/patch-src_secret_meson.build b/devel/libvirt/files/patch-src_secret_meson.build
new file mode 100644
index 000000000000..a6f39657c3ef
--- /dev/null
+++ b/devel/libvirt/files/patch-src_secret_meson.build
@@ -0,0 +1,25 @@
+--- src/secret/meson.build.orig	2026-03-02 17:19:51 UTC
++++ src/secret/meson.build
+@@ -54,13 +54,15 @@ if conf.has('WITH_SECRETS')
+ 
+   virt_secret_init_encryption_conf.set('localstatedir', localstatedir)
+ 
+-  configure_file(
+-    input: 'virt-secret-init-encryption.service.in',
+-    output: '@0@.service'.format('virt-secret-init-encryption'),
+-    configuration: virt_secret_init_encryption_conf,
+-    install: true,
+-    install_dir: unitdir,
+-  )
++  if init_script == 'systemd'
++    configure_file(
++      input: 'virt-secret-init-encryption.service.in',
++      output: '@0@.service'.format('virt-secret-init-encryption'),
++      configuration: virt_secret_init_encryption_conf,
++      install: true,
++      install_dir: unitdir,
++    )
++  endif
+ 
+   virt_daemon_units += {
+     'service': 'virtsecretd',
diff --git a/devel/libvirt/pkg-plist b/devel/libvirt/pkg-plist
index 8d91af9450f2..d8e2d19273ff 100644
--- a/devel/libvirt/pkg-plist
+++ b/devel/libvirt/pkg-plist
@@ -54,6 +54,7 @@ share/man/man8/virtvboxd.8.gz
 @sample %%ETCDIR%%/libvirt.conf.sample
 @sample %%ETCDIR%%/libvirtd.conf.sample
 @sample %%ETCDIR%%/network.conf.sample
+@sample %%ETCDIR%%/secret.conf.sample
 %%BHYVE%%@sample %%ETCDIR%%/virtbhyved.conf.sample
 @sample %%ETCDIR%%/virtlockd.conf.sample
 @sample %%ETCDIR%%/virtlogd.conf.sample
@@ -121,6 +122,7 @@ sbin/libvirtd
 sbin/virtlockd
 sbin/virtlogd
 share/augeas/lenses/libvirt_lockd.aug
+share/augeas/lenses/libvirt_secrets.aug
 share/augeas/lenses/libvirtd.aug
 share/augeas/lenses/libvirtd_network.aug
 %%BHYVE%%share/augeas/lenses/libvirtd_bhyve.aug
@@ -128,6 +130,7 @@ share/augeas/lenses/virtlockd.aug
 share/augeas/lenses/virtlogd.aug
 %%QEMU%%share/augeas/lenses/libvirtd_qemu.aug
 %%QEMU%%share/augeas/lenses/tests/test_libvirt_lockd.aug
+share/augeas/lenses/tests/test_libvirt_secrets.aug
 share/augeas/lenses/tests/test_libvirtd.aug
 share/augeas/lenses/tests/test_libvirtd_network.aug
 %%BHYVE%%share/augeas/lenses/tests/test_virtbhyved.aug
@@ -426,6 +429,7 @@ share/augeas/lenses/virtvboxd.aug
 %%NLS%%share/locale/uk/LC_MESSAGES/libvirt.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/libvirt.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libvirt.mo
+%%NLS%%share/locale/zh_Hant/LC_MESSAGES/libvirt.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/libvirt.mo
 %%BHYVE%%lib/libvirt/connection-driver/libvirt_driver_bhyve.so
 %%QEMU%%lib/libvirt/connection-driver/libvirt_driver_qemu.so
@@ -447,6 +451,7 @@ lib/libvirt/storage-backend/libvirt_storage_backend_fs.so
 %%QEMU%%@dir /var/lib/libvirt/qemu/ram
 %%QEMU%%@dir /var/lib/libvirt/qemu/save
 %%QEMU%%@dir /var/lib/libvirt/qemu/snapshot
+%%QEMU%%@dir /var/lib/libvirt/qemu/varstore
 %%QEMU%%@dir /var/lib/libvirt/qemu
 %%QEMU%%@dir /var/lib/libvirt/swtpm
 %%QEMU%%@dir /var/log/swtpm/libvirt/qemu
@@ -474,9 +479,10 @@ lib/libvirt/storage-backend/libvirt_storage_backend_fs.so
 @dir /var/lib/libvirt/dnsmasq
 @dir /var/lib/libvirt/filesystems
 @dir /var/lib/libvirt/images
-@dir /var/lib/libvirt/lockd/files
 @dir /var/lib/libvirt/lockd
+@dir /var/lib/libvirt/lockd/files
 @dir /var/lib/libvirt/network
+@dir /var/lib/libvirt/secrets
 @dir /var/lib/libvirt
 @dir /var/lib
 @dir /var/log/libvirt/lxc