Merge branch 'master' of git://github.com/bareos/bareos

LICENSE

@@ -148,6 +148,102 @@ Copyright: Steve Reid <steve@edmweb.com>
 License: public-domain
 replaced the SHA licensed implementation (Copyright: 2001 The Internet Society), mentioned later in this document.
 
+e)
+Bareos can be compiled with data compression and decompression using
+the fastlzlib library.  (see git://github.com/exalead/fastlzlib.git)
+The following licenses (LICENSE, LICENSE-FASTLZ and LICENSE-LZ4) apply
+to the fastlzlib and its components:
+
+    == LICENSE ==
+
+    zlib-like interface to fast block compression (LZ4 or FastLZ) libraries
+    Copyright (C) 2013 Exalead SA. (http://www.exalead.com/)
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+    Remarks/Bugs:
+    LZ4 compression library by Yann Collet (yann.collet.73@gmail.com)
+    FastLZ compression library by Ariya Hidayat (ariya@kde.org)
+    Library encapsulation by Xavier Roche (fastlz@exalead.com)
+
+
+    == LICENSE-FASTLZ ==
+
+    FastLZ - lightning-fast lossless compression library
+
+    Copyright (C) 2007 Ariya Hidayat (ariya@kde.org)
+    Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+    Copyright (C) 2005 Ariya Hidayat (ariya@kde.org)
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+
+    == LICENSE-LZ4 ==
+
+    LZ4 - Fast LZ compression algorithm
+    Header File
+    Copyright (C) 2011-2012, Yann Collet.
+    BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+        * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+        * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following disclaimer
+    in the documentation and/or other materials provided with the
+    distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    You can contact the author at :
+    - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
+    - LZ4 source repository : http://code.google.com/p/lz4/
+
 ===========================================
 
 2.
@@ -338,101 +434,6 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-Bareos can be compiled with data compression and decompression using
-the fastlzlib library.  (see git://github.com/exalead/fastlzlib.git)
-The following licenses (LICENSE, LICENSE-FASTLZ and LICENSE-LZ4) apply
-to the fastlzlib and its components:
-
-== LICENSE ==
-
-  zlib-like interface to fast block compression (LZ4 or FastLZ) libraries
-  Copyright (C) 2013 Exalead SA. (http://www.exalead.com/)
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-  Remarks/Bugs:
-  LZ4 compression library by Yann Collet (yann.collet.73@gmail.com)
-  FastLZ compression library by Ariya Hidayat (ariya@kde.org)
-  Library encapsulation by Xavier Roche (fastlz@exalead.com)
-
-
-== LICENSE-FASTLZ ==
-
-FastLZ - lightning-fast lossless compression library
-
-Copyright (C) 2007 Ariya Hidayat (ariya@kde.org)
-Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-Copyright (C) 2005 Ariya Hidayat (ariya@kde.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-== LICENSE-LZ4 ==
-
-   LZ4 - Fast LZ compression algorithm
-   Header File
-   Copyright (C) 2011-2012, Yann Collet.
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   You can contact the author at :
-   - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
-   - LZ4 source repository : http://code.google.com/p/lz4/
-
 
 3.
 

autoconf/configure.in

@@ -4203,6 +4203,21 @@ fi
 
 AC_SUBST(BUILD_SD_BACKENDS)
 
+
+
+dnl install storage backend config files
+
+INSTALL_SD_CONFS="device-fifo.conf device-tape-with-autoloader.conf"
+if test X"$have_glusterfs" = "Xyes" ; then
+    INSTALL_SD_CONFS="${INSTALL_SD_CONFS} device-gluster.conf"
+fi
+if test X"$have_ceph_rados" = "Xyes" ; then
+    INSTALL_SD_CONFS="${INSTALL_SD_CONFS} device-ceph-rados.conf"
+fi
+AC_SUBST(INSTALL_SD_CONFS)
+
+
+
 dnl Insanity check
 if test "x${subsysdir}" = "x${sbindir}" ; then
    echo " "

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for bareos 14.3.0.
+# Generated by GNU Autoconf 2.69 for bareos 14.4.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='bareos'
 PACKAGE_TARNAME='bareos'
-PACKAGE_VERSION='14.3.0'
-PACKAGE_STRING='bareos 14.3.0'
+PACKAGE_VERSION='14.4.0'
+PACKAGE_STRING='bareos 14.4.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -631,6 +631,7 @@ ac_includes_default="\
 
 ac_header_list=
 ac_subst_vars='LTLIBOBJS
+INSTALL_SD_CONFS
 BUILD_SD_BACKENDS
 BUILD_DIR_PLUGINS
 BUILD_SD_PLUGINS
@@ -1621,7 +1622,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bareos 14.3.0 to adapt to many kinds of systems.
+\`configure' configures bareos 14.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1690,7 +1691,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bareos 14.3.0:";;
+     short | recursive ) echo "Configuration of bareos 14.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1908,7 +1909,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bareos configure 14.3.0
+bareos configure 14.4.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2863,7 +2864,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bareos $as_me 14.3.0, which was
+It was created by bareos $as_me 14.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -32402,6 +32403,20 @@ fi
 
 
 
+
+
+
+INSTALL_SD_CONFS="device-fifo.conf device-tape-with-autoloader.conf"
+if test X"$have_glusterfs" = "Xyes" ; then
+    INSTALL_SD_CONFS="${INSTALL_SD_CONFS} device-gluster.conf"
+fi
+if test X"$have_ceph_rados" = "Xyes" ; then
+    INSTALL_SD_CONFS="${INSTALL_SD_CONFS} device-ceph-rados.conf"
+fi
+
+
+
+
 if test "x${subsysdir}" = "x${sbindir}" ; then
    echo " "
    echo " "
@@ -32924,7 +32939,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bareos $as_me 14.3.0, which was
+This file was extended by bareos $as_me 14.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -32990,7 +33005,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-bareos config.status 14.3.0
+bareos config.status 14.4.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

debian/Makefile

@@ -2,7 +2,9 @@
 # Makefile for preparations of Debian builds
 #
 
-all:
+all: copyright
+
+copyright: copyright.header copyright.footer
 	@install copyright.header copyright
 	@sed -r -e 's/^$$/./' -e 's/^[ ]*(.*)$$/    \1/' ../LICENSE >> copyright
 	@cat copyright.footer >> copyright

debian/bareos-common.dirs

@@ -1,2 +1,3 @@
+/etc/bareos/bareos-dir.d
 /var/lib/bareos
 /var/log/bareos

debian/bareos-common.postinst

@@ -22,6 +22,7 @@ daemon_group=bareos
 
 permissions()
 {
+  chown ${daemon_user}:${daemon_group} /etc/bareos/bareos-dir.d
   chown ${daemon_user}:${daemon_group} /var/lib/bareos/
   chown ${daemon_user}:${daemon_group} /var/log/bareos/
 }

debian/bareos-storage-fifo.install.in

@@ -1 +1,2 @@
+/etc/bareos/bareos-sd.d/device-fifo.conf
 @backenddir@/libbareossd-fifo*.so