From nobody Sat Jun 15 23:36:12 2024 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 4W1swX3htHz5Pdqs; Sat, 15 Jun 2024 23:36:12 +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 4W1swX3BSvz544j; Sat, 15 Jun 2024 23:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718494572; 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=Ncbm6PgDZ0nMptvn/I2uGhxEtq9KL4dDDYbqtOfmZ9c=; b=XiIN37CqNP0g9p9gI86zgUpTMDKoeJQvnX9HEv/xuYKVqkhNOBJ60loZ3CqMW6TAI4QOcG g7BjFGF+zvRLkvbu7mLpVSlairjKoeQBMZRH2eRDbHX/BjAd79qd4KCrHt/YXBIKCfDYM+ 9DSsLjDj8Yu6U+vaFlWdBJb32mRu+00CLd69G7eatL1Oegm1l1EUepttIbtNSBxhTiC6C3 GgELGTmoXmN1qZmROEi92BRWStFaBvKoWKGnrOmHBecYXRaPv3TAUNJVx9dt3vC6eOGt5O pT1gwiO6EUeSsOZrUObd8ERScbdPf/agNAOtarYCuyyyC59fZ6PxZ2+Hib4Xng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718494572; a=rsa-sha256; cv=none; b=w/THQw8R3CdERvNyhlFozyuMQtL9VRceCoTHzPjhMsaNkdr6E6+166hDGR1lLqQ1aRWfdj +HlQwFAfQ6D5W18WbQvk6ZyvDaj4Bsjx9CCVKpA54NmZdsTMAtSCWHDqPz3w+rI6MCoZK8 knVCzRhxcTL8X/hzCun3Yspu4t7k3iu9bQV97NLw26gMMEOqFeT6mMJEM8fT6wkuYLXVmA lyI/eOJhhAb9ZVYOmU5AUHOUdEMKQ/612+jTbJl9I0caYs0RXfvue2uqH23ekakuWQpK1o yjB0pG7mUh0XA/Ozv7H9OvYzAlV3GLX+SBqRTyuG6Cc8j7UPZoY5Ebt+GKz52Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718494572; 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=Ncbm6PgDZ0nMptvn/I2uGhxEtq9KL4dDDYbqtOfmZ9c=; b=Pa2U15sKaiJTfR4C73YMrAjtt0P1JFrRbvQPgb/T8xQ9seFXoIjQ4OwsZLJlPQvLNDziyy 6WzH1PGAyVE1jigLieJJOTY0X48WEu3dKkFdNlBGnBgAI1Kih0W2r4dqHtar/ROSnKSgpx /d8kXNaCsxMQAkrxOjG2uLEkEvBgAVNzoT1uh5wQjQxpaG493oV9PVkz6e99Cc6e+uvkdf InaIdPCgB3GXKdqpteGWMvBHnRSfa7lv9CayE5yK0IaqHA2wjzb0cDapxXmH1k29hLBMN3 gJMZrBoSd1XWcVcNPe/RifFlyhJuFEojc1098chChaozLqH28xFU+5Iq3jqwJQ== 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 4W1swX2kZNzPXw; Sat, 15 Jun 2024 23:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45FNaCcx049807; Sat, 15 Jun 2024 23:36:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45FNaCvU049804; Sat, 15 Jun 2024 23:36:12 GMT (envelope-from git) Date: Sat, 15 Jun 2024 23:36:12 GMT Message-Id: <202406152336.45FNaCvU049804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Pedro F. Giffuni" Subject: git: fc3907ce001e - main - fparseln: Update license 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pfg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc3907ce001ec95ff4f32861bfa84f81c268d179 Auto-Submitted: auto-generated The branch main has been updated by pfg: URL: https://cgit.FreeBSD.org/src/commit/?id=fc3907ce001ec95ff4f32861bfa84f81c268d179 commit fc3907ce001ec95ff4f32861bfa84f81c268d179 Author: Pedro F. Giffuni AuthorDate: 2024-06-15 23:30:27 +0000 Commit: Pedro F. Giffuni CommitDate: 2024-06-15 23:30:27 +0000 fparseln: Update license Remove 3rd and 4th clauses in christos' license. OK christos. Obtained from: NetBSD --- lib/libutil/fparseln.3 | 10 ++-------- lib/libutil/fparseln.c | 9 ++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3 index 7ddfaefcc943..2f7ebcbf4d68 100644 --- a/lib/libutil/fparseln.3 +++ b/lib/libutil/fparseln.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: fparseln.3,v 1.7 1999/07/02 15:49:12 simonb Exp $ +.\" $NetBSD: fparseln.3,v 1.4 2009/10/21 01:07:45 snj Exp $ .\" .\" Copyright (c) 1997 Christos Zoulas. All rights reserved. .\" @@ -10,11 +10,6 @@ .\" 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 Christos Zoulas. -.\" 4. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -52,8 +47,7 @@ returns a pointer to the next logical line from the stream referenced by This string is .Dv NUL terminated and it is dynamically allocated on each invocation. -It is the -responsibility of the caller to free the pointer. +It is the responsibility of the caller to free the pointer. .Pp By default, if a character is escaped, both it and the preceding escape character will be present in the returned string. diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c index c9290230c126..256ee5b04cea 100644 --- a/lib/libutil/fparseln.c +++ b/lib/libutil/fparseln.c @@ -1,7 +1,7 @@ -/* $NetBSD: fparseln.c,v 1.7 2007/03/08 19:57:53 drochner Exp $ */ +/* $NetBSD: fparseln.c,v 1.10 2009/10/21 01:07:45 snj Exp $ */ /*- - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 Christos Zoulas. All rights reserved. * @@ -13,11 +13,6 @@ * 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 Christos Zoulas. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES