[Pkg-libvirt-commits] [libvirt] 03/03: Update patches
Guido Guenther
agx at moszumanska.debian.org
Fri Mar 7 11:58:58 UTC 2014
This is an automated email from the git hooks/post-receive script.
agx pushed a commit to branch experimental
in repository libvirt.
commit c7bf77603a8173b9c2747dc1ae880951f4d49d40
Author: Guido Günther <agx at sigxcpu.org>
Date: Thu Mar 6 12:53:21 2014 +0100
Update patches
Dropped
xen-fix-parsing-xend-http-response.patch - applied upstream
---
.../Don-t-fail-if-we-can-t-setup-avahi.patch | 4 +--
...duce-udevadm-settle-timeout-to-10-seconds.patch | 2 +-
.../Allow-libvirt-group-to-access-the-socket.patch | 15 ++++----
.../patches/debian/Debianize-libvirt-guests.patch | 10 +++---
.../debian/Debianize-systemd-service-files.patch | 6 ++--
.../Don-t-enable-default-network-on-boot.patch | 8 ++---
debian/patches/debian/remove-RHism.diff.patch | 2 +-
debian/patches/series | 1 -
.../xen-fix-parsing-xend-http-response.patch | 40 ----------------------
9 files changed, 25 insertions(+), 63 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 3dd7576..8f7b72e 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 8907768..7e8b17a 100644
+index f70e260..92072f6 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
-@@ -1070,8 +1070,7 @@ void virNetServerRun(virNetServerPtr srv)
+@@ -1071,8 +1071,7 @@ void virNetServerRun(virNetServerPtr srv)
virObjectLock(srv);
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 b09087f..769864f 100644
--- a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+++ b/debian/patches/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 87cc2e7..d258b52 100644
+index 7a2fbb0..6a41d92 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/Allow-libvirt-group-to-access-the-socket.patch b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
index ecc2bd0..bc1296c 100644
--- a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
@@ -3,12 +3,12 @@ Date: Thu, 26 Jun 2008 20:01:38 +0200
Subject: Allow libvirt group to access the socket
---
- daemon/libvirtd.conf | 8 ++++----
+ daemon/libvirtd.conf | 9 +++++----
daemon/test_libvirtd.aug.in | 4 ----
- 2 files changed, 4 insertions(+), 8 deletions(-)
+ 2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index 5353927..6632dde 100644
+index 073c178..6a98bc1 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -78,7 +78,7 @@
@@ -20,16 +20,17 @@ index 5353927..6632dde 100644
# Set the UNIX socket permissions for the R/O socket. This is used
# for monitoring VM status only
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,8 @@
#
# If not using PolicyKit and setting group ownership for access
- # control then you may want to relax this to:
+ # control, then you may want to relax this too.
-#unix_sock_rw_perms = "0770"
++# control then you may want to relax this to:
+unix_sock_rw_perms = "0770"
# Set the name of the directory in which sockets will be found/created.
#unix_sock_dir = "/var/run/libvirt"
-@@ -126,7 +126,7 @@
+@@ -126,7 +127,7 @@
#
# To restrict monitoring of domains you may wish to enable
# an authentication mechanism here
@@ -38,7 +39,7 @@ index 5353927..6632dde 100644
# Set an authentication scheme for UNIX read-write sockets
# By default socket permissions only allow root. If PolicyKit
-@@ -135,7 +135,7 @@
+@@ -135,7 +136,7 @@
#
# If the unix_sock_rw_perms are changed you may wish to enable
# an authentication mechanism here
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index 877dc30..b705782 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -9,7 +9,7 @@ Origin: vendor
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
-index 38e93c5..7aa6eee 100644
+index 4bbd4e4..116b232 100644
--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
@@ -1,5 +1,17 @@
@@ -31,7 +31,7 @@ index 38e93c5..7aa6eee 100644
# Copyright (C) 2011-2013 Red Hat, Inc.
#
# This library is free software; you can redistribute it and/or
-@@ -16,33 +28,33 @@
+@@ -16,23 +28,23 @@
# License along with this library. If not, see
# <http://www.gnu.org/licenses/>.
@@ -66,7 +66,9 @@ index 38e93c5..7aa6eee 100644
SHUTDOWN_TIMEOUT=300
PARALLEL_SHUTDOWN=0
START_DELAY=0
- BYPASS_CACHE=0
+@@ -40,11 +52,11 @@ BYPASS_CACHE=0
+ CONNECT_RETRIES=10
+ RETRIES_SLEEP=1
-test -f "$sysconfdir"/sysconfig/libvirt-guests &&
- . "$sysconfdir"/sysconfig/libvirt-guests
@@ -79,7 +81,7 @@ index 38e93c5..7aa6eee 100644
RETVAL=0
-@@ -531,8 +543,7 @@ gueststatus() {
+@@ -538,8 +550,7 @@ gueststatus() {
# rh_status
# Display current status: whether saved state exists, and whether start
diff --git a/debian/patches/debian/Debianize-systemd-service-files.patch b/debian/patches/debian/Debianize-systemd-service-files.patch
index 4007d92..fc84e31 100644
--- a/debian/patches/debian/Debianize-systemd-service-files.patch
+++ b/debian/patches/debian/Debianize-systemd-service-files.patch
@@ -8,13 +8,13 @@ Subject: Debianize systemd service files
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
-index dc2433a..3c2a6b8 100644
+index e1f2a07..f33a08e 100644
--- a/daemon/libvirtd.service.in
+++ b/daemon/libvirtd.service.in
-@@ -13,8 +13,8 @@ Documentation=man:libvirtd(8)
- Documentation=http://libvirt.org
+@@ -14,8 +14,8 @@ Documentation=http://libvirt.org
[Service]
+ Type=notify
-EnvironmentFile=-/etc/sysconfig/libvirtd
-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
+EnvironmentFile=-/etc/default/libvirt-bin
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 95a7629..6d6c7eb 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 57e163f..ed1d453 100644
+index 6ef32ee..ae9b7db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -2569,9 +2569,6 @@ if WITH_NETWORK
+@@ -2607,9 +2607,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 57e163f..ed1d453 100644
uninstall-local:: uninstall-init uninstall-systemd
diff --git a/src/Makefile.in b/src/Makefile.in
-index 02bc06b..e9dc961 100644
+index d5a6f62..9bf6aeb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -9697,9 +9697,6 @@ install-data-local: install-init install-systemd
+@@ -9868,9 +9868,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/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 1be4565..28040c9 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 3534b54..918bba7 100644
+index ab9bdd9..9712174 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -107,7 +107,7 @@ alphabetic character, @, [, ], \, ^, _.
diff --git a/debian/patches/series b/debian/patches/series
index 0baf1ce..6148614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +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
-xen-fix-parsing-xend-http-response.patch
diff --git a/debian/patches/xen-fix-parsing-xend-http-response.patch b/debian/patches/xen-fix-parsing-xend-http-response.patch
deleted file mode 100644
index e993128..0000000
--- a/debian/patches/xen-fix-parsing-xend-http-response.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Jim Fehlig <jfehlig at suse.com>
-Date: Tue, 28 Jan 2014 18:15:48 -0700
-Subject: xen: fix parsing xend http response
-
-Commit df36af58 broke parsing of http response from xend. The prior
-use of atoi() would happily parse e.g. a string containing "200 OK\r\n",
-whereas virStrToLong_i() will fail when called with a NULL end_ptr.
-Change the calls to virStrToLong_i() to provide a non-NULL end_ptr.
----
- src/xen/xend_internal.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
-index 87e77a6..25137b8 100644
---- a/src/xen/xend_internal.c
-+++ b/src/xen/xend_internal.c
-@@ -282,6 +282,7 @@ xend_req(int fd, char **content)
- size_t buffer_size = 4096;
- int content_length = 0;
- int retcode = 0;
-+ char *end_ptr;
-
- if (VIR_ALLOC_N(buffer, buffer_size) < 0)
- return -1;
-@@ -291,13 +292,13 @@ xend_req(int fd, char **content)
- break;
-
- if (istartswith(buffer, "Content-Length: ")) {
-- if (virStrToLong_i(buffer + 16, NULL, 10, &content_length) < 0) {
-+ if (virStrToLong_i(buffer + 16, &end_ptr, 10, &content_length) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("failed to parse Xend response content length"));
- return -1;
- }
- } else if (istartswith(buffer, "HTTP/1.1 ")) {
-- if (virStrToLong_i(buffer + 9, NULL, 10, &retcode) < 0) {
-+ if (virStrToLong_i(buffer + 9, &end_ptr, 10, &retcode) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("failed to parse Xend response return code"));
- return -1;
--
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