On 12/08/2014 04:41 PM, Denys Vlasenko wrote:
On Thu, Dec 4, 2014 at 4:21 PM, Adam Tkac <[email protected]> wrote:
Henning Brauer, author of the openntpd (ntpd.c applet is based on it), asked
me to improve license and copyright statement of the ntpd.c applet and
explicitly mention openntpd license©right. Proposed patch is attached,
can you please include it? Thanks it advance.
Copyright notice there is already a mess (both GPL and BSD ... that's wrong).
With your patch, it adds another BSD clause. Also, ntpd_simple.c
also needs fixing, right?
Please submit a patch which replaces existing notice with a consistent one.
I'm not licensing expert but IMO it's impossible to merge all licenses
into one statement as you wish. If you use existing code, you cannot
change license unless you are author. If licenses differ for parts of
code, all of them should be mentioned.
I dig on the Internet about possibility to "relicense" BSD code under
GPL and it's not possible. However it's possible to license changes to
BSD code under GPL. So in my opinion the best solution is to mention all
of the license notices (from both OpenNTPd and NTPd) and license all
busybox changes under GPL. What do you think about attached patch?
Once we agree on patch for ntpd.c, I will copy it for ntpd_simple.c.
Regards, Adam
>From 8f93987acb8b8234b1c35d8866200be56bef1d9f Mon Sep 17 00:00:00 2001
From: Adam Tkac <[email protected]>
Date: Mon, 1 Dec 2014 14:24:42 +0100
Subject: [PATCH] Mention original OpenNTPd license in ntpd.c applet source
code.
Signed-off-by: Adam Tkac <[email protected]>
---
networking/ntpd.c | 36 +++++++++++++++++++++++++++++++++---
1 file changed, 33 insertions(+), 3 deletions(-)
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 2d4f076..dc33766 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1,12 +1,42 @@
/*
* NTP client/server, based on OpenNTPD 3.9p1
*
- * Author: Adam Tkac <[email protected]>
+ * Busybox port author: Adam Tkac <[email protected]>
*
- * Licensed under GPLv2, see file LICENSE in this source tree.
+ * All busybox changes are licensed under GPLv2, see file LICENSE in this
+ * source tree.
+ *
+ ***********************************************************************
+ * Original OpenNTPd code is licensed under an ISC-style licence with the
+ * following copyright holders, first for the files from OpenBSD's ntpd:
+ *
+ * Copyright (c) 2003, 2004 Henning Brauer <[email protected]>
+ * Copyright (c) 2004 Alexander Guy <[email protected]>
+ *
+ * and the portability layer:
+ *
+ * Copyright (c) 2004 Darren Tucker <dtucker at zip com au>
+ * Copyright (C) 2000-2003 Damien Miller <[email protected]>
+ * Copyright (c) 1996 by Internet Software Consortium
+ * Copyright (c) 1998 Todd C. Miller <[email protected]>
+ * Copyright (c) 2004 Anthony O.Zabelin <rz1a at mail.ru>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ ***********************************************************************
*
* Parts of OpenNTPD clock syncronization code is replaced by
- * code which is based on ntp-4.2.6, whuch carries the following
+ * code which is based on ntp-4.2.6, which carries the following
* copyright notice:
*
***********************************************************************
--
2.1.0
_______________________________________________
busybox mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/busybox
