[pkg-bacula-commits] [bacula] 02/02: Refresh Debian patches

Sven Hartge hartge-guest at moszumanska.debian.org
Sat Nov 4 19:36:42 UTC 2017 

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

hartge-guest pushed a commit to branch master
in repository bacula.

commit 50307f9e9449e83286e10a173e9394c525b83486
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sat Nov 4 20:05:52 2017 +0100

    Refresh Debian patches
---
 .../debian-remove-upstream-autoconf-log.patch      |  3 -
 debian/patches/non-forking-systemd-units.patch     | 65 ++++++++++------------
 .../upstream-fix-update_sqlite3_tables.patch       |  6 +-
 3 files changed, 31 insertions(+), 43 deletions(-)

diff --git a/debian/patches/debian-remove-upstream-autoconf-log.patch b/debian/patches/debian-remove-upstream-autoconf-log.patch
index 7666994..0537f3f 100644
--- a/debian/patches/debian-remove-upstream-autoconf-log.patch
+++ b/debian/patches/debian-remove-upstream-autoconf-log.patch
@@ -2,9 +2,6 @@ Description: Remove unused files from upstream sources (found by lintian)
 Author: Alexander Golovko <alexandro at ankalagon.ru>
 Last-Update: 2012-06-01
 
-diff --git a/autoconf/config.log b/autoconf/config.log
-deleted file mode 100644
-index fb9038e..0000000
 --- a/autoconf/config.log
 +++ /dev/null
 @@ -1,3 +0,0 @@
diff --git a/debian/patches/non-forking-systemd-units.patch b/debian/patches/non-forking-systemd-units.patch
index a43fc0e..7c74cce 100644
--- a/debian/patches/non-forking-systemd-units.patch
+++ b/debian/patches/non-forking-systemd-units.patch
@@ -1,10 +1,10 @@
-Description: Change systemd.units to non-forking simple mode
+Description: Adapt upstream systemd units to Debian packaging 
 Author: Sven Hartge <sven at svenhartge.de>
 
 --- a/platforms/systemd/bacula-dir.service.in
 +++ b/platforms/systemd/bacula-dir.service.in
 @@ -3,13 +3,13 @@
- # Copyright (C) 2000-2016 Kern Sibbald
+ # Copyright (C) 2000-2017 Kern Sibbald
  # License: BSD 2-Clause; see file LICENSE-FOSS
  #
 -# /lib/systemd/system/bacula-dir.service
@@ -17,37 +17,34 @@ Author: Sven Hartge <sven at svenhartge.de>
 -#    enable : systemctl enable bacula-dir
 -#    start : systemctl start bacula-dir
 +#    enable : systemctl enable bacula-director
-+#    start : systemctl start bacula-director
++#    start : systemctl start bacula-dirirector
  #
  #
  
-@@ -17,19 +17,24 @@
+@@ -17,18 +17,23 @@
  [Unit]
  Description=Bacula Director Daemon service
  Requires=network.target
 -After=network.target multi-user.target
 +After=network.target multi-user.target postgresql.service mysql.service
- RequiresMountsFor=@working_dir@ @sysconfdir@ @sbindir@ @piddir@
+ RequiresMountsFor=@working_dir@ @sysconfdir@ @sbindir@
  
  # From http://www.freedesktop.org/software/systemd/man/systemd.service.html
  [Service]
--Type=forking
+ Type=simple
 -User=@dir_user@
 -Group=@dir_group@
--ExecStart=@sbindir@/bacula-dir -c @sysconfdir@/bacula-dir.conf
--PIDFile=@piddir@/bacula-dir. at dir_port@.pid
+-ExecStart=@sbindir@/bacula-dir -fP -c @sysconfdir@/bacula-dir.conf
 -ExecReload=@sbindir@/bacula-dir -t -c @sysconfdir@/bacula-dir.conf
-+Type=simple
-+User=root
-+Group=root
++User=bacula
++Group=bacula
 +Environment="CONFIG=/etc/bacula/bacula-dir.conf"
 +EnvironmentFile=-/etc/default/bacula-dir
-+ExecStartPre=@sbindir@/bacula-dir -t -u bacula -g bacula -c $CONFIG
-+ExecStart=@sbindir@/bacula-dir -f -u bacula -g bacula -c $CONFIG
-+ExecReload=@sbindir@/bacula-dir -t -u bacula -g bacula -c $CONFIG
++ExecStartPre=@sbindir@/bacula-dir -t -c $CONFIG
++ExecStart=@sbindir@/bacula-dir -fP -c $CONFIG
++ExecReload=@sbindir@/bacula-dir -t -c $CONFIG
  ExecReload=/bin/kill -HUP $MAINPID
-+SuccessExitStatus=15
- StandardError=syslog
+ SuccessExitStatus=15
 +Restart=on-failure
 +RestartSec=60
  
