Merge branch 'master' into arch-all-transition

debian/bacula-sd.install

@@ -3,8 +3,8 @@ etc/bacula/scripts/isworm
 etc/bacula/scripts/mtx-changer
 etc/bacula/scripts/mtx-changer.conf
 etc/bacula/scripts/tapealert
-usr/lib/bacula/bacula-sd-cloud-driver*.so
-usr/lib/bacula/bacula-sd-aligned-driver*.so
+#usr/lib/bacula/bacula-sd-aligned-driver*.so
+#usr/lib/bacula/bacula-sd-cloud-driver*.so
 usr/sbin/bacula-sd
 usr/sbin/bcopy
 usr/sbin/bextract

debian/changelog

 bacula (9.4.0-1) UNRELEASED; urgency=medium
 
   [ Carsten Leonhardt ]
-  * New upstream version 9.4.0. The main new features are: Cloud
-    (Amazon S3) and WORM tape support.
+  * New upstream version 9.4.0.
+    The main new features is: WORM tape support.
 
   [ Sven Hartge ]
   * Switch bacula-director-{mysql,pgsql,sqlite3,common} to 
     Architecture: all, they contain no architecture-dependent files
-  * Ship bacula-sd plugins
-   + aligned: Allows the SD to create volumes with better alignment
-     suited for deduplication
-     http://blog.bacula.org/whitepapers/DedupVolumes.pdf
-   + cloud: Allows the SD to directly interface with object storages
-     http://blog.bacula.org/whitepapers/ObjectStorage.pdf
 
  -- Carsten Leonhardt <leo@debian.org>  Mon, 17 Dec 2018 11:33:25 +0100
 

debian/patches/series

@@ -5,6 +5,7 @@ upstream/multiarch-library-path-detection
 upstream/relative-dirs-for-reproduceability
 upstream/fix-spelling
 upstream/fix-pkg-config-autoconf-macro
+upstream/add-libs3-checks
 debian/fix-default-config
 debian/fix-default-dbtype
 debian/fix-sql-bindir

debian/patches/upstream/add-libs3-checks

+Description: Add code to check and enable S3 support
+Author: Sven Hartge <sven@svenhartge.de>
+Last-Update: 2018-12-19
+
+--- a/autoconf/configure.in
++++ b/autoconf/configure.in
+@@ -385,6 +385,7 @@
+ support_smartalloc=yes
+ support_readline=yes
+ support_lzo=yes
++support_s3=yes
+ support_conio=yes
+ support_bat=no
+ support_tls=no
+@@ -1896,6 +1897,20 @@
+ 
+ AC_CHECK_FUNC(accept4, [AC_DEFINE(HAVE_ACCEPT4, 1, [Define to 1 if you have the 'accept4' function.])])
+ 
++dnl ---------------------------------------------------
++dnl Check for S3 support/directory (default on)
++dnl ---------------------------------------------------
++dnl this allows you to turn it completely off
++
++AC_ARG_ENABLE(s3,
++   AC_HELP_STRING([--disable-s3], [disable S3 support @<:@default=yes@:>@]),
++   [
++       if test x$enableval = xno; then
++	  support_s3=no
++       fi
++   ]
++)
++
+ S3_INC=
+ S3_LIBS=
+ S3_LDFLAGS=
+@@ -3641,6 +3656,7 @@
+    Encryption support:	     ${support_crypto}
+    ZLIB support:	     ${have_zlib}
+    LZO support: 	     ${have_lzo}
++   S3 support:               ${have_libs3}
+    enable-smartalloc:	     ${support_smartalloc}
+    enable-lockmgr:	     ${support_lockmgr}
+    bat support: 	     ${support_bat}

debian/rules

@@ -59,7 +59,8 @@ CONF_ALL	= \
 	--with-dump-email=root \
 	--with-job-email=root \
 	--with-mysql --with-postgresql --with-sqlite3 \
-	--enable-bat --with-x
+	--enable-bat --with-x \
+	--disable-s3
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 CONF_ALL	+= --with-systemd=/lib/systemd/system
@@ -128,7 +129,7 @@ override_dh_auto_install-arch:
 
 override_dh_install-arch:
 	# sd plugins aren't installed automatically
-	make DESTDIR=$(CURDIR)/debian/tmp -C src/stored install-aligned install-cloud
+	# make DESTDIR=$(CURDIR)/debian/tmp -C src/stored install-aligned install-cloud
 	dh_install -a
 	# create a reference of which database type is installed on the system
 	# and create a link to the dbconfig information that is dbtype independent