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):
  * <p...@freebsd.org> 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):
 # <p...@freebsd.org> 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):
  * <jo...@freebsd.org> 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):
  * <jo...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
 # <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> 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):
  * <ko...@india.hp.com> 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):
  * <p...@freebsd.org> 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):
  * <p...@freebsd.org> wrote this file.  As long as you retain this notice you
_______________________________________________
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"

Reply via email to