[Pkg-libvirt-commits] [libvirt] 01/02: Enable selinux driver

[Guido Guenther]

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

agx pushed a commit to branch master
in repository libvirt.

commit 13052e424e3072dd2427ba064d0ad9366624448c
Author: Laurent Bigonville <bigon at debian.org>
Date:   Sat Dec 28 11:27:25 2013 +0100

    Enable selinux driver
    
    Closes: #688179
---
 debian/control | 2 ++
 debian/rules   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 1c4e4b2..109d4a7 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Build-Depends:
  libnetcf-dev (>= 1:0.2.3-3~) [linux-any],
  libsanlock-dev [linux-any],
  libaudit-dev [linux-any],
+ libselinux1-dev (>= 2.0.82) [linux-any],
  systemtap-sdt-dev [amd64 armel armhf i386 ia64 powerpc s390],
 # for --with-storage-sheepdog
  sheepdog [linux-any],
@@ -88,6 +89,7 @@ Package: libvirt0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: lvm2 [linux-any]
+Breaks: selinux-policy-default (<< 2:2.20131214-1~), selinux-policy-mls (<< 2:2.20131214-1~)
 Description: library for interfacing with different virtualization systems
  Libvirt is a C toolkit to interact with the virtualization capabilities
  of recent versions of Linux (and other OSes). The library aims at providing
diff --git a/debian/rules b/debian/rules
index 2b5df76..cf8e596 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
   WITH_SANLOCK        = --with-sanlock
   WITH_INIT_SCRIPT    =	--with-init-script=systemd
   WITH_AUDIT          = --with-audit
+  WITH_SELINUX        = --with-selinux --with-secdriver-selinux
   ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf i386 ia64 powerpc s390))
       WITH_DTRACE     = --with-dtrace
   else
@@ -61,6 +62,7 @@ else
   WITH_NETCF          = --without-netcf
   WITH_INIT_SCRIPT    =	--with-init-script=none
   WITH_AUDIT          = --without-audit
+  WITH_SELINUX        = --without-selinux
   WITH_DTRACE         = --without-dtrace
   WITH_XEN            = --without-xen
   WITH_LIBXL          = --without-libxl
@@ -88,7 +90,7 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
 	$(WITH_STORAGE_RBD)      \
 	$(WITH_INIT_SCRIPT)      \
 	$(WITH_NUMA)             \
-	--without-selinux        \
+	$(WITH_SELINUX)          \
 	--without-esx		 \
 	--without-phyp           \
 	$(WITH_CAPNG)		 \

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