Merge bitcoin/bitcoin#31864: doc: add missing copyright headers

fanquake · fanquake · commit bc4b04c5bfb4 · 2025-05-20T12:18:42.000+01:00
c7c3bfa doc: add & amend copyright headers (fanquake) f667000 contrib: remove outdated entries from copyright_header.py (fanquake) 0817f2d doc: update MIT license URL (fanquake) 6854497 contrib: remove GPL-3+ from debian/copyright (fanquake) Pull request description: Add & amends a number of copyright headers. Remove some now obselete doc/code. ACKs for top commit: willcl-ark: ACK c7c3bfa Tree-SHA512: 746ca4217e310f7f907fcd5d1e03d481b65045d57048b892a2c993be690898b6681fe6003b4f6a448b551c0ddcb32cad07998de208284a64cc4853fd4d63df52
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ License
 -------
 
 Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
-information or see https://opensource.org/licenses/MIT.
+information or see https://opensource.org/license/MIT.
 
 Development Process
 -------------------
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
@@ -121,17 +121,6 @@ Comment:
  You should have received a copy of the GNU General Public License along
  with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-License: GPL-3+
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU General Public License, Version 3 or any
- later version published by the Free Software Foundation.
-Comment:
- On Debian systems the GNU General Public License (GPL) version 3 is
- located in '/usr/share/common-licenses/GPL-3'.
- .
- You should have received a copy of the GNU General Public License along
- with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 License: public-domain
  This work is in the public domain.
 
diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py
@@ -22,7 +22,6 @@
     'src/test/fuzz/FuzzedDataProvider.h',
     'src/tinyformat.h',
     'src/bench/nanobench.h',
-    'test/functional/test_framework/bignum.py',
     # python init:
     '*__init__.py',
 ]
@@ -94,7 +93,6 @@ def compile_copyright_regex(copyright_style, year_style, name):
     r"Satoshi Nakamoto",
     r"The Bitcoin Core developers",
     r"BitPay Inc\.",
-    r"University of Illinois at Urbana-Champaign\.",
     r"Pieter Wuille",
     r"Wladimir J\. van der Laan",
     r"Jeff Garzik",
diff --git a/src/clientversion.cpp b/src/clientversion.cpp
@@ -96,6 +96,6 @@ std::string LicenseInfo()
            "\n" +
            "\n" +
            _("This is experimental software.") + "\n" +
-           strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s"), "COPYING", "<https://opensource.org/licenses/MIT>").translated +
+           strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s"), "COPYING", "<https://opensource.org/license/MIT>").translated +
            "\n";
 }
diff --git a/src/node/peerman_args.cpp b/src/node/peerman_args.cpp
@@ -1,3 +1,7 @@
+// Copyright (c) 2023-present The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://opensource.org/license/mit.
+
 #include <node/peerman_args.h>
 
 #include <common/args.h>
diff --git a/src/node/peerman_args.h b/src/node/peerman_args.h
@@ -1,3 +1,7 @@
+// Copyright (c) 2023-present The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://opensource.org/license/mit.
+
 #ifndef BITCOIN_NODE_PEERMAN_ARGS_H
 #define BITCOIN_NODE_PEERMAN_ARGS_H
 
diff --git a/src/node/txdownloadman_impl.cpp b/src/node/txdownloadman_impl.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024
+// Copyright (c) 2024-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/node/txdownloadman_impl.h b/src/node/txdownloadman_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2024
+// Copyright (c) 2024-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #ifndef BITCOIN_NODE_TXDOWNLOADMAN_IMPL_H
diff --git a/src/test/fuzz/headerssync.cpp b/src/test/fuzz/headerssync.cpp
@@ -1,3 +1,7 @@
+// Copyright (c) 2022-present The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://opensource.org/license/mit.
+
 #include <arith_uint256.h>
 #include <chain.h>
 #include <chainparams.h>
diff --git a/src/test/fuzz/partially_downloaded_block.cpp b/src/test/fuzz/partially_downloaded_block.cpp
@@ -1,3 +1,7 @@
+// Copyright (c) 2023-present The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://opensource.org/license/mit.
+
 #include <blockencodings.h>
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
diff --git a/src/univalue/include/univalue_escapes.h b/src/univalue/include/univalue_escapes.h
@@ -1,3 +1,8 @@
+// Copyright 2014 BitPay Inc.
+// Copyright (c) 2022-present The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://opensource.org/license/mit.
+
 #ifndef BITCOIN_UNIVALUE_INCLUDE_UNIVALUE_ESCAPES_H
 #define BITCOIN_UNIVALUE_INCLUDE_UNIVALUE_ESCAPES_H
 static const char *escapes[256] = {
diff --git a/src/univalue/test/test_json.cpp b/src/univalue/test/test_json.cpp
@@ -1,3 +1,8 @@
+// Copyright 2014 BitPay Inc.
+// Copyright (c) 2017-present The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://opensource.org/license/mit.
+
 // Test program that can be called by the JSON test suite at
 // https://github.com/nst/JSONTestSuite.
 //
diff --git a/src/util/transaction_identifier.h b/src/util/transaction_identifier.h
@@ -1,3 +1,7 @@
+// Copyright (c) 2023-present The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://opensource.org/license/mit.
+
 #ifndef BITCOIN_UTIL_TRANSACTION_IDENTIFIER_H
 #define BITCOIN_UTIL_TRANSACTION_IDENTIFIER_H
 
diff --git a/test/lint/lint_ignore_dirs.py b/test/lint/lint_ignore_dirs.py
@@ -1,3 +1,9 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2024-present The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+
 SHARED_EXCLUDED_SUBTREES = ["src/leveldb/",
                  "src/crc32c/",
                  "src/secp256k1/",

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,6 @@ std::string LicenseInfo()`
`96`	`96`	`"\n" +`
`97`	`97`	`"\n" +`
`98`	`98`	`_("This is experimental software.") + "\n" +`
`99`		`- strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s"), "COPYING", "<https://opensource.org/licenses/MIT>").translated +`
	`99`	`+ strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s"), "COPYING", "<https://opensource.org/license/MIT>").translated +`
`100`	`100`	`"\n";`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2024`
	`1`	`+// Copyright (c) 2024-present The Bitcoin Core developers`
`2`	`2`	`// Distributed under the MIT software license, see the accompanying`
`3`	`3`	`// file COPYING or http://www.opensource.org/licenses/mit-license.php.`
`4`	`4`