From: Dave Hart Date: Sun, 19 Mar 2023 19:58:02 +0000 (-0400) Subject: [Bug 3725] Make copyright of clk_wharton.c compatible with Debian. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddb8ae7d7e3f9490757bd829ba4defdfd2f66347;p=thirdparty%2Fntp.git [Bug 3725] Make copyright of clk_wharton.c compatible with Debian. bk: 6417694aULT6gV88hS1BA6hTMbXHQQ --- diff --git a/ChangeLog b/ChangeLog index 4843f182a..8675e4757 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ * [Bug 3758] Provide a 'device' config statement for refclocks * [Bug 3757] Improve handling of Linux-PPS in NTPD * [Bug 3741] 4.2.8p15 can't build with glibc 2.34 +* [Bug 3725] Make copyright of clk_wharton.c compatible with Debian. + Philippe De Muyter * [Bug 3724] ntp-keygen with openSSL 1.1.1 fails on Windows - openssl applink needed again for openSSL-1.1.1 * [Bug 3699] Problems handling drift file and restoring previous drifts @@ -59,6 +61,8 @@ - applied patch by Gerry Garvey * [Bug 3432] refclocks that 'write()' should check the result - 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. * [Bug 2525] Turn on automake subdir-objects across the project. * [Bug 2410] syslog an error message on panic exceeded. * Use https in the AC_INIT URLs in configure.ac. diff --git a/html/copyright.html b/html/copyright.html index 51c6cfd62..d00cf9712 100644 --- a/html/copyright.html +++ b/html/copyright.html @@ -82,6 +82,7 @@
  • Reg Clemens <reg@dwf.com> Oncore driver (Current maintainer)
  • Steve Clift <clift@ml.csiro.au> OMEGA clock driver
  • Casey Crellin <casey@csc.co.za> vxWorks (Tornado) port and help with target configuration
    • +
  • Philippe De Muyter <phdm@macqel.be> Wharton reference clock driver, sysV68 and AIX modifications.
  • Sven Dietrich <sven_dietrich@trimble.com> Palisade reference clock driver, NT adj. residuals, integrated Greg's Winnt port.
  • John A. Dundas III <dundas@salt.jpl.nasa.gov> Apple A/UX port
  • Torsten Duwe <duwe@immd4.informatik.uni-erlangen.de> Linux port
    • diff --git a/libparse/clk_wharton.c b/libparse/clk_wharton.c index e9e3d8464..371137dc6 100644 --- 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 - * - * 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"