[ntpsec commit] License exception cleanup in ports/winnt PPS API files.
Eric S. Raymond
esr at ntpsec.org
Thu Oct 22 11:46:38 UTC 2015
Module: ntpsec
Branch: master
Commit: 15571bbcfedb4b59d60b36da99ba1a0c05d869b5
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=15571bbcfedb4b59d60b36da99ba1a0c05d869b5
Author: Eric S. Raymond <esr at thyrsus.com>
Date: Thu Oct 22 07:29:39 2015 -0400
License exception cleanup in ports/winnt PPS API files.
modified: ports/winnt/include/timepps.h
modified: ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.h
deleted: ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.txt
modified: ports/winnt/ppsapi/loopback/src/loopback-ppsapi.c
modified: ports/winnt/ppsapi/loopback/src/timepps.h
modified: ports/winnt/ppsapi/skelprov/skeleton-ppsapi-provider.c
Replace licenses with SPDX tags.
Approved-by: Mark Atwood <me at mark.atwood.name>
---
ports/winnt/include/timepps.h | 27 ++---------
.../ppsapi/loopback/monolithic-serialpps-timepps.h | 27 ++---------
.../loopback/monolithic-serialpps-timepps.txt | 52 ----------------------
ports/winnt/ppsapi/loopback/src/loopback-ppsapi.c | 31 +++----------
ports/winnt/ppsapi/loopback/src/timepps.h | 27 ++---------
.../ppsapi/skelprov/skeleton-ppsapi-provider.c | 27 ++---------
6 files changed, 17 insertions(+), 174 deletions(-)
diff --git a/ports/winnt/include/timepps.h b/ports/winnt/include/timepps.h
index c278532..ad597fb 100644
--- a/ports/winnt/include/timepps.h
+++ b/ports/winnt/include/timepps.h
@@ -2,20 +2,6 @@
* *
* Copyright (c) David L. Mills 1999-2009 *
* *
- * Permission to use, copy, modify, and distribute this software and *
- * its documentation for any purpose and with or without fee is hereby *
- * granted, provided that the above copyright notice appears in all *
- * copies and that both the copyright notice and this permission *
- * notice appear in supporting documentation, and that the name *
- * University of Delaware not be used in advertising or publicity *
- * pertaining to distribution of the software without specific, *
- * written prior permission. The University of Delaware makes no *
- * representations about the suitability this software for any *
- * purpose. It is provided "as is" without express or implied *
- * warranty. *
- * *
- ***********************************************************************
- * *
* This header file complies with "Pulse-Per-Second API for UNIX-like *
* Operating Systems, Version 1.0", rfc2783. Credit is due Jeff Mogul *
* and Marc Brett, from whom much of this code was shamelessly stolen. *
@@ -27,20 +13,13 @@
* This Windows version was derived by Dave Hart *
* <davehart at davehart.com> from Mills' timepps-Solaris.h *
* *
- ***********************************************************************
- * *
* Some of this include file *
* Copyright (c) 1999 by Ulrich Windl, *
* based on code by Reg Clemens <reg at dwf.com> *
* based on code by Poul-Henning Kamp <phk at FreeBSD.org> *
- * *
- ***********************************************************************
- * *
- * "THE BEER-WARE LICENSE" (Revision 42): *
- * <phk at 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 this stuff is worth it, you can buy me a beer *
- * in return. Poul-Henning Kamp *
+ * *
+ * SPDX-License-Identifier: NTP *
+ * SPDX-License-Identifier: Beerware *
* *
**********************************************************************/
diff --git a/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.h b/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.h
index a882494..0984026 100644
--- a/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.h
+++ b/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.h
@@ -2,20 +2,6 @@
* *
* Copyright (c) David L. Mills 1999-2000 *
* *
- * Permission to use, copy, modify, and distribute this software and *
- * its documentation for any purpose and with or without fee is hereby *
- * granted, provided that the above copyright notice appears in all *
- * copies and that both the copyright notice and this permission *
- * notice appear in supporting documentation, and that the name *
- * University of Delaware not be used in advertising or publicity *
- * pertaining to distribution of the software without specific, *
- * written prior permission. The University of Delaware makes no *
- * representations about the suitability this software for any *
- * purpose. It is provided "as is" without express or implied *
- * warranty. *
- * *
- ***********************************************************************
- * *
* This header file complies with "Pulse-Per-Second API for UNIX-like *
* Operating Systems, Version 1.0", rfc2783. Credit is due Jeff Mogul *
* and Marc Brett, from whom much of this code was shamelessly stolen. *
@@ -29,20 +15,13 @@
* This Windows version was derived by Dave Hart *
* <davehart at davehart.com> from Mills' timepps-Solaris.h *
* *
- ***********************************************************************
- * *
* Some of this include file *
* Copyright (c) 1999 by Ulrich Windl, *
* based on code by Reg Clemens <reg at dwf.com> *
* based on code by Poul-Henning Kamp <phk at FreeBSD.org> *
- * *
- ***********************************************************************
- * *
- * "THE BEER-WARE LICENSE" (Revision 42): *
- * <phk at 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 this stuff is worth it, you can buy me a beer *
- * in return. Poul-Henning Kamp *
+ * *
+ * SPDX-License-Identifier: NTP *
+ * SPDX-License-Identifier: Beerware *
* *
**********************************************************************/
diff --git a/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.txt b/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.txt
deleted file mode 100644
index e335d4d..0000000
--- a/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-/***********************************************************************
- * *
- * Copyright (c) David L. Mills 1999-2000 *
- * *
- * Permission to use, copy, modify, and distribute this software and *
- * its documentation for any purpose and with or without fee is hereby *
- * granted, provided that the above copyright notice appears in all *
- * copies and that both the copyright notice and this permission *
- * notice appear in supporting documentation, and that the name *
- * University of Delaware not be used in advertising or publicity *
- * pertaining to distribution of the software without specific, *
- * written prior permission. The University of Delaware makes no *
- * representations about the suitability this software for any *
- * purpose. It is provided "as is" without express or implied *
- * warranty. *
- * *
- ***********************************************************************
- * *
- * This header file complies with "Pulse-Per-Second API for UNIX-like *
- * Operating Systems, Version 1.0", rfc2783. Credit is due Jeff Mogul *
- * and Marc Brett, from whom much of this code was shamelessly stolen. *
- * *
- * This modified timepps.h can be used to provide a PPSAPI interface *
- * to a machine running Windows with a suitably modified *
- * serialpps.sys being used in place of serial.sys. It can *
- * be extended to support a modified parallel port driver once *
- * available. *
- * *
- * This Windows version was derived by Dave Hart *
- * <davehart at davehart.com> from Mills' timepps-Solaris.h *
- * *
- ***********************************************************************
- * *
- * Some of this include file *
- * Copyright (c) 1999 by Ulrich Windl, *
- * based on code by Reg Clemens <reg at dwf.com> *
- * based on code by Poul-Henning Kamp <phk at FreeBSD.org> *
- * *
- ***********************************************************************
- * *
- * "THE BEER-WARE LICENSE" (Revision 42): *
- * <phk at 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 this stuff is worth it, you can buy me a beer *
- * in return. Poul-Henning Kamp *
- * *
- **********************************************************************/
-
-timepps.h implements IETF RFC "Pulse-Per-Second API for UNIX-like
-Operating Systems, Version 1.0" for Microsoft Windows.
-
-
diff --git a/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.c b/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.c
index 04db73b..7f61d79 100644
--- a/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.c
+++ b/ports/winnt/ppsapi/loopback/src/loopback-ppsapi.c
@@ -7,45 +7,24 @@
* *
* Copyright (c) David L. Mills 1999-2009 *
* *
- * Permission to use, copy, modify, and distribute this software and *
- * its documentation for any purpose and without fee is hereby *
- * granted, provided that the above copyright notice appears in all *
- * copies and that both the copyright notice and this permission *
- * notice appear in supporting documentation, and that the name *
- * University of Delaware not be used in advertising or publicity *
- * pertaining to distribution of the software without specific, *
- * written prior permission. The University of Delaware makes no *
- * representations about the suitability this software for any *
- * purpose. It is provided "as is" without express or implied *
- * warranty. *
- * *
- ***********************************************************************
- * *
* This header file complies with "Pulse-Per-Second API for UNIX-like *
* Operating Systems, Version 1.0", rfc2783. Credit is due Jeff Mogul *
* and Marc Brett, from whom much of this code was shamelessly stolen. *
* *
* This serialpps-ppsapi-provider.dll implements the PPSAPI provider *
* for serialpps.sys, which is a very lightly patched Windows *
- * serial.sys with CD timestamping support.
+ * serial.sys with CD timestamping support. *
* *
* This Windows version was derived by Dave Hart *
- * <davehart at davehart.com> from David L. Mills' timepps-Solaris.h *
- * *
- ***********************************************************************
+ * <davehart at davehart.com> from Mills' timepps-Solaris.h *
* *
* Some of this include file *
* Copyright (c) 1999 by Ulrich Windl, *
* based on code by Reg Clemens <reg at dwf.com> *
* based on code by Poul-Henning Kamp <phk at FreeBSD.org> *
- * *
- ***********************************************************************
- * *
- * "THE BEER-WARE LICENSE" (Revision 42): *
- * <phk at 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 this stuff is worth it, you can buy me a beer *
- * in return. Poul-Henning Kamp *
+ * *
+ * SPDX-License-Identifier: NTP *
+ * SPDX-License-Identifier: Beerware *
* *
**********************************************************************/
diff --git a/ports/winnt/ppsapi/loopback/src/timepps.h b/ports/winnt/ppsapi/loopback/src/timepps.h
index 22822f5..03d4065 100644
--- a/ports/winnt/ppsapi/loopback/src/timepps.h
+++ b/ports/winnt/ppsapi/loopback/src/timepps.h
@@ -2,20 +2,6 @@
* *
* Copyright (c) David L. Mills 1999-2009 *
* *
- * Permission to use, copy, modify, and distribute this software and *
- * its documentation for any purpose and with or without fee is hereby *
- * granted, provided that the above copyright notice appears in all *
- * copies and that both the copyright notice and this permission *
- * notice appear in supporting documentation, and that the name *
- * University of Delaware not be used in advertising or publicity *
- * pertaining to distribution of the software without specific, *
- * written prior permission. The University of Delaware makes no *
- * representations about the suitability this software for any *
- * purpose. It is provided "as is" without express or implied *
- * warranty. *
- * *
- ***********************************************************************
- * *
* This header file complies with "Pulse-Per-Second API for UNIX-like *
* Operating Systems, Version 1.0", rfc2783. Credit is due Jeff Mogul *
* and Marc Brett, from whom much of this code was shamelessly stolen. *
@@ -27,20 +13,13 @@
* This Windows version was derived by Dave Hart *
* <davehart at davehart.com> from Mills' timepps-Solaris.h *
* *
- ***********************************************************************
- * *
* Some of this include file *
* Copyright (c) 1999 by Ulrich Windl, *
* based on code by Reg Clemens <reg at dwf.com> *
* based on code by Poul-Henning Kamp <phk at FreeBSD.org> *
- * *
- ***********************************************************************
- * *
- * "THE BEER-WARE LICENSE" (Revision 42): *
- * <phk at 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 this stuff is worth it, you can buy me a beer *
- * in return. Poul-Henning Kamp *
+ * *
+ * SPDX-License-Identifier: NTP *
+ * SPDX-License-Identifier: Beerware *
* *
**********************************************************************/
diff --git a/ports/winnt/ppsapi/skelprov/skeleton-ppsapi-provider.c b/ports/winnt/ppsapi/skelprov/skeleton-ppsapi-provider.c
index 6f96018..f5ddb21 100644
--- a/ports/winnt/ppsapi/skelprov/skeleton-ppsapi-provider.c
+++ b/ports/winnt/ppsapi/skelprov/skeleton-ppsapi-provider.c
@@ -6,20 +6,6 @@
* *
* Copyright (c) David L. Mills 1999-2009 *
* *
- * Permission to use, copy, modify, and distribute this software and *
- * its documentation for any purpose and without fee is hereby *
- * granted, provided that the above copyright notice appears in all *
- * copies and that both the copyright notice and this permission *
- * notice appear in supporting documentation, and that the name *
- * University of Delaware not be used in advertising or publicity *
- * pertaining to distribution of the software without specific, *
- * written prior permission. The University of Delaware makes no *
- * representations about the suitability this software for any *
- * purpose. It is provided "as is" without express or implied *
- * warranty. *
- * *
- ***********************************************************************
- * *
* This header file complies with "Pulse-Per-Second API for UNIX-like *
* Operating Systems, Version 1.0", rfc2783. Credit is due Jeff Mogul *
* and Marc Brett, from whom much of this code was shamelessly stolen. *
@@ -29,20 +15,13 @@
* derived from serialpps-ppsapi-provider.c which was derived from *
* David L. Mills' timepps.h for Solaris. *
* *
- ***********************************************************************
- * *
* Some of this include file *
* Copyright (c) 1999 by Ulrich Windl, *
* based on code by Reg Clemens <reg at dwf.com> *
* based on code by Poul-Henning Kamp <phk at FreeBSD.org> *
- * *
- ***********************************************************************
- * *
- * "THE BEER-WARE LICENSE" (Revision 42): *
- * <phk at 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 this stuff is worth it, you can buy me a beer *
- * in return. Poul-Henning Kamp *
+ * *
+ * SPDX-License-Identifier: NTP *
+ * SPDX-License-Identifier: Beerware *
* *
**********************************************************************/
More information about the vc
mailing list