Date: Thu, 30 Nov 2017 15:10:11 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326398 - in head: sys/netpfil/pf sys/sparc64/pci sys/sys sys/x86/isa usr.bin/gencat usr.sbin/ppp usr.sbin/watch Message-ID: <201711301510.vAUFAB2A054502@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Thu Nov 30 15:10:11 2017 New Revision: 326398 URL: https://svnweb.freebsd.org/changeset/base/326398 Log: SPDX: Fix some cases wrongly attributed to MIT. In the cases of BSD-style license variants without clauses, use 0BSD for the time being in lack of a better description. Modified: head/sys/netpfil/pf/if_pfsync.c head/sys/sparc64/pci/sbbc.c head/sys/sys/gpio.h head/sys/sys/msg.h head/sys/sys/snoop.h head/sys/x86/isa/isa.c head/usr.bin/gencat/gencat.c head/usr.sbin/ppp/arp.c head/usr.sbin/watch/watch.c Modified: head/sys/netpfil/pf/if_pfsync.c ============================================================================== --- head/sys/netpfil/pf/if_pfsync.c Thu Nov 30 14:38:07 2017 (r326397) +++ head/sys/netpfil/pf/if_pfsync.c Thu Nov 30 15:10:11 2017 (r326398) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT + * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND ISC) * * Copyright (c) 2002 Michael Shalayeff * Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org> Modified: head/sys/sparc64/pci/sbbc.c ============================================================================== --- head/sys/sparc64/pci/sbbc.c Thu Nov 30 14:38:07 2017 (r326397) +++ head/sys/sparc64/pci/sbbc.c Thu Nov 30 15:10:11 2017 (r326398) @@ -1,6 +1,6 @@ /* $OpenBSD: sbbc.c,v 1.7 2009/11/09 17:53:39 nicm Exp $ */ /*- - * SPDX-License-Identifier: MIT AND BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: (ISC AND BSD-2-Clause-FreeBSD) * * Copyright (c) 2008 Mark Kettenis * Modified: head/sys/sys/gpio.h ============================================================================== --- head/sys/sys/gpio.h Thu Nov 30 14:38:07 2017 (r326397) +++ head/sys/sys/gpio.h Thu Nov 30 15:10:11 2017 (r326398) @@ -1,7 +1,7 @@ /* $NetBSD: gpio.h,v 1.7 2009/09/25 20:27:50 mbalmer Exp $ */ /* $OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT + * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND ISC) * * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org> * All rights reserved. Modified: head/sys/sys/msg.h ============================================================================== --- head/sys/sys/msg.h Thu Nov 30 14:38:07 2017 (r326397) +++ head/sys/sys/msg.h Thu Nov 30 15:10:11 2017 (r326398) @@ -4,7 +4,7 @@ /*- * SVID compatible msg.h file * - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: 0BSD * * Author: Daniel Boulet * Modified: head/sys/sys/snoop.h ============================================================================== --- head/sys/sys/snoop.h Thu Nov 30 14:38:07 2017 (r326397) +++ head/sys/sys/snoop.h Thu Nov 30 15:10:11 2017 (r326398) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: 0BSD * * Copyright (c) 1995 Ugen J.S.Antsilevich * Modified: head/sys/x86/isa/isa.c ============================================================================== --- head/sys/x86/isa/isa.c Thu Nov 30 14:38:07 2017 (r326397) +++ head/sys/x86/isa/isa.c Thu Nov 30 15:10:11 2017 (r326398) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT + * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND ISC) * * Copyright (c) 1998 Doug Rabson * All rights reserved. Modified: head/usr.bin/gencat/gencat.c ============================================================================== --- head/usr.bin/gencat/gencat.c Thu Nov 30 14:38:07 2017 (r326397) +++ head/usr.bin/gencat/gencat.c Thu Nov 30 15:10:11 2017 (r326398) @@ -4,7 +4,7 @@ /* $NetBSD: gencat.c,v 1.18 2003/10/27 00:12:43 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND MIT + * SPDX-License-Identifier: (BSD-2-Clause-NetBSD AND ISC) * * Copyright (c) 1996 The NetBSD Foundation, Inc. * All rights reserved. Modified: head/usr.sbin/ppp/arp.c ============================================================================== --- head/usr.sbin/ppp/arp.c Thu Nov 30 14:38:07 2017 (r326397) +++ head/usr.sbin/ppp/arp.c Thu Nov 30 15:10:11 2017 (r326398) @@ -2,7 +2,7 @@ * sys-bsd.c - System-dependent procedures for setting up * PPP interfaces on bsd-4.4-ish systems (including 386BSD, NetBSD, etc.) * - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: 0BSD * * Copyright (c) 1989 Carnegie Mellon University. * All rights reserved. Modified: head/usr.sbin/watch/watch.c ============================================================================== --- head/usr.sbin/watch/watch.c Thu Nov 30 14:38:07 2017 (r326397) +++ head/usr.sbin/watch/watch.c Thu Nov 30 15:10:11 2017 (r326398) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: 0BSD * * Copyright (c) 1995 Ugen J.S.Antsilevich *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711301510.vAUFAB2A054502>