[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-62-g1c18684
Alexander Golovko
alexandro at ankalagon.ru
Mon May 21 12:46:53 UTC 2012
The following commit has been merged in the master branch:
commit 5371c79d19a8b38cdd8e01bf5dca0e59a2a69e66
Merge: 960e5edb090fe04ed070b956bf809f5e602685c5 2d1b1b31fd49f4325501a1c5a77b2499d5064f57
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date: Sun May 20 19:57:46 2012 +0400
Merge commit '2d1b1b3'
+ add missed changes in bacula-director-sqlite3 and bacula-director-pgsql
init scripts
+ fix filenames mistypes in /etc/default
+ add entries to changelog
diff --combined debian/bacula-director-mysql.bacula-director.init
index 021fd87,95f9bc2..dba6559
--- a/debian/bacula-director-mysql.bacula-director.init
+++ b/debian/bacula-director-mysql.bacula-director.init
@@@ -19,7 -19,6 +19,6 @@@ DAEMON=/usr/sbin/bacula-di
NAME="bacula-dir"
PORT=9101
DESC="Bacula Director"
- ARGS="-c /etc/bacula/bacula-dir.conf -u bacula -g bacula"
test -f $DAEMON || exit 0
@@@ -34,6 -33,12 +33,12 @@@ PIDFILE=/var/run/bacula/$NAME.$PORT.pi
. /lib/lsb/init-functions
. /usr/share/bacula-common/common-functions
-if [ -r /etc/default/bacula-dir ]; then
- . /etc/default/bacula-dir
++if [ -r /etc/default/$NAME ]; then
++ . /etc/default/$NAME
+ fi
+
-CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
++CONFIG="${CONFIG:-/etc/bacula/$NAME.conf}"
+
create_var_run_dir
get_pid()
@@@ -56,7 -61,7 +61,7 @@@ kill_pid(
do_start()
{
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --oknodo --exec $DAEMON -- $ARGS
+ --oknodo --exec $DAEMON -- -c $CONFIG $ARGS
}
# do_stop()
@@@ -64,7 -69,7 +69,7 @@@ do_stop(
{
get_pid $PIDFILE ;
start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON
+ --exec $DAEMON -- -c $CONFIG $ARGS
# make sure daemon is stopped/killed
if [ -n "$pid" ]; then
if check_pid $pid ; then
@@@ -91,6 -96,12 +96,12 @@@ case "$1" i
log_failure_msg "Not starting $DESC: disabled via /etc/bacula/do_not_run"
exit 0
fi
+
+ if [ "$ENABLED" = "no" ]; then
- log_failure_msg "Not starting $DESC: disabled via /etc/default/bacula-dir"
++ log_failure_msg "Not starting $DESC: disabled via /etc/default/$NAME"
+ exit 0
+ fi
+
create_var_run_dir
log_daemon_msg "Starting $DESC..."
if do_start ; then
diff --combined debian/bacula-director-pgsql.bacula-director.init
index 021fd87,1e12cb9..dba6559
--- a/debian/bacula-director-pgsql.bacula-director.init
+++ b/debian/bacula-director-pgsql.bacula-director.init
@@@ -7,6 -7,7 +7,6 @@@
# Should-Stop: bacula-fd
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: Start Bacula Director at boot time
### END INIT INFO
# bacula-director SysV init script for Bacula-Director.
#
@@@ -19,7 -20,6 +19,6 @@@ DAEMON=/usr/sbin/bacula-di
NAME="bacula-dir"
PORT=9101
DESC="Bacula Director"
- ARGS="-c /etc/bacula/bacula-dir.conf -u bacula -g bacula"
test -f $DAEMON || exit 0
@@@ -29,12 -29,13 +28,18 @@@ if [ -n "`getent services bacula-dir`"
PORT=`getent services bacula-dir | awk '{ gsub("/tcp","",$2); print $2; }'`
fi
+
+PIDFILE=/var/run/bacula/$NAME.$PORT.pid
+
. /lib/lsb/init-functions
-if [ -r /etc/default/bacula-dir ]; then
- . /etc/default/bacula-dir
+. /usr/share/bacula-common/common-functions
++if [ -r /etc/default/$NAME ]; then
++ . /etc/default/$NAME
+ fi
+
-PIDFILE=/var/run/bacula/$NAME.$PORT.pid
-CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
++CONFIG="${CONFIG:-/etc/bacula/$NAME.conf}"
++
+create_var_run_dir
get_pid()
{
@@@ -56,7 -57,7 +61,7 @@@ kill_pid(
do_start()
{
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --oknodo --exec $DAEMON -- $ARGS
+ --oknodo --exec $DAEMON -- -c $CONFIG $ARGS
}
# do_stop()
@@@ -64,7 -65,7 +69,7 @@@ do_stop(
{
get_pid $PIDFILE ;
start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON
+ --exec $DAEMON -- -c $CONFIG $ARGS
# make sure daemon is stopped/killed
if [ -n "$pid" ]; then
if check_pid $pid ; then
@@@ -91,7 -92,12 +96,13 @@@ case "$1" i
log_failure_msg "Not starting $DESC: disabled via /etc/bacula/do_not_run"
exit 0
fi
+
+ if [ "$ENABLED" = "no" ]; then
- log_failure_msg "Not starting $DESC: disabled via /etc/default/bacula-dir"
++ log_failure_msg "Not starting $DESC: disabled via /etc/default/$NAME"
+ exit 0
+ fi
+
+ create_var_run_dir
log_daemon_msg "Starting $DESC..."
if do_start ; then
log_end_msg 0
diff --combined debian/bacula-director-sqlite3.bacula-director.init
index 021fd87,1e12cb9..dba6559
--- a/debian/bacula-director-sqlite3.bacula-director.init
+++ b/debian/bacula-director-sqlite3.bacula-director.init
@@@ -7,6 -7,7 +7,6 @@@
# Should-Stop: bacula-fd
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: Start Bacula Director at boot time
### END INIT INFO
# bacula-director SysV init script for Bacula-Director.
#
@@@ -19,7 -20,6 +19,6 @@@ DAEMON=/usr/sbin/bacula-di
NAME="bacula-dir"
PORT=9101
DESC="Bacula Director"
- ARGS="-c /etc/bacula/bacula-dir.conf -u bacula -g bacula"
test -f $DAEMON || exit 0
@@@ -29,12 -29,13 +28,18 @@@ if [ -n "`getent services bacula-dir`"
PORT=`getent services bacula-dir | awk '{ gsub("/tcp","",$2); print $2; }'`
fi
+
+PIDFILE=/var/run/bacula/$NAME.$PORT.pid
+
. /lib/lsb/init-functions
-if [ -r /etc/default/bacula-dir ]; then
- . /etc/default/bacula-dir
+. /usr/share/bacula-common/common-functions
++if [ -r /etc/default/$NAME ]; then
++ . /etc/default/$NAME
+ fi
+
-PIDFILE=/var/run/bacula/$NAME.$PORT.pid
-CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
++CONFIG="${CONFIG:-/etc/bacula/$NAME.conf}"
++
+create_var_run_dir
get_pid()
{
@@@ -56,7 -57,7 +61,7 @@@ kill_pid(
do_start()
{
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --oknodo --exec $DAEMON -- $ARGS
+ --oknodo --exec $DAEMON -- -c $CONFIG $ARGS
}
# do_stop()
@@@ -64,7 -65,7 +69,7 @@@ do_stop(
{
get_pid $PIDFILE ;
start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON
+ --exec $DAEMON -- -c $CONFIG $ARGS
# make sure daemon is stopped/killed
if [ -n "$pid" ]; then
if check_pid $pid ; then
@@@ -91,7 -92,12 +96,13 @@@ case "$1" i
log_failure_msg "Not starting $DESC: disabled via /etc/bacula/do_not_run"
exit 0
fi
+
+ if [ "$ENABLED" = "no" ]; then
- log_failure_msg "Not starting $DESC: disabled via /etc/default/bacula-dir"
++ log_failure_msg "Not starting $DESC: disabled via /etc/default/$NAME"
+ exit 0
+ fi
+
+ create_var_run_dir
log_daemon_msg "Starting $DESC..."
if do_start ; then
log_end_msg 0
diff --combined debian/bacula-fd.init
index 3f98ca9,49a808c..8834ef1
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@@ -20,7 -20,6 +20,6 @@@ DAEMON=/usr/sbin/bacula-f
NAME="bacula-fd"
PORT=9102
DESC="Bacula File daemon"
- ARGS="-c /etc/bacula/bacula-fd.conf"
test -f $DAEMON || exit 0
@@@ -32,20 -31,27 +31,27 @@@ f
. /lib/lsb/init-functions
. /usr/share/bacula-common/common-functions
-if [ -r /etc/default/bacula-fd ]; then
- . /etc/default/bacula-fd
++if [ -r /etc/default/$NAME ]; then
++ . /etc/default/$NAME
+ fi
+
-CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
++CONFIG="${CONFIG:-/etc/bacula/$NAME.conf}"
+
create_var_run_dir
+
PIDFILE=/var/run/bacula/$NAME.$PORT.pid
do_start()
{
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --oknodo --exec $DAEMON -- $ARGS
+ --oknodo --exec $DAEMON -- -c $CONFIG $ARGS
}
do_stop()
{
start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON
+ --exec $DAEMON -- -c $CONFIG $ARGS
}
case "$1" in
@@@ -55,6 -61,11 +61,11 @@@
exit 0
fi
+ if [ "$ENABLED" = "no" ]; then
- log_failure_msg "Not starting $DESC: disabled via /etc/default/bacula-fd"
++ log_failure_msg "Not starting $DESC: disabled via /etc/default/$NAME"
+ exit 0
+ fi
+
log_daemon_msg "Starting $DESC..."
if do_start ; then
log_end_msg 0
diff --combined debian/bacula-sd.init
index f914645,1958924..e70e6aa
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@@ -18,7 -18,6 +18,6 @@@ DAEMON=/usr/sbin/bacula-s
NAME="bacula-sd"
PORT=9103
DESC="Bacula Storage daemon"
- ARGS="-c /etc/bacula/bacula-sd.conf -u bacula -g tape"
test -f $DAEMON || exit 0
@@@ -30,6 -29,12 +29,12 @@@ f
. /lib/lsb/init-functions
. /usr/share/bacula-common/common-functions
-if [ -r /etc/default/bacula-sd ]; then
- . /etc/default/bacula-sd
++if [ -r /etc/default/$NAME ]; then
++ . /etc/default/$NAME
+ fi
+
-CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
++CONFIG="${CONFIG:-/etc/bacula/$NAME.conf}"
+
create_var_run_dir
PIDFILE=/var/run/bacula/$NAME.$PORT.pid
@@@ -37,13 -42,13 +42,13 @@@
do_start()
{
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --oknodo --exec $DAEMON -- $ARGS
+ --oknodo --exec $DAEMON -- -c $CONFIG $ARGS
}
do_stop()
{
start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON -- $ARGS
+ --exec $DAEMON -- -c $CONFIG $ARGS
}
case "$1" in
@@@ -53,6 -58,11 +58,11 @@@
exit 0
fi
+ if [ "$ENABLED" = "no" ]; then
- log_failure_msg "Not starting $DESC: disabled via /etc/default/bacula-sd"
++ log_failure_msg "Not starting $DESC: disabled via /etc/default/$NAME"
+ exit 0
+ fi
+
log_daemon_msg "Starting $DESC..."
if do_start ; then
log_end_msg 0
diff --combined debian/changelog
index ddf6d4c,9891987..414dd2a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,70 -1,3 +1,74 @@@
+bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
+
+ [ Alexander Golovko ]
+ * debian/patches/switch-nonfree-sha1-to-openssl.patch
+ (Closes: #658326):
+ + switch from upstream nonfree SHA1 implementation to openssl
+ * debian/patches/fix-binutils-gold-linking.patch (Closes: #553956):
+ + fix linking with binutils-gold.
+ * debian/patches/fix-readline-ncurses-depends.patch
+ (Closes: #646730):
+ + fix ncurses requirement for readline-compiled bconsole, thanks
+ to Sven Joachim <svenjoac at gmx.de>.
+
+ [ Bartosz Cisek ]
+ * debian/rules:
+ + fix --with-dir-passowrd= typo.
+
+ [ Ben Hutchings ]
+ * debian/control:
+ + add autoconf to Build-Depends:.
+ * debian/patches/fix-mysql-autoconf.patch:
+ + fix FTBFS with multi-arch libmysqlclient-dev (Closes: #672765).
+ * debian/rules:
+ + recreate configure script on build.
+
+ [ Jan Hauke Rahm ]
+ * debian/*:
+ + rework patching to use 3.0 (quilt).
+ + rewrite to use debhelper.
++ + add init scripts /etc/default processing for enabling, config path
++ and arguments (Closes: #555737, #530019, #530018, #530014),
++ thanks to Christopher Phillips (Blake) <blake at lindenlab.com>
++ and Teodor <mteodor at gmail.com>.
+ * debian/bacula-director-mysql.script.5.0.0,
+ debian/rules:
+ - remove lenny->squeeze upgrade path.
+ + don't add useless call to ldconfig
+ * debian/bacula-director-sqlite3.config,
+ debian/bacula-director-sqlite3.postinst,
+ debian/control:
+ - remove sqlite->sqlite3 upgrade path (lenny->squeeze) (Closes: #612352).
+ + update git-repository url
+ * debian/bacula-traymonitor.links:
+ + also link the man page for traymonitor.
+ * debian/bacula-director-common.bacula-director.init,
+ debian/bacula-fd.init, debian/bacula-sd.init (Closes: #608600):
+ + Fix: init scripts fail if daemon already running
+ * debian/patches/remove-use-statement-for-mysql:
+ + remove "use <dbname>" statement from database setup/update
+ scripts because we can't provide correct database name in it.
+ * debian/*bacula-director.init:
+ + move bacula-director init script from bacula-director-common
+ package into bacula-director-<dbtype> packages.
+ * debian/*.install (Closes: #621282):
+ + stop shipping .la files
+
+ [ Luca Capello ]
+ * debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch:
+ + import from Git commit:fc7990a.
+ * debian/README.Debian:
+ + explain why upstream sources are not DFSG-free.
+
+ [ Martin Pitt ]
+ * debian/control (Closes: #639466):
+ + update libpq-dev Build-Depends: to 9.1.
+ + Build-Depends: on postgresql-server-dev-all.
+ + leave only the unversioned postgresql-client package in
+ bacula-director-pgsql's Depends: and Recommends:.
+
+ --
+
bacula (5.0.3-1) unstable; urgency=low
* [27362ff7] Adopted by bacula packaging group (Closes: #612296)
--
Bacula, a network backup, recovery and verification program
More information about the pkg-bacula-commits
mailing list