From 80768469945ecc3ad5a457ac067508da2703b7cb Mon Sep 17 00:00:00 2001
From: Bright Chen <chenguangmingfe@foxmail.com>
Date: Wed, 2 Aug 2023 22:48:11 +0800
Subject: [PATCH] Update base64url license

---
 .licenserc.yaml            |  1 +
 LICENSE                    | 38 ++++++++++++++++++++++++++++++++++++--
 src/butil/base64url.cc     |  2 +-
 src/butil/base64url.h      |  4 ++--
 test/base64url_unittest.cc |  2 +-
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/.licenserc.yaml b/.licenserc.yaml
index 042769f140..a189f6bceb 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -59,6 +59,7 @@ header:
     - 'src/butil/atomic*'
     - 'src/butil/auto_reset.h'
     - 'src/butil/base64.*'
+    - 'src/butil/base64url.*'
     - 'src/butil/base_export.h'
     - 'src/butil/base_paths.cc'
     - 'src/butil/basictypes.h'
diff --git a/LICENSE b/LICENSE
index 33bc089159..0efd09e42e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -761,7 +761,6 @@ src/butil/at_exit.*
 src/butil/atomic*
 src/butil/auto_reset.h
 src/butil/base64.*
-src/butil/base64url.*
 src/butil/base_export.h
 src/butil/base_paths.cc
 src/butil/basictypes.h
@@ -898,7 +897,7 @@ Some portions of these files are derived from code in the Chromium project,
 copyright (c) Google inc and (c) The Chromium Authors and licensed under the
 3-clause BSD license:
 
-  Copyright (c) 2000 - 2015 The Chromium Authors. All rights reserved.
+  Copyright (c) 2000 - 2014 The Chromium Authors. All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are
@@ -925,3 +924,38 @@ copyright (c) Google inc and (c) The Chromium Authors and licensed under the
   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+src/butil/base64url.*
+test/base64url_unittest.cc
+
+Some portions of these files are derived from code in the Chromium project,
+copyright The Chromium Authors and licensed under the 3-clause BSD license:
+
+  Copyright 2015 The Chromium Authors
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+     * Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following disclaimer
+  in the documentation and/or other materials provided with the
+  distribution.
+     * Neither the name of Google LLC nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/butil/base64url.cc b/src/butil/base64url.cc
index 934d721a52..f782f33dcc 100644
--- a/src/butil/base64url.cc
+++ b/src/butil/base64url.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/src/butil/base64url.h b/src/butil/base64url.h
index 30fd647f35..438f6b7fa4 100644
--- a/src/butil/base64url.h
+++ b/src/butil/base64url.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file
+// found in the LICENSE file.
 
 #ifndef BASE_BASE64URL_H_
 #define BASE_BASE64URL_H_
diff --git a/test/base64url_unittest.cc b/test/base64url_unittest.cc
index e8e09ac787..4995b162a0 100644
--- a/test/base64url_unittest.cc
+++ b/test/base64url_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.