@@ -55,25 +52,22 @@ Author: Sven Hartge <sven at svenhartge.de>
  WantedBy=multi-user.target
 --- a/platforms/systemd/bacula-fd.service.in
 +++ b/platforms/systemd/bacula-fd.service.in
-@@ -22,12 +22,18 @@
- 
+@@ -23,10 +23,17 @@
  # from http://www.freedesktop.org/software/systemd/man/systemd.service.html
  [Service]
--Type=forking
+ Type=simple
 -User=@fd_user@
 -Group=@fd_group@
--ExecStart=@sbindir@/bacula-fd -c @sysconfdir@/bacula-fd.conf
--PIDFile=@piddir@/bacula-fd. at fd_port@.pid
-+Type=simple
+-ExecStart=@sbindir@/bacula-fd -fP -c @sysconfdir@/bacula-fd.conf
 +User=root
 +Group=root
 +Environment="CONFIG=/etc/bacula/bacula-fd.conf"
 +EnvironmentFile=-/etc/default/bacula-fd
 +ExecStartPre=@sbindir@/bacula-fd -t -c $CONFIG
-+ExecStart=@sbindir@/bacula-fd -f -c $CONFIG
++ExecStart=@sbindir@/bacula-fd -fP -c $CONFIG
++ExecReload=@sbindir@/bacula-fd -t -c $CONFIG
 +ExecReload=/bin/kill -HUP $MAINPID
-+SuccessExitStatus=15
- StandardError=syslog
+ SuccessExitStatus=15
 +Restart=on-failure
 +RestartSec=60
  
@@ -81,25 +75,22 @@ Author: Sven Hartge <sven at svenhartge.de>
  WantedBy=multi-user.target
 --- a/platforms/systemd/bacula-sd.service.in
 +++ b/platforms/systemd/bacula-sd.service.in
-@@ -21,13 +21,19 @@
- 
+@@ -22,11 +22,18 @@
  # from http://www.freedesktop.org/software/systemd/man/systemd.service.html
  [Service]
--Type=forking
+ Type=simple
 -User=@sd_user@
 -Group=@sd_group@
--ExecStart=@sbindir@/bacula-sd -c @sysconfdir@/bacula-sd.conf
--PIDFile=@piddir@/bacula-sd. at sd_port@.pid
-+Type=simple
-+User=root
-+Group=root
+-ExecStart=@sbindir@/bacula-sd -fP -c @sysconfdir@/bacula-sd.conf
++User=bacula
++Group=tape
 +Environment="CONFIG=/etc/bacula/bacula-sd.conf"
 +EnvironmentFile=-/etc/default/bacula-sd
-+ExecStartPre=@sbindir@/bacula-sd -t -u bacula -g tape -c $CONFIG
-+ExecStart=@sbindir@/bacula-sd -f -u bacula -g tape -c $CONFIG
++ExecStartPre=@sbindir@/bacula-sd -t -c $CONFIG
++ExecStart=@sbindir@/bacula-sd -fP -c $CONFIG
++ExecReload=@sbindir@/bacula-sd -t -c $CONFIG
 +ExecReload=/bin/kill -HUP $MAINPID
-+SuccessExitStatus=15
- StandardError=syslog
+ SuccessExitStatus=15
  LimitMEMLOCK=infinity
 +Restart=on-failure
 +RestartSec=60
diff --git a/debian/patches/upstream-fix-update_sqlite3_tables.patch b/debian/patches/upstream-fix-update_sqlite3_tables.patch
index 0909f1b..c99d242 100644
--- a/debian/patches/upstream-fix-update_sqlite3_tables.patch
+++ b/debian/patches/upstream-fix-update_sqlite3_tables.patch
@@ -15,7 +15,7 @@ Last-Update: 2017-09-10
     VolErrors INTEGER UNSIGNED DEFAULT 0,
     VolWrites BIGINT UNSIGNED DEFAULT 0,
     VolCapacityBytes BIGINT UNSIGNED DEFAULT 0,
-@@ -239,14 +239,20 @@
+@@ -239,15 +239,20 @@
  DROP TABLE Media;
  ALTER TABLE new_Media RENAME TO Media;
  CREATE INDEX inx8 ON Media (PoolId);
@@ -27,8 +27,8 @@ Last-Update: 2017-09-10
  DROP TABLE BaseFiles;
  ALTER TABLE basefiles_temp RENAME TO BaseFiles;
  
--CREATE INDEX job_jobtdate_inx ON job (JobTDate);
-+CREATE INDEX job_jobtdate_inx ON Job (JobTDate);
+ CREATE INDEX job_jobtdate_inx ON job (JobTDate);
+-ALTER TABLE Pool ADD COLUMN CacheRetention BIGINT DEFAULT 0;
 +ALTER TABLE Pool ADD COLUMN CacheRetention BIGINT UNSIGNED DEFAULT 0;
 +
 +DROP TABLE IF EXISTS NextId;

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

More information about the pkg-bacula-commits mailing list