[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-6-21-gbbe70c0

[Alexander Golovko]

The following commit has been merged in the master branch:
commit d350163f5eabf85f5faf11eb901a452e45db64f9
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Thu Nov 8 01:05:53 2012 +0400

    build bacula with capabilities(7) support
    
    Backported commits:
      c6b51c2c010ae82f73d8cdce2eecbfbe52e6bbec (partially)
      74198182c2fa9e2567077356e345ff5251e26bf1
      6e1fab3c304fa73b9c6801a07290ce48b7cadb24

diff --git a/debian/README.Debian b/debian/README.Debian
index 11c9936..1b003f8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -83,9 +83,13 @@ Make sure you customize the passwords in the files in /etc/bacula.
 
 The installation will create a bacula user on the system, and the
 daemons and RunBefore/RunAfter jobs will run as that user.  However,
-the file director must run as root, as will your ClientRunBefore/After
-jobs.  Installation of a director will ask you for a database user to
-use.
+the file daemon run as root, as will your ClientRunBefore/After
+jobs. File daemon can use linux capabilities(7) for drop root
+privileges, but it require root privileges for correctly restore
+original files permissions. For run file daemon without root 
+privileges you can add ARGS="-k -u <username>" into
+/etc/default/bacula-fd. This is linux specific feature. Installation 
+of a director will ask you for a database user to use.
 
 You can run Bacula consoles as any user, but the user you use will
 need to be able to read the console config files.  These files are, by
diff --git a/debian/changelog b/debian/changelog
index de36764..1c21137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,10 @@ bacula (5.2.6+dfsg-2+deb7u1) testing; urgency=high
   * debian/patches/fix_dump_resources_acl.patch, debian/rules:
     + Fix console ACL's bypass with dump_resource, SA CVE-2012-4430
       (Closes: #687923).
+  * debian/control:
+    + Add build-depends for read-all capability support (Closes: #683080).
+  * debian/README.Debian:
+    + Add information about file daemon without root privileges.
 
   [ Bart Swedrowski ]
   * debian/bacula-console.postinst,debian/bacula-console-qt.postinst,
diff --git a/debian/control b/debian/control
index 1dfab6e..e1f40d2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: autotools-dev, autoconf, debhelper (>= 8.1.3), po-debconf,
  zlib1g-dev, libreadline-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev
  (>= 9.1), postgresql-server-dev-all, libwrap0-dev, python-dev, libgtk2.0-dev,
  libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc,
- libxt-dev, libqt4-dev, libssl-dev
+ libxt-dev, libqt4-dev, libssl-dev, libcap-dev [linux-any]
 Build-Conflicts: python2.4
 Standards-Version: 3.9.2
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-bacula/bacula.git;a=summary

-- 
Bacula, a network backup, recovery and verification program