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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 694b788e0f82a734ca98bb0930a97432240c7fe8
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Wed Jul 18 23:48:14 2012 +0400

    Rework d077cd3c - daemon user/groups with systemd.
    
    Upstream build system require daemon users, specified in
    --with-(dir|fd|sd)-(user|group) options be existed on compile time.
    So my previous solution with configure options break compiling on clean
    systems.

diff --git a/debian/changelog b/debian/changelog
index 6b788b1..3205446 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 bacula (5.2.6+dfsg-3) unstable; urgency=high
 
   [ Alexander Golovko ]
-  * debian/rules:
+  * debian/patches/fix-systemd-daemon-user-group.patch,
+    debian/patches/series:
     + fix daemons user/group on systems with systemd (Closes: #679958).
   * debian/rules, debian/*.init, debian/bacula-common.postrm,
     debian/additions/common-functions.init:
diff --git a/debian/patches/fix-systemd-daemon-user-group.patch b/debian/patches/fix-systemd-daemon-user-group.patch
new file mode 100644
index 0000000..78a8f10
--- /dev/null
+++ b/debian/patches/fix-systemd-daemon-user-group.patch
@@ -0,0 +1,47 @@
+Description: Set user and group of daemons, started by systemd.
+ Upstream solution is specify user and group on configure script call. But
+ build system require theese users and groups be available on compile-time.
+Bug-Debian: 556207
+Bug-Debian: 679958
+Author: Alexander Golovko <alexandro at ankalagon.ru>
+Last-Update: 2012-07-19
+
+--- a/platforms/systemd/bacula-dir.service.in
++++ b/platforms/systemd/bacula-dir.service.in
+@@ -26,8 +26,8 @@ ConditionPathIsDirectory=@working_dir@
+ 
+ [Service]
+ Type=forking
+-User=@dir_user@
+-Group=@dir_group@
++User=bacula
++Group=bacula
+ PIDFile=@piddir@/bacula-dir. at dir_port@.pid
+ # EnvironmentFile=-/etc/sysconfig/bacula-dir
+ StandardOutput=syslog
+--- a/platforms/systemd/bacula-fd.service.in
++++ b/platforms/systemd/bacula-fd.service.in
+@@ -21,8 +21,8 @@ After=var-run.mount nss-lookup.target network.target remote-fs.target syslog.tar
+ 
+ [Service]
+ Type=forking
+-User=@fd_user@
+-Group=@fd_group@
++User=root
++Group=root
+ PIDFile=@piddir@/bacula-fd. at fd_port@.pid
+ StandardOutput=syslog
+ ExecStart=@sbindir@/bacula-fd -c @sysconfdir@/bacula-fd.conf
+--- a/platforms/systemd/bacula-sd.service.in
++++ b/platforms/systemd/bacula-sd.service.in
+@@ -21,8 +21,8 @@ After=var-run.mount nss-lookup.target network.target remote-fs.target syslog.tar
+ 
+ [Service]
+ Type=forking
+-User=@sd_user@
+-Group=@sd_group@
++User=bacula
++Group=tape
+ PIDFile=@piddir@/bacula-sd. at sd_port@.pid
+ # EnvironmentFile=-/etc/sysconfig/bacula-sd
+ StandardOutput=syslog
diff --git a/debian/patches/series b/debian/patches/series
index 825e8b1..98f8e5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ fix-libbaccats-rpath.patch
 fix-scriptdir-examples-devices.patch
 add-systemd-bacula.conf-for-piddir.patch
 delegate-chuid-to-systemd.patch
+fix-systemd-daemon-user-group.patch
diff --git a/debian/rules b/debian/rules
index ee2296a..ccea066 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,12 +34,6 @@ CONF_ALL	= \
 	--with-db-name=XXX_DBNAME_XXX \
 	--with-db-user=XXX_DBUSER_XXX \
 	--with-db-password=XXX_DBPASSWORD_XXX \
-	--with-dir-user=bacula \
-	--with-dir-group=bacula \
-	--with-fd-user=root \
-	--with-fd-group=root \
-	--with-sd-user=bacula \
-	--with-sd-group=tape \
 	--config-cache \
 	--with-archivedir=/nonexistant/path/to/file/archive/dir \
 	--sysconfdir=/etc/bacula \

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