Clean up some incorrect copyrights

diff --git a/bacula/platforms/rpms/redhat/bacula-aligned.spec.in b/bacula/platforms/rpms/redhat/bacula-aligned.spec.in
index e6906a5e4614a6d0e18f1bf2ce9d85c331c96a04..dd65edffa8ac8c4075facaa2e1061e7c21f0b310 100644 (file)
--- a/bacula/platforms/rpms/redhat/bacula-aligned.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula-aligned.spec.in
@@ -1,6 +1,8 @@
 # Bacula RPM spec file
 #
-# Copyright (C) 2013-2014 Bacula Systems SA
+# Copyright (C) 2000-2020 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 
 # Platform Build Configuration
 # TODO: merge all plugins into one spec file

diff --git a/bacula/platforms/rpms/redhat/bacula-bat.spec.in b/bacula/platforms/rpms/redhat/bacula-bat.spec.in
index 1b4a3bb18ee87250c3c2ebeca5e12e387b93069f..120b8c701b6b8764b4b3d73f46c19a6a110dc567 100644 (file)
--- a/bacula/platforms/rpms/redhat/bacula-bat.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula-bat.spec.in
@@ -1,8 +1,7 @@
 #
 # Bacula RPM spec file
 #
-#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 

diff --git a/bacula/platforms/rpms/redhat/bacula-client-static.spec.in b/bacula/platforms/rpms/redhat/bacula-client-static.spec.in
index d3bff82cdb34de9cafcbb9b1bc1d24bd85f6b27f..50af426af22553f93bf265355bbe1a18ab8b2107 100644 (file)
--- a/bacula/platforms/rpms/redhat/bacula-client-static.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula-client-static.spec.in
@@ -1,7 +1,6 @@
 # Bacula RPM spec file
 #
-#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 

diff --git a/bacula/platforms/rpms/redhat/bacula-cloud.spec.in b/bacula/platforms/rpms/redhat/bacula-cloud.spec.in
index a8a5e44834af63a9b7560eba14e33fa65d5f44e7..8d7abf877fa53c9d882b19c540bf8a75764db6c3 100644 (file)
--- a/bacula/platforms/rpms/redhat/bacula-cloud.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula-cloud.spec.in
@@ -1,6 +1,8 @@
 # Bacula RPM spec file
 #
-# Copyright (C) 2012-2017 Bacula Systems SA
+# Copyright (C) 2000-2020 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 
 # Platform Build Configuration
 # TODO: merge all plugins into one spec file
@@ -138,7 +140,7 @@ cd ../bacula-%{_version}
         --with-mon-fd-password="XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX" \
         --with-mon-sd-password="XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX" \
         --with-openssl \
-            --with-tcp-wrappers
+             --with-tcp-wrappers
 
 make
 

diff --git a/bacula/platforms/rpms/redhat/bacula-docs.spec.in b/bacula/platforms/rpms/redhat/bacula-docs.spec.in
index afe268234a0a18022ffd649d730d6a722e74f29a..f45978bca5f49536d11c15631e4c62281c48e19e 100644 (file)
--- a/bacula/platforms/rpms/redhat/bacula-docs.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula-docs.spec.in
@@ -1,6 +1,9 @@
 #
 # Bacula RPM spec file
 #
+# Copyright (C) 2000-2020 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 
 # Platform Build Configuration
 

diff --git a/bacula/platforms/rpms/redhat/bacula-mtx.spec.in b/bacula/platforms/rpms/redhat/bacula-mtx.spec.in
index b53067cb35ec704710283072b06e4d9d9ba8a632..89e13d98ecd408630d89f5817515345b0b01aa77 100644 (file)
--- a/bacula/platforms/rpms/redhat/bacula-mtx.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula-mtx.spec.in
@@ -1,8 +1,7 @@
 #
 # Bacula RPM spec file
 #
-#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 

diff --git a/bacula/platforms/rpms/redhat/bacula.spec.in b/bacula/platforms/rpms/redhat/bacula.spec.in
index e16e0145e16e699d8c7c8735fa0c54fe1a970cc5..90e4e53639d8fb2b7741de0b5d1a137b2dc97a8d 100644 (file)
--- a/bacula/platforms/rpms/redhat/bacula.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula.spec.in
@@ -1,6 +1,9 @@
 #
 # Bacula RPM spec file
 #
+# Copyright (C) 2000-2020 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 
 # Platform Build Configuration
 

diff --git a/bacula/platforms/rpms/suse/bacula-aligned.spec.in b/bacula/platforms/rpms/suse/bacula-aligned.spec.in
index b09bebc8476c0c8ff3d144904d09624677e7a1a9..04dcbee7ffe4da91a6db3667861f017a985ff6fc 100644 (file)
--- a/bacula/platforms/rpms/suse/bacula-aligned.spec.in
+++ b/bacula/platforms/rpms/suse/bacula-aligned.spec.in
@@ -1,6 +1,8 @@
 # Bacula RPM spec file
 #
-# Copyright (C) 2013-2014 Bacula Systems SA
+# Copyright (C) 2000-2020 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 
 # Platform Build Configuration
 # TODO: merge all plugins into one spec file

diff --git a/bacula/platforms/rpms/suse/bacula-bat.spec.in b/bacula/platforms/rpms/suse/bacula-bat.spec.in
index b4eed6db1aa2773ff51c8cfad2f6d04784d5bbb4..8f8738fce8ee8e3ac125547de01a8989e0845e1a 100644 (file)
--- a/bacula/platforms/rpms/suse/bacula-bat.spec.in
+++ b/bacula/platforms/rpms/suse/bacula-bat.spec.in
@@ -1,8 +1,7 @@
 #
 # Bacula RPM spec file
 #
-#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 

diff --git a/bacula/platforms/rpms/suse/bacula-docs.spec.in b/bacula/platforms/rpms/suse/bacula-docs.spec.in
index 605b9cea7f7b638c80036974123c7bc78a128b23..f45978bca5f49536d11c15631e4c62281c48e19e 100644 (file)
--- a/bacula/platforms/rpms/suse/bacula-docs.spec.in
+++ b/bacula/platforms/rpms/suse/bacula-docs.spec.in
@@ -1,8 +1,7 @@
 #
 # Bacula RPM spec file
 #
-#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 

diff --git a/bacula/platforms/rpms/suse/bacula-mtx.spec.in b/bacula/platforms/rpms/suse/bacula-mtx.spec.in
index b53067cb35ec704710283072b06e4d9d9ba8a632..89e13d98ecd408630d89f5817515345b0b01aa77 100644 (file)
--- a/bacula/platforms/rpms/suse/bacula-mtx.spec.in
+++ b/bacula/platforms/rpms/suse/bacula-mtx.spec.in
@@ -1,8 +1,7 @@
 #
 # Bacula RPM spec file
 #
-#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 

diff --git a/bacula/platforms/rpms/suse/bacula.spec.in b/bacula/platforms/rpms/suse/bacula.spec.in
index d80bcba15a36068aa0b876b7971625013ebcfcf7..35780b01c91f3d039eeab0dc2b3c5bde0ebcc35e 100644 (file)
--- a/bacula/platforms/rpms/suse/bacula.spec.in
+++ b/bacula/platforms/rpms/suse/bacula.spec.in
@@ -1,7 +1,6 @@
 # Bacula RPM spec file
 #
-#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 

diff --git a/bacula/scripts/manual_prune.pl b/bacula/scripts/manual_prune.pl
index d01dbbfd1e64ab2ef24c196c3567bf6b6f800bb2..f514f06b342417daefe5d83f6c233c9299fb6859 100755 (executable)
--- a/bacula/scripts/manual_prune.pl
+++ b/bacula/scripts/manual_prune.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 use strict;
@@ -37,15 +37,10 @@ use strict;
 
 =head1 LICENSE
 
-   Copyright (C) 2008-2014 Bacula Systems SA
-
-   Bacula(R) is a registered trademark of Kern Sibbald.
-   The licensor of Bacula Enterprise is Bacula Systems SA,
-   Rue Galilee 5, 1400 Yverdon-les-Bains, Switzerland.
-
-  This file has been made available for your personal use in the
-  hopes that it will allow community users to make better use of
-  Bacula.
+#
+# Copyright (C) 2000-2020 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 
 =head1 VERSION
 

diff --git a/regress/scripts/regress-utils.sh b/regress/scripts/regress-utils.sh
index df94032b7419d0646b6df17e2612464f9d2c54e3..c9f938516961aba9ef7549529069e0664add2fba 100644 (file)
--- a/regress/scripts/regress-utils.sh
+++ b/regress/scripts/regress-utils.sh
@@ -1,20 +1,8 @@
 #!/bin/bash
 #
-#    Bacula® - The Network Backup Solution
-#
-#    Copyright (C) 2007-2017 Bacula Systems SA
-#    All rights reserved.
-#
-#    The main author of Bacula is Kern Sibbald, with contributions from many
-#    others, a complete list can be found in the file AUTHORS.
-#
-#    Licensees holding a valid Bacula Systems SA license may use this file
-#    and others of this release in accordance with the proprietary license
-#    agreement provided in the LICENSE file.  Redistribution of any part of
-#    this release is not permitted.
-#
-#    Bacula® is a registered trademark of Kern Sibbald.
 #
+# Copyright (C) 2000-2020 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # This is an Inteos regression tests support utilities.
 # Author: Radoslaw Korzeniewski, radekk@inteos.pl, Inteos Sp. z o.o.
@@ -32,8 +20,8 @@
 # now check if we are running under a proper shell
 if test "x$SHELL" != "x/bin/bash"
 then
-       echo "Regression script must use BASH for this utilities!"
-       exit 1
+        echo "Regression script must use BASH for this utilities!"
+        exit 1
 fi
 
 #
@@ -44,7 +32,7 @@ setup_plugin_param()
 LPLUG=$1
 if [ "x$debug" != "x" ]
 then
-       LPLUG="$LPLUG debug=1"
+        LPLUG="$LPLUG debug=1"
 fi
 export LPLUG
 }
@@ -87,7 +75,7 @@ exit $?
 #   generate ${tmp}/blog${ltest}.out job output messages logfile
 #
 # in:
-#      $1 - a test number to perform which means it execute a job=${JobName}${1}
+#       $1 - a test number to perform which means it execute a job=${JobName}${1}
 #
 do_regress_backup_test()
 {
@@ -95,7 +83,7 @@ ltest=$1
 blevel="full"
 if [ "x$2" != "x" ]
 then
-       blevel=$2
+        blevel=$2
 fi
 printf "     backup test${ltest} ... "
 cat << END_OF_DATA >${tmp}/bconcmds
@@ -157,7 +145,7 @@ lpath=$2
 lplug=$LPLUG
 if [ "x$3" != "x" ]
 then
-       lplug=$3
+        lplug=$3
 fi
 printf "     listing test${ltest} ... "
 cat << END_OF_DATA >${tmp}/bconcmds