From 213486fc1b9fc0675a35b5c530447b401f9410ff Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 5 Jan 2025 17:16:54 +0000 Subject: Remove leftovers from ftp and rsh/ssh methods removal References: fd3684cdbc165ceaa635ed19fcbd231f509b0179 --- COPYING | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'COPYING') diff --git a/COPYING b/COPYING index 670c30d5d..0f0e3f68f 100644 --- a/COPYING +++ b/COPYING @@ -16,11 +16,8 @@ Comment: for the project has always been GPL-2+, so we cannot be sure that contributors meant to grant additional permissions. . - Translation files are considered to generally be GPL-2+, - but they also include strings used by methods/rsh.cc which appears to be GPL-2. - As the translations are split into separate domains later on, - these strings are not loaded by library users outside of apt - (they are in the 'apt' translation domain). + Translation files are also considered to generally be GPL-2+, + but they might include strings used in code with other licenses. . The apt-pkg/contrib/fileutl.cc file states "RunScripts()" is "GPLv2". We believe that this was not meant to exclude later versions of the GPL, @@ -56,23 +53,6 @@ Files: methods/connect.c Copyright: Copyright (c) 1996 - 2023, Daniel Stenberg, , and many contributors License: GPL-2+ and curl -Files: methods/rsh.cc -Copyright: 2000 Ben Collins -License: GPL-2 -Comment: - This file stated: - Licensed under the GNU General Public License v2 [no exception clauses] - . - We believe that this was intended to be not a statement against future - versions of the GPL, but meant to exclude the Qt license exception in - place in APT until that time. - . - We received permission from Ben in 2021 to relicense under GPL-2+, - contributions from Adam Heath and Daniel Hartwig may still have to - be considered GPL-2 for the time being. - . - Other contributions are GPL-2+ - Files: CMake/FindBerkeley.cmake Copyright: 2006, Alexander Dymo, 2016, Julian Andres Klode -- cgit v1.2.3-70-g09d2