[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.0.6-1
Guido Günther
agx at sigxcpu.org
Thu Jun 6 20:12:42 UTC 2013
The following commit has been merged in the master branch:
commit 7921e44a949d435fd435496aac14b78306ab3c5e
Author: Guido Günther <agx at sigxcpu.org>
Date: Thu Jun 6 13:42:43 2013 +0200
Update patches
Debianize-libvirt-guests.patch adjuste to upstream changes
Dropped patches (applied upstream):
Add-sanitytest.py.patch
Fixup-rpcgen-code-on-kFreeBSD-too.patch
Make-detect_scsi_host_caps-a-function-on-all-archite.patch
daemon-fix-leak-after-listing-all-volumes.patch
virInitctlRequest-Don-t-hardcode-384-bytes-size.patch
virthreadpthread-don-t-try-to-cast-pthread_t-to-void.patch
diff --git a/debian/patches/Add-sanitytest.py.patch b/debian/patches/Add-sanitytest.py.patch
deleted file mode 100644
index 4ade08a..0000000
--- a/debian/patches/Add-sanitytest.py.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 2 May 2013 16:48:32 +0200
-Subject: Add sanitytest.py
-
-missing from the upstream tarball
----
- python/sanitytest.py | 36 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
- create mode 100644 python/sanitytest.py
-
-diff --git a/python/sanitytest.py b/python/sanitytest.py
-new file mode 100644
-index 0000000..ace6792
---- /dev/null
-+++ b/python/sanitytest.py
-@@ -0,0 +1,36 @@
-+#!/usr/bin/python
-+
-+import libvirt
-+
-+globals = dir(libvirt)
-+
-+# Sanity test that the generator hasn't gone wrong
-+
-+# Look for core classes
-+for clsname in ["virConnect",
-+ "virDomain",
-+ "virDomainSnapshot",
-+ "virInterface",
-+ "virNWFilter",
-+ "virNodeDevice",
-+ "virNetwork",
-+ "virSecret",
-+ "virStoragePool",
-+ "virStorageVol",
-+ "virStream",
-+ ]:
-+ assert(clsname in globals)
-+ assert(object in getattr(libvirt, clsname).__bases__)
-+
-+# Constants
-+assert("VIR_CONNECT_RO" in globals)
-+
-+# Error related bits
-+assert("libvirtError" in globals)
-+assert("VIR_ERR_AUTH_FAILED" in globals)
-+assert("virGetLastError" in globals)
-+
-+# Some misc methods
-+assert("virInitialize" in globals)
-+assert("virEventAddHandle" in globals)
-+assert("virEventRegisterDefaultImpl" in globals)
diff --git a/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch b/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
index 766493b..df6e949 100644
--- a/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
+++ b/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
@@ -39,10 +39,10 @@ index 106ca73..9745e26 100644
</define>
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index d0fc755..981910a 100644
+index 4043d6d..dabdbaa 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2324,11 +2324,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
+@@ -2081,11 +2081,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
if ((guest = virCapabilitiesAddGuest(caps,
guest_archs[i].hvm ? "hvm" : "xen",
guest_archs[i].arch,
diff --git a/debian/patches/Disable-failing-virnetsockettest.patch b/debian/patches/Disable-failing-virnetsockettest.patch
index eaf9dfb..9537448 100644
--- a/debian/patches/Disable-failing-virnetsockettest.patch
+++ b/debian/patches/Disable-failing-virnetsockettest.patch
@@ -8,10 +8,10 @@ until we debugged the interaction with pbuilder
1 file changed, 2 insertions(+)
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
-index aaa6acb..4caae06 100644
+index 4c5a0ea..261e63f 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
-@@ -496,10 +496,12 @@ mymain(void)
+@@ -497,10 +497,12 @@ mymain(void)
if (virtTestRun("Socket UNIX Addrs", 1, testSocketUNIXAddrs, NULL) < 0)
ret = -1;
diff --git a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
index acad97b..d60755a 100644
--- a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
+++ b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
@@ -7,10 +7,10 @@ Subject: Don't fail if we can't setup avahi
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
-index e536cc3..d40e52d 100644
+index a54f395..1bf6f94 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
-@@ -1066,8 +1066,7 @@ void virNetServerRun(virNetServerPtr srv)
+@@ -1064,8 +1064,7 @@ void virNetServerRun(virNetServerPtr srv)
virObjectLock(srv);
diff --git a/debian/patches/Fixup-rpcgen-code-on-kFreeBSD-too.patch b/debian/patches/Fixup-rpcgen-code-on-kFreeBSD-too.patch
deleted file mode 100644
index 1cec2b8..0000000
--- a/debian/patches/Fixup-rpcgen-code-on-kFreeBSD-too.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 3 May 2013 07:17:18 +0200
-Subject: Fixup rpcgen code on kFreeBSD too
-
-since it uses glibc's rpcgen.
----
- src/rpc/genprotocol.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl
-index c8c1570..f02ce13 100755
---- a/src/rpc/genprotocol.pl
-+++ b/src/rpc/genprotocol.pl
-@@ -31,7 +31,7 @@ open RPCGEN, "-|", $rpcgen, $mode, $xdrdef
- open TARGET, ">$target"
- or die "cannot create $target: $!";
-
--my $fixup = $^O eq "linux" || $^O eq "cygwin";
-+my $fixup = $^O eq "linux" || $^O eq "cygwin" || $^O eq "gnukfreebsd";
-
- if ($mode eq "-c") {
- print TARGET "#include <config.h>\n";
diff --git a/debian/patches/Make-detect_scsi_host_caps-a-function-on-all-archite.patch b/debian/patches/Make-detect_scsi_host_caps-a-function-on-all-archite.patch
deleted file mode 100644
index 38173f3..0000000
--- a/debian/patches/Make-detect_scsi_host_caps-a-function-on-all-archite.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 3 May 2013 08:03:26 +0200
-Subject: Make detect_scsi_host_caps a function on all architectures
-
-In the non linux case some callers like gather_scsi_host_caps needed the
-return code of -1 while others like update_caps needed an emtpy
-statement (to avoid a "statement without effect" warning). This is much
-simpler solved by using a function instead of a define.
----
- src/node_device/node_device_driver.h | 11 +----------
- src/node_device/node_device_linux_sysfs.c | 10 +++++++++-
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h
-index b6c6f18..9e97b7d 100644
---- a/src/node_device/node_device_driver.h
-+++ b/src/node_device/node_device_driver.h
-@@ -51,16 +51,7 @@ void nodeDeviceUnlock(virNodeDeviceDriverStatePtr driver);
-
- int nodedevRegister(void);
-
--# ifdef __linux__
--
--# define detect_scsi_host_caps(d) detect_scsi_host_caps_linux(d)
--int detect_scsi_host_caps_linux(union _virNodeDevCapData *d);
--
--# else /* __linux__ */
--
--# define detect_scsi_host_caps(d) (-1)
--
--# endif /* __linux__ */
-+int detect_scsi_host_caps(union _virNodeDevCapData *d);
-
- int nodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags);
- int nodeListDevices(virConnectPtr conn, const char *cap, char **const names,
-diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c
-index fd91430..0c84619 100644
---- a/src/node_device/node_device_linux_sysfs.c
-+++ b/src/node_device/node_device_linux_sysfs.c
-@@ -38,7 +38,7 @@
- #ifdef __linux__
-
- int
--detect_scsi_host_caps_linux(union _virNodeDevCapData *d)
-+detect_scsi_host_caps(union _virNodeDevCapData *d)
- {
- char *max_vports = NULL;
- char *vports = NULL;
-@@ -127,4 +127,12 @@ cleanup:
- return ret;
- }
-
-+#else
-+
-+int
-+detect_scsi_host_caps(union _virNodeDevCapData *d ATTRIBUTE_UNUSED)
-+{
-+ return -1;
-+}
-+
- #endif /* __linux__ */
diff --git a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
index 5132eed..645fbc2 100644
--- a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+++ b/debian/patches/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 b9de33c..477661f 100644
+index a29da14..c41d674 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
-@@ -3171,7 +3171,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
+@@ -1418,7 +1418,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid,
void virFileWaitForDevices(void)
{
# ifdef UDEVADM
diff --git a/debian/patches/daemon-fix-leak-after-listing-all-volumes.patch b/debian/patches/daemon-fix-leak-after-listing-all-volumes.patch
deleted file mode 100644
index a0fe32e..0000000
--- a/debian/patches/daemon-fix-leak-after-listing-all-volumes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko at redhat.com>
-Date: Fri, 12 Apr 2013 17:30:56 +0200
-Subject: daemon: fix leak after listing all volumes
-
-CVE-2013-1962
-
-remoteDispatchStoragePoolListAllVolumes wasn't freeing the pool.
-The pool also held a reference to the connection, preventing it from
-getting freed and closing the netcf interface driver, which held two
-sockets open.
-
-Closes: #708647
----
- daemon/remote.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/daemon/remote.c b/daemon/remote.c
-index e5e3f2c..dd72f9f 100644
---- a/daemon/remote.c
-+++ b/daemon/remote.c
-@@ -4226,6 +4226,8 @@ cleanup:
- virStorageVolFree(vols[i]);
- VIR_FREE(vols);
- }
-+ if (pool)
-+ virStoragePoolFree(pool);
- return rv;
- }
-
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index d87b609..887e319 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -5,25 +5,17 @@ Subject: Debianize libvirt-guests
Origin: vendor
---
- tools/libvirt-guests.sh.in | 42 +++++++++++++++++++++++++-----------------
+ tools/libvirt-guests.sh.in | 41 ++++++++++++++++++++++++-----------------
tools/libvirt-guests.sysconf | 4 ++--
- 2 files changed, 27 insertions(+), 19 deletions(-)
+ 2 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
-index 4f2e203..3ad8864 100644
+index 38e93c5..0f729be 100644
--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
-@@ -1,32 +1,41 @@
+@@ -1,5 +1,17 @@
#!/bin/sh
-
--sysconfdir="@sysconfdir@"
--localstatedir="@localstatedir@"
--libvirtd="@sbindir@"/libvirtd
--
--# Source function library.
--test ! -r "$sysconfdir"/rc.d/init.d/functions ||
-- . "$sysconfdir"/rc.d/init.d/functions
-+# the following is the LSB init header
+#
+### BEGIN INIT INFO
+# Provides: libvirt-guests
@@ -36,7 +28,21 @@ index 4f2e203..3ad8864 100644
+# on shutdown and resuming them on next boot
+# See http://libvirt.org
+### END INIT INFO
-+
++#
+ # Copyright (C) 2011-2013 Red Hat, Inc.
+ #
+ # This library is free software; you can redistribute it and/or
+@@ -16,33 +28,29 @@
+ # License along with this library. If not, see
+ # <http://www.gnu.org/licenses/>.
+
+-sysconfdir="@sysconfdir@"
+-localstatedir="@localstatedir@"
+-libvirtd="@sbindir@"/libvirtd
+-
+-# Source function library.
+-test ! -r "$sysconfdir"/rc.d/init.d/functions ||
+- . "$sysconfdir"/rc.d/init.d/functions
+sysconfdir=/etc
+localstatedir=/var
+libvirtd=/usr/sbin/libvirtd
@@ -70,7 +76,7 @@ index 4f2e203..3ad8864 100644
RETVAL=0
-@@ -515,8 +524,7 @@ gueststatus() {
+@@ -531,8 +539,7 @@ gueststatus() {
# rh_status
# Display current status: whether saved state exists, and whether start
diff --git a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
index 299c55b..e337748 100644
--- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
+++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
@@ -10,10 +10,10 @@ to not interfere with existing network configurations
2 files changed, 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index cd098db..4152d08 100644
+index 680101f..b1e3d01 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -2191,9 +2191,6 @@ if WITH_NETWORK
+@@ -2196,9 +2196,6 @@ if WITH_NETWORK
cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
@@ -24,10 +24,10 @@ index cd098db..4152d08 100644
uninstall-local:: uninstall-init uninstall-systemd
diff --git a/src/Makefile.in b/src/Makefile.in
-index b77c778..dff659c 100644
+index b616b9e..299ad53 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -7632,9 +7632,6 @@ install-data-local: install-init install-systemd
+@@ -7656,9 +7656,6 @@ install-data-local: install-init install-systemd
@WITH_NETWORK_TRUE@ cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
@WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
diff --git a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
index 1227c2e..9b068ea 100644
--- a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
@@ -13,10 +13,10 @@ Closes: #517059
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 9dbbe07..d0fc755 100644
+index cfc8139..4043d6d 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2328,7 +2328,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
+@@ -2085,7 +2085,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
"/usr/lib64/xen/bin/qemu-dm" :
"/usr/lib/xen/bin/qemu-dm"),
(guest_archs[i].hvm ?
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 6bda2d7..dde5911 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 11984bc..05a30ca 100644
+index 7c8ce18..66ff2b4 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -107,7 +107,7 @@ alphabetic character, @, [, ], \, ^, _.
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 4659b14..b8e60ce 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -42,10 +42,10 @@ to savely detect that the command 'info migrate' is not implemented.
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index daade3d..8546eb0 100644
+index d4ee93d..20b9a99 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
-@@ -1572,7 +1572,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1568,7 +1568,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
}
status->disk_total *= 1024;
}
diff --git a/debian/patches/series b/debian/patches/series
index 1ae8142..6148614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,9 +10,3 @@ Don-t-fail-if-we-can-t-setup-avahi.patch
Reduce-udevadm-settle-timeout-to-10-seconds.patch
debian/Debianize-systemd-service-files.patch
Allow-xen-toolstack-to-find-it-s-binaries.patch
-virthreadpthread-don-t-try-to-cast-pthread_t-to-void.patch
-Add-sanitytest.py.patch
-virInitctlRequest-Don-t-hardcode-384-bytes-size.patch
-Fixup-rpcgen-code-on-kFreeBSD-too.patch
-Make-detect_scsi_host_caps-a-function-on-all-archite.patch
-daemon-fix-leak-after-listing-all-volumes.patch
diff --git a/debian/patches/virInitctlRequest-Don-t-hardcode-384-bytes-size.patch b/debian/patches/virInitctlRequest-Don-t-hardcode-384-bytes-size.patch
deleted file mode 100644
index 1956533..0000000
--- a/debian/patches/virInitctlRequest-Don-t-hardcode-384-bytes-size.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 1 May 2013 22:35:44 +0200
-Subject: virInitctlRequest: Don't hardcode 384 bytes size
-
-When MAXHOSTNAMELEN is set we have to take it's value into account.
-Otherwise the build fails on kFreeBSD (FreeBSD kernel and GNU userland)
----
- src/util/virinitctl.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
-index 1618ffa..9a3e8a3 100644
---- a/src/util/virinitctl.c
-+++ b/src/util/virinitctl.c
-@@ -103,7 +103,11 @@ struct virInitctlRequest {
- } i;
- };
-
--verify(sizeof(struct virInitctlRequest) == 384);
-+# ifdef MAXHOSTNAMELEN
-+ verify(sizeof(struct virInitctlRequest) == 320 + MAXHOSTNAMELEN);
-+# else
-+ verify(sizeof(struct virInitctlRequest) == 384);
-+#endif
-
- /*
- * Send a message to init to change the runlevel
diff --git a/debian/patches/virthreadpthread-don-t-try-to-cast-pthread_t-to-void.patch b/debian/patches/virthreadpthread-don-t-try-to-cast-pthread_t-to-void.patch
deleted file mode 100644
index 7264339..0000000
--- a/debian/patches/virthreadpthread-don-t-try-to-cast-pthread_t-to-void.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 2 May 2013 12:03:18 +0200
-Subject: virthreadpthread: don't try to cast pthread_t to void*
-
-This fixes the build on kFreeBSD that otherwise fails with:
-
-util/virthreadpthread.c: In function 'virThreadSelfID':
-util/virthreadpthread.c:222:27: error: cast from function call of type 'pthread_t' to non-matching type 'void *' [-Werror=bad-function-cast]
----
- src/util/virthreadpthread.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virthreadpthread.c b/src/util/virthreadpthread.c
-index b42b333..8d5e197 100644
---- a/src/util/virthreadpthread.c
-+++ b/src/util/virthreadpthread.c
-@@ -219,7 +219,7 @@ int virThreadSelfID(void)
- tid = syscall(SYS_gettid);
- return (int)tid;
- #else
-- return (int)(intptr_t)(void *)pthread_self();
-+ return (int)(intptr_t)pthread_self();
- #endif
- }
-
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list