From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E7A6158012 for ; Tue, 21 Sep 2021 10:49:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E3C3E0849; Tue, 21 Sep 2021 10:49:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66194E0849 for ; Tue, 21 Sep 2021 10:49:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45EF9342DB6 for ; Tue, 21 Sep 2021 10:49:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADEB1CF for ; Tue, 21 Sep 2021 10:49:52 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1632221382.efdc1bc80e961d65854255c10e3d639e5ae53a6f.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: licenses/ X-VCS-Repository: repo/gentoo X-VCS-Files: licenses/BSD licenses/BSD-1 licenses/BSD-2 licenses/BSD-4 licenses/BSD-with-attribution licenses/BSD-with-disclosure licenses/Princeton licenses/rc X-VCS-Directories: licenses/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: efdc1bc80e961d65854255c10e3d639e5ae53a6f X-VCS-Branch: master Date: Tue, 21 Sep 2021 10:49:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e25fae92-8333-43ac-9a36-de65a344a965 X-Archives-Hash: 6ed00505495da6292d236165df4fe1de commit: efdc1bc80e961d65854255c10e3d639e5ae53a6f Author: Ulrich Müller gentoo org> AuthorDate: Tue Sep 21 10:46:04 2021 +0000 Commit: Ulrich Müller gentoo 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 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) , +Copyright (c) , 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 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) , +Copyright (c) , 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) , +Copyright (c) , 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) , +Copyright (c) , 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 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) , +Copyright (c) , 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 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
.] @@ -17,10 +17,10 @@ modification, are permitted provided that the following conditions are met: acknowledgment: "This product includes software developed by (
)." -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) , +Copyright (c) , 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 by . All rights reserved. +Copyright by . 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 . All rights reserved. + * Copyright . 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.