[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 14 commits: changelog: Create entry for 6.8.0-1
Guido Günther
gitlab at salsa.debian.org
Fri Oct 30 15:12:33 GMT 2020
Guido Günther pushed to branch debian/master at Libvirt Packaging Team / libvirt
Commits:
941f5f2f by Andrea Bolognani at 2020-10-17T11:59:42+02:00
changelog: Create entry for 6.8.0-1
Gbp-Dch: Ignore
- - - - -
06de2cc4 by Andrea Bolognani at 2020-10-17T12:12:41+02:00
scripts: Port bump-symbols.py to Python 3
Gbp-Dch: Ignore
- - - - -
b133403c by Andrea Bolognani at 2020-10-24T11:10:29+02:00
Bump symbol versions
libvirt 6.8.0 doesn't introduce any new public symbols.
Gbp-Dch: Ignore
- - - - -
11671ad8 by Andrea Bolognani at 2020-10-28T00:25:25+01:00
patches: Drop backport/[...]gluster-module-dep.patch
- - - - -
2b2d94fb by Andrea Bolognani at 2020-10-28T00:25:36+01:00
patches: Refresh patches
Gbp-Dch: Ignore
- - - - -
d4522ee3 by Andrea Bolognani at 2020-10-28T00:25:36+01:00
patches: Add backport/rpc-Fix-virt-ssh-helper-detection.patch
Backport a fix for the virt-ssh-helper feature from the upcoming
6.9.0 release.
- - - - -
f3381f46 by Andrea Bolognani at 2020-10-28T00:25:36+01:00
libvirt-clients: Expand wildcards
We will soon need to be more mindful of which package each binary ends
in, and wildcards while convenient are no help in that scenario.
Gbp-Dch: Ignore
- - - - -
10121058 by Andrea Bolognani at 2020-10-28T01:07:41+01:00
libvirt-daemon: Install virt-ssh-helper
This new binary, if available, is used to tunnel the connection when
working with a remote libvirtd instance.
- - - - -
10703673 by Andrea Bolognani at 2020-10-28T01:07:41+01:00
control: Drop Build-Depends on netcat-openbsd
It's merely a runtime dependency, and an optional one at that.
- - - - -
509eb72a by Andrea Bolognani at 2020-10-28T01:07:41+01:00
control: Drop Build-Depends on libdbus-1-dev
libvirt is now using GDBus, the D-Bus implementation included in GLib,
instead of libdbus.
- - - - -
bf0ec4fe by Andrea Bolognani at 2020-10-28T01:07:41+01:00
rules: Fix spelling for selinux_mount option
It was not adapted correctly during the switch to Meson.
Gbp-Dch: Ignore
- - - - -
54c08554 by Andrea Bolognani at 2020-10-28T01:07:41+01:00
rules: Stop explicitly disabling HAL support
All traces of HAL have been removed from upstream libvirt,
including the corresponding Meson option.
Gbp-Dch: Ignore
- - - - -
fa24a6a5 by Andrea Bolognani at 2020-10-28T01:07:41+01:00
rules: Pass qemu_moddir option
libvirt is now able to detect when QEMU modules are added,
removed and modified, but in order to do that it needs to know
where they are located.
Gbp-Dch: Ignore
- - - - -
053bc84e by Andrea Bolognani at 2020-10-28T01:08:40+01:00
Document changes and release 6.8.0-1
- - - - -
17 changed files:
- debian/changelog
- debian/control
- debian/libvirt-clients.install
- debian/libvirt-daemon.install
- debian/libvirt0.symbols
- + debian/patches/backport/rpc-Fix-virt-ssh-helper-detection.patch
- − debian/patches/backport/src-storage-meson-fix-vir_storage_file_gluster-module-dep.patch
- debian/patches/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch
- debian/patches/debian/Set-defaults-for-zfs-tools.patch
- debian/patches/debian/Use-sensible-editor-by-default.patch
- debian/patches/debian/apparmor_profiles_local_include.patch
- debian/patches/forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
- debian/patches/forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
- debian/patches/forward/Skip-vircgrouptest.patch
- debian/patches/series
- debian/rules
- debian/scripts/bump-symbols.py
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+libvirt (6.8.0-1) unstable; urgency=medium
+
+ * Team upload
+
+ * [a09e8f2] New upstream version 6.8.0
+ * [11671ad] patches: Drop backport/[...]gluster-module-dep.patch
+ * [d4522ee] patches: Add backport/rpc-Fix-virt-ssh-helper-detection.patch
+ * [1012105] libvirt-daemon: Install virt-ssh-helper
+ * [1070367] control: Drop Build-Depends on netcat-openbsd
+ * [509eb72] control: Drop Build-Depends on libdbus-1-dev
+
+ -- Andrea Bolognani <eof at kiyuko.org> Wed, 28 Oct 2020 01:08:23 +0100
+
libvirt (6.7.0-3) experimental; urgency=medium
* Team upload
=====================================
debian/control
=====================================
@@ -18,7 +18,6 @@ Build-Depends:
libaudit-dev [linux-any],
libcap-ng-dev [linux-any],
libcurl4-gnutls-dev,
- libdbus-1-dev [linux-any],
libdevmapper-dev [linux-any],
libfuse-dev [linux-any],
libgcrypt20-dev,
@@ -48,7 +47,6 @@ Build-Depends:
libyajl-dev,
lvm2 [linux-any],
meson (>= 0.54.0~),
- netcat-openbsd,
nfs-common,
numad [linux-any],
open-iscsi [linux-any],
=====================================
debian/libvirt-clients.install
=====================================
@@ -1,7 +1,19 @@
etc/libvirt/libvirt-admin.conf
etc/libvirt/libvirt.conf
-usr/bin/*
+usr/bin/virsh
+usr/bin/virt-admin
+usr/bin/virt-host-validate
+usr/bin/virt-login-shell
+usr/bin/virt-pki-validate
+usr/bin/virt-qemu-run
+usr/bin/virt-xml-validate
usr/lib/libvirt/virt-login-shell-helper
-usr/share/man/man1/*
+usr/share/man/man1/virsh.1
+usr/share/man/man1/virt-admin.1
+usr/share/man/man1/virt-host-validate.1
+usr/share/man/man1/virt-login-shell.1
+usr/share/man/man1/virt-pki-validate.1
+usr/share/man/man1/virt-qemu-run.1
+usr/share/man/man1/virt-xml-validate.1
usr/share/man/man7/virkeycode-*.7
usr/share/man/man7/virkeyname-*.7
=====================================
debian/libvirt-daemon.install
=====================================
@@ -1,3 +1,4 @@
+usr/bin/virt-ssh-helper
usr/lib/*/libvirt/connection-driver/libvirt_driver_interface.so
usr/lib/*/libvirt/connection-driver/libvirt_driver_network.so
usr/lib/*/libvirt/connection-driver/libvirt_driver_nodedev.so
=====================================
debian/libvirt0.symbols
=====================================
@@ -125,7 +125,7 @@ libvirt.so.0 libvirt0 #MINVER#
*@LIBVIRT_5.8.0 6.0.0~rc1
*@LIBVIRT_5.10.0 6.0.0~rc1
*@LIBVIRT_6.0.0 6.0.0~rc1
- *@LIBVIRT_PRIVATE_6.7.0 6.7.0
+ *@LIBVIRT_PRIVATE_6.8.0 6.8.0
libvirt-qemu.so.0 libvirt0 #MINVER#
*@LIBVIRT_QEMU_0.8.3 0.8.3
@@ -147,4 +147,4 @@ libvirt-admin.so.0 libvirt0 #MINVER#
*@LIBVIRT_ADMIN_1.3.0 1.2.18
*@LIBVIRT_ADMIN_2.0.0 2.0.0~rc1
*@LIBVIRT_ADMIN_3.0.0 3.0.0
- *@LIBVIRT_ADMIN_PRIVATE_6.7.0 6.7.0
+ *@LIBVIRT_ADMIN_PRIVATE_6.8.0 6.8.0
=====================================
debian/patches/backport/rpc-Fix-virt-ssh-helper-detection.patch
=====================================
@@ -0,0 +1,35 @@
+From: Andrea Bolognani <abologna at redhat.com>
+Date: Tue, 27 Oct 2020 00:15:33 +0100
+Subject: rpc: Fix virt-ssh-helper detection
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+When trying to figure out whether virt-ssh-helper is available
+on the remote host, we mistakenly look for the helper by the
+name it had while the feature was being worked on instead of
+the one that was ultimately picked, and thus end up using the
+netcat fallback every single time.
+
+Fixes: f8ec7c842df9e40c6607eae9b0223766cb226336
+Signed-off-by: Andrea Bolognani <abologna at redhat.com>
+Reviewed-by: Neal Gompa <ngompa13 at gmail.com>
+Reviewed-by: Daniel P. Berrangé <berrange at redhat.com>
+(cherry picked from commit 7d959c302d10e97390b171334b885887de427a32)
+---
+ src/rpc/virnetclient.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
+index 8c7c7a0..d430f32 100644
+--- a/src/rpc/virnetclient.c
++++ b/src/rpc/virnetclient.c
+@@ -453,7 +453,7 @@ virNetClientSSHHelperCommand(virNetClientProxy proxy,
+
+ switch (proxy) {
+ case VIR_NET_CLIENT_PROXY_AUTO:
+- return g_strdup_printf("sh -c 'which virt-nc 1>/dev/null 2>&1; "
++ return g_strdup_printf("sh -c 'which virt-ssh-helper 1>/dev/null 2>&1; "
+ "if test $? = 0; then "
+ " %s; "
+ "else"
=====================================
debian/patches/backport/src-storage-meson-fix-vir_storage_file_gluster-module-dep.patch deleted
=====================================
@@ -1,26 +0,0 @@
-From: Pavel Hrdina <phrdina at redhat.com>
-Date: Tue, 8 Sep 2020 15:45:11 +0200
-Subject: src/storage/meson: fix vir_storage_file_gluster module dependencies
-
-The correct key for dependencies for virt_modules hash is `deps`.
-
-Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
-Reviewed-by: Peter Krempa <pkrempa at redhat.com>
-(cherry picked from commit a490693367ea903542a5200214b87430772b27db)
----
- src/storage/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/storage/meson.build b/src/storage/meson.build
-index 18ea0f3..b4cefe9 100644
---- a/src/storage/meson.build
-+++ b/src/storage/meson.build
-@@ -187,7 +187,7 @@ if conf.has('WITH_STORAGE_GLUSTER')
- 'sources': [
- files(storage_file_gluster_sources),
- ],
-- 'dependenciec': [
-+ 'deps': [
- glusterfs_dep,
- ],
- 'install_dir': storage_file_install_dir,
=====================================
debian/patches/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch
=====================================
@@ -37,10 +37,10 @@ this revert and follow upstream as 2.32 dropped the option to enable
1 file changed, 2 deletions(-)
diff --git a/meson.build b/meson.build
-index 8178c31..6cb9bd8 100644
+index ebfac74..fac914b 100644
--- a/meson.build
+++ b/meson.build
-@@ -1481,8 +1481,6 @@ endif
+@@ -1465,8 +1465,6 @@ endif
# use extra library as it's provided by libc directly.
if host_machine.system() == 'windows'
xdr_dep = cc.find_library('portablexdr', required: false)
=====================================
debian/patches/debian/Set-defaults-for-zfs-tools.patch
=====================================
@@ -8,10 +8,10 @@ so we don't have to build-depend on a program in contrib
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
-index dabd419..8178c31 100644
+index 2e57a43..ebfac74 100644
--- a/meson.build
+++ b/meson.build
-@@ -2060,18 +2060,15 @@ if conf.has('WITH_LIBVIRTD')
+@@ -2046,18 +2046,15 @@ if conf.has('WITH_LIBVIRTD')
foreach name : ['zfs', 'zpool']
set_variable(
'@0 at _prog'.format(name),
=====================================
debian/patches/debian/Use-sensible-editor-by-default.patch
=====================================
@@ -8,10 +8,10 @@ It is the reasonable default for Debian.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/vsh.c b/tools/vsh.c
-index 11f493f..e7fda20 100644
+index 87c409e..b9b4590 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
-@@ -2395,7 +2395,7 @@ vshEditWriteToTempFile(vshControl *ctl, const char *doc)
+@@ -2399,7 +2399,7 @@ vshEditWriteToTempFile(vshControl *ctl, const char *doc)
/* Hard-code default editor used as a fallback if not configured by
* VISUAL or EDITOR environment variables. */
=====================================
debian/patches/debian/apparmor_profiles_local_include.patch
=====================================
@@ -20,7 +20,7 @@ index dd18c8a..be8b9ee 100644
#include <local/usr.lib.libvirt.virt-aa-helper>
}
diff --git a/src/security/apparmor/usr.sbin.libvirtd.in b/src/security/apparmor/usr.sbin.libvirtd.in
-index f203076..c3b1b63 100644
+index bf4563e..6fce647 100644
--- a/src/security/apparmor/usr.sbin.libvirtd.in
+++ b/src/security/apparmor/usr.sbin.libvirtd.in
@@ -134,4 +134,7 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) {
=====================================
debian/patches/forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
=====================================
@@ -13,10 +13,10 @@ require the 'TERM' environment variable to be set to the terminal type.
1 file changed, 2 insertions(+)
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index f3aba01..d973584 100644
+index f79a638..a57d27f 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
-@@ -881,6 +881,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
+@@ -878,6 +878,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
virCommandAddEnvPass(cmd, "KRB5CCNAME");
virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK");
virCommandAddEnvPass(cmd, "SSH_ASKPASS");
=====================================
debian/patches/forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
=====================================
@@ -10,7 +10,7 @@ Closes: #663931
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 8639176..fceb670 100644
+index 48b38c7..5f77e51 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -1321,7 +1321,7 @@ void virWaitForDevices(void)
=====================================
debian/patches/forward/Skip-vircgrouptest.patch
=====================================
@@ -9,7 +9,7 @@ without sysfs mounted.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 44e72cb..7edec9f 100644
+index e5be556..c52ea5f 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -20,7 +20,7 @@
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,4 @@
-backport/src-storage-meson-fix-vir_storage_file_gluster-module-dep.patch
+backport/rpc-Fix-virt-ssh-helper-detection.patch
forward/Skip-vircgrouptest.patch
forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
=====================================
debian/rules
=====================================
@@ -44,7 +44,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
WITH_FIREWALLD = -Dfirewalld=enabled
WITH_ATTR = -Dattr=enabled
WITH_AUDIT = -Daudit=enabled
- WITH_SELINUX = -Dselinux=enabled -Dsecdriver_selinux=enabled -Dselinux-mount=/sys/fs/selinux
+ WITH_SELINUX = -Dselinux=enabled -Dsecdriver_selinux=enabled -Dselinux_mount=/sys/fs/selinux
WITH_APPARMOR = -Dapparmor=enabled -Dsecdriver_apparmor=enabled -Dapparmor_profiles=true
WITH_NSS_PLUGIN = -Dnss=enabled
WITH_DTRACE = -Ddtrace=enabled
@@ -74,7 +74,7 @@ else
WITH_FIREWALLD = -Dfirewalld=disabled
WITH_ATTR = -Dattr=disabled
WITH_AUDIT = -Daudit=disabled
- WITH_SELINUX = -Dselinux=disabled -Dsecdriver_selinux=disabled -Dselinux-mount=
+ WITH_SELINUX = -Dselinux=disabled -Dsecdriver_selinux=disabled -Dselinux_mount=
WITH_APPARMOR = -Dapparmor=disabled -Dsecdriver_apparmor=disabled -Dapparmor_profiles=false
WITH_NSS_PLUGIN = -Dnss=disabled
WITH_DTRACE = -Ddtrace=disabled
@@ -90,6 +90,7 @@ DEB_CONFIGURE_EXTRA_ARGS := \
-Ddriver_qemu=enabled \
-Dqemu_user=libvirt-qemu \
-Dqemu_group=libvirt-qemu \
+ -Dqemu_moddir=/usr/lib/$(DEB_HOST_MULTIARCH)/qemu \
$(WITH_OPENVZ) \
-Dsasl=enabled \
-Dyajl=enabled \
@@ -120,7 +121,6 @@ DEB_CONFIGURE_EXTRA_ARGS := \
$(WITH_LXC) \
$(WITH_DTRACE) \
$(WITH_AUDIT) \
- -Dhal=disabled \
$(WITH_FIREWALLD) \
$(WITH_ATTR) \
$(WITH_NSS_PLUGIN) \
=====================================
debian/scripts/bump-symbols.py
=====================================
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
#
# Bump symbol versions of libvirt0
@@ -19,7 +19,7 @@ symbols = open(symbols_file)
symbols_new = open('%s.new' % symbols_file, 'w+')
if len(sys.argv) != 2:
- print >>sys.stderr, "Need a version"
+ print("Need a version", file=sys.stderr)
sys.exit(1)
version = sys.argv[1]
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/e72501f2553bd83dfa0908a3a028c55320be0545...053bc84e2aaef3a3b5273b05dfc64307a47b8c17
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/e72501f2553bd83dfa0908a3a028c55320be0545...053bc84e2aaef3a3b5273b05dfc64307a47b8c17
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/20201030/39f8c3fa/attachment-0001.html>
More information about the Pkg-libvirt-commits
mailing list