[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.0.4-1-1-gc2302f5

[Guido Günther]

The following commit has been merged in the master branch:
commit c2302f57ec83aeb29564483a0d3e3be31bb67700
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Apr 16 10:56:16 2013 +0200

    Dont' fail with aug-tools installed
    
    Thanks; Manuel VIVES
    Closes: #705528

diff --git a/debian/control b/debian/control
index 7ae4b0b..89e993d 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Build-Depends: cdbs (>= 0.4.90~),
 # for --with-storage-sheepdog
  sheepdog [linux-any],
 # For "make check"
+ augeas-tools,
  dwarves,
  libxml2-utils,
  dnsmasq-base,
diff --git a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
index 766326c..f39ba3b 100644
--- a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
@@ -3,8 +3,9 @@ Date: Thu, 26 Jun 2008 20:01:38 +0200
 Subject: Allow libvirt group to access the socket
 
 ---
- daemon/libvirtd.conf |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ daemon/libvirtd.conf        |    8 ++++----
+ daemon/test_libvirtd.aug.in |    4 ----
+ 2 files changed, 4 insertions(+), 8 deletions(-)
 
 diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
 index 47da520..bf0b92a 100644
@@ -46,3 +47,20 @@ index 47da520..bf0b92a 100644
  
  # Change the authentication scheme for TCP sockets.
  #
+diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in
+index 455b74a..3c4a0b7 100644
+--- a/daemon/test_libvirtd.aug.in
++++ b/daemon/test_libvirtd.aug.in
+@@ -9,12 +9,8 @@ module Test_libvirtd =
+         { "listen_addr" = "192.168.0.1" }
+         { "mdns_adv" = "1" }
+         { "mdns_name" = "Virtualization Host Joe Demo" }
+-        { "unix_sock_group" = "libvirt" }
+         { "unix_sock_ro_perms" = "0777" }
+-        { "unix_sock_rw_perms" = "0770" }
+         { "unix_sock_dir" = "/var/run/libvirt" }
+-        { "auth_unix_ro" = "none" }
+-        { "auth_unix_rw" = "none" }
+         { "auth_tcp" = "sasl" }
+         { "auth_tls" = "none" }
+         { "key_file" = "/etc/pki/libvirt/private/serverkey.pem" }

-- 
Libvirt Debian packaging