[pkg-bacula-commits] [bacula] 01/02: Merge remote-tracking branch 'origin/hardcode-users'

[Carsten Leonhardt]

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

leo pushed a commit to branch master
in repository bacula.

commit fca18115c2af3298c21b4689a0d8de89104026a7
Merge: e06568a 736b87f
Author: Carsten Leonhardt <leo at debian.org>
Date:   Wed Oct 19 22:41:48 2016 +0200

    Merge remote-tracking branch 'origin/hardcode-users'
    
    With small cleanups

 debian/TODO                                    |  6 +++++
 debian/additions/common-functions.dpkg         | 11 ++-------
 debian/bacula-director.init                    |  6 +++--
 debian/bacula-fd.init                          |  7 +++---
 debian/bacula-sd.init                          |  6 +++--
 debian/bacula-sd.postinst                      |  4 +++-
 debian/changelog                               | 15 +++++++++++-
 debian/patches/non-forking-systemd-units.patch | 32 +++++++++++++++-----------
 8 files changed, 56 insertions(+), 31 deletions(-)

diff --cc debian/additions/common-functions.dpkg
index 976324b,f091e7b..e180d08
--- a/debian/additions/common-functions.dpkg
+++ b/debian/additions/common-functions.dpkg
@@@ -115,10 -115,10 +115,10 @@@ install_config() 
  # Usage: call from postinst script "setup_etc_default <package> $@"
  #
  # on a fresh install, generate default /etc/default/* file
- # on an upgrade, preserve ENABLED, ARGS and CONFIG variables/
 -# on an upgrade, preserve ENABLED and CONFIG variables/
++# on an upgrade, preserve ENABLED and CONFIG variables
  #
  setup_etc_default() {
-     local PACKAGE SERVICE ARGS DEFAULT_ARGS ENABLED CONFIG DEFAULTS tempfile
+     local PACKAGE SERVICE ENABLED CONFIG DEFAULTS tempfile
      PACKAGE="$1"
  
      if [ "$2" != "configure" ]; then
diff --cc debian/bacula-director.init
index fac1755,a66d111..8ac7c36
--- a/debian/bacula-director.init
+++ b/debian/bacula-director.init
@@@ -63,9 -65,9 +65,9 @@@ kill_pid(
  
  do_start()
  {
- 	if $DAEMON -t -c $CONFIG $ARGS > /dev/null 2>&1; then
+ 	if $DAEMON -u $BUSER -g $BGROUP -t -c $CONFIG > /dev/null 2>&1; then
  		start-stop-daemon --start --quiet --pidfile $PIDFILE \
- 		--oknodo --exec $DAEMON -- -c $CONFIG $ARGS
 -		--oknodo --exec $DAEMON --chuid $BUSER:$BGROUP -- -c $CONFIG 
++		--oknodo --exec $DAEMON --chuid $BUSER:$BGROUP -- -c $CONFIG
  		return 0
  	else
  		log_progress_msg "- the configtest"
diff --cc debian/bacula-fd.init
index 48f38af,76eb8a4..649b9cc
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@@ -51,9 -52,9 +52,9 @@@ PIDFILE=/run/bacula/$NAME.$PORT.pi
  
  do_start()
  {
- 	if $DAEMON -t -c $CONFIG $ARGS > /dev/null 2>&1; then
+ 	if $DAEMON -u $BUSER -g $BGROUP -t -c $CONFIG > /dev/null 2>&1; then
  		start-stop-daemon --start --quiet --pidfile $PIDFILE \
- 		--oknodo --exec $DAEMON -- -c $CONFIG $ARGS
 -		--oknodo --exec $DAEMON --chuid $BUSER:$BGROUP -- -c $CONFIG 
++		--oknodo --exec $DAEMON --chuid $BUSER:$BGROUP -- -c $CONFIG
  		return 0
  	else
  		log_progress_msg "- the configtest"
diff --cc debian/changelog
index d18734f,32b3ad2..887aeaa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,26 +1,23 @@@
- bacula (7.4.4+dfsg-2) unstable; urgency=medium
 -bacula (7.4.4+dfsg-3) unstable; urgency=medium
++bacula (7.4.4+dfsg-2) experimental; urgency=medium
 +
++  [Carsten Leonhardt]
 +  * Added version to Depends on lsb-base (found by lintian)
 +  * Use the new default-mysql-* metapackages in dependencies
 +  * Bump debhelper compat level to 10, parallel build now default
  
+   [Sven Hartge]
+   * Remove configuration option to change runtime user for director
+     and storage daemon. This was never really possible without
+     recompiling the package in the first place.
+     This change also fixes problems with automatic backtrace
+     generation which does not work if the daemon changes its
+     uid/git itself. (See Issue#1905 in Bacula-BTS and commit
+     39240129 and f085b9e9 in upstream git.)
+   * Change owner of /etc/bacula/bacula-sd.conf to bacula:bacula
+     bacula-sd needs to read it while already running as non-root
+     user bacula.
+ 
 - -- 
 -  
 -bacula (7.4.4+dfsg-2) unstable; urgency=medium
 -
 -  * Added version to Depends on lsb-base (found by lintian)
 -  * Use the new default-mysql-* metapackages in dependencies
 -  * Bump debhelper compat level to 10, parallel build now default
 -
 - -- 
 + --
  
  bacula (7.4.4+dfsg-1) unstable; urgency=medium
  

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