[pkg-bacula-commits] [bacula] 05/06: refreshed debian/patches

Carsten Leonhardt leo at moszumanska.debian.org
Mon Aug 14 21:37:03 UTC 2017 

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

leo pushed a commit to branch master
in repository bacula.

commit d9da1646cb1ab8ab5c6a35180ea0c19061d96f61
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Aug 14 23:02:43 2017 +0200

    refreshed debian/patches
---
 debian/changelog                                   |  6 ++--
 debian/patches/enable-hardening-for-bat.patch      |  2 +-
 debian/patches/fix-default-config                  | 18 ++++------
 debian/patches/fix-mysql55-sql-syntax.patch        |  2 +-
 debian/patches/non-forking-systemd-units.patch     | 12 +++----
 .../patches/switch-nonfree-sha1-to-openssl.patch   | 40 +++++++++++-----------
 6 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a9e142..6207471 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 bacula (9.0.3+dfsg-1) unstable; urgency=low
 
   * New upstream release (Closes: #855645)
-  * Refreshed debian patch "fix-default-config"
+  * Refreshed debian patches "fix-default-config",
+    "switch-nonfree-sha1-to-openssl.patch" and
+    "non-forking-systemd-units.patch"
   * Default installations now use PostgreSQL, which is recommended by
     upstream. Upstream no longer officially supports SQLite3, added a news
     entry about the fact and a note in the package description of
@@ -10,7 +12,7 @@ bacula (9.0.3+dfsg-1) unstable; urgency=low
     database version update and abort the build if needed
   * updated upstreams signing key
 
- --
+ -- Carsten Leonhardt <leo at debian.org>  Mon, 14 Aug 2017 22:44:45 +0200
 
 bacula (7.4.4+dfsg-5) unstable; urgency=medium
 
diff --git a/debian/patches/enable-hardening-for-bat.patch b/debian/patches/enable-hardening-for-bat.patch
index 8561224..5e60a1c 100644
--- a/debian/patches/enable-hardening-for-bat.patch
+++ b/debian/patches/enable-hardening-for-bat.patch
@@ -3,7 +3,7 @@ Origin: https://wiki.debian.org/Hardening#Notes_for_packages_using_QMake
 Bug-Debian: 736461
 --- a/src/qt-console/bat.pro.in
 +++ b/src/qt-console/bat.pro.in
-@@ -183,3 +183,9 @@
+@@ -185,3 +185,9 @@
  QMAKE_EXTRA_TARGETS += depend
  
  TRANSLATIONS += ts/bat_fr.ts ts/bat_de.ts
diff --git a/debian/patches/fix-default-config b/debian/patches/fix-default-config
index 76242b2..6801bbc 100644
--- a/debian/patches/fix-default-config
+++ b/debian/patches/fix-default-config
@@ -5,7 +5,7 @@ Last-Update: 2012-06-01
 +++ b/src/dird/bacula-dir.conf.in
 @@ -16,7 +16,7 @@
  #
-  
+ 
  Director {                            # define myself
 -  Name = @basename at -dir
 +  Name = @debian_hostname at -dir
@@ -64,7 +64,7 @@ Last-Update: 2012-06-01
  #  Address = @hostname at 2
  #  FDPort = @fd_port@
  #  Catalog = MyCatalog
-@@ -314,7 +315,7 @@
+@@ -317,7 +318,7 @@
  # Restricted console used by tray-monitor to get the status of the director
  #
  Console {
@@ -115,7 +115,7 @@ Last-Update: 2012-06-01
  }
 --- a/src/stored/bacula-sd.conf.in
 +++ b/src/stored/bacula-sd.conf.in
-@@ -15,18 +15,19 @@
+@@ -15,7 +15,7 @@
  #
  
  Storage {                             # definition of myself
@@ -124,11 +124,7 @@ Last-Update: 2012-06-01
    SDPort = @sd_port@                  # Director's port
    WorkingDirectory = "@working_dir@"
    Pid Directory = "@piddir@"
-   Maximum Concurrent Jobs = 20
-+  SDAddress = 127.0.0.1
- }
- 
- #
+@@ -27,7 +27,7 @@
  # List Directors who are permitted to contact Storage daemon
  #
  Director {
@@ -137,7 +133,7 @@ Last-Update: 2012-06-01
    Password = "@sd_password@"
  }
  
-@@ -35,7 +36,7 @@
+@@ -36,7 +36,7 @@
  #   status of the storage daemon
  #
  Director {
@@ -146,7 +142,7 @@ Last-Update: 2012-06-01
    Password = "@mon_sd_password@"
    Monitor = yes
  }
-@@ -284,5 +285,5 @@
+@@ -330,5 +330,5 @@
  #
  Messages {
    Name = Standard
@@ -187,7 +183,7 @@ Last-Update: 2012-06-01
    Password = "@dir_password@"
 --- a/src/qt-console/tray-monitor/tray-monitor.conf.in
 +++ b/src/qt-console/tray-monitor/tray-monitor.conf.in
-@@ -3,27 +3,27 @@
+@@ -6,27 +6,27 @@
  #
  
  Monitor {
diff --git a/debian/patches/fix-mysql55-sql-syntax.patch b/debian/patches/fix-mysql55-sql-syntax.patch
index 2158d43..e5a9b94 100644
--- a/debian/patches/fix-mysql55-sql-syntax.patch
+++ b/debian/patches/fix-mysql55-sql-syntax.patch
@@ -7,7 +7,7 @@ Last-Modified: 2012-06-03
 
 --- a/src/cats/make_mysql_tables.in
 +++ b/src/cats/make_mysql_tables.in
-@@ -377,8 +377,8 @@
+@@ -383,8 +383,8 @@
  
  CREATE TABLE Counters (
     Counter TINYBLOB NOT NULL,
diff --git a/debian/patches/non-forking-systemd-units.patch b/debian/patches/non-forking-systemd-units.patch
index 636c915..046a489 100644
--- a/debian/patches/non-forking-systemd-units.patch
+++ b/debian/patches/non-forking-systemd-units.patch
@@ -3,12 +3,12 @@ Author: Sven Hartge <sven at svenhartge.de>
 
 --- a/platforms/systemd/bacula-dir.service.in
 +++ b/platforms/systemd/bacula-dir.service.in
-@@ -17,18 +17,21 @@
+@@ -17,18 +17,22 @@
  [Unit]
  Description=Bacula Director Daemon service
  Requires=network.target
--After=network.target
-+After=network.target postgresql.service mysql.service
+-After=network.target multi-user.target
++After=network.target multi-user.target postgresql.service mysql.service
  RequiresMountsFor=@working_dir@ @sysconfdir@ @sbindir@ @piddir@
  
  # From http://www.freedesktop.org/software/systemd/man/systemd.service.html
@@ -18,7 +18,6 @@ Author: Sven Hartge <sven at svenhartge.de>
 -Group=@dir_group@
 -ExecStart=@sbindir@/bacula-dir -c @sysconfdir@/bacula-dir.conf
 -PIDFile=@piddir@/bacula-dir. at dir_port@.pid
--ExecReload=@sbindir@/bacula-dir -t -c @sysconfdir@/bacula-dir.conf
 +Type=simple
 +User=bacula
 +Group=bacula
@@ -27,6 +26,7 @@ Author: Sven Hartge <sven at svenhartge.de>
 +ExecStartPre=@sbindir@/bacula-dir -t -c $CONFIG
 +ExecStart=@sbindir@/bacula-dir -f -c $CONFIG
 +ExecReload=@sbindir@/bacula-dir -t -c $CONFIG
+ ExecReload=@sbindir@/bacula-dir -t -c @sysconfdir@/bacula-dir.conf
  ExecReload=/bin/kill -HUP $MAINPID
 +SuccessExitStatus=15
  StandardError=syslog
@@ -76,5 +76,5 @@ Author: Sven Hartge <sven at svenhartge.de>
 +ExecReload=/bin/kill -HUP $MAINPID
 +SuccessExitStatus=15
  StandardError=syslog
- #LimitMEMLOCK=infinity
- TimeoutStopSec=3min
+ LimitMEMLOCK=infinity
+ 
diff --git a/debian/patches/switch-nonfree-sha1-to-openssl.patch b/debian/patches/switch-nonfree-sha1-to-openssl.patch
index 45c43aa..a9bc88b 100644
--- a/debian/patches/switch-nonfree-sha1-to-openssl.patch
+++ b/debian/patches/switch-nonfree-sha1-to-openssl.patch
@@ -7,7 +7,7 @@ Last-Update: 2012-06-02
 
 --- a/src/lib/lib.h
 +++ b/src/lib/lib.h
-@@ -50,7 +50,7 @@
+@@ -53,7 +53,7 @@
  #include "fnmatch.h"
  #endif
  #include "md5.h"
@@ -19,24 +19,24 @@ Last-Update: 2012-06-02
 --- a/src/lib/Makefile.in
 +++ b/src/lib/Makefile.in
 @@ -38,7 +38,7 @@
- 		fnmatch.h guid_to_name.h htable.h lex.h \
- 		lib.h md5.h mem_pool.h message.h \
- 		openssl.h plugins.h protos.h queue.h rblist.h \
--		runscript.h rwlock.h serial.h sellist.h sha1.h \
-+		runscript.h rwlock.h serial.h sellist.h \
- 		smartall.h status.h tls.h tree.h var.h \
- 		waitq.h watchdog.h workq.h \
- 		parse_conf.h ini.h \
-@@ -54,7 +54,7 @@
- 	      guid_to_name.c hmac.c jcr.c lex.c alist.c dlist.c \
- 	      md5.c message.c mem_pool.c openssl.c \
- 	      plugins.c priv.c queue.c bregex.c \
--	      runscript.c rwlock.c scan.c sellist.c serial.c sha1.c \
-+	      runscript.c rwlock.c scan.c sellist.c serial.c \
- 	      signal.c smartall.c rblist.c tls.c tree.c \
- 	      util.c var.c watchdog.c workq.c btimers.c \
- 	      address_conf.c breg.c htable.c lockmgr.c devlock.c
-@@ -176,13 +176,6 @@
+       flist.h fnmatch.h guid_to_name.h htable.h lex.h \
+       lib.h lz4.h md5.h mem_pool.h message.h \
+       openssl.h parse_conf.h plugins.h protos.h queue.h rblist.h \
+-      runscript.h rwlock.h serial.h sellist.h sha1.h sha2.h \
++      runscript.h rwlock.h serial.h sellist.h sha2.h \
+       smartall.h status.h tls.h tree.h var.h \
+       watchdog.h workq.h ini.h \
+       lockmgr.h devlock.h output.h bwlimit.h
+@@ -52,7 +52,7 @@
+       guid_to_name.c hmac.c jcr.c lex.c lz4.c alist.c dlist.c \
+       md5.c message.c mem_pool.c openssl.c \
+       plugins.c priv.c queue.c bregex.c \
+-      runscript.c rwlock.c scan.c sellist.c serial.c sha1.c sha2.c \
++      runscript.c rwlock.c scan.c sellist.c serial.c sha2.c \
+       signal.c smartall.c rblist.c tls.c tree.c \
+       util.c var.c watchdog.c workq.c btimers.c \
+       worker.c flist.c \
+@@ -218,13 +218,6 @@
  	$(RMF) md5.o
  	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) md5.c
  
@@ -50,7 +50,7 @@ Last-Update: 2012-06-02
  bsnprintf: Makefile bsnprintf.o
  	$(RMF) bsnprintf.o
  	$(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE)  $(CFLAGS) bsnprintf.c
-@@ -232,7 +225,7 @@
+@@ -274,7 +267,7 @@
  
  clean:	libtool-clean
  	@$(RMF) core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3

-- 
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