[Bug 3725] Make copyright of clk_wharton.c compatible with Debian.

bk: 6417694aULT6gV88hS1BA6hTMbXHQQ

diff --git a/ChangeLog b/ChangeLog
index 4843f182a050113d113032203055f914c7da4bea..8675e47576f57650684738333e1f1657c75e0718 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
 * [Bug 3758] Provide a 'device' config statement for refclocks <perlinger@ntp.org> 
 * [Bug 3757] Improve handling of Linux-PPS in NTPD <perlinger@ntp.org>
 * [Bug 3741] 4.2.8p15 can't build with glibc 2.34 <perlinger@ntp.org>
+* [Bug 3725] Make copyright of clk_wharton.c compatible with Debian.
+             Philippe De Muyter <phdm@macqel.be>
 * [Bug 3724] ntp-keygen with openSSL 1.1.1 fails on Windows <perlinger@ntp.org>
   - openssl applink needed again for openSSL-1.1.1
 * [Bug 3699] Problems handling drift file and restoring previous drifts <perlinger@ntp.org>
@@ -59,6 +61,8 @@
   - applied patch by Gerry Garvey
 * [Bug 3432] refclocks that 'write()' should check the result <perlinger@ntp.org>
   - backport from -dev, plus some more work on warnings for unchecked results
+* [Bug 2990] multicastclient incorrectly causes bind to broadcast address.
+             Integrated patch from Brian Utterback. <hart@ntp.org>
 * [Bug 2525] Turn on automake subdir-objects across the project. <hart@ntp.org>
 * [Bug 2410] syslog an error message on panic exceeded. <brian.utterback@oracle.com>
 * Use https in the AC_INIT URLs in configure.ac.  <stenn@ntp.org>

diff --git a/html/copyright.html b/html/copyright.html
index 51c6cfd62417a91c5d1cd26961b8cd6a0d392690..d00cf97121781e40376683be759066d5bf07dd98 100644 (file)
--- a/html/copyright.html
+++ b/html/copyright.html
@@ -82,6 +82,7 @@
   <li><a href="mailto:%20reg@dwf.com">Reg Clemens &lt;reg@dwf.com&gt;</a> Oncore driver (Current maintainer)</li>
   <li><a href="mailto:%20clift@ml.csiro.au">Steve Clift &lt;clift@ml.csiro.au&gt;</a> OMEGA clock driver</li>
   <li><a href="mailto:%20casey@csc.co.za">Casey Crellin &lt;casey@csc.co.za&gt;</a> vxWorks (Tornado) port and help with target configuration</li>
+  <li><a href="mailto:%20phdm@macqel.be">Philippe De Muyter &lt;phdm@macqel.be&gt;</a> Wharton reference clock driver, sysV68 and AIX modifications.</li>
   <li><a href="mailto:%20Sven_Dietrich@trimble.COM">Sven Dietrich &lt;sven_dietrich@trimble.com&gt;</a> Palisade reference clock driver, NT adj. residuals, integrated Greg's Winnt port.</li>
   <li><a href="mailto:%20dundas@salt.jpl.nasa.gov">John A. Dundas III &lt;dundas@salt.jpl.nasa.gov&gt;</a> Apple A/UX port</li>
   <li><a href="mailto:%20duwe@immd4.informatik.uni-erlangen.de">Torsten Duwe &lt;duwe@immd4.informatik.uni-erlangen.de&gt;</a> Linux port</li>

diff --git a/libparse/clk_wharton.c b/libparse/clk_wharton.c
index e9e3d84644ac0c22c564147c9367164ca4840a46..371137dc6fe82efb61cc2d50f0cda789f1e4e147 100644 (file)
--- a/libparse/clk_wharton.c
+++ b/libparse/clk_wharton.c
@@ -12,13 +12,6 @@
 #if defined(REFCLOCK) && defined(CLOCK_PARSE) && defined(CLOCK_WHARTON_400A)
 /*
  * Support for WHARTON 400A Series clock + 404.2 serial interface.
- *
- * Copyright (C) 1999, 2000 by Philippe De Muyter <phdm@macqel.be>
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- * 
  */
 
 #include "ntp_fp.h"