[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.7.1-2-7-ga62a4a7

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 175d497124f19aef0596613f53b7c343e428c994
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Wed Oct 21 14:15:17 2009 +0200

    Fix SELinux linking issues.
    
    Pulled from upstream 309acaa0230494b8ec08d03375c10238cb2daf55.

diff --git a/debian/patches/0005-Fix-SELinux-linking-issues.patch b/debian/patches/0005-Fix-SELinux-linking-issues.patch
new file mode 100644
index 0000000..7fdcbac
--- /dev/null
+++ b/debian/patches/0005-Fix-SELinux-linking-issues.patch
@@ -0,0 +1,36 @@
+From: =?utf-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
+Date: Mon, 19 Oct 2009 21:16:34 +0200
+Subject: [PATCH] Fix SELinux linking issues.
+
+---
+ src/Makefile.am |    2 ++
+ src/Makefile.in |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5963a73..3ba7caf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -657,6 +657,8 @@ libvirt_driver_security_la_CFLAGS = \
+ libvirt_driver_security_la_LDFLAGS =
+ if WITH_SECDRIVER_SELINUX
+ libvirt_driver_security_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES)
++libvirt_driver_security_la_CFLAGS += $(SELINUX_CFLAGS)
++libvirt_driver_security_la_LDFLAGS += $(SELINUX_LIBS)
+ endif
+ if WITH_SECDRIVER_APPARMOR
+ libvirt_driver_security_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES)
+diff --git a/src/Makefile.in b/src/Makefile.in
+index acbf648..2cb6689 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -114,6 +114,8 @@ host_triplet = @host@
+ @HAVE_DEVKIT_TRUE@@WITH_NODE_DEVICES_TRUE at am__append_70 = $(DEVKIT_LIBS)
+ @WITH_DRIVER_MODULES_TRUE@@WITH_NODE_DEVICES_TRUE at am__append_71 = -module -avoid-version
+ @WITH_SECDRIVER_SELINUX_TRUE at am__append_72 = $(SECURITY_DRIVER_SELINUX_SOURCES)
++ at WITH_SECDRIVER_SELINUX_TRUE@am__append_74 = $(SELINUX_CFLAGS)
++ at WITH_SECDRIVER_SELINUX_TRUE@am__append_75 = $(SELINUX_LIBS)
+ @WITH_SECDRIVER_APPARMOR_TRUE at am__append_73 = $(SECURITY_DRIVER_APPARMOR_SOURCES)
+ @WITH_SECDRIVER_APPARMOR_TRUE at am__append_74 = $(APPARMOR_CFLAGS)
+ @WITH_SECDRIVER_APPARMOR_TRUE at am__append_75 = $(APPARMOR_LIBS)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a8c0f9e..8926c3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-qemu-disable-network.diff.patch
 0003-allow-libvirt-group-to-access-the-socket.patch
 0004-fix-Debian-specific-path-to-hvm-loader.patch
+0005-Fix-SELinux-linking-issues.patch

-- 
Libvirt Debian packaging