From 0949bcaa8a38639a22ac4b3494d9acf8830f7f2d Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 25 May 2018 11:09:02 +0200 Subject: [PATCH] Fix license problems in Bug #2382 --- bacula/src/win32/compat/print.cpp | 40 ++++++++++++++++++ bacula/src/win32/filed/plugins/node.h | 41 ++++++++----------- .../win32/full_win32_installer/winbacula.nsi | 4 ++ 3 files changed, 60 insertions(+), 25 deletions(-) diff --git a/bacula/src/win32/compat/print.cpp b/bacula/src/win32/compat/print.cpp index 78b0271a8c..4b34550201 100644 --- a/bacula/src/win32/compat/print.cpp +++ b/bacula/src/win32/compat/print.cpp @@ -1,3 +1,43 @@ +/* + * + * Note: 25 May 2018. This code appears not to have a copyright, however, + * it appears to come from exactly the same code source as bsnprintf.c + * in the Bacula src/lib. The code in that file has two licenses that + * am adding here: + */ + +/* + Bacula(R) - The Network Backup Solution + + Copyright (C) 2000-2018 Kern Sibbald + + The original 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. + + This notice must be preserved when any source code is + conveyed and/or propagated. + + Bacula(R) is a registered trademark of Kern Sibbald. +*/ +/* + * Copyright Patrick Powell 1995 + * + * This code is based on code written by Patrick Powell + * (papowell@astart.com) It may be used for any purpose as long + * as this notice remains intact on all source code distributions. + * + * Adapted for Bacula -- note there were lots of bugs in + * the original code: %lld and %s were seriously broken, and + * with FP turned off %f seg faulted. + * + * Kern Sibbald, November MMV + * + */ /************************************************************** * Original: * Patrick Powell Tue Apr 11 09:48:21 PDT 1995 diff --git a/bacula/src/win32/filed/plugins/node.h b/bacula/src/win32/filed/plugins/node.h index dcaa43f420..591b997a0a 100644 --- a/bacula/src/win32/filed/plugins/node.h +++ b/bacula/src/win32/filed/plugins/node.h @@ -1,29 +1,20 @@ /* - Bacula® - The Network Backup Solution - - Copyright (C) 2008-2008 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. - This program is Free Software; you can redistribute it and/or - modify it under the terms of version three of the GNU Affero General Public - License as published by the Free Software Foundation, which is - listed in the file LICENSE. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. - - Bacula® is a registered trademark of Kern Sibbald. - The licensor of Bacula is the Free Software Foundation Europe - (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, - Switzerland, email:ftf@fsfeurope.org. + Bacula(R) - The Network Backup Solution + + Copyright (C) 2000-2018 Kern Sibbald + + The original 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. + + This notice must be preserved when any source code is + conveyed and/or propagated. + + Bacula(R) is a registered trademark of Kern Sibbald. */ /* * Written by James Harper, October 2008 diff --git a/bacula/src/win32/full_win32_installer/winbacula.nsi b/bacula/src/win32/full_win32_installer/winbacula.nsi index 700dff6316..c56e5015e1 100644 --- a/bacula/src/win32/full_win32_installer/winbacula.nsi +++ b/bacula/src/win32/full_win32_installer/winbacula.nsi @@ -1,3 +1,7 @@ +# +# Copyright (C) 2000-2018 Kern Sibbald +# License: BSD 2-Clause; see file LICENSE-FOSS +# ; winbacula.nsi ; ; Began as a version written by Michel Meyers (michel@tcnnet.dyndns.org) -- 2.39.2