From nobody Wed Oct 12 09:22:01 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 4MnRxP5KzBz4fqfc; Wed, 12 Oct 2022 09:22:01 +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 4MnRxP4sWjz3fk0; Wed, 12 Oct 2022 09:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665566521; 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=o//+45jQyqkRHyds2qZ0NM0AD+5aFuwiwiSDkoEiOoc=; b=gN6OdA6Sj8VmTogSesIkJW8URpEOOmHnZ00Xtmgp8mwavODqm/q1Ai1OrXT/wyHex4TAfm Rfo/sohXnNcOSbcgogvCbbIxp9Vm2F0fUERd9+LR2ymuBQ2/ons2r5578uEWvJkD1L5Nx0 1sb3s4rq8+jb4B86NIWfymgHzzotI8trQLy46PMxM13YgFr0b5Ni64S42u/AsmVYKnKjJd ksuz5uLtR6rSygfWQrMDwu5s926MY3tWSsz5yPZIGE6PvPl+xqXWWoymX59HMujkYfZG65 /fSqByzLMt64VYDU37Vgsp5l8VEG09dKBN9ne1laer9fcrTp/cWfnGgRQzNnAA== 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 4MnRxP3w9wz1GTx; Wed, 12 Oct 2022 09:22:01 +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 29C9M1B2056334; Wed, 12 Oct 2022 09:22:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29C9M11R056333; Wed, 12 Oct 2022 09:22:01 GMT (envelope-from git) Date: Wed, 12 Oct 2022 09:22:01 GMT Message-Id: <202210120922.29C9M11R056333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 911128a75374 - stable/12 - 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 911128a7537484f7882667b5920fe08a17b3502c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665566521; 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=o//+45jQyqkRHyds2qZ0NM0AD+5aFuwiwiSDkoEiOoc=; b=FDXjEIZkAkmvQFqx3noqvYmlztU8W1UFGke4dCJJHw+XWztSi728NJO851Tn1cR5Q7NXuM 2fuJ9H/iiYhZbSozml4fzfRJLkj9fj07yBbRnL1NUfdL+yXjt+O5lkNATHV6zGvgKZ8t43 9YIdnakQ/xnbhnQRS+2lsvmXPTmTycB2hpYHRB3Ftdifw+Rz4L5PDmuAfzPJfWrqpPNoq5 mkA8Li5q08no0Gn2UE8qbxlctDRq0CQXC1j40IPy5vAYTsH8Rqv7LREiN7Su5X21f96PYr /6SUHHQLTSGfWGayaHbJBhVsNpZINemNFC0BcOSpfrSJHEOLgDuuV6XlTUegeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665566521; a=rsa-sha256; cv=none; b=OxVezEcJK8E72X6h8Ymj4Is7yTlMJKgqOJmdo/XK3Yo5mocFab5AA7CL51ojV6BO/1cgqo kkIcwSHzCPQARi1/CPQbtnczScjfuxmqnw5v08rWItSaFE7zLud6RldsvDK/FvTNOaeAVp c1/baj0dMX/F7bOtxSgVDvgH3cy9q+VyXwZW8mE62vUwH0L2sVy1ZJMGmvzW9kj9USx39Q 6XiMBLZ6T8ThY2+pqDqarfWxLoNTmYtlvZX8qHlCPtfZuR1rcZpiQMldTmUMwqnBSn4JMd 2tB8o1L3HX99y23b5qVNirV5GkqrHNhPJbnIHiTpX/PE249TigINJ/XuQoF43Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=911128a7537484f7882667b5920fe08a17b3502c commit 911128a7537484f7882667b5920fe08a17b3502c Author: Baptiste Daroussin AuthorDate: 2022-01-25 08:17:36 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-12 09:20:44 +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 (cherry picked from commit 389844c058ec1ab69bb506601ed673fdd4e4d12b) --- 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 e2f6d74552ec..ac28b96b3c5a 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 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/locate.c b/usr.bin/locate/locate/locate.c index 29c46b2b78cc..f97626a318a5 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 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/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. *