[Pkg-libvirt-commits] [libvirt] 03/05: Rework patches

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.2.9_rc2-1
in repository libvirt.

commit 79ae3d2892a96c4afa6d68ad2038e4f9ec5cd0cd
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Sep 30 20:19:33 2014 +0200

    Rework patches
    
    Dropped
    
        qemu-remove-capabilities.....patch: applied upstream
---
 .../Don-t-fail-if-we-can-t-setup-avahi.patch       |  2 +-
 .../Don-t-enable-default-network-on-boot.patch     |  8 ++++----
 ...emove-capabilities.monitor.sock-when-done.patch | 23 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 5 insertions(+), 29 deletions(-)

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 7f8a186..3132547 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,7 +7,7 @@ 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 7e3fc0a..3f13fac 100644
+index 762c185..6e489e7 100644
 --- a/src/rpc/virnetserver.c
 +++ b/src/rpc/virnetserver.c
 @@ -1093,8 +1093,7 @@ void virNetServerRun(virNetServerPtr srv)
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 2712d3c..be1e973 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
@@ -9,10 +9,10 @@ to not interfere with existing network configurations
  2 files changed, 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 7680bae..175ebad 100644
+index e65177f..4a43e9a 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -2715,9 +2715,6 @@ if WITH_NETWORK
+@@ -2719,9 +2719,6 @@ if WITH_NETWORK
  	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
  	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
@@ -23,10 +23,10 @@ index 7680bae..175ebad 100644
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 6c592ea..48fe646 100644
+index 870dab4..c0b59b9 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -10626,9 +10626,6 @@ install-data-local: install-init install-systemd
+@@ -10645,9 +10645,6 @@ install-data-local: install-init install-systemd
  @WITH_NETWORK_TRUE@	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
diff --git a/debian/patches/qemu-remove-capabilities.monitor.sock-when-done.patch b/debian/patches/qemu-remove-capabilities.monitor.sock-when-done.patch
deleted file mode 100644
index 5902b5d..0000000
--- a/debian/patches/qemu-remove-capabilities.monitor.sock-when-done.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 25 Sep 2014 10:30:58 +0200
-Subject: qemu: remove capabilities.monitor.sock when done
-
-Prompted by
-
-   http://bugs.debian.org/761131
----
- src/qemu/qemu_capabilities.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 49f5f75..dca00b2 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -3306,6 +3306,7 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps,
-     virCommandAbort(cmd);
-     virCommandFree(cmd);
-     VIR_FREE(monarg);
-+    ignore_value(unlink(monpath));
-     VIR_FREE(monpath);
-     virObjectUnref(vm);
-     virObjectUnref(xmlopt);
diff --git a/debian/patches/series b/debian/patches/series
index 309540f..79b6e13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,3 @@ Allow-xen-toolstack-to-find-it-s-binaries.patch
 Skip-vircgrouptest.patch
 debian/Use-sensible-editor-as-fallback.patch
 debian/Debianize-virtlockd.patch
-qemu-remove-capabilities.monitor.sock-when-done.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git