[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.10.1-1

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 39ae471f0c113e4da5e62cbd7f17e3b066642a61
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Sep 6 09:20:49 2012 +0200

    Drop Revert-security-Add-DAC-to-security_drivers.patch
    
    fixed upstream.

diff --git a/debian/patches/Revert-security-Add-DAC-to-security_drivers.patch b/debian/patches/Revert-security-Add-DAC-to-security_drivers.patch
deleted file mode 100644
index 1501137..0000000
--- a/debian/patches/Revert-security-Add-DAC-to-security_drivers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Peter Krempa <pkrempa at redhat.com>
-Date: Wed, 29 Aug 2012 14:29:43 +0200
-Subject: Revert "security: Add DAC to security_drivers"
-
-This reverts commit 9f9b7b85c9b422e8f4e813f3920bf8f433246a4a.
-
-The DAC security driver needs special handling and extra parameters and
-can't just be added to regular security drivers.
----
- src/security/security_driver.c |    2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/security/security_driver.c b/src/security/security_driver.c
-index e6da220..f450a94 100644
---- a/src/security/security_driver.c
-+++ b/src/security/security_driver.c
-@@ -35,7 +35,6 @@
- # include "security_apparmor.h"
- #endif
- 
--#include "security_dac.h"
- #include "security_nop.h"
- 
- #define VIR_FROM_THIS VIR_FROM_SECURITY
-@@ -47,7 +46,6 @@ static virSecurityDriverPtr security_drivers[] = {
- #ifdef WITH_SECDRIVER_APPARMOR
-     &virAppArmorSecurityDriver,
- #endif
--    &virSecurityDriverDAC,
-     &virSecurityDriverNop, /* Must always be last, since it will always probe */
- };
- 
diff --git a/debian/patches/series b/debian/patches/series
index dd101f9..22a535b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ Disable-failing-virnetsockettest.patch
 Don-t-fail-if-we-can-t-setup-avahi.patch
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-systemd-service-files.patch
-Revert-security-Add-DAC-to-security_drivers.patch

-- 
Libvirt Debian packaging