From 985f7cb363eae3a94ffe6bb9ffcaf7c3d28a6f6f Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 14 Feb 2025 15:17:04 +0100 Subject: [PATCH 1/4] contrib: remove GPL-3+ from debian/copyright This is unused. --- contrib/debian/copyright | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/contrib/debian/copyright b/contrib/debian/copyright index af8a1bc0c14..4e4deef9a1f 100644 --- 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 . -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 . - License: public-domain This work is in the public domain. From f5ee4e7afff9be077f3f22de0890b68c551652b8 Mon Sep 17 00:00:00 2001 From: fanquake Date: Mon, 3 Mar 2025 15:20:26 +0000 Subject: [PATCH 2/4] doc: update MIT license URL --- README.md | 2 +- src/clientversion.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c5b6ce4588e..6628e0a5c98 100644 --- 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/src/clientversion.cpp b/src/clientversion.cpp index 10e9472b84b..d9e65037ae4 100644 --- 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", "").translated + + strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s"), "COPYING", "").translated + "\n"; } From 9599d9a373a1f3a5f1b84dcb160a5ad0d94eb2de Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 14 Feb 2025 16:37:58 +0100 Subject: [PATCH 3/4] contrib: remove outdated entries from copyright_header.py --- contrib/devtools/copyright_header.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py index 3c98ee7b20d..12d7276455c 100755 --- a/contrib/devtools/copyright_header.py +++ b/contrib/devtools/copyright_header.py @@ -22,7 +22,6 @@ EXCLUDE = [ '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 @@ EXPECTED_HOLDER_NAMES = [ 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", From d58874a30af6a5efc9f46e4cf0385a165d057bea Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 14 Feb 2025 16:36:39 +0100 Subject: [PATCH 4/4] doc: add & amend copyright headers --- src/node/peerman_args.cpp | 4 ++++ src/node/peerman_args.h | 4 ++++ src/node/txdownloadman_impl.cpp | 2 +- src/node/txdownloadman_impl.h | 2 +- src/test/fuzz/headerssync.cpp | 4 ++++ src/test/fuzz/partially_downloaded_block.cpp | 4 ++++ src/univalue/include/univalue_escapes.h | 5 +++++ src/univalue/test/test_json.cpp | 5 +++++ src/util/transaction_identifier.h | 4 ++++ src/wallet/migrate.cpp | 1 + test/lint/lint_ignore_dirs.py | 6 ++++++ 11 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/node/peerman_args.cpp b/src/node/peerman_args.cpp index b0ae2663651..bdf66a06339 100644 --- 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 http://www.opensource.org/licenses/mit-license.php. + #include #include diff --git a/src/node/peerman_args.h b/src/node/peerman_args.h index 73dbdb446c2..299cfe48eaa 100644 --- 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 http://www.opensource.org/licenses/mit-license.php. + #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 index 452c75da05d..9a4daa14098 100644 --- a/src/node/txdownloadman_impl.cpp +++ b/src/node/txdownloadman_impl.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2024 +// Copyright (c) 2024 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 index d9688d0c8d8..401cd4fd14b 100644 --- a/src/node/txdownloadman_impl.h +++ b/src/node/txdownloadman_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 +// Copyright (c) 2024 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 index 8135b0d4eab..b049d2df89e 100644 --- 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 http://www.opensource.org/licenses/mit-license.php. + #include #include #include diff --git a/src/test/fuzz/partially_downloaded_block.cpp b/src/test/fuzz/partially_downloaded_block.cpp index 82d781cd53c..e1ff61914f9 100644 --- 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://www.opensource.org/licenses/mit-license.php. + #include #include #include diff --git a/src/univalue/include/univalue_escapes.h b/src/univalue/include/univalue_escapes.h index 83767e8ac5d..fc5fe757c28 100644 --- a/src/univalue/include/univalue_escapes.h +++ b/src/univalue/include/univalue_escapes.h @@ -1,3 +1,8 @@ +// Copyright 2014 BitPay Inc. +// Copyright 2015-present Bitcoin Core Developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or https://opensource.org/licenses/mit-license.php. + #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 index f8c10238d4d..62ad9e5bed3 100644 --- a/src/univalue/test/test_json.cpp +++ b/src/univalue/test/test_json.cpp @@ -1,3 +1,8 @@ +// Copyright 2014 BitPay Inc. +// Copyright 2015-present Bitcoin Core Developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or https://opensource.org/licenses/mit-license.php. + // 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 index 81b053843df..2d9128a7120 100644 --- a/src/util/transaction_identifier.h +++ b/src/util/transaction_identifier.h @@ -1,3 +1,7 @@ +// Copyright (c) 2023 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_UTIL_TRANSACTION_IDENTIFIER_H #define BITCOIN_UTIL_TRANSACTION_IDENTIFIER_H diff --git a/src/wallet/migrate.cpp b/src/wallet/migrate.cpp index d2c163027d2..be15e0243b1 100644 --- a/src/wallet/migrate.cpp +++ b/src/wallet/migrate.cpp @@ -1,3 +1,4 @@ +// Copyright (c) 2024 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/test/lint/lint_ignore_dirs.py b/test/lint/lint_ignore_dirs.py index af9ee7ef6be..0efdb830391 100644 --- 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 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. + SHARED_EXCLUDED_SUBTREES = ["src/leveldb/", "src/crc32c/", "src/secp256k1/",