Commit e7e9ca8441b5c50b985ef513a8b5e7e23825b922 - libvirt

+1

-1

debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch less more

38	38	</define>
39	39
40	40	diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
41		index 60a21a1..2a7aa98 100644
	41	index b69f428..9d71e30 100644
42	42	--- a/src/xen/xen_hypervisor.c
43	43	+++ b/src/xen/xen_hypervisor.c
44	44	@@ -2144,11 +2144,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,

+2

-2

debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch less more

9	9	1 file changed, 1 insertion(+), 1 deletion(-)
10	10
11	11	diff --git a/src/util/virutil.c b/src/util/virutil.c
12		index d80d994..3b32865 100644
	12	index 170dd59..3451aa2 100644
13	13	--- a/src/util/virutil.c
14	14	+++ b/src/util/virutil.c
15		@@ -1542,7 +1542,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
	15	@@ -1586,7 +1586,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
16	16	void virFileWaitForDevices(void)
17	17	{
18	18	# ifdef UDEVADM

+1

-1

debian/patches/Skip-vircgrouptest.patch less more

8	8	1 file changed, 1 insertion(+), 1 deletion(-)
9	9
10	10	diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
11		index 322f6cb..3e2901b 100644
	11	index f55ef74..9f8bc76 100644
12	12	--- a/tests/vircgrouptest.c
13	13	+++ b/tests/vircgrouptest.c
14	14	@@ -22,7 +22,7 @@

+0

-22

~~debian/patches/apparmor-Don-t-scrub-environment-of-virtlogd-process.patch~~ less more

0		From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
1		Date: Sun, 5 Jun 2016 13:05:13 +0200
2		Subject: apparmor: Don't scrub environment of virtlogd process
3
4		otherwise we drop variables like XDG_RUNTIME_DIR with qemu:///session
5		and libvirtd faild to find virtlogd's socket.
6		---
7		examples/apparmor/usr.sbin.libvirtd \| 1 +
8		1 file changed, 1 insertion(+)
9
10		diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
11		index be4e1ef..30f6508 100644
12		--- a/examples/apparmor/usr.sbin.libvirtd
13		+++ b/examples/apparmor/usr.sbin.libvirtd
14		@@ -45,6 +45,7 @@
15		/bin/* PUx,
16		/sbin/* PUx,
17		/usr/bin/* PUx,
18		+ /usr/sbin/virtlogd pix,
19		/usr/sbin/* PUx,
20		/lib/udev/scsi_id PUx,
21		/usr/{lib,lib64}/xen-common/bin/xen-toolstack PUx,

+4

-4

debian/patches/debian/Don-t-enable-default-network-on-boot.patch less more

8	8	2 files changed, 2 insertions(+), 4 deletions(-)
9	9
10	10	diff --git a/src/Makefile.am b/src/Makefile.am
11		index 12b66c2..d49749a 100644
	11	index b91ff74..1a2268d 100644
12	12	--- a/src/Makefile.am
13	13	+++ b/src/Makefile.am
14		@@ -3092,8 +3092,7 @@ if WITH_NETWORK
	14	@@ -3107,8 +3107,7 @@ if WITH_NETWORK
15	15	$(DESTDIR)$(confdir)/qemu/networks/default.xml && \
16	16	rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
17	17	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \

22	22
23	23	uninstall-local:: uninstall-init uninstall-systemd
24	24	diff --git a/src/Makefile.in b/src/Makefile.in
25		index d923b7a..4dadea7 100644
	25	index 64cd856..aa670be 100644
26	26	--- a/src/Makefile.in
27	27	+++ b/src/Makefile.in
28		@@ -11321,8 +11321,7 @@ install-data-local: install-init install-systemd
	28	@@ -11465,8 +11465,7 @@ install-data-local: install-init install-systemd
29	29	@WITH_NETWORK_TRUE@ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
30	30	@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
31	31	@WITH_NETWORK_TRUE@ ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \

+2

-2

debian/patches/debian/apparmor_profiles_local_include.patch less more

20	20	+ #include <local/usr.lib.libvirt.virt-aa-helper>
21	21	}
22	22	diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
23		index 5d606e6..be4e1ef 100644
	23	index 23f70f5..30f6508 100644
24	24	--- a/examples/apparmor/usr.sbin.libvirtd
25	25	+++ b/examples/apparmor/usr.sbin.libvirtd
26		@@ -66,4 +66,6 @@
	26	@@ -67,4 +67,6 @@
27	27	# allow changing to our UUID-based named profiles
28	28	change_profile -> @{LIBVIRT}-[0-9a-f]-[0-9a-f]-[0-9a-f]-[0-9a-f]-[0-9a-f]*,
29	29

+1

-1

debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch less more

11	11	5 files changed, 6 insertions(+), 6 deletions(-)
12	12
13	13	diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
14		index fc9e1c6..60a21a1 100644
	14	index 79b25b3..b69f428 100644
15	15	--- a/src/xen/xen_hypervisor.c
16	16	+++ b/src/xen/xen_hypervisor.c
17	17	@@ -2148,7 +2148,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,

+0

-22

~~debian/patches/debian/libsystemd.patch~~ less more

0		From: Michael Biebl <biebl@debian.org>
1		Date: Tue, 11 Aug 2015 07:25:01 +0200
2		Subject: libsystemd
3
4		Use libsystemd instead of deprecated libsystemd-daemon
5		---
6		m4/virt-systemd-daemon.m4 \| 2 +-
7		1 file changed, 1 insertion(+), 1 deletion(-)
8
9		diff --git a/m4/virt-systemd-daemon.m4 b/m4/virt-systemd-daemon.m4
10		index 8516e41..c9708ec 100644
11		--- a/m4/virt-systemd-daemon.m4
12		+++ b/m4/virt-systemd-daemon.m4
13		@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
14		dnl
15
16		AC_DEFUN([LIBVIRT_CHECK_SYSTEMD_DAEMON],[
17		- LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd-daemon], [0.27.1])
18		+ LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd], [209])
19
20		old_CFLAGS="$CFLAGS"
21		old_LIBS="$LIBS"

+1

-1

debian/patches/debian/remove-RHism.diff.patch less more

6	6	1 file changed, 1 insertion(+), 1 deletion(-)
7	7
8	8	diff --git a/tools/virsh.pod b/tools/virsh.pod
9		index 6844823..d4fe18f 100644
	9	index 601cb44..b28236d 100644
10	10	--- a/tools/virsh.pod
11	11	+++ b/tools/virsh.pod
12	12	@@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.

+0

-2

debian/patches/series less more

11	11	debian/Use-upstreams-polkit-rule.patch
12	12	Allow-access-to-libnl-3-config-files.patch
13	13	debian/apparmor_profiles_local_include.patch
14		debian/libsystemd.patch
15	14	virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
16		apparmor-Don-t-scrub-environment-of-virtlogd-process.patch

+1

-1

debian/patches/virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch less more

23	23	# access PKI infrastructure
24	24	/etc/pki/libvirt-vnc/** r,
25	25	diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
26		index 691bbdf..ecb9e12 100644
	26	index 9eafaee..a36a4ec 100644
27	27	--- a/src/security/virt-aa-helper.c
28	28	+++ b/src/security/virt-aa-helper.c
29	29	@@ -512,6 +512,7 @@ valid_path(const char *path, const bool readonly)