From owner-svn-src-head@freebsd.org Thu Nov 30 20:33:53 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 739F1DB9584; Thu, 30 Nov 2017 20:33:53 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0FB4773DFB; Thu, 30 Nov 2017 20:33:49 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAUKXm26022544; Thu, 30 Nov 2017 20:33:48 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAUKXju7022512; Thu, 30 Nov 2017 20:33:45 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201711302033.vAUKXju7022512@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Thu, 30 Nov 2017 20:33:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326408 - in head: lib/libfetch sbin/recoverdisk share/examples/BSD_daemon share/examples/libusb20 sys/dev/led sys/dev/md sys/dev/mn sys/dev/ppbus sys/i386/i386 sys/kern sys/sys sys/x86... X-SVN-Group: head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: in head: lib/libfetch sbin/recoverdisk share/examples/BSD_daemon share/examples/libusb20 sys/dev/led sys/dev/md sys/dev/mn sys/dev/ppbus sys/i386/i386 sys/kern sys/sys sys/x86/include tools/tools/kern... X-SVN-Commit-Revision: 326408 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 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: Thu, 30 Nov 2017 20:33:53 -0000 Author: pfg Date: Thu Nov 30 20:33:45 2017 New Revision: 326408 URL: https://svnweb.freebsd.org/changeset/base/326408 Log: SPDX: use the Beerware identifier. Modified: head/lib/libfetch/ftp.c head/sbin/recoverdisk/recoverdisk.c head/share/examples/BSD_daemon/beastie.fig head/share/examples/libusb20/bulk.c head/share/examples/libusb20/control.c head/sys/dev/led/led.c head/sys/dev/md/md.c head/sys/dev/mn/if_mn.c head/sys/dev/ppbus/pps.c head/sys/i386/i386/elan-mmcr.c head/sys/i386/i386/mp_clock.c head/sys/kern/imgact_gzip.c head/sys/kern/inflate.c head/sys/kern/kern_tc.c head/sys/kern/subr_disk.c head/sys/sys/disk.h head/sys/sys/smp.h head/sys/sys/timepps.h head/sys/x86/include/x86_smp.h head/tools/tools/kernxref/kernxref.sh head/usr.bin/ministat/ministat.c head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c head/usr.sbin/ctm/ctm/ctm.c head/usr.sbin/ctm/ctm/ctm_ed.c head/usr.sbin/ctm/ctm/ctm_input.c head/usr.sbin/ctm/ctm/ctm_pass1.c head/usr.sbin/ctm/ctm/ctm_pass2.c head/usr.sbin/ctm/ctm/ctm_pass3.c head/usr.sbin/ctm/ctm/ctm_passb.c head/usr.sbin/ctm/ctm/ctm_syntax.c head/usr.sbin/fdwrite/fdwrite.c Modified: head/lib/libfetch/ftp.c ============================================================================== --- head/lib/libfetch/ftp.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/lib/libfetch/ftp.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND Beerware) * * Copyright (c) 1998-2011 Dag-Erling Smørgrav * All rights reserved. Modified: head/sbin/recoverdisk/recoverdisk.c ============================================================================== --- head/sbin/recoverdisk/recoverdisk.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/sbin/recoverdisk/recoverdisk.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/share/examples/BSD_daemon/beastie.fig ============================================================================== --- head/share/examples/BSD_daemon/beastie.fig Thu Nov 30 20:21:42 2017 (r326407) +++ head/share/examples/BSD_daemon/beastie.fig Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ #FIG 3.2 +# SPDX-License-Identifier: Beerware +# # ---------------------------------------------------------------------------- # "THE BEER-WARE LICENSE" (Revision 42): # wrote this file. As long as you retain this notice you Modified: head/share/examples/libusb20/bulk.c ============================================================================== --- head/share/examples/libusb20/bulk.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/share/examples/libusb20/bulk.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,7 @@ -/* ---------------------------------------------------------------------------- +/*- + * SPDX-License-Identifier: Beerware + * + * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp): * wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think Modified: head/share/examples/libusb20/control.c ============================================================================== --- head/share/examples/libusb20/control.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/share/examples/libusb20/control.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,7 @@ -/* ---------------------------------------------------------------------------- +/*- + * SPDX-License-Identifier: Beerware + * + * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp): * wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think Modified: head/sys/dev/led/led.c ============================================================================== --- head/sys/dev/led/led.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/dev/led/led.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/dev/md/md.c ============================================================================== --- head/sys/dev/md/md.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/dev/md/md.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: (Beerware AND BSD-3-Clause) + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you @@ -11,8 +13,6 @@ */ /*- - * SPDX-License-Identifier: BSD-3-Clause - * * The following functions are based in the vn(4) driver: mdstart_swap(), * mdstart_vnode(), mdcreate_swap(), mdcreate_vnode() and mddestroy(), * and as such under the following copyright: Modified: head/sys/dev/mn/if_mn.c ============================================================================== --- head/sys/dev/mn/if_mn.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/dev/mn/if_mn.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/dev/ppbus/pps.c ============================================================================== --- head/sys/dev/ppbus/pps.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/dev/ppbus/pps.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/i386/i386/elan-mmcr.c ============================================================================== --- head/sys/i386/i386/elan-mmcr.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/i386/i386/elan-mmcr.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/i386/i386/mp_clock.c ============================================================================== --- head/sys/i386/i386/mp_clock.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/i386/i386/mp_clock.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/kern/imgact_gzip.c ============================================================================== --- head/sys/kern/imgact_gzip.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/kern/imgact_gzip.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/kern/inflate.c ============================================================================== --- head/sys/kern/inflate.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/kern/inflate.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,5 +1,7 @@ -/* +/*- * Most parts of this file are not covered by: + * + * SPDX-License-Identifier: Beerware * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/kern/kern_tc.c ============================================================================== --- head/sys/kern/kern_tc.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/kern/kern_tc.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/kern/subr_disk.c ============================================================================== --- head/sys/kern/subr_disk.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/kern/subr_disk.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/sys/disk.h ============================================================================== --- head/sys/sys/disk.h Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/sys/disk.h Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/sys/smp.h ============================================================================== --- head/sys/sys/smp.h Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/sys/smp.h Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/sys/timepps.h ============================================================================== --- head/sys/sys/timepps.h Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/sys/timepps.h Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/sys/x86/include/x86_smp.h ============================================================================== --- head/sys/x86/include/x86_smp.h Thu Nov 30 20:21:42 2017 (r326407) +++ head/sys/x86/include/x86_smp.h Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/tools/tools/kernxref/kernxref.sh ============================================================================== --- head/tools/tools/kernxref/kernxref.sh Thu Nov 30 20:21:42 2017 (r326407) +++ head/tools/tools/kernxref/kernxref.sh Thu Nov 30 20:33:45 2017 (r326408) @@ -1,5 +1,7 @@ : # +# SPDX-License-Identifier: Beerware +# # ---------------------------------------------------------------------------- # "THE BEER-WARE LICENSE" (Revision 42): # wrote this file. As long as you retain this notice you Modified: head/usr.bin/ministat/ministat.c ============================================================================== --- head/usr.bin/ministat/ministat.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/usr.bin/ministat/ministat.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c ============================================================================== --- head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: (BSD-2-Clause AND Beerware) + * * Copyright (c) 2005-2006 The FreeBSD Project * All rights reserved. * Modified: head/usr.sbin/ctm/ctm/ctm.c ============================================================================== --- head/usr.sbin/ctm/ctm/ctm.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/usr.sbin/ctm/ctm/ctm.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/usr.sbin/ctm/ctm/ctm_ed.c ============================================================================== --- head/usr.sbin/ctm/ctm/ctm_ed.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/usr.sbin/ctm/ctm/ctm_ed.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/usr.sbin/ctm/ctm/ctm_input.c ============================================================================== --- head/usr.sbin/ctm/ctm/ctm_input.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/usr.sbin/ctm/ctm/ctm_input.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/usr.sbin/ctm/ctm/ctm_pass1.c ============================================================================== --- head/usr.sbin/ctm/ctm/ctm_pass1.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/usr.sbin/ctm/ctm/ctm_pass1.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/usr.sbin/ctm/ctm/ctm_pass2.c ============================================================================== --- head/usr.sbin/ctm/ctm/ctm_pass2.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/usr.sbin/ctm/ctm/ctm_pass2.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/usr.sbin/ctm/ctm/ctm_pass3.c ============================================================================== --- head/usr.sbin/ctm/ctm/ctm_pass3.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/usr.sbin/ctm/ctm/ctm_pass3.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/usr.sbin/ctm/ctm/ctm_passb.c ============================================================================== --- head/usr.sbin/ctm/ctm/ctm_passb.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/usr.sbin/ctm/ctm/ctm_passb.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/usr.sbin/ctm/ctm/ctm_syntax.c ============================================================================== --- head/usr.sbin/ctm/ctm/ctm_syntax.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/usr.sbin/ctm/ctm/ctm_syntax.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you Modified: head/usr.sbin/fdwrite/fdwrite.c ============================================================================== --- head/usr.sbin/fdwrite/fdwrite.c Thu Nov 30 20:21:42 2017 (r326407) +++ head/usr.sbin/fdwrite/fdwrite.c Thu Nov 30 20:33:45 2017 (r326408) @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: Beerware + * * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you