[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 5 commits: changelog: Create entry for 9.9.0-1
Andrea Bolognani (@abologna)
gitlab at salsa.debian.org
Mon Nov 6 22:43:07 GMT 2023
Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt
Commits:
ad0f4684 by Andrea Bolognani at 2023-11-04T00:02:44+01:00
changelog: Create entry for 9.9.0-1
Gbp-Dch: Ignore
- - - - -
a1e9ca62 by Andrea Bolognani at 2023-11-04T00:34:45+01:00
copyright: Update copyright information
Gbp-Dch: Ignore
- - - - -
c0370cf8 by Andrea Bolognani at 2023-11-04T00:34:45+01:00
symbols: Bump symbol versions
No new public symbols.
Gbp-Dch: Ignore
- - - - -
80870c1a by Andrea Bolognani at 2023-11-04T00:34:55+01:00
patches: Drop obsolete patches
Specifically
* backport/meson-Improve-nbdkit-configurability.patch
* forward/meson-Fix-XDR-check-for-GNU-Hurd.patch
both of which are part of the 9.9.0 upstream release.
- - - - -
85539e59 by Andrea Bolognani at 2023-11-04T00:36:48+01:00
Document changes and release 9.9.0-1
- - - - -
6 changed files:
- debian/changelog
- debian/copyright
- debian/libvirt0.symbols
- − debian/patches/backport/meson-Improve-nbdkit-configurability.patch
- − debian/patches/forward/meson-Fix-XDR-check-for-GNU-Hurd.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libvirt (9.9.0-1) unstable; urgency=medium
+
+ * [df62dc1] New upstream version 9.9.0
+ * [80870c1] patches: Drop obsolete patches
+ - backport/meson-Improve-nbdkit-configurability.patch
+ - forward/meson-Fix-XDR-check-for-GNU-Hurd.patch
+
+ -- Andrea Bolognani <eof at kiyuko.org> Sat, 04 Nov 2023 00:36:00 +0100
+
libvirt (9.8.0-2) unstable; urgency=medium
[ Michal Maloszewski ]
=====================================
debian/copyright
=====================================
@@ -13,6 +13,10 @@ Copyright: 2008-2019 Red Hat, Inc.
2001-2022 Free Software Foundation, Inc.
License: GPL-3.0+
+Files: src/ch/ch_capabilities.*
+Copyright: 2023 Microsoft Corp.
+License: LGPL-2.1+
+
Files: src/conf/*
Copyright: 2005-2019 Red Hat, Inc
2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
=====================================
debian/libvirt0.symbols
=====================================
@@ -99,7 +99,7 @@ libvirt.so.0 libvirt0 #MINVER#
*@LIBVIRT_8.5.0 8.5.0
*@LIBVIRT_9.0.0 9.0.0
*@LIBVIRT_9.7.0 9.7.0
- *@LIBVIRT_PRIVATE_9.8.0 9.8.0
+ *@LIBVIRT_PRIVATE_9.9.0 9.9.0
libvirt-qemu.so.0 libvirt0 #MINVER#
*@LIBVIRT_QEMU_0.8.3 0.8.3
@@ -117,4 +117,4 @@ libvirt-admin.so.0 libvirt0 #MINVER#
*@LIBVIRT_ADMIN_2.0.0 2.0.0~rc1
*@LIBVIRT_ADMIN_3.0.0 3.0.0
*@LIBVIRT_ADMIN_8.6.0 8.9.0
- *@LIBVIRT_ADMIN_PRIVATE_9.8.0 9.8.0
+ *@LIBVIRT_ADMIN_PRIVATE_9.9.0 9.9.0
=====================================
debian/patches/backport/meson-Improve-nbdkit-configurability.patch deleted
=====================================
@@ -1,243 +0,0 @@
-From: Andrea Bolognani <abologna at redhat.com>
-Date: Thu, 5 Oct 2023 00:37:09 +0200
-Subject: meson: Improve nbdkit configurability
-
-Currently, nbdkit support will automatically be enabled as long as
-the pidfd_open(2) syscall is available. Optionally, libnbd is used
-to generate more user-friendly error messages.
-
-In theory this is all good, since use of nbdkit is supposed to be
-transparent to the user. In practice, however, there is a problem:
-if support for it is enabled at build time and the necessary
-runtime components are installed, nbdkit will always be preferred,
-with no way for the user to opt out.
-
-This will arguably be fine in the long run, but right now none of
-the platforms that we target ships with a SELinux policy that
-allows libvirt to launch nbdkit, and the AppArmor policy that we
-maintain ourselves hasn't been updated either.
-
-So, in practice, as of today having nbdkit installed on the host
-makes network disks completely unusable unless you're willing to
-compromise the overall security of the system by disabling
-SELinux/AppArmor.
-
-In order to make the transition smoother, provide a convenient
-way for users and distro packagers to disable nbdkit support at
-compile time until SELinux and AppArmor are ready.
-
-In the process, detection is completely overhauled. libnbd is
-made mandatory when nbdkit support is enabled, since availability
-across operating systems is comparable and offering users the
-option to make error messages worse doesn't make a lot of sense;
-we also make sure that an explicit request from the user to
-enable/disable nbdkit support is either complied with, or results
-in a build failure when that's not possible. Last but not least,
-we avoid linking against libnbd when nbdkit support is disabled.
-
-At the RPM level, we disable the feature when building against
-anything older than Fedora 40, which still doesn't have the
-necessary SELinux bits but will hopefully gain them by the time
-it's released. We also allow nbdkit support to be disabled at
-build time the same way as other optional features, that is, by
-passing "--define '_without_nbdkit 1'" to rpmbuild. Finally, if
-nbdkit support has been disabled, installing libvirt will no
-longer drag it in as a (weak) dependency.
-
-Signed-off-by: Andrea Bolognani <abologna at redhat.com>
-Reviewed-by: Jonathon Jongsma <jjongsma at redhat.com>
-(cherry picked from commit 7cbd8c42305735375b60abf8abc47838a7a050d4)
-
-Forwarded: not-needed
-Origin: https://gitlab.com/libvirt/libvirt/-/commit/7cbd8c42305735375b60abf8abc47838a7a050d4
----
- libvirt.spec.in | 28 +++++++++++++++++++++++++---
- meson.build | 29 +++++++++++++++++++++--------
- meson_options.txt | 2 +-
- src/qemu/qemu_nbdkit.c | 6 +++---
- 4 files changed, 50 insertions(+), 15 deletions(-)
-
-diff --git a/libvirt.spec.in b/libvirt.spec.in
-index f3d21cc..fe54c45 100644
---- a/libvirt.spec.in
-+++ b/libvirt.spec.in
-@@ -95,6 +95,7 @@
- %define with_fuse 0
- %define with_sanlock 0
- %define with_numad 0
-+%define with_nbdkit 0
- %define with_firewalld_zone 0
- %define with_netcf 0
- %define with_libssh2 0
-@@ -173,6 +174,18 @@
- %endif
- %endif
-
-+# We should only enable nbdkit support if the OS ships a SELinux policy that
-+# allows libvirt to launch it. Right now that's not the case anywhere, but
-+# things should be fine by the time Fedora 40 is released.
-+#
-+# TODO: add RHEL 9 once a minor release that contains the necessary SELinux
-+# bits exists (we only support the most recent minor release)
-+%if %{with_qemu}
-+ %if 0%{?fedora} >= 40
-+ %define with_nbdkit 0%{!?_without_nbdkit:1}
-+ %endif
-+%endif
-+
- %ifarch %{arches_dmidecode}
- %define with_dmidecode 0%{!?_without_dmidecode:1}
- %endif
-@@ -312,6 +325,9 @@ BuildRequires: util-linux
- BuildRequires: libacl-devel
- # From QEMU RPMs, used by virstoragetest
- BuildRequires: /usr/bin/qemu-img
-+%endif
-+# nbdkit support requires libnbd
-+%if %{with_nbdkit}
- BuildRequires: libnbd-devel
- %endif
- # For LVM drivers
-@@ -769,9 +785,11 @@ Requires: numad
- Recommends: passt
- Recommends: passt-selinux
- %endif
-+ %if %{with_nbdkit}
- Recommends: nbdkit
- Recommends: nbdkit-curl-plugin
- Recommends: nbdkit-ssh-plugin
-+ %endif
-
- %description daemon-driver-qemu
- The qemu driver plugin for the libvirtd daemon, providing
-@@ -1078,10 +1096,8 @@ exit 1
-
- %if %{with_qemu}
- %define arg_qemu -Ddriver_qemu=enabled
-- %define arg_libnbd -Dlibnbd=enabled
- %else
- %define arg_qemu -Ddriver_qemu=disabled
-- %define arg_libnbd -Dlibnbd=disabled
- %endif
-
- %if %{with_openvz}
-@@ -1158,6 +1174,12 @@ exit 1
- %define arg_numad -Dnumad=disabled
- %endif
-
-+%if %{with_nbdkit}
-+ %define arg_nbdkit -Dnbdkit=enabled
-+%else
-+ %define arg_nbdkit -Dnbdkit=disabled
-+%endif
-+
- %if %{with_fuse}
- %define arg_fuse -Dfuse=enabled
- %else
-@@ -1270,7 +1292,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
- -Dyajl=enabled \
- %{?arg_sanlock} \
- -Dlibpcap=enabled \
-- %{?arg_libnbd} \
-+ %{?arg_nbdkit} \
- -Dlibnl=enabled \
- -Daudit=enabled \
- -Ddtrace=enabled \
-diff --git a/meson.build b/meson.build
-index ca5633c..1529cea 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1011,10 +1011,27 @@ endif
- libiscsi_version = '1.18.0'
- libiscsi_dep = dependency('libiscsi', version: '>=' + libiscsi_version, required: get_option('libiscsi'))
-
--libnbd_version = '1.0'
--libnbd_dep = dependency('libnbd', version: '>=' + libnbd_version, required: get_option('libnbd'))
--if libnbd_dep.found()
-- conf.set('WITH_LIBNBD', 1)
-+if not get_option('nbdkit').disabled()
-+ libnbd_version = '1.0'
-+ libnbd_dep = dependency('libnbd', version: '>=' + libnbd_version, required: false)
-+
-+ nbdkit_requested = get_option('nbdkit').enabled()
-+ nbdkit_syscall_ok = conf.has('WITH_DECL_SYS_PIDFD_OPEN')
-+ nbdkit_libnbd_ok = libnbd_dep.found()
-+
-+ if not nbdkit_syscall_ok and nbdkit_requested
-+ error('nbdkit support requires pidfd_open(2)')
-+ endif
-+ if not nbdkit_libnbd_ok and nbdkit_requested
-+ error('nbdkit support requires libnbd')
-+ endif
-+
-+ if nbdkit_syscall_ok and nbdkit_libnbd_ok
-+ conf.set('WITH_NBDKIT', 1)
-+ endif
-+endif
-+if not conf.has('WITH_NBDKIT')
-+ libnbd_dep = dependency('', required: false)
- endif
-
- libnl_version = '3.0'
-@@ -2024,10 +2041,6 @@ endif
-
- conf.set_quoted('TLS_PRIORITY', get_option('tls_priority'))
-
--if conf.has('WITH_DECL_SYS_PIDFD_OPEN')
-- conf.set('WITH_NBDKIT', 1)
--endif
--
- # Various definitions
-
- # Python3 < 3.7 treats the C locale as 7-bit only. We must force env vars so
-diff --git a/meson_options.txt b/meson_options.txt
-index ba6e49a..7c428a9 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -25,7 +25,6 @@ option('curl', type: 'feature', value: 'auto', description: 'curl support')
- option('fuse', type: 'feature', value: 'auto', description: 'fuse support')
- option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support')
- option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi support')
--option('libnbd', type: 'feature', value: 'auto', description: 'libnbd support')
- option('libnl', type: 'feature', value: 'auto', description: 'libnl support')
- option('libpcap', type: 'feature', value: 'auto', description: 'libpcap support')
- option('libssh', type: 'feature', value: 'auto', description: 'libssh support')
-@@ -105,6 +104,7 @@ option('loader_nvram', type: 'string', value: '', description: 'Pass list of pai
- option('login_shell', type: 'feature', value: 'auto', description: 'build virt-login-shell')
- option('nss', type: 'feature', value: 'auto', description: 'enable Name Service Switch plugin for resolving guest IP addresses')
- option('numad', type: 'feature', value: 'auto', description: 'use numad to manage CPU placement dynamically')
-+option('nbdkit', type: 'feature', value: 'auto', description: 'use nbdkit to access network disks')
- option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils for power management')
- option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether to install sysctl configs')
- option('tls_priority', type: 'string', value: 'NORMAL', description: 'set the default TLS session priority string')
-diff --git a/src/qemu/qemu_nbdkit.c b/src/qemu/qemu_nbdkit.c
-index 17819ca..3ad63cf 100644
---- a/src/qemu/qemu_nbdkit.c
-+++ b/src/qemu/qemu_nbdkit.c
-@@ -19,7 +19,7 @@
-
- #include <config.h>
- #include <glib.h>
--#if WITH_LIBNBD
-+#if WITH_NBDKIT
- # include <libnbd.h>
- #endif
- #include <sys/syscall.h>
-@@ -1159,7 +1159,7 @@ qemuNbdkitProcessStart(qemuNbdkitProcess *proc,
- g_autofree char *basename = g_strdup_printf("%s-nbdkit-%i", vm->def->name, proc->source->id);
- int logfd = -1;
- g_autoptr(qemuLogContext) logContext = NULL;
--#if WITH_LIBNBD
-+#if WITH_NBDKIT
- struct nbd_handle *nbd = NULL;
- #endif
-
-@@ -1214,7 +1214,7 @@ qemuNbdkitProcessStart(qemuNbdkitProcess *proc,
-
- while (virTimeBackOffWait(&timebackoff)) {
- if (virFileExists(proc->socketfile)) {
--#if WITH_LIBNBD
-+#if WITH_NBDKIT
- /* if the disk source was misconfigured, nbdkit will not produce an error
- * until somebody connects to the socket and tries to access the nbd
- * export. This results in poor user experience because the only error we
=====================================
debian/patches/forward/meson-Fix-XDR-check-for-GNU-Hurd.patch deleted
=====================================
@@ -1,24 +0,0 @@
-From: Andrea Bolognani <eof at kiyuko.org>
-Date: Mon, 9 Oct 2023 23:17:10 +0200
-Subject: meson: Fix XDR check for GNU/Hurd
-
-The situation is the same as Linux: since glibc no
-longer includes the RPC functionality, libtirpc must
-be used to complement it.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 1529cea..c0f4e1c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -867,7 +867,7 @@ if not get_option('driver_remote').disabled()
- # use extra library as it's provided by libc directly.
- if host_machine.system() == 'windows'
- xdr_dep = cc.find_library('portablexdr', required: get_option('driver_remote'))
-- elif host_machine.system() == 'linux'
-+ elif host_machine.system() in [ 'linux', 'gnu' ]
- xdr_dep = dependency('libtirpc', required: get_option('driver_remote'))
- elif host_machine.system() in [ 'freebsd', 'darwin' ]
- xdr_dep = cc.find_library('c', required: get_option('driver_remote'))
=====================================
debian/patches/series
=====================================
@@ -1,7 +1,5 @@
-backport/meson-Improve-nbdkit-configurability.patch
forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
-forward/meson-Fix-XDR-check-for-GNU-Hurd.patch
debian/Debianize-libvirt-guests.patch
debian/apparmor_profiles_local_include.patch
debian/Use-sensible-editor-by-default.patch
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/f2548bfb87f4b1fa8e2d8bec4f64ad480e6dfea0...85539e59d154b7ecfd8bfecc7f86a01eebad9234
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/f2548bfb87f4b1fa8e2d8bec4f64ad480e6dfea0...85539e59d154b7ecfd8bfecc7f86a01eebad9234
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20231106/77809098/attachment-0001.htm>
More information about the Pkg-libvirt-commits
mailing list