From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 6 Jun 2006 08:21:52 +0000 (-0400)
Subject: Copyright cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b20082791e173dd1df5de7fec4f6b91cc126a9cd;p=thirdparty%2Fntp.git

Copyright cleanup

bk: 44853b200bK6I9PC9QjODkv4EI_cYA
---

diff --git a/clockstuff/Makefile.am b/clockstuff/Makefile.am
index 239bcebe81..e8eb85a96c 100644
--- a/clockstuff/Makefile.am
+++ b/clockstuff/Makefile.am
@@ -11,6 +11,8 @@ clktest_LDADD = ../libntp/libntp.a
 ETAGS_ARGS = Makefile.am
 #EXTRA_DIST = TAGS
 
+# clktest-opts.def wants ../include/copyright.def
+
 chutest$(EXEEXT): ../libntp/libntp.a
 
 clktest$(EXEEXT): ../libntp/libntp.a
diff --git a/clockstuff/clktest-opts.def b/clockstuff/clktest-opts.def
index 9b9f99dd09..43e7a6d882 100644
--- a/clockstuff/clktest-opts.def
+++ b/clockstuff/clktest-opts.def
@@ -2,28 +2,6 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen 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.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
 prog-name      = "clktest";
 prog-title     = "test the clock line discipline";
 argument       = '<tty_device>';
diff --git a/include/copyright.def b/include/copyright.def
index cac5f53b27..f6fb4c8ea7 100644
--- a/include/copyright.def
+++ b/include/copyright.def
@@ -1,10 +1,11 @@
 /* -*- Mode: Text -*- */
 
 copyright = {
-    date  = "1970-2004";
+    date  = "1970-2006";
     owner = "ntp.org";
     eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
+    type  = note;
+    text  = "see html/copyright.html";
 };
 
 #ifndef __windows__
diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index e22604b998..b1b5e46fa0 100644
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -61,23 +61,23 @@ libntpd_a_SOURCES = jupiter.h ntp_control.c \
 	refclock_zyfer.c
 
 $(srcdir)/ntpd-opts.h: ntpd-opts.c
-$(srcdir)/ntpd-opts.c: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpd-opts.c: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) ntpd-opts.def
 
-$(srcdir)/ntpd.1: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpd.1: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) -Tagman1.tpl -bntpd ntpd-opts.def
 
-$(srcdir)/ntpd-opts.texi $(srcdir)/ntpd-opts.menu: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpd-opts.texi $(srcdir)/ntpd-opts.menu: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpd-opts.def
 
 $(srcdir)/ntpdsim-opts.h: ntpdsim-opts.c
-$(srcdir)/ntpdsim-opts.c: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdsim-opts.c: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) ntpdsim-opts.def
 
-$(srcdir)/ntpdsim.1: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdsim.1: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) -Tagman1.tpl -bntpdsim ntpdsim-opts.def
 
-$(srcdir)/ntpdsim-opts.texi $(srcdir)/ntpdsim-opts.menu: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdsim-opts.texi $(srcdir)/ntpdsim-opts.menu: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpdsim-opts.def
 
 $(PROGRAMS): $(LDADD)
diff --git a/ntpd/ntpd-opts.def b/ntpd/ntpd-opts.def
index b821627111..ad280177b8 100644
--- a/ntpd/ntpd-opts.def
+++ b/ntpd/ntpd-opts.def
@@ -2,34 +2,7 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen 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.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
-copyright = {
-    date  = "1970-2004";
-    owner = "ntp.org";
-    eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
-};
+#include copyright.def
 
 prog-name      = "ntpd";
 prog-title     = "NTP daemon program";
diff --git a/ntpd/ntpdbase-opts.def b/ntpd/ntpdbase-opts.def
index f0aa2a4516..a06f352fe8 100644
--- a/ntpd/ntpdbase-opts.def
+++ b/ntpd/ntpdbase-opts.def
@@ -1,17 +1,4 @@
 
-#ifndef __windows__
-rcfile         = ".ntprc";
-#else
-rcfile         = "ntp.ini";
-#endif
-
-environrc;
-
-version         = `
-eval VERSION=\`sed -e 's/.*,\\[//' -e 's/\\].*//' < ../version.m4\`
-[ -z "${VERSION}" ] && echo "Cannot determine VERSION" && kill -TERM $AG_pid
-echo $VERSION`;
-
 test-main;
 
 flag = {
diff --git a/ntpd/ntpdsim-opts.def b/ntpd/ntpdsim-opts.def
index 60db112fb3..f6ede78000 100644
--- a/ntpd/ntpdsim-opts.def
+++ b/ntpd/ntpdsim-opts.def
@@ -2,34 +2,7 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen 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.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
-copyright = {
-    date  = "1970-2004";
-    owner = "ntp.org";
-    eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
-};
+#include copyright.def
 
 prog-name      = "ntpdsim";
 prog-title     = "NTP daemon simulation program";
diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index 9c5874f4f5..4d44e839f4 100644
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -22,13 +22,13 @@ man_MANS=	ntpdc.1
 run_ag=         cd $(srcdir) && autogen -L ../include
 
 $(srcdir)/ntpdc-opts.h: ntpdc-opts.c
-$(srcdir)/ntpdc-opts.c: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdc-opts.c: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) ntpdc-opts.def
 
-$(srcdir)/ntpdc.1: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdc.1: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) -Tagman1.tpl -bntpdc ntpdc-opts.def
 
-$(srcdir)/ntpdc-opts.texi $(srcdir)/ntpdc-opts.menu: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdc-opts.texi $(srcdir)/ntpdc-opts.menu: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpdc-opts.def
 
 ntpdc_SOURCES = ntpdc.c ntpdc_ops.c ntpdc-opts.c ntpdc-opts.h
diff --git a/ntpdc/ntpdc-opts.def b/ntpdc/ntpdc-opts.def
index 49985c3802..10dc535568 100644
--- a/ntpdc/ntpdc-opts.def
+++ b/ntpdc/ntpdc-opts.def
@@ -2,28 +2,6 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen 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.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
 prog-name      = "ntpdc";
 prog-title     = "vendor-specific NTP query program";
 
diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index d755aec02e..24eb0d787a 100644
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -15,13 +15,13 @@ run_ag=         cd $(srcdir) && autogen -L ../include
 ntpq_SOURCES=	ntpq.c ntpq-subs.c ntpq-opts.c ntpq-opts.h
 
 $(srcdir)/ntpq-opts.h: ntpq-opts.c
-$(srcdir)/ntpq-opts.c: ntpq-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpq-opts.c: ntpq-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) ntpq-opts.def
 
-$(srcdir)/ntpq.1: ntpq-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpq.1: ntpq-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) -Tagman1.tpl -bntpq ntpq-opts.def
 
-$(srcdir)/ntpq-opts.texi $(srcdir)/ntpq-opts.menu: ntpq-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpq-opts.texi $(srcdir)/ntpq-opts.menu: ntpq-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpq-opts.def
 
 $(PROGRAMS): $(LDADD)
diff --git a/ntpq/ntpq-opts.def b/ntpq/ntpq-opts.def
index 875def061e..57204001b3 100644
--- a/ntpq/ntpq-opts.def
+++ b/ntpq/ntpq-opts.def
@@ -2,35 +2,7 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen 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.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
-copyright = {
-    date  = "1970-2004";
-    owner = "ntp.org";
-    eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
-};
-
+#include copyright.def
 
 prog-name      = "ntpq";
 prog-title     = "standard NTP query program";
@@ -39,19 +11,6 @@ long-opts;
 config-header  = config.h;
 argument       = '[ host ...]';
 
-#ifndef __windows__
-rcfile         = ".ntprc";
-#else
-rcfile         = "ntp.ini";
-#endif
-
-environrc;
-
-version         = `
-eval VERSION=\`sed -e 's/.*,\\[//' -e 's/\\].*//' < ../version.m4\`
-[ -z "${VERSION}" ] && echo "Cannot determine VERSION" && kill -TERM $AG_pid
-echo $VERSION`;
-
 test-main;
 
 flag = {
diff --git a/sntp/sntp-opts.def b/sntp/sntp-opts.def
index 91cf8a83db..ef2e341bd6 100644
--- a/sntp/sntp-opts.def
+++ b/sntp/sntp-opts.def
@@ -2,33 +2,12 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen 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.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
 copyright = {
-    date  = "1970-2005";
+    date  = "1970-2006";
     owner = "ntp.org";
     eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
+    type  = note;
+    text  = 'See the sntp/Copyright file';
 };
 
 
diff --git a/util/Makefile.am b/util/Makefile.am
index ba147b2128..7610c2d730 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -21,13 +21,13 @@ man_MANS=	ntp-keygen.1
 run_ag=         cd $(srcdir) && autogen -L ../include
 
 $(srcdir)/ntp-keygen-opts.h: ntp-keygen-opts.c
-$(srcdir)/ntp-keygen-opts.c: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntp-keygen-opts.c: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) ntp-keygen-opts.def
 
-$(srcdir)/ntp-keygen.1: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntp-keygen.1: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) -Tagman1.tpl -bntp-keygen ntp-keygen-opts.def
 
-$(srcdir)/ntp-keygen-opts.texi $(srcdir)/ntp-keygen-opts.menu: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntp-keygen-opts.texi $(srcdir)/ntp-keygen-opts.menu: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
 	$(run_ag) -Taginfo.tpl -DLEVEL=section ntp-keygen-opts.def
 
 
diff --git a/util/ntp-keygen-opts.def b/util/ntp-keygen-opts.def
index c4aa3c67d4..898c2fc33b 100644
--- a/util/ntp-keygen-opts.def
+++ b/util/ntp-keygen-opts.def
@@ -2,43 +2,14 @@
 
 autogen definitions options;
 
-/*
- *   $Id: sntp-opts.def,v 1.1.1.1 2005/12/14 00:29:10 bkorb Exp $
- *
- *  NTP copyright 1970-2005 ntp.org
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen 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.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
-copyright = {
-    date  = "1970-2005";
-    owner = "ntp.org";
-    eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
-};
-
+#include copyright.def
 
 prog-name      = "ntp-keygen";
 prog-title     = "Create a NTP host key";
 package        = ntp;
-homerc         =  $HOME, ".";
-rcfile         = '.ntprc';
+
 long-opts;
-environrc;
+
 test-main;
 
 config-header  = "config.h";