From 2c44620e5e344ca2b4acaaaa5408502332ca5aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Mon, 1 Jan 2024 22:49:12 +0100 Subject: [PATCH] Comply with base64 license terms (#14199) --- src/util/base64.cpp | 1 + src/util/base64.h | 35 ++++++++++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/util/base64.cpp b/src/util/base64.cpp index 0c2455222..ac4421f51 100644 --- a/src/util/base64.cpp +++ b/src/util/base64.cpp @@ -2,6 +2,7 @@ base64.cpp and base64.h Copyright (C) 2004-2008 René Nyffenegger +Stricter validation added by the Minetest Contributors. This source code is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages diff --git a/src/util/base64.h b/src/util/base64.h index 7f2bf1368..68fa5b743 100644 --- a/src/util/base64.h +++ b/src/util/base64.h @@ -1,20 +1,29 @@ /* -Minetest -Copyright (C) 2013-2017 celeron55, Perttu Ahola +base64.cpp and base64.h -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. +Copyright (C) 2004-2008 René Nyffenegger +Minor modifications by the Minetest Contributors. -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 Lesser General Public License for more details. +This source code is provided 'as-is', without any express or implied +warranty. In no event will the author be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this source code must not be misrepresented; you must not + claim that you wrote the original source code. If you use this source code + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original source code. + +3. This notice may not be removed or altered from any source distribution. + +René Nyffenegger rene.nyffenegger@adp-gmbh.ch -You should have received a copy of the GNU Lesser 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. */ #pragma once