[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 6 commits: changelog: Create entry for 6.9.0-1
Guido Günther
gitlab at salsa.debian.org
Mon Nov 16 08:54:41 GMT 2020
Guido Günther pushed to branch debian/master at Libvirt Packaging Team / libvirt
Commits:
a6e14354 by Andrea Bolognani at 2020-11-06T22:51:45+01:00
changelog: Create entry for 6.9.0-1
Gbp-Dch: Ignore
- - - - -
a7a88125 by Andrea Bolognani at 2020-11-06T22:55:54+01:00
symbols: Bump symbol versions
libvirt 6.9.0 doesn't introduce any new public symbols.
Gbp-Dch: Ignore
- - - - -
88c8a9e7 by Andrea Bolognani at 2020-11-06T22:55:54+01:00
patches: Drop backport/rpc-Fix-virt-ssh-helper-detection.patch
- - - - -
04a12496 by Andrea Bolognani at 2020-11-06T22:55:54+01:00
patches: Refresh patches
Gbp-Dch: Ignore
- - - - -
1c09d562 by Andrea Bolognani at 2020-11-06T23:41:35+01:00
rules: Update list of options passed to Meson
The 'macvtap' option no longer exists, while the 'libnl',
'docs' and 'tests' options have been introduced.
Gbp-Dch: Ignore
- - - - -
b1f7cfa6 by Andrea Bolognani at 2020-11-08T15:34:59+01:00
Document changes and release 6.9.0-1
- - - - -
13 changed files:
- debian/changelog
- debian/libvirt0.symbols
- − debian/patches/backport/rpc-Fix-virt-ssh-helper-detection.patch
- debian/patches/debian/Debianize-virtlockd.patch
- debian/patches/debian/Debianize-virtlogd.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/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
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libvirt (6.9.0-1) unstable; urgency=medium
+
+ * Team upload
+
+ * [9328bc8] New upstream version 6.9.0
+ * [88c8a9e] patches: Drop backport/rpc-Fix-virt-ssh-helper-detection.patch
+
+ -- Andrea Bolognani <eof at kiyuko.org> Sun, 08 Nov 2020 15:33:59 +0100
+
libvirt (6.8.0-1) unstable; urgency=medium
* Team upload
=====================================
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.8.0 6.8.0
+ *@LIBVIRT_PRIVATE_6.9.0 6.9.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.8.0 6.8.0
+ *@LIBVIRT_ADMIN_PRIVATE_6.9.0 6.9.0
=====================================
debian/patches/backport/rpc-Fix-virt-ssh-helper-detection.patch deleted
=====================================
@@ -1,35 +0,0 @@
-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/debian/Debianize-virtlockd.patch
=====================================
@@ -7,7 +7,7 @@ Subject: Debianize virtlockd
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
-index e7f8057..6d52f0e 100644
+index 4a6fab0..12aebde 100644
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -7,7 +7,7 @@ Documentation=man:virtlockd(8)
@@ -18,4 +18,4 @@ index e7f8057..6d52f0e 100644
+EnvironmentFile=- at sysconfdir@/default/virtlockd
ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
ExecReload=/bin/kill -USR1 $MAINPID
- # Loosing the locks is a really bad thing that will
+ # Losing the locks is a really bad thing that will
=====================================
debian/patches/debian/Debianize-virtlogd.patch
=====================================
@@ -7,7 +7,7 @@ Subject: Debianize virtlogd
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
-index daff48e..0e3b3d1 100644
+index 8ab5478..dd25c7c 100644
--- a/src/logging/virtlogd.service.in
+++ b/src/logging/virtlogd.service.in
@@ -7,7 +7,7 @@ Documentation=man:virtlogd(8)
@@ -18,4 +18,4 @@ index daff48e..0e3b3d1 100644
+EnvironmentFile=- at sysconfdir@/default/virtlogd
ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
ExecReload=/bin/kill -USR1 $MAINPID
- # Loosing the logs is a really bad thing that will
+ # Losing the logs is a really bad thing that will
=====================================
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 ebfac74..fac914b 100644
+index 604b597..fd49d18 100644
--- a/meson.build
+++ b/meson.build
-@@ -1465,8 +1465,6 @@ endif
+@@ -1450,8 +1450,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 2e57a43..ebfac74 100644
+index 365c16d..604b597 100644
--- a/meson.build
+++ b/meson.build
-@@ -2046,18 +2046,15 @@ if conf.has('WITH_LIBVIRTD')
+@@ -2023,18 +2023,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 87c409e..b9b4590 100644
+index ca92bcd..898f0e6 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
-@@ -2399,7 +2399,7 @@ vshEditWriteToTempFile(vshControl *ctl, const char *doc)
+@@ -2378,7 +2378,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/forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
=====================================
@@ -13,7 +13,7 @@ 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 f79a638..a57d27f 100644
+index fc9dd02..eb5a4b2 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -878,6 +878,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
=====================================
debian/patches/forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
=====================================
@@ -10,10 +10,10 @@ Closes: #663931
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 48b38c7..5f77e51 100644
+index 708c3cf..fdc25aa 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
-@@ -1321,7 +1321,7 @@ void virWaitForDevices(void)
+@@ -1316,7 +1316,7 @@ void virWaitForDevices(void)
if (!(udev = virFindFileInPath(UDEVADM)))
return;
=====================================
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 e5be556..c52ea5f 100644
+index 6c1a766..5808ca2 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -20,7 +20,7 @@
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
-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
=====================================
@@ -34,7 +34,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
WITH_STORAGE_GLUSTER = -Dstorage_gluster=enabled
WITH_UDEV = -Dudev=enabled
WITH_CAPNG = -Dcapng=enabled
- WITH_MACVTAP = -Dmacvtap=enabled
+ WITH_LIBNL = -Dlibnl=enabled
WITH_NETWORK = -Ddriver_network=enabled
WITH_OPENVZ = -Ddriver_openvz=enabled
WITH_NETCF = -Dnetcf=enabled
@@ -64,7 +64,7 @@ else
WITH_STORAGE_GLUSTER = -Dstorage_gluster=disabled
WITH_UDEV = -Dudev=disabled
WITH_CAPNG = -Dcapng=disabled
- WITH_MACVTAP = -Dmacvtap=disabled
+ WITH_LIBNL = -Dlibnl=disabled
WITH_NETWORK = -Ddriver_network=disabled
WITH_OPENVZ = -Ddriver_openvz=disabled
WITH_NETCF = -Dnetcf=disabled
@@ -91,6 +91,8 @@ DEB_CONFIGURE_EXTRA_ARGS := \
-Dqemu_user=libvirt-qemu \
-Dqemu_group=libvirt-qemu \
-Dqemu_moddir=/usr/lib/$(DEB_HOST_MULTIARCH)/qemu \
+ -Ddocs=enabled \
+ -Dtests=enabled \
$(WITH_OPENVZ) \
-Dsasl=enabled \
-Dyajl=enabled \
@@ -113,7 +115,7 @@ DEB_CONFIGURE_EXTRA_ARGS := \
$(WITH_APPARMOR) \
-Ddriver_esx=enabled \
$(WITH_CAPNG) \
- $(WITH_MACVTAP) \
+ $(WITH_LIBNL) \
$(WITH_NETWORK) \
$(WITH_NETCF) \
$(WITH_LIBXL) \
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/aaceac3e778591e12921b9d4e8187fbe3471c249...b1f7cfa6a723b849ca2bacab01eafb45c40229b2
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/aaceac3e778591e12921b9d4e8187fbe3471c249...b1f7cfa6a723b849ca2bacab01eafb45c40229b2
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/20201116/d0468832/attachment-0001.html>
More information about the Pkg-libvirt-commits
mailing list