[gentoo-commits] repo/gentoo:master commit in: licenses/

[Ulrich Müller]

commit:     efdc1bc80e961d65854255c10e3d639e5ae53a6f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 21 10:46:04 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 10:49:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efdc1bc8

licenses: Update placeholders in BSDish licenses

Sync license texts from https://spdx.org/licenses/ where applicable.

Avoid the term "copyright owner" in placeholders:
https://www.gnu.org/philosophy/words-to-avoid.html.en#CopyrightOwner

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 licenses/BSD                  | 8 ++++----
 licenses/BSD-1                | 6 +++---
 licenses/BSD-2                | 6 +++---
 licenses/BSD-4                | 8 ++++----
 licenses/BSD-with-attribution | 8 ++++----
 licenses/BSD-with-disclosure  | 2 +-
 licenses/Princeton            | 2 +-
 licenses/rc                   | 2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/licenses/BSD b/licenses/BSD
index 45f4d9a7002..cb976bfe2b7 100644
--- a/licenses/BSD
+++ b/licenses/BSD
@@ -1,4 +1,4 @@
-Copyright (c) <YEAR>, <OWNER>
+Copyright (c) <year>, <copyright holder>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -9,14 +9,14 @@ modification, are permitted provided that the following conditions are met:
 2. 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.
-3. Neither the name of the <ORGANIZATION> nor the names of its
+3. Neither the name of the copyright holder 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"
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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

diff --git a/licenses/BSD-1 b/licenses/BSD-1
index 68ec5a422af..a4023adbe07 100644
--- a/licenses/BSD-1
+++ b/licenses/BSD-1
@@ -1,4 +1,4 @@
-Copyright (c) <YEAR>, <OWNER>
+Copyright (c) <year>, <copyright holder>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -7,10 +7,10 @@ modification, are permitted provided that the following conditions are met:
 1. Redistributions of source code must retain the above copyright notice,
    this list of conditions and the following disclaimer.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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

diff --git a/licenses/BSD-2 b/licenses/BSD-2
index a995d5485fb..a7a1f195836 100644
--- a/licenses/BSD-2
+++ b/licenses/BSD-2
@@ -1,4 +1,4 @@
-Copyright (c) <YEAR>, <OWNER>
+Copyright (c) <year>, <copyright holder>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -10,10 +10,10 @@ modification, are permitted provided that the following conditions are met:
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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

diff --git a/licenses/BSD-4 b/licenses/BSD-4
index 96694a7fecb..2b76c58bd9c 100644
--- a/licenses/BSD-4
+++ b/licenses/BSD-4
@@ -1,4 +1,4 @@
-Copyright (c) <YEAR>, <OWNER>
+Copyright (c) <year>, <copyright holder>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -13,14 +13,14 @@ modification, are permitted provided that the following conditions are met:
    must display the following acknowledgement:
    This product includes software developed by the University of
    California, Berkeley and its contributors.
-4. Neither the name of the <ORGANIZATION> nor the names of its
+4. Neither the name of the copyright holder 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"
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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

diff --git a/licenses/BSD-with-attribution b/licenses/BSD-with-attribution
index a3b72f61c91..e93704a7073 100644
--- a/licenses/BSD-with-attribution
+++ b/licenses/BSD-with-attribution
@@ -1,4 +1,4 @@
-Copyright (c) <YEAR>, <OWNER>
+Copyright (c) <YEAR>, <COPYRIGHT HOLDER>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met:
 2. 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.
-3. Neither the name of the <ORGANIZATION> nor the names of its
+3. Neither the name of the copyright holder nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without [specific] prior written permission.
    [For permission [or any legal details], [please] contact <ADDRESS>.]
@@ -17,10 +17,10 @@ modification, are permitted provided that the following conditions are met:
    acknowledgment: "This product includes software developed by
    <ORGANIZATION> (<ADDRESS>)."
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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

diff --git a/licenses/BSD-with-disclosure b/licenses/BSD-with-disclosure
index 41f1a450178..100abf4eacf 100644
--- a/licenses/BSD-with-disclosure
+++ b/licenses/BSD-with-disclosure
@@ -1,4 +1,4 @@
-Copyright (c) <YEAR>, <OWNER>
+Copyright (c) <year>, <copyright holder>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/licenses/Princeton b/licenses/Princeton
index 4f4f09e7223..2227061a06a 100644
--- a/licenses/Princeton
+++ b/licenses/Princeton
@@ -11,7 +11,7 @@ and that the same appear on ALL copies of the software, database and
 documentation, including modifications that you make for internal
 use or for distribution.
 
-Copyright <YEAR> by <OWNER>.  All rights reserved.
+Copyright <year> by <copyright holder>.  All rights reserved.
 
 THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON
 UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR

diff --git a/licenses/rc b/licenses/rc
index da656a66ef2..4e65c9d2ea4 100644
--- a/licenses/rc
+++ b/licenses/rc
@@ -1,5 +1,5 @@
 /*
- * Copyright <YEAR> <OWNER>.  All rights reserved.
+ * Copyright <year> <copyright holder>.  All rights reserved.
  *
  * This software is not subject to any license of the American Telephone
  * and Telegraph Company or of the Regents of the University of California.