From nobody Thu May 18 18:42:24 2023 X-Original-To: dev-commits-src-main@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 4QMf3N5l2mz4Bt7C; Thu, 18 May 2023 18:42:24 +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 4QMf3N4pRhz3Q5W; Thu, 18 May 2023 18:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684435344; 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=Csi3b6wOKY4XDTbM8EEV6N0v/AJdMKnyjdf2hCad06w=; b=Mc4faOakAGnhcAqRobS6GdgFNF5wWlddfuZ2XII8/FQBOnI4UIgLuxCbyM1rR51fKMNHx7 UTq764L0g6HbsUOwWiYawNfRfIX8gyqv2ddais9BE80CASI277RUf6Qrx94lWFGz2M1rnS qFb/3cI7GI9zvyNZTyeFNz4fbvPKWOzNFzLY/Lo6lMTEPIkz1vEdLd5whGNMgpzCaQDW/P 0QxJEElsp4l+sLlbmw3UBbYr0IutFM/NfB0H0+OhE3aIjJwaQPUDqH0ymTQTi3HNv/LQbW uY3h8O1XlfHZeqKLtyYlaow2Tj6sUoNqiUP/U5xeSJ5vdxPNgxQngfsELFhtDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684435344; 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=Csi3b6wOKY4XDTbM8EEV6N0v/AJdMKnyjdf2hCad06w=; b=KeG6uU2+rQqYAvBoHKwSc/i5BqmYY7NMet+paUKz6uVRGPdohb7IYB5/O+SrrhCPnOhp4W 1LAhBzqcBVVvNH1kH3aDWYpChKKM8SEni3Q8cD7LrELaQtVWfRlae+WL7WiY9TbMMTk6tx Os6Rd6h5DNX9A3mj9f69sYvjDRK6LpafRqr4s29lG+IUZ5agwCHHweDZ2FLIwPf3k2X0uT MhqXddyh6aeIyF3PbNqUjF3tTqoowXiHVWHH2EpQ223WHm/I9qTQM5N/pPGHXjX4uHMwP2 16gJbodpCaVGM9hjEx9K7hCuNTKaopbNzBCnpB2x7PXkes0Asg8vRVMrxoAMIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684435344; a=rsa-sha256; cv=none; b=XZqPOMVMkVXj3qfSel1EVTP4lK1zH2ffFxQsHSM93UA3yCyv8fimap6idHt2Mb7xJELJdB V7ja2gP1539Ye01LU6CIkWzaMQYfkG9AVZrJVjaFEPUaZs3xj5ra1ixAY+qdZz4vXDn/uD V07lqpAX9Rfz2Yq/1Uffy3eEdU0l6wl7EZs5ItEuMS39eEPy2Q+/hwLrpUsrzWnAf/0an+ tTGMLPlXO0hhxAVgJBkCAY6ag2bQ4MUXLdQ0ty51TO6hOmOuY2K8TenuVH4vc9WBxbf2dh j0xtuKRha8Q8UrFzQoToXw+VB6WQYoX+BOulYmAm+2WZtT80tYPTMj4gHv6tMw== 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 4QMf3N3tbxzwwm; Thu, 18 May 2023 18:42:24 +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 34IIgOUD083013; Thu, 18 May 2023 18:42:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34IIgOEa083012; Thu, 18 May 2023 18:42:24 GMT (envelope-from git) Date: Thu, 18 May 2023 18:42:24 GMT Message-Id: <202305181842.34IIgOEa083012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Wemm Subject: git: e829181c6534 - main - libc: Update copyright text to match current templates. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: peter X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e829181c653485529ba8efc2969afb78b2ec4c76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by peter: URL: https://cgit.FreeBSD.org/src/commit/?id=e829181c653485529ba8efc2969afb78b2ec4c76 commit e829181c653485529ba8efc2969afb78b2ec4c76 Author: Peter Wemm AuthorDate: 2023-05-18 18:30:10 +0000 Commit: Peter Wemm CommitDate: 2023-05-18 18:30:10 +0000 libc: Update copyright text to match current templates. --- lib/libc/gen/__getosreldate.c | 1 - lib/libc/gen/setproctitle.3 | 29 +++++++++++++++++------------ lib/libc/gen/setproctitle.c | 26 ++++++++++++++++++-------- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/lib/libc/gen/__getosreldate.c b/lib/libc/gen/__getosreldate.c index 81fd125b2ee6..685382f76977 100644 --- a/lib/libc/gen/__getosreldate.c +++ b/lib/libc/gen/__getosreldate.c @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2007 Peter Wemm - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3 index a725977e5191..15bafa23a982 100644 --- a/lib/libc/gen/setproctitle.3 +++ b/lib/libc/gen/setproctitle.3 @@ -1,23 +1,28 @@ -.\" Copyright (c) 1995 Peter Wemm -.\" All rights reserved. +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 1995 Peter Wemm .\" .\" Redistribution and use in source and binary forms, with or without -.\" modification, is permitted provided that the following conditions +.\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright -.\" notice immediately at the beginning of the file, without modification, -.\" this list of conditions, and the following disclaimer. +.\" notice, this list of conditions and the following disclaimer. .\" 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. This work was done expressly for inclusion into FreeBSD. Other use -.\" is permitted provided this notation is included. -.\" 4. Absolutely no warranty of function or purpose is made by the author -.\" Peter Wemm. -.\" 5. Modifications may be freely made to this file providing the above -.\" conditions are met. .\" -.\" $FreeBSD$ +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. .\" .\" The following requests are required for all man pages. .Dd November 28, 2022 diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c index 08612e99d9bb..743f27d15b50 100644 --- a/lib/libc/gen/setproctitle.c +++ b/lib/libc/gen/setproctitle.c @@ -1,18 +1,28 @@ -/* - * Copyright (c) 1995 Peter Wemm - * All rights reserved. +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 1995 Peter Wemm * * Redistribution and use in source and binary forms, with or without - * modification, is permitted provided that the following conditions + * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice immediately at the beginning of the file, without modification, - * this list of conditions, and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 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. Absolutely no warranty of function or purpose is made by the author - * Peter Wemm. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. */ #include