From nobody Tue Jan 25 08:21:02 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 09E5B1970976; Tue, 25 Jan 2022 08:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jjfv26fGxz3vyY; Tue, 25 Jan 2022 08:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643098863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zk6egyfe1Q9Y7VajSvcSZm+C9W9yqAKmiX3gvCP/6r0=; b=vgpK3MY9rN4QIQwDhHXjk+vBQXshA4ryB2xJ6JBKLQC799lzymXdoZb4NXSckDhmLOZ1GQ 3a5kQBYof2yP3bW8V/jbiDdgnkzVlLgCLOpxhC2zF78jBfPmDgn0AOS0L/WIeuAFkW+oXR hyG3qDle6NihYM8UjHCpaTzThiVLScZdsw/KQc5O29LtVgK3/2ianHnwO8B2jpbt2wWDuy 35Nu9gbBJN2+v9k+rmhdz3+nHPDfEGNBGMl4U9UNVWAtpvs/oXw5T8n1tA2vUuSC+i6qOS 5vyy2xVskIW90VCJiccOif34GCLoaR5qpqaqH1nLMW7YP3WCAaEU+QgooPIi1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BF5EE25EDA; Tue, 25 Jan 2022 08:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20P8L2w2089785; Tue, 25 Jan 2022 08:21:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P8L2cM089784; Tue, 25 Jan 2022 08:21:02 GMT (envelope-from git) Date: Tue, 25 Jan 2022 08:21:02 GMT Message-Id: <202201250821.20P8L2cM089784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 389844c058ec - main - locate: change from BSD-4-clause to BSD-3-clause List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 389844c058ec1ab69bb506601ed673fdd4e4d12b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643098863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zk6egyfe1Q9Y7VajSvcSZm+C9W9yqAKmiX3gvCP/6r0=; b=Npa07P3T9qRKKoRGEHqWKwRQSBPMo5prqeduEJCXrBferNsSyFeDUG4ZG8/IX9aQev0pGg BtB6Ay6PqxJY4nRT2EpTubBn5BLyApGr3TGxxyeVzD117YbqduDDTMh3j7DjeL3FHsv3gQ XcnZPWTkfKKRbvXYLoSHRqeL1xEg0McIvkKbY2L4FpcD6F0kDjccX4XqtUTyLy/iVETn2W 2JJg/Kt060FUiGdIxM9K4ONk7bOgn8J7eodeOAWt7iqA8yZ3OvKdJ/Rmo28KjXj3Yi2vYK Sn5rJnOK0KGqThmZdjnsiA+RVcuayKphh1SXUcgQgzkoovAmtLfqknPg5Gr6zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643098863; a=rsa-sha256; cv=none; b=VuDv8bVrDOUm/eFgm9DR/+VfMRcW4+wlOmuWLr9pQig6sYeDMuvToA0nDr50WmBZbLUD3k oO+mJ7lQcXkg+5dT7inhdpF698iJyeOo7iQwwu/zS+/D9fNMv87WncLM31lzrZsurtywTV O5DSjK4PieMjtUXKalg9Qyu9XuJBNtRPLYorU/9mwZIJCCK5Kqb0BspsbYD0ftjFRAW/HN lCzRcNUphvGmfSJFAKVE5sgB66ABNQQ7udgLVzwjwXlPLs2kC+gHEpDfNaf2yGkI0kjCPe C0DQOlPLFcyQ7kf09ZAoR2+/GlK0JVHyMePY+zGc75U/Puufowf4Q11AUB0DMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=389844c058ec1ab69bb506601ed673fdd4e4d12b commit 389844c058ec1ab69bb506601ed673fdd4e4d12b Author: Baptiste Daroussin AuthorDate: 2022-01-25 08:17:36 +0000 Commit: Baptiste Daroussin CommitDate: 2022-01-25 08:20:17 +0000 locate: change from BSD-4-clause to BSD-3-clause We have the authorization from the University of California to remove the advertising clause for a while, wosch@ who also hold a copyright on this code also approved the relicensing Approved by: wosch@ MFC after: 3 days --- usr.bin/locate/bigram/locate.bigram.c | 8 ++------ usr.bin/locate/code/locate.code.c | 8 ++------ usr.bin/locate/locate/fastfind.c | 8 ++------ usr.bin/locate/locate/locate.c | 8 ++------ usr.bin/locate/locate/locate.h | 8 ++------ usr.bin/locate/locate/pathnames.h | 8 ++------ usr.bin/locate/locate/util.c | 8 ++------ 7 files changed, 14 insertions(+), 42 deletions(-) diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c index d92677b426c6..0868a5f89070 100644 --- a/usr.bin/locate/bigram/locate.bigram.c +++ b/usr.bin/locate/bigram/locate.bigram.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1995 Wolfram Schneider . Berlin. * Copyright (c) 1989, 1993 @@ -16,11 +16,7 @@ * 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. All advertising materials mentioning features or use of this software - * 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 University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c index 18ee68c93527..4decf5a2e864 100644 --- a/usr.bin/locate/code/locate.code.c +++ b/usr.bin/locate/code/locate.code.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1995 Wolfram Schneider . Berlin. * Copyright (c) 1989, 1993 @@ -16,11 +16,7 @@ * 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. All advertising materials mentioning features or use of this software - * 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 University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c index 081101fce96a..b230f93439fd 100644 --- a/usr.bin/locate/locate/fastfind.c +++ b/usr.bin/locate/locate/fastfind.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1995-2022 Wolfram Schneider * Copyright (c) 1989, 1993 @@ -16,11 +16,7 @@ * 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. All advertising materials mentioning features or use of this software - * 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 University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c index e65109819153..d339037c2003 100644 --- a/usr.bin/locate/locate/locate.c +++ b/usr.bin/locate/locate/locate.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1995-2022 Wolfram Schneider * Copyright (c) 1989, 1993 @@ -16,11 +16,7 @@ * 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. All advertising materials mentioning features or use of this software - * 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 University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h index 5ef97d36688f..6393160d55b4 100644 --- a/usr.bin/locate/locate/locate.h +++ b/usr.bin/locate/locate/locate.h @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1995 Wolfram Schneider . Berlin. * Copyright (c) 1989, 1993 @@ -13,11 +13,7 @@ * 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. All advertising materials mentioning features or use of this software - * 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 University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/usr.bin/locate/locate/pathnames.h b/usr.bin/locate/locate/pathnames.h index dfd8084b2598..21fc9a172f81 100644 --- a/usr.bin/locate/locate/pathnames.h +++ b/usr.bin/locate/locate/pathnames.h @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -12,11 +12,7 @@ * 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. All advertising materials mentioning features or use of this software - * 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 University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c index fa208f3dfe8e..42710de9490a 100644 --- a/usr.bin/locate/locate/util.c +++ b/usr.bin/locate/locate/util.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1995 Wolfram Schneider . Berlin. * Copyright (c) 1989, 1993 @@ -16,11 +16,7 @@ * 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. All advertising materials mentioning features or use of this software - * 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 University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. *