[Pkg-libvirt-commits] [libvirt] 04/09: Rediff patches
Guido Guenther
agx at moszumanska.debian.org
Thu Mar 31 15:05:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
agx pushed a commit to annotated tag debian/1.3.3_rc1-1
in repository libvirt.
commit ecc2a6b1a28afe2430e06136757748cdb829a955
Author: Guido Günther <agx at sigxcpu.org>
Date: Thu Mar 31 14:55:19 2016 +0200
Rediff patches
---
debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch | 2 +-
debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch | 4 ++--
debian/patches/Skip-vircgrouptest.patch | 2 +-
debian/patches/debian/Don-t-enable-default-network-on-boot.patch | 8 ++++----
debian/patches/debian/Use-upstreams-polkit-rule.patch | 2 +-
.../patches/debian/fix-Debian-specific-path-to-hvm-loader.patch | 2 +-
debian/patches/debian/remove-RHism.diff.patch | 2 +-
.../patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch | 4 ++--
.../virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch | 2 +-
9 files changed, 14 insertions(+), 14 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 1d4ce48..f412df0 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,7 +39,7 @@ index 88e08d2..bfbc8c9 100644
</define>
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 5ad5ad6..85f19af 100644
+index 60a21a1..2a7aa98 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2144,11 +2144,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
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 70045b1..d833724 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 bb9604a..f078221 100644
+index b401f8d..ea4801c 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
-@@ -1538,7 +1538,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+@@ -1535,7 +1535,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
void virFileWaitForDevices(void)
{
# ifdef UDEVADM
diff --git a/debian/patches/Skip-vircgrouptest.patch b/debian/patches/Skip-vircgrouptest.patch
index c9388a9..3fe49d5 100644
--- a/debian/patches/Skip-vircgrouptest.patch
+++ b/debian/patches/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 7ea6e13..a46d993 100644
+index 322f6cb..3e2901b 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -22,7 +22,7 @@
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 15c28fc..390a310 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 aa5ab69..0507a48 100644
+index 1726d06..b96a55d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -2985,9 +2985,6 @@ if WITH_NETWORK
+@@ -3053,9 +3053,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 aa5ab69..0507a48 100644
uninstall-local:: uninstall-init uninstall-systemd
diff --git a/src/Makefile.in b/src/Makefile.in
-index 9204224..c1a9529 100644
+index 784c49e..2230f6d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -10849,9 +10849,6 @@ install-data-local: install-init install-systemd
+@@ -11201,9 +11201,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/Use-upstreams-polkit-rule.patch b/debian/patches/debian/Use-upstreams-polkit-rule.patch
index 9516b5c..66e9edc 100644
--- a/debian/patches/debian/Use-upstreams-polkit-rule.patch
+++ b/debian/patches/debian/Use-upstreams-polkit-rule.patch
@@ -8,7 +8,7 @@ As of 1.2.16 upstream ships a Polkit rule like Debian does.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index be1b5a9..ddd3ddc 100644
+index 2dbe81b..39bed47 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -301,14 +301,14 @@ install-data-polkit::
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 d103f3f..a13bb78 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
@@ -12,7 +12,7 @@ Closes: #517059
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index c1834cb..5ad5ad6 100644
+index fc9e1c6..60a21a1 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2148,7 +2148,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 486da55..1639cae 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 e830c59..ebda0c9 100644
+index 0c02d7f..6cc8495 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 360a123..ba64de0 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 316a942..2095a2e 100644
+index ccae02f..250d4fc 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
-@@ -1468,7 +1468,15 @@ int qemuMonitorTextGetMigrationStats(qemuMonitorPtr mon,
+@@ -1465,7 +1465,15 @@ int qemuMonitorTextGetMigrationStats(qemuMonitorPtr mon,
}
stats->disk_total *= 1024;
}
diff --git a/debian/patches/virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch b/debian/patches/virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
index 41ee4a1..e71f6bc 100644
--- a/debian/patches/virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
+++ b/debian/patches/virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
@@ -24,7 +24,7 @@ index efb4873..9f996ab 100644
# access PKI infrastructure
/etc/pki/libvirt-vnc/** r,
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
-index 5de56e5..1a8f53e 100644
+index a2d7226..9b47264 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -570,6 +570,7 @@ valid_path(const char *path, const bool readonly)
--
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