[Pkg-libvirt-commits] [libvirt] 04/06: Update patches

Guido Guenther agx at alioth.debian.org
Sun Nov 3 11:14:36 UTC 2013 

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

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

commit 6a8cd2d23dbcc25312178bdaafc56988437e5a0f
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Nov 3 10:35:31 2013 +0100

    Update patches
---
 .../patches/Allow-xen-toolstack-to-find-it-s-binaries.patch  |    4 ++--
 debian/patches/Disable-failing-virnetsockettest.patch        |   10 +++++-----
 .../patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch  |    2 +-
 debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch      |    6 +++---
 .../Reduce-udevadm-settle-timeout-to-10-seconds.patch        |    4 ++--
 debian/patches/debian/Debianize-libvirt-guests.patch         |    3 +--
 debian/patches/debian/Debianize-systemd-service-files.patch  |    2 +-
 .../debian/Don-t-enable-default-network-on-boot.patch        |    9 ++++-----
 .../debian/fix-Debian-specific-path-to-hvm-loader.patch      |    3 +--
 debian/patches/debian/remove-RHism.diff.patch                |    2 +-
 ...atch-qemuMonitorTextGetMigrationStatus-to-intercept.patch |    2 +-
 11 files changed, 22 insertions(+), 25 deletions(-)

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 7c8361f..72755af 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
@@ -19,10 +19,10 @@ Closes: #685749
  12 files changed, 24 insertions(+), 26 deletions(-)
 
 diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
-index 65c7c72..c36ad7c 100644
+index aee03d7..6ffe626 100644
 --- a/docs/schemas/capability.rng
 +++ b/docs/schemas/capability.rng
-@@ -263,13 +263,13 @@
+@@ -271,13 +271,13 @@
  
    <define name='emulator'>
      <element name='emulator'>
diff --git a/debian/patches/Disable-failing-virnetsockettest.patch b/debian/patches/Disable-failing-virnetsockettest.patch
index 4df8c34..a52811a 100644
--- a/debian/patches/Disable-failing-virnetsockettest.patch
+++ b/debian/patches/Disable-failing-virnetsockettest.patch
@@ -1,4 +1,4 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
 Date: Fri, 8 Jul 2011 22:17:56 +0200
 Subject: Disable failing virnetsockettest
 
@@ -8,17 +8,17 @@ until we debugged the interaction with pbuilder
  1 file changed, 2 insertions(+)
 
 diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
-index 5b434ba..fad9a98 100644
+index eda95bc..89ead5c 100644
 --- a/tests/virnetsockettest.c
 +++ b/tests/virnetsockettest.c
 @@ -497,10 +497,12 @@ mymain(void)
-     if (virtTestRun("Socket UNIX Addrs", 1, testSocketUNIXAddrs, NULL) < 0)
+     if (virtTestRun("Socket UNIX Addrs", testSocketUNIXAddrs, NULL) < 0)
          ret = -1;
  
 +#if 0
-     if (virtTestRun("Socket External Command /dev/zero", 1, testSocketCommandNormal, NULL) < 0)
+     if (virtTestRun("Socket External Command /dev/zero", testSocketCommandNormal, NULL) < 0)
          ret = -1;
-     if (virtTestRun("Socket External Command /dev/does-not-exist", 1, testSocketCommandFail, NULL) < 0)
+     if (virtTestRun("Socket External Command /dev/does-not-exist", testSocketCommandFail, NULL) < 0)
          ret = -1;
 +#endif
  
diff --git a/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch b/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
index 077276f..dd50a86 100644
--- a/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
+++ b/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
@@ -1,4 +1,4 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
 Date: Sun, 26 Jun 2011 15:56:27 +0200
 Subject: Disable gnulib's test-nonplocking-pipe.sh
 
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 599c8e0..3dd7576 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
@@ -1,4 +1,4 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
 Date: Sat, 14 Jan 2012 18:09:01 +0100
 Subject: Don't fail if we can't setup avahi
 
@@ -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 2306e10..05ae649 100644
+index 8907768..7e8b17a 100644
 --- a/src/rpc/virnetserver.c
 +++ b/src/rpc/virnetserver.c
 @@ -1070,8 +1070,7 @@ void virNetServerRun(virNetServerPtr srv)
@@ -19,4 +19,4 @@ index 2306e10..05ae649 100644
 +    if (srv->mdns)
          goto cleanup;
  
-     srv->quit = 0;
+     srv->quit = false;
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 bbaf98d..b09087f 100644
--- a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+++ b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
@@ -1,4 +1,4 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
 Date: Mon, 4 Jun 2012 16:18:52 +0200
 Subject: Reduce udevadm settle timeout to 10 seconds
 
@@ -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 d9e0bc4..83fb286 100644
+index 87cc2e7..d258b52 100644
 --- a/src/util/virutil.c
 +++ b/src/util/virutil.c
 @@ -1444,7 +1444,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index 752fd28..dceb53a 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -1,9 +1,8 @@
-From: =?UTF-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
+From: =?utf-8?q?Laurent_L=C3=A9onard?= <laurent at open-minds.org>
 Date: Thu, 9 Dec 2010 22:36:29 +0100
 Subject: Debianize libvirt-guests
 
 Origin: vendor
-
 ---
  tools/libvirt-guests.sh.in   | 41 ++++++++++++++++++++++++-----------------
  tools/libvirt-guests.sysconf |  4 ++--
diff --git a/debian/patches/debian/Debianize-systemd-service-files.patch b/debian/patches/debian/Debianize-systemd-service-files.patch
index 5107d2e..a5a9c92 100644
--- a/debian/patches/debian/Debianize-systemd-service-files.patch
+++ b/debian/patches/debian/Debianize-systemd-service-files.patch
@@ -1,4 +1,4 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
 Date: Tue, 26 Jun 2012 09:30:39 +0200
 Subject: Debianize systemd service files
 
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 68304fc..9a376db 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
@@ -3,17 +3,16 @@ Date: Fri, 7 Mar 2008 09:08:26 +0100
 Subject: Don't enable default network on boot
 
 to not interfere with existing network configurations
-
 ---
  src/Makefile.am | 3 ---
  src/Makefile.in | 3 ---
  2 files changed, 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 8632b18..02413a4 100644
+index 21b9caf..18cb9e2 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -2467,9 +2467,6 @@ if WITH_NETWORK
+@@ -2545,9 +2545,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; }
@@ -24,10 +23,10 @@ index 8632b18..02413a4 100644
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 1077572..1d81a61 100644
+index cf35fe1..aa405e6 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -9133,9 +9133,6 @@ install-data-local: install-init install-systemd
+@@ -9594,9 +9594,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/debian/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
index 66d482e..6e6d00c 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
@@ -1,9 +1,8 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
 Date: Thu, 26 Feb 2009 14:29:58 +0100
 Subject: fix Debian specific path to hvm loader
 
 Closes: #517059
-
 ---
  src/xen/xen_hypervisor.c               | 2 +-
  tests/xencapsdata/xen-i686-pae-hvm.xml | 2 +-
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 392d8b7..277d7fe 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 e12a800..1ae7183 100644
+index dac9a08..f91e1fa 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 cdc27b7..7b3ebd4 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -1,4 +1,4 @@
-From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= <biessmann at corscience.de>
+From: =?utf-8?q?Andreas_Bie=C3=9Fmann?= <biessmann at corscience.de>
 Date: Thu, 18 Mar 2010 13:05:59 +0100
 Subject: patch qemuMonitorTextGetMigrationStatus to intercept unknown command
  'info migrate'

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

More information about the Pkg-libvirt-commits mailing list