From owner-svn-src-head@freebsd.org Sat Dec 28 04:08:17 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A603A1D936C; Sat, 28 Dec 2019 04:08:17 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47l9Cj3zQyz4vSj; Sat, 28 Dec 2019 04:08:17 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from [192.168.0.5] (unknown [181.52.72.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: pfg) by smtp.freebsd.org (Postfix) with ESMTPSA id EFEA817E30; Sat, 28 Dec 2019 04:08:16 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Subject: Re: svn commit: r356142 - in head/sys: dev/ofw sys To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201912280316.xBS3GFEt041168@gndrsh.dnsmgr.net> From: Pedro Giffuni Autocrypt: addr=pfg@FreeBSD.org; keydata= mQENBFU6tr0BCAC/MABNSg8O9sLZZ1cCl8GczwjnyF6WEvtfLpIkAWEo49H3TuG3cMNwuavi xnwASLS73ppj6ziWK1QsfdAaA8Mkvk25UtenfsCTiA38q0RwvHPn8W6eorJ6rYHRReNnncA+ oPLrLmL6IOUK9dlcLJP5i45PGwpx9YNI+D/BFcji7enpnsGjunhRE3NJ1YBXiKMormfnPvpV yVWpKnnB03nFIQphW108G5U9wytZqsiGkshn0ar0FBGsdJ19d/ePBuMceaWRtf0nJrNkC9sB D8ISmFp6/DAoQBhyJxvemC83/QNV5u9kGdwemaKOJ6SdAmBBZYbdAxCO8i/Eq33mrXx7ABEB AAG0H1BlZHJvIEdpZmZ1bmkgPHBmZ0BGcmVlQlNELm9yZz6JATcEEwEKACEFAlU6tr0CGwMF CwkIBwMFFQoJCAsFFgMCAQACHgECF4AACgkQzWsLls7yLQTFEgf/blVvg7MPpZp/KWwEShqI VpkJLhXLjvYzjoSCrpuVtNMCdpYh3L6gY5mBr9VASc/iWb6DUUxX9g6oLQ4l1e8eEwSHdXda RG/NjxJhz8dsLO8H6dnwl6HEZ+nymXIibX6GGy10gQeyv6sNGsgSCwlyFJZcv2lW2M1ev11w 3yY1eQnIsPq4vyIMYEQ1aIIYu1JPNEzRZ7sDuRGdnvMH7FhHaNzSs8d4PHw2JSwDHPuN/W6S UhK+A/TDW9BQ4ZzDRpKrIPfWqkAa+76NtGglmJWS99WG7rJAoPUIj2xpzojoQbT3z1vbeGxK cgGvOyQMlrJSRZwOtFuhcdbQ6DX4ETI7NrkBDQRVOra9AQgA1ACQK5u/H1MgjSKXQttCv8Kz /k7fHmaWLrhPAJH6bqR7wpv/Hz2y/8uD+5qg/vk9/pwYuj9TzbCXs9NeWye/+DV8Aw7Z22b2 OjB0VbEpHREDs0zS+0KMP7STOPpyHVYdgWCQ7Qgd/LG0gfUP5M0R8s2OH3Il8rcS4ZeEd/tr O3LyoDiK4mInT/X3oJX7xetws3jpSPk51TDOplamehXjndwemttUTw1czITF9MfDosaihoUr o6NcAtBzFYIF2NuKhrASs9prec+e36a3lCUbMOHof62TnBZZnWtNdmnv1RNv3q17yavqi0F/ rvtmckHhJ8NcnYL8/gGD48nhKf60UQARAQABiQEfBBgBCgAJBQJVOra9AhsMAAoJEM1rC5bO 8i0EkGAH+QG/1y0mcOBFsouMdmDUpRusRxWHdmdIjFt4FJ2/K7YDyrliKcUTOp+zjCyfLVE6 UELiRvsT+mg4QcZL7e+JAuLkW5LhiAskz8/1fRgnwVquTcYd7TPJrYnejpLyumhbsgo0bN4G s9yrJeQpKbln6YQxifzT4Eqot3aEeZxlUEKzQd0Vq1ci8PTI1krvda9x+FdGvKxY9Iz4T+SW NZsvBaCXo9hjJZ7U1VaCdWxgHhy5tuTuMAGGS9lCGbdvdKuAbSQDtcvx0jcY5s7Q2t2udCyV mRDbQYrl8PEyJa3Cz3NoBD9g9EEr9PlX05hOWMVf3M5pS4j/XKbzUbKqiBy1VPw= Organization: FreeBSD Message-ID: <31c49f48-db69-4b8b-54d0-8e575bb3d2f4@FreeBSD.org> Date: Fri, 27 Dec 2019 23:08:14 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.3.1 MIME-Version: 1.0 In-Reply-To: <201912280316.xBS3GFEt041168@gndrsh.dnsmgr.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Language: en-US X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2019 04:08:17 -0000 On 2019-12-27 22:16, Rodney W. Grimes wrote: >> Author: pfg >> Date: Sat Dec 28 02:58:30 2019 >> New Revision: 356142 >> URL: https://svnweb.freebsd.org/changeset/base/356142 >> >> Log: >> SPDX: update some tags with two licenses. >> >> Modified: >> head/sys/dev/ofw/openfirm.h >> head/sys/sys/sched.h >> >> Modified: head/sys/dev/ofw/openfirm.h >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/sys/dev/ofw/openfirm.h Sat Dec 28 02:11:41 2019 (r356141) >> +++ head/sys/dev/ofw/openfirm.h Sat Dec 28 02:58:30 2019 (r356142) >> @@ -1,7 +1,7 @@ >> /* $NetBSD: openfirm.h,v 1.1 1998/05/15 10:16:00 tsubai Exp $ */ >> =20 >> /*- >> - * SPDX-License-Identifier: BSD-4-Clause >> + * SPDX-License-Identifier: (BSD-4-Clause AND BSD-2-Clause-FreeBSD) >> * >> * Copyright (C) 1995, 1996 Wolfgang Solfrank. >> * Copyright (C) 1995, 1996 TooLs GmbH. >> >> Modified: head/sys/sys/sched.h >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/sys/sys/sched.h Sat Dec 28 02:11:41 2019 (r356141) >> +++ head/sys/sys/sched.h Sat Dec 28 02:58:30 2019 (r356142) >> @@ -1,5 +1,5 @@ >> /*- >> - * SPDX-License-Identifier: BSD-4-Clause >> + * SPDX-License-Identifier: (BSD-4-Clause AND BSD-2-Clause-FreeBSD) >> * >> * Copyright (c) 1996, 1997 >> * HD Associates, Inc. All rights reserved. >> > This situation should not of occured, and leads to an ambigous license = state. It actually happens a lot (I mean two or more licenses in the same file): SPDX explicitly uses AND (not OR) for cases like this. > What code is under license 2 clause and what under 4 clause?=20 Anyone redistributing the file has to respect both licenses. If you are lucky enough to have access to version control you may be able to discern the author and the corresponding license, otherwise you are trapped with both. > It looks to me as if this was done by Jeff Robinson as the 2 clause is > attached to his copyright and we should probably just ask him to relax > that back to the files existing 4 clause license, and or go after Greg > Ansley of HD associtates to get them to relax the 4 clause. > No, Jeff (or anyone else, as I said there are many cases in our tree) is entitled to choose his own license as long as it is compatible with the pre-existing licensing. Pedro.