Address statements of public domain

28 files changed, 139 insertions, 2 deletions

diff --git a/COPYING b/COPYING
index d518ef5d4..825da5132 100644
--- a/COPYING
+++ b/COPYING
@@ -2,6 +2,19 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: apt
 Upstream-Contact: APT Development Team <deity@lists.debian.org>
 Source: https://salsa.debian.org/apt-team/apt
+Comment:
+ APT is an old software with lots of contributors over its lifetime. This
+ file is a best effort to document the statements of copyright and licenses
+ as stated in the file, but is not a complete representation of all copyright
+ holders - those have been lost to times.
+ .
+ Several bits of apt-pkg/contrib have had public domain dedications but
+ contributions from authors in countries not recognizing a public domain
+ concept. We believe that these contributions have been done in good faith,
+ and we treat them as if they had been made under the GPL-2+ as we believe
+ some contributors may have missed these facts and the overall license statement
+ for the project has always been GPL-2+, so we cannot be sure that contributors
+ meant to grant additional permissions.
 
 Files: *
 Copyright: 1997-1999 Jason Gunthorpe and others
diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index b80543c91..998af2fd6 100644
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -1,9 +1,13 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
 
    Command Line Class - Sophisticated command line parser
    
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Jason Gunthorpe <jgg@debian.org>.
    
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 5a7db1bbf..1134ed667 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -1,4 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
 
@@ -8,9 +9,12 @@
    for a tree-oriented configuration environment. All runtime configuration
    is stored in here.
 
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Jason Gunthorpe <jgg@debian.org>.
-   
+
    ##################################################################### */
 									/*}}}*/
 // Include files							/*{{{*/
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index ac53b9648..dd28af16d 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -1,4 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
 
@@ -7,6 +8,9 @@
    We use a simple STL vector to store each error record. A PendingFlag
    is kept which indicates when the vector contains a Sever error.
 
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Jason Gunthorpe.
 
diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index 24eead8d5..dd50b9cc4 100644
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -1,4 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
    
@@ -31,6 +32,9 @@
      if (open(..))
         return _error->Errno(..);
    
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Jason Gunthorpe.
    
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 10c656301..fad51ded1 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,4 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
    
@@ -7,6 +8,9 @@
    CopyFile - Buffered copy of a single file
    GetLock - dpkg compatible lock file manipulation (fcntl)
    
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    Most of this source is placed in the Public Domain, do with it what 
    you will
    It was originally written by Jason Gunthorpe <jgg@debian.org>.
@@ -14,6 +18,10 @@
    
    The exception is RunScripts() it is under the GPLv2
 
+   We believe that this reference to GPLv2 was not meant to exclude later
+   versions as that would have changed the overall project license from GPL-2+
+   to GPL-2.
+
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 6f808ac9b..970b11878 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -1,4 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
    
@@ -12,6 +13,9 @@
    The file class is a handy abstraction for various functions+classes
    that need to accept filenames.
    
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Jason Gunthorpe.
    
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index f37eb585b..c08cd24d9 100644
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -1,9 +1,13 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
    
    Macros Header - Various useful macro definitions
 
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Brian C. White.
    
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index 76db7b542..fe834d5ba 100644
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -1,4 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
    
@@ -16,9 +17,12 @@
    generators. It provides a large allocated workspace and members
    to allocate space from the workspace in an efficient fashion.
    
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Jason Gunthorpe.
-   
+
    ##################################################################### */
 									/*}}}*/
 #ifndef PKGLIB_MMAP_H
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index a6f408c0e..ec694da75 100644
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -1,10 +1,14 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
 
    netrc file parser - returns the login and password of a give host in
                        a specified netrc-type file
 
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    Originally written by Daniel Stenberg, <daniel@haxx.se>, et al. and
    placed into the Public Domain, do with it what you will.
 
diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h
index 444397900..2d202d14b 100644
--- a/apt-pkg/contrib/netrc.h
+++ b/apt-pkg/contrib/netrc.h
@@ -1,10 +1,14 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
 
    netrc file parser - returns the login and password of a give host in
                        a specified netrc-type file
 
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    Originally written by Daniel Stenberg, <daniel@haxx.se>, et al. and
    placed into the Public Domain, do with it what you will.
 
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 3a0a6eaa3..67100f1a2 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1,4 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
 
@@ -8,6 +9,9 @@
    things to strings. They are useful in file parsers, URI handlers and
    especially in APT methods.   
    
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Jason Gunthorpe <jgg@gpu.srv.ualberta.ca>
    
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 8439af6fe..1fdc8dc99 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -1,4 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
+// SPDX-License-Identifier: GPL-2.0+
 // Description								/*{{{*/
 /* ######################################################################
 
@@ -7,6 +8,9 @@
    _strstrip is a function to remove whitespace from the front and end
    of a string.
    
+   This file had this historic note, but now includes further changes
+   under the GPL-2.0+:
+
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Jason Gunthorpe <jgg@gpu.srv.ualberta.ca>   
    
diff --git a/po/ar.po b/po/ar.po
index 76ad55a26..0d301a3fc 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,4 +1,9 @@
 # translation of apt_po.po to Arabic
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 #
 # Ossama M. Khayat <okhayat@yahoo.com>, 2005, 2006.
diff --git a/po/bs.po b/po/bs.po
index 76f26f4de..a33a8553d 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -1,4 +1,9 @@
 # APT - Advanced Package Transfer
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 # Safir Šećerović <sapphire@linux.org.ba>, 2004
 #
diff --git a/po/cs.po b/po/cs.po
index de05a2f11..fb6d1cb70 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,4 +1,9 @@
 # Czech translation of APT
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 # Miroslav Kure <kurem@debian.cz>, 2004-2023.
 #
diff --git a/po/dz.po b/po/dz.po
index c119df8b8..5167c48b4 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1,3 +1,8 @@
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 # Kinley Tshering <gasepkuenden2k3@hotmail.com>, 2006
 msgid ""
diff --git a/po/el.po b/po/el.po
index d649f66de..94e2971ec 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,6 +1,11 @@
 # translation of apt_po_el.po to Greek
 # translation of apt_po_el.po to
 # Greek Translation of APT.
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 #
 # Fanis Dokianakis <madf@hellug.gr>, 2003.
diff --git a/po/eu.po b/po/eu.po
index c0c407ee0..ed88f37b8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,4 +1,8 @@
 # translation of apt_po_eu.po to Euskara
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 #
 # Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
diff --git a/po/fi.po b/po/fi.po
index 230594bb1..77e8c45fa 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,5 +1,10 @@
 # translation of fi.po to Finnish
 # Finnish translation of apt.
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 # Tapio Lehtonen <tale@debian.org>, 2004-2006,2008.
 #
diff --git a/po/gl.po b/po/gl.po
index 6b1753446..69a442244 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,5 +1,10 @@
 # translation of apt_po_gl.po to galician
 # Galician translation of apt
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 #
 # Jacobo Tarrío <jtarrio@debian.org>, 2005, 2007, 2008.
diff --git a/po/he.po b/po/he.po
index 2f7b7f4f0..50581bc36 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,4 +1,9 @@
 # English translation of apt_po.
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 # Lior Kaplan <webmaster@guides.co.il>, 2004.
 #
diff --git a/po/km.po b/po/km.po
index 69ead3610..6f7e34e6e 100644
--- a/po/km.po
+++ b/po/km.po
@@ -1,5 +1,9 @@
 # translation of apt_po_km.po to Khmer
 # translation of apt_po_km.po to
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 #
 # Eng Vannak <evannak@khmeros.info>, 2006.
diff --git a/po/mr.po b/po/mr.po
index c30530fb6..0dd6b9ccf 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,5 +1,9 @@
 # Marathi messages for the apt suite.
 #
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 # Sampada <sampadanakhare@gmail.com>, 2008
 #
diff --git a/po/ro.po b/po/ro.po
index bc50cb668..b5667b6e3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,4 +1,9 @@
 # translation of ro.po to Romanian
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 #
 # Sorin Batariuc <sorin@bonbon.net>, 2004, 2005, 2006.
diff --git a/po/uk.po b/po/uk.po
index da8baf324..94a1e4f4d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,4 +1,9 @@
 # translation of apt-all.po to Українська
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 #
 # A. Bondarenko <artem.brz@gmail.com>, 2006, 2012.
diff --git a/po/vi.po b/po/vi.po
index 15350ab34..37c8af21a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,5 +1,10 @@
 # Vietnamese Translation for Apt.
 # Bản dịch tiếng Việt dành cho Apt.
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 # Clytie Siddall <clytie@riverland.net.au>, 2005, 2006, 2007, 2008, 2009, 2010.
 # Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 15c37a18a..25da950c5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,4 +1,9 @@
 # Chinese/Simplified translation of apt.
+#
+# Licensing is complex as the msgid come from several files, please see
+# the individual files for licensing information.
+#
+# This file originally stated:
 # This file is put in the public domain.
 # Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008.
 # Tchaikov <tchaikov@sjtu.org>, 2005, 2007.