From 8de83c74d5f1561a77034886ea7a2eb36e40117a Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 3 Jan 2015 17:53:01 +0100 Subject: [PATCH] Revert to using LGPLv3 for simple scripts --- bacula/src/cats/create_bacula_database.in | 16 +------ bacula/src/cats/create_mysql_database.in | 16 +------ bacula/src/cats/create_postgresql_database.in | 16 +------ bacula/src/cats/create_sqlite3_database.in | 16 +------ bacula/src/cats/delete_catalog_backup.in | 16 +------ bacula/src/cats/grant_bacula_privileges.in | 16 +------ bacula/src/cats/grant_mysql_privileges.in | 16 +------ .../src/cats/grant_postgresql_privileges.in | 16 +------ bacula/src/cats/grant_sqlite3_privileges.in | 16 +------ bacula/src/cats/make_bacula_tables.in | 16 +------ bacula/src/cats/make_catalog_backup.in | 15 +------ bacula/src/cats/make_catalog_backup.pl.in | 44 +++++++++---------- bacula/src/cats/make_mysql_tables.in | 16 +------ bacula/src/cats/make_postgresql_tables.in | 16 +------ bacula/src/cats/make_sqlite3_tables.in | 15 +------ bacula/src/cats/update_bacula_tables.in | 16 +------ bacula/src/cats/update_mysql_tables.in | 16 +------ bacula/src/cats/update_postgresql_tables.in | 16 +------ bacula/src/cats/update_sqlite3_tables.in | 16 +------ 19 files changed, 58 insertions(+), 272 deletions(-) diff --git a/bacula/src/cats/create_bacula_database.in b/bacula/src/cats/create_bacula_database.in index cf00c99d0c..7997935af5 100644 --- a/bacula/src/cats/create_bacula_database.in +++ b/bacula/src/cats/create_bacula_database.in @@ -3,20 +3,8 @@ # This routine creates the Bacula database # using PostgreSQL, Ingres, MySQL, or SQLite. # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # default_db_type=@DEFAULT_DB_TYPE@ diff --git a/bacula/src/cats/create_mysql_database.in b/bacula/src/cats/create_mysql_database.in index 855bed39ca..9ab1fc070b 100644 --- a/bacula/src/cats/create_mysql_database.in +++ b/bacula/src/cats/create_mysql_database.in @@ -2,20 +2,8 @@ # # shell script to create Bacula database(s) # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # bindir=@MYSQL_BINDIR@ diff --git a/bacula/src/cats/create_postgresql_database.in b/bacula/src/cats/create_postgresql_database.in index c9e7f0cd7f..1d19a0527b 100644 --- a/bacula/src/cats/create_postgresql_database.in +++ b/bacula/src/cats/create_postgresql_database.in @@ -2,20 +2,8 @@ # # shell script to create Bacula database(s) # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # PATH="@POSTGRESQL_BINDIR@:$PATH" diff --git a/bacula/src/cats/create_sqlite3_database.in b/bacula/src/cats/create_sqlite3_database.in index 510bc87228..7010ff24c7 100644 --- a/bacula/src/cats/create_sqlite3_database.in +++ b/bacula/src/cats/create_sqlite3_database.in @@ -2,20 +2,8 @@ # # shell script to create Bacula SQLite tables # -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. -# +# Author: Kern Sibbald +# License: LGPLv3 bindir=@SQLITE_BINDIR@ PATH=$bindir:$PATH diff --git a/bacula/src/cats/delete_catalog_backup.in b/bacula/src/cats/delete_catalog_backup.in index 9e232ff504..0054dae90b 100755 --- a/bacula/src/cats/delete_catalog_backup.in +++ b/bacula/src/cats/delete_catalog_backup.in @@ -2,20 +2,8 @@ # # This script deletes a catalog dump # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # db_name=@db_name@ diff --git a/bacula/src/cats/grant_bacula_privileges.in b/bacula/src/cats/grant_bacula_privileges.in index 793d1066ab..b6fe3c34a1 100755 --- a/bacula/src/cats/grant_bacula_privileges.in +++ b/bacula/src/cats/grant_bacula_privileges.in @@ -4,20 +4,8 @@ # Bacula tables for PostgreSQL or MySQL. # SQLite does not have permissions. # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # default_db_type=@DEFAULT_DB_TYPE@ diff --git a/bacula/src/cats/grant_mysql_privileges.in b/bacula/src/cats/grant_mysql_privileges.in index 40203ca46a..de9849ba80 100644 --- a/bacula/src/cats/grant_mysql_privileges.in +++ b/bacula/src/cats/grant_mysql_privileges.in @@ -2,20 +2,8 @@ # # shell script to grant privileges to the bacula database # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # db_user=${db_user:-@db_user@} bindir=@MYSQL_BINDIR@ diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in index 1e49c0281f..850e9d8e2a 100644 --- a/bacula/src/cats/grant_postgresql_privileges.in +++ b/bacula/src/cats/grant_postgresql_privileges.in @@ -2,20 +2,8 @@ # # shell script to grant privileges to the bacula database # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # db_user=${db_user:-@db_user@} bindir=@POSTGRESQL_BINDIR@ diff --git a/bacula/src/cats/grant_sqlite3_privileges.in b/bacula/src/cats/grant_sqlite3_privileges.in index 6972835fa3..67898fea55 100644 --- a/bacula/src/cats/grant_sqlite3_privileges.in +++ b/bacula/src/cats/grant_sqlite3_privileges.in @@ -2,20 +2,8 @@ # # shell script to grant privileges to the bacula database # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # bindir=@SQLITE_BINDIR@ diff --git a/bacula/src/cats/make_bacula_tables.in b/bacula/src/cats/make_bacula_tables.in index 951e59dfca..9c172de7e3 100755 --- a/bacula/src/cats/make_bacula_tables.in +++ b/bacula/src/cats/make_bacula_tables.in @@ -3,20 +3,8 @@ # This routine makes the appropriately configured # Bacula tables for PostgreSQL, Ingres, MySQL, or SQLite. # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # default_db_type=@DEFAULT_DB_TYPE@ diff --git a/bacula/src/cats/make_catalog_backup.in b/bacula/src/cats/make_catalog_backup.in index 9731732a9c..778993485f 100755 --- a/bacula/src/cats/make_catalog_backup.in +++ b/bacula/src/cats/make_catalog_backup.in @@ -1,18 +1,7 @@ #!/bin/sh # -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # # # This script dumps your Bacula catalog in ASCII format diff --git a/bacula/src/cats/make_catalog_backup.pl.in b/bacula/src/cats/make_catalog_backup.pl.in index 9a322aa5d0..475285409b 100644 --- a/bacula/src/cats/make_catalog_backup.pl.in +++ b/bacula/src/cats/make_catalog_backup.pl.in @@ -48,24 +48,24 @@ sub dump_pgsql umask(0077); if ($args{db_address}) { - $ENV{PGHOST}=$args{db_address}; + $ENV{PGHOST}=$args{db_address}; } if ($args{db_socket}) { - $ENV{PGHOST}=$args{db_socket}; + $ENV{PGHOST}=$args{db_socket}; } if ($args{db_port}) { - $ENV{PGPORT}=$args{db_port}; + $ENV{PGPORT}=$args{db_port}; } if ($args{db_user}) { - $ENV{PGUSER}=$args{db_user}; + $ENV{PGUSER}=$args{db_user}; } if ($args{db_password}) { - $ENV{PGPASSWORD}=$args{db_password}; + $ENV{PGPASSWORD}=$args{db_password}; } $ENV{PGDATABASE}=$args{db_name}; exec("HOME='$wd' pg_dump -c > '$wd/$args{db_name}.sql'"); print "Error while executing postgres dump $!\n"; - return 1; # in case of error + return 1; # in case of error } sub dump_mysql @@ -74,12 +74,12 @@ sub dump_mysql umask(0077); unlink("$wd/.my.cnf"); open(MY, ">$wd/.my.cnf") - or die "Can't open $wd/.my.cnf for writing $@"; + or die "Can't open $wd/.my.cnf for writing $@"; $args{db_address} = $args{db_address} || "localhost"; my $addr = "host=$args{db_address}"; - if ($args{db_socket}) { # unix socket is fastest than net socket - $addr = "socket=$args{db_socket}"; + if ($args{db_socket}) { # unix socket is fastest than net socket + $addr = "socket=$args{db_socket}"; } print MY "[client] @@ -88,7 +88,7 @@ user=$args{db_user} password=$args{db_password} "; if ($args{db_port}) { - print MY "port=$args{db_port}\n"; + print MY "port=$args{db_port}\n"; } close(MY); @@ -102,16 +102,16 @@ sub dump_catalog { my %args = @_; if ($args{db_type} eq 'SQLite3') { - $ENV{PATH}="@SQLITE_BINDIR@:$ENV{PATH}"; - dump_sqlite3(%args); + $ENV{PATH}="@SQLITE_BINDIR@:$ENV{PATH}"; + dump_sqlite3(%args); } elsif ($args{db_type} eq 'PostgreSQL') { - $ENV{PATH}="@POSTGRESQL_BINDIR@:$ENV{PATH}"; - dump_pgsql(%args); + $ENV{PATH}="@POSTGRESQL_BINDIR@:$ENV{PATH}"; + dump_pgsql(%args); } elsif ($args{db_type} eq 'MySQL') { - $ENV{PATH}="@MYSQL_BINDIR@:$ENV{PATH}"; - dump_mysql(%args); + $ENV{PATH}="@MYSQL_BINDIR@:$ENV{PATH}"; + dump_mysql(%args); } else { - die "This database type isn't supported"; + die "This database type isn't supported"; } } @@ -130,14 +130,14 @@ my %cfg; while(my $l = ) { if ($l =~ /catalog=(.+)/) { - if (exists $cfg{catalog} and $cfg{catalog} eq $cat) { - exit dump_catalog(%cfg); - } - %cfg = (); # reset + if (exists $cfg{catalog} and $cfg{catalog} eq $cat) { + exit dump_catalog(%cfg); + } + %cfg = (); # reset } if ($l =~ /(\w+)=(.+)/) { - $cfg{$1}=$2; + $cfg{$1}=$2; } } diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in index 19c5cbf8f3..16d59a1e0c 100644 --- a/bacula/src/cats/make_mysql_tables.in +++ b/bacula/src/cats/make_mysql_tables.in @@ -6,20 +6,8 @@ # You won't get any support for performance issue if you changed the default # schema. # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # bindir=@MYSQL_BINDIR@ PATH="$bindir:$PATH" diff --git a/bacula/src/cats/make_postgresql_tables.in b/bacula/src/cats/make_postgresql_tables.in index bc5435c6b1..7b4e0801c9 100644 --- a/bacula/src/cats/make_postgresql_tables.in +++ b/bacula/src/cats/make_postgresql_tables.in @@ -6,20 +6,8 @@ # You won't get any support for performance issue if you changed the default # schema. # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # bindir=@POSTGRESQL_BINDIR@ PATH="$bindir:$PATH" diff --git a/bacula/src/cats/make_sqlite3_tables.in b/bacula/src/cats/make_sqlite3_tables.in index b87be080b4..55548412a5 100644 --- a/bacula/src/cats/make_sqlite3_tables.in +++ b/bacula/src/cats/make_sqlite3_tables.in @@ -2,19 +2,8 @@ # # shell script to create Bacula SQLite tables # -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # bindir=@SQLITE_BINDIR@ diff --git a/bacula/src/cats/update_bacula_tables.in b/bacula/src/cats/update_bacula_tables.in index 334b3914cd..176989e95c 100755 --- a/bacula/src/cats/update_bacula_tables.in +++ b/bacula/src/cats/update_bacula_tables.in @@ -3,20 +3,8 @@ # This routine alters the appropriately configured # Bacula tables for PostgreSQL, Ingres, MySQL, or SQLite. # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # default_db_type=@DEFAULT_DB_TYPE@ diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in index 5dca6e9a79..204925f43f 100644 --- a/bacula/src/cats/update_mysql_tables.in +++ b/bacula/src/cats/update_mysql_tables.in @@ -2,20 +2,8 @@ # # Shell script to update MySQL Community version 5.0.x to 5.2.x # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # echo " " diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in index a24d3a92cd..1e041302ee 100644 --- a/bacula/src/cats/update_postgresql_tables.in +++ b/bacula/src/cats/update_postgresql_tables.in @@ -3,20 +3,8 @@ # Shell script to update PostgreSQL tables from version 12 to 14 # or Bacula Community version 5.0.x to 5.2.x # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # echo " " diff --git a/bacula/src/cats/update_sqlite3_tables.in b/bacula/src/cats/update_sqlite3_tables.in index 368ee28fc9..68ceb2ca3c 100644 --- a/bacula/src/cats/update_sqlite3_tables.in +++ b/bacula/src/cats/update_sqlite3_tables.in @@ -2,20 +2,8 @@ # # Shell script to update sqlite3 tables from Bacula Community version 5.0.x to 5.2.x # -# -# Bacula® - The Network Backup Solution -# -# Copyright (C) 2000-2014 Free Software Foundation Europe e.V. -# -# The main author of Bacula is Kern Sibbald, with contributions from many -# others, a complete list can be found in the file AUTHORS. -# -# You may use this file and others of this release according to the -# license defined in the LICENSE file, which includes the Affero General -# Public License, v3.0 ("AGPLv3") and some additional permissions and -# terms pursuant to its AGPLv3 Section 7. -# -# Bacula® is a registered trademark of Kern Sibbald. +# Author: Kern Sibbald +# License: LGPLv3 # echo " " -- 2.39.5