Re: svn commit: r335454 - head/usr.bin/ar
> On 20 June 2018 at 20:48, Rodney W. Grimes > wrote: > > > > My claim still stands, the commit message and reality do not match, > > Ed claimed that he was switching to 2-clause FreeBSD license, yet > > it does not appear to actually do that. > > The commit message could have been more clear indeed. Thanks for acknowledging that. > > > Does SPDX have rules for dual tagging a file? I seem to recall that > > there was some way to do that at least. > > It does (using license1 AND/OR license2), but in this case one of the > licenses is a subset of the other. I think it would be best to indicate that both exist in the SPDX tag so that decisions can be made about this rather bad situation of licenses. Though it may be a subset it is still unclear as to exactly what this means, or how to apply them seperatly. Technically the 2 clause "authors" are above the 3 clause license in the file, does that mean that clause 3 applies to them too? I do not believe that was the original intent, but that is the literal fact. Use of above and below in the license is probably bad legal form and should have an absolute reference rather than an ambibous relative reference. -- Rod Grimes rgri...@freebsd.org ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r335454 - head/usr.bin/ar
On 20 June 2018 at 20:48, Rodney W. Grimes wrote: > > My claim still stands, the commit message and reality do not match, > Ed claimed that he was switching to 2-clause FreeBSD license, yet > it does not appear to actually do that. The commit message could have been more clear indeed. > Does SPDX have rules for dual tagging a file? I seem to recall that > there was some way to do that at least. It does (using license1 AND/OR license2), but in this case one of the licenses is a subset of the other. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r335454 - head/usr.bin/ar
> On 20/06/2018 17:42, Rodney W. Grimes wrote: > >> Author: emaste > >> Date: Wed Jun 20 18:43:17 2018 > >> New Revision: 335454 > >> URL: https://svnweb.freebsd.org/changeset/base/335454 > >> > >> Log: > >>usr.bin/ar: use standard 2-Clause FreeBSD license > >> > >>Many licenses on ar files contained small variations from the standard > >>FreeBSD license text. To avoid license proliferation switch to the usual > >>2-clause FreeBSD license after obtaining permission from all copyright > >>holders. > >> > >>Approved by:jkoshy, kaiw, kientzle > >>Sponsored by: The FreeBSD Foundation > >>Differential Revision: https://reviews.freebsd.org/D14561 > >> > >> Modified: > >>head/usr.bin/ar/ar.c > >>head/usr.bin/ar/read.c > >>head/usr.bin/ar/util.c > >> > >> Modified: head/usr.bin/ar/ar.c > >> == > >> --- head/usr.bin/ar/ar.c Wed Jun 20 17:37:55 2018(r335453) > >> +++ head/usr.bin/ar/ar.c Wed Jun 20 18:43:17 2018(r335454) > >> @@ -1,4 +1,6 @@ > >> /*- > >> + * SPDX-License-Identifier: BSD-3-Clause > >> + * > > I think there may be an error above, commit message says 2 clause, > > license below appears to be 2 clause, yet above we have 3? > Look at all the file: there are two licenses there. My claim still stands, the commit message and reality do not match, Ed claimed that he was switching to 2-clause FreeBSD license, yet it does not appear to actually do that. It further claims that he obtained permission from ALL copyright holders, which also appears to not be true, or he could of removed the 3 clause. The dual license is an even bigger can of worms, as then technically this file is neither BSD-2-Clause nor BSD-3-Clause, but some hybrid that has to be treated specially. Does SPDX have rules for dual tagging a file? I seem to recall that there was some way to do that at least. I am unclear as to it even be legal or valid to have added the 2 clause license on top of the BSD 3 clause license. > Pedro. -- Rod Grimes rgri...@freebsd.org ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r335454 - head/usr.bin/ar
On 20/06/2018 17:42, Rodney W. Grimes wrote: Author: emaste Date: Wed Jun 20 18:43:17 2018 New Revision: 335454 URL: https://svnweb.freebsd.org/changeset/base/335454 Log: usr.bin/ar: use standard 2-Clause FreeBSD license Many licenses on ar files contained small variations from the standard FreeBSD license text. To avoid license proliferation switch to the usual 2-clause FreeBSD license after obtaining permission from all copyright holders. Approved by: jkoshy, kaiw, kientzle Sponsored by:The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D14561 Modified: head/usr.bin/ar/ar.c head/usr.bin/ar/read.c head/usr.bin/ar/util.c Modified: head/usr.bin/ar/ar.c == --- head/usr.bin/ar/ar.cWed Jun 20 17:37:55 2018(r335453) +++ head/usr.bin/ar/ar.cWed Jun 20 18:43:17 2018(r335454) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * I think there may be an error above, commit message says 2 clause, license below appears to be 2 clause, yet above we have 3? Look at all the file: there are two licenses there. Pedro. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r335454 - head/usr.bin/ar
> Author: emaste > Date: Wed Jun 20 18:43:17 2018 > New Revision: 335454 > URL: https://svnweb.freebsd.org/changeset/base/335454 > > Log: > usr.bin/ar: use standard 2-Clause FreeBSD license > > Many licenses on ar files contained small variations from the standard > FreeBSD license text. To avoid license proliferation switch to the usual > 2-clause FreeBSD license after obtaining permission from all copyright > holders. > > Approved by:jkoshy, kaiw, kientzle > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D14561 > > Modified: > head/usr.bin/ar/ar.c > head/usr.bin/ar/read.c > head/usr.bin/ar/util.c > > Modified: head/usr.bin/ar/ar.c > == > --- head/usr.bin/ar/ar.c Wed Jun 20 17:37:55 2018(r335453) > +++ head/usr.bin/ar/ar.c Wed Jun 20 18:43:17 2018(r335454) > @@ -1,4 +1,6 @@ > /*- > + * SPDX-License-Identifier: BSD-3-Clause > + * I think there may be an error above, commit message says 2 clause, license below appears to be 2 clause, yet above we have 3? > * Copyright (c) 2007 Kai Wang > * Copyright (c) 2007 Tim Kientzle > * Copyright (c) 2007 Joseph Koshy > @@ -8,22 +10,22 @@ > * modification, are permitted provided that the following conditions > * are met: > * 1. Redistributions of source code must retain the above copyright > - *notice, this list of conditions and the following disclaimer > - *in this position and unchanged. > + *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. > * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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. > + * 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. > */ > > /*- > > Modified: head/usr.bin/ar/read.c > == > --- head/usr.bin/ar/read.cWed Jun 20 17:37:55 2018(r335453) > +++ head/usr.bin/ar/read.cWed Jun 20 18:43:17 2018(r335454) > @@ -1,4 +1,6 @@ > /*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > * Copyright (c) 2007 Kai Wang > * Copyright (c) 2007 Tim Kientzle > * All rights reserved. > @@ -7,22 +9,22 @@ > * modification, are permitted provided that the following conditions > * are met: > * 1. Redistributions of source code must retain the above copyright > - *notice, this list of conditions and the following disclaimer > - *in this position and unchanged. > + *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. > * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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
svn commit: r335454 - head/usr.bin/ar
Author: emaste Date: Wed Jun 20 18:43:17 2018 New Revision: 335454 URL: https://svnweb.freebsd.org/changeset/base/335454 Log: usr.bin/ar: use standard 2-Clause FreeBSD license Many licenses on ar files contained small variations from the standard FreeBSD license text. To avoid license proliferation switch to the usual 2-clause FreeBSD license after obtaining permission from all copyright holders. Approved by: jkoshy, kaiw, kientzle Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D14561 Modified: head/usr.bin/ar/ar.c head/usr.bin/ar/read.c head/usr.bin/ar/util.c Modified: head/usr.bin/ar/ar.c == --- head/usr.bin/ar/ar.cWed Jun 20 17:37:55 2018(r335453) +++ head/usr.bin/ar/ar.cWed Jun 20 18:43:17 2018(r335454) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2007 Kai Wang * Copyright (c) 2007 Tim Kientzle * Copyright (c) 2007 Joseph Koshy @@ -8,22 +10,22 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer - *in this position and unchanged. + *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. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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. + * 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. */ /*- Modified: head/usr.bin/ar/read.c == --- head/usr.bin/ar/read.c Wed Jun 20 17:37:55 2018(r335453) +++ head/usr.bin/ar/read.c Wed Jun 20 18:43:17 2018(r335454) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2007 Kai Wang * Copyright (c) 2007 Tim Kientzle * All rights reserved. @@ -7,22 +9,22 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer - *in this position and unchanged. + *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. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR
