[tz] [PATCH 1/1] * LICENSE: New file.

Paul Eggert eggert at cs.ucla.edu
Tue Dec 8 17:49:55 UTC 2015


On 10/23/2015 03:12 PM, James Knight wrote:
> Adding a license-specific file to aid in package management and other
> possible use cases.

Thanks for the suggestion. I installed the attached proposed patch into 
the experimental Github version: it adds a LICENSE file and also 
attempts to clarify and clean up and standardize some of the old 
licensing cruft.
-------------- next part --------------
From b8ac3fe721dcd8a97466a969ea8e5d5fa787554d Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert at cs.ucla.edu>
Date: Tue, 8 Dec 2015 09:16:01 -0800
Subject: [PROPOSED PATCH] Clarify licensing status
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This follows up on a suggestion by James Knight in:
http://mm.icann.org/pipermail/tz/2015-October/022799.html
* .gitignore, CONTRIBUTING, Makefile, README, checklinks.awk:
* checktab.awk, tzselect.ksh: Mention that they’re public domain.
* LICENSE: New file.
* Makefile (COMMON): Add it.
* NEWS: Document this.
* date.c, newstrftime.3, strftime.c: Switch to 3-clause BSD license.
---
 .gitignore     |  2 ++
 CONTRIBUTING   |  4 ++++
 LICENSE        |  4 ++++
 Makefile       |  2 +-
 NEWS           |  5 +++++
 README         | 10 ++++++----
 checklinks.awk |  2 +-
 checktab.awk   |  2 +-
 date.c         | 44 ++++++++++++++++++++++++++++----------------
 newstrftime.3  |  6 +-----
 strftime.c     | 49 ++++++++++++++++++++++++++++++-------------------
 tzselect.ksh   |  2 +-
 12 files changed, 84 insertions(+), 48 deletions(-)
 create mode 100644 LICENSE

diff --git a/.gitignore b/.gitignore
index dea650e..91098d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+# Files intentionally not tracked by Git.
+# This file is in the public domain.
 *.a
 *.asc
 *.o
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 358bc20..e40102e 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -67,3 +67,7 @@ Git repository.  If you use Git the following workflow may be helpful:
 Please do not create issues or pull requests on GitHub, as the
 proper procedure for proposing and distributing patches is via
 email as illustrated above.
+
+-----
+
+This file is in the public domain.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..a9b60d8
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,4 @@
+With a few exceptions, all files in the tz code and data (including
+this one) are in the public domain.  The exceptions are tzcode's
+date.c, newstrftime.3, and strftime.c, which contain material derived
+from BSD and which use the BSD 3-clause license.
diff --git a/Makefile b/Makefile
index cebe399..46d3233 100644
--- a/Makefile
+++ b/Makefile
@@ -344,7 +344,7 @@ MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
 			time2posix.3.txt \
 			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
 			date.1.txt
-COMMON=		CONTRIBUTING Makefile NEWS README Theory
+COMMON=		CONTRIBUTING LICENSE Makefile NEWS README Theory
 WEB_PAGES=	tz-art.htm tz-link.htm
 DOCS=		$(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
 PRIMARY_YDATA=	africa antarctica asia australasia \
diff --git a/NEWS b/NEWS
index a50aced..9f93bbb 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,11 @@ Unreleased, experimental changes
 
   Changes affecting documentation
 
+    A new file LICENSE makes it easier to see that the code and data
+    are mostly public-domain.  (Thanks to James Knight.)  The three
+    non-public-domain files now use the current (3-clause) BSD license
+    instead of older versions of that license.
+
     tz-link.htm mentions the BDE library (thanks to Andrew Paprocki)
     and CCTZ (thanks to Tim Parenti).
 
diff --git a/README b/README
index 06ef1d9..8deaf16 100644
--- a/README
+++ b/README
@@ -10,10 +10,6 @@ locations around the globe.  It is updated periodically to reflect
 changes made by political bodies to time zone boundaries, UTC offsets,
 and daylight-saving rules.
 
-Unless otherwise specified, all files in the tz code and data are in
-the public domain, so clarified as of 2009-05-17 by Arthur David Olson.
-The few exceptions are code derived from BSD, which uses the BSD license.
-
 Here is a recipe for acquiring, building, installing, and testing the
 tz distribution on a GNU/Linux or similar host.
 
@@ -59,3 +55,9 @@ None of them are responsible for remaining errors.
 Look in <ftp://ftp.iana.org/tz/releases/> for updated versions of these files.
 
 Please send comments or information to tz at iana.org.
+
+-----
+
+This file is in the public domain, so clarified as of 2009-05-17 by
+Arthur David Olson.  The other files in this distribution are either
+public domain or BSD licensed; see the file LICENSE for details.
diff --git a/checklinks.awk b/checklinks.awk
index f0ff726..5b3e157 100644
--- a/checklinks.awk
+++ b/checklinks.awk
@@ -1,6 +1,6 @@
 # Check links in tz tables.
 
-# Contributed by Paul Eggert.
+# Contributed by Paul Eggert.  This file is in the public domain.
 
 BEGIN {
     # Special marker indicating that the name is defined as a Zone.
diff --git a/checktab.awk b/checktab.awk
index 6a456bf..6c2e41b 100644
--- a/checktab.awk
+++ b/checktab.awk
@@ -1,6 +1,6 @@
 # Check tz tables for consistency.
 
-# Contributed by Paul Eggert.
+# Contributed by Paul Eggert.  This file is in the public domain.
 
 BEGIN {
 	FS = "\t"
diff --git a/date.c b/date.c
index 4eecc50..824e57d 100644
--- a/date.c
+++ b/date.c
@@ -1,19 +1,31 @@
-/*
- * Copyright (c) 1985, 1987, 1988 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
+/* Display or set the current time and date.  */
+
+/* Copyright 1985, 1987, 1988 The Regents of the University of California.
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   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.
+   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.
+   3. Neither the name of the University nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.  */
 
 #include "private.h"
 #include "locale.h"
diff --git a/newstrftime.3 b/newstrftime.3
index 6afc948..9a60ee3 100644
--- a/newstrftime.3
+++ b/newstrftime.3
@@ -14,11 +14,7 @@
 .\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
diff --git a/strftime.c b/strftime.c
index 27af34a..7a139bd 100644
--- a/strftime.c
+++ b/strftime.c
@@ -1,29 +1,40 @@
+/* Convert a broken-down time stamp to a string.  */
+
+/* Copyright 1989 The Regents of the University of California.
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   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.
+   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.
+   3. Neither the name of the University nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.  */
+
 /*
-** Based on the UCB version with the copyright notice and sccsid
-** appearing below.
+** Based on the UCB version with the copyright notice appearing above.
 **
 ** This is ANSIish only when "multibyte character == plain character".
 */
 
 #include "private.h"
 
-/*
-** Copyright (c) 1989 The Regents of the University of California.
-** All rights reserved.
-**
-** Redistribution and use in source and binary forms are permitted
-** provided that the above copyright notice and this paragraph are
-** duplicated in all such forms and that any documentation,
-** advertising materials, and other materials related to such
-** distribution and use acknowledge that the software was developed
-** by the University of California, Berkeley. The name of the
-** University may not be used to endorse or promote products derived
-** from this software without specific prior written permission.
-** THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-** IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
 #include "tzfile.h"
 #include "fcntl.h"
 #include "locale.h"
diff --git a/tzselect.ksh b/tzselect.ksh
index 2c3b2f4..df5621f 100644
--- a/tzselect.ksh
+++ b/tzselect.ksh
@@ -7,7 +7,7 @@ REPORT_BUGS_TO=tz at iana.org
 # Ask the user about the time zone, and output the resulting TZ value to stdout.
 # Interact with the user via stderr and stdin.
 
-# Contributed by Paul Eggert.
+# Contributed by Paul Eggert.  This file is in the public domain.
 
 # Porting notes:
 #
-- 
2.1.0


More information about the tz mailing list