From 4a00a21274db875a768369f24fda70bb22f7ea86 Mon Sep 17 00:00:00 2001 From: Spencer Jackson Date: Fri, 9 Feb 2024 15:39:36 -0500 Subject: [PATCH] SERVER-85973 Update valgrind license information (#18665) (cherry picked from commit b961c0cac68109cf755e4a21fcbf2fc52153c355) GitOrigin-RevId: 38f52be023b3517abec57e88198520ba129a2e7f --- README.third_party.md | 2 +- distsrc/THIRD-PARTY-NOTICES | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.third_party.md b/README.third_party.md index c9d9cd3d152..16b00f0e18c 100644 --- a/README.third_party.md +++ b/README.third_party.md @@ -53,7 +53,7 @@ a notice will be included in | [TomCrypt] | Public Domain | 1.18.2 | ✗ | ✗ | | [Unicode] | Unicode-DFS-2015 | 8.0.0 | ✗ | ✗ | | [libunwind] | MIT | 1.6.2 + changes | | ✗ | -| [Valgrind] | BSD-3-Clause\[1] | 3.17.0 | | ✗ | +| [Valgrind] | BSD-4-Clause\[1] | 3.17.0 | | ✗ | | [variant] | BSL-1.0 | 1.4.0 | | ✗ | | [wiredtiger] | | \[2] | ✗ | ✗ | | [yaml-cpp] | MIT | 0.6.3 | | ✗ | diff --git a/distsrc/THIRD-PARTY-NOTICES b/distsrc/THIRD-PARTY-NOTICES index 5f47c9cb329..0620491ee95 100644 --- a/distsrc/THIRD-PARTY-NOTICES +++ b/distsrc/THIRD-PARTY-NOTICES @@ -759,7 +759,7 @@ distribution for details. This file is part of Valgrind, a dynamic binary instrumentation framework. -Copyright (C) 2000-2015 Julian Seward. All rights reserved. +Copyright (C) 2000-2017 Julian Seward. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -768,16 +768,16 @@ are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product +2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written +4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -799,7 +799,7 @@ Notice that the above BSD-style license applies to this one file the terms of the GNU General Public License, version 2. See the COPYING file in the source distribution for details. ----------------------------------------------------------------- +---------------------------------------------------------------- 18) License notice for ICU4C ----------------------------