From d942707de2dd9809338882f09a9f23316dc8be36 Mon Sep 17 00:00:00 2001 From: ian Date: Sun, 10 Oct 1999 13:16:23 +0000 Subject: [PATCH] Copyrights now acknowledge fanf for adns. Individual file copyrights too. --- INSTALL | 4 +++- Makefile.in | 9 +++++++-- acconfig.h | 7 ++++++- aclocal.m4 | 7 +++++++ client/Makefile.in | 7 ++++++- client/adnshost.c | 7 ++++++- client/adnslogres.c | 6 +++++- client/adnstest.c | 7 ++++++- configure.in | 7 ++++++- dynamic/Makefile.in | 7 ++++++- regress/Makefile.in | 7 ++++++- regress/harness.h.m4 | 7 ++++++- regress/hcommon.c.m4 | 7 ++++++- regress/hmacros.i4 | 7 ++++++- regress/hplayback.c.m4 | 7 ++++++- regress/hrecord.c.m4 | 7 ++++++- regress/hsyscalls.i4 | 7 ++++++- settings.make.in | 7 ++++++- src/Makefile.in | 7 ++++++- src/adns.h | 38 +++++++++++++++++++++++++++++++++++--- src/adns.make | 7 ++++++- src/check.c | 7 ++++++- src/event.c | 7 ++++++- src/general.c | 7 ++++++- src/internal.h | 7 ++++++- src/parse.c | 7 ++++++- src/poll.c | 7 ++++++- src/query.c | 7 ++++++- src/reply.c | 7 ++++++- src/setup.c | 7 ++++++- src/transmit.c | 7 ++++++- src/types.c | 7 ++++++- 32 files changed, 219 insertions(+), 34 deletions(-) diff --git a/INSTALL b/INSTALL index ffae5f5..25a3e95 100644 --- a/INSTALL +++ b/INSTALL @@ -26,7 +26,9 @@ COPYRIGHT This file, INSTALL, contains installation instructions and other details for adns. -adns is Copyright (C)1997-9 Ian Jackson . +adns is + Copyright (C) 1997-1999 Ian Jackson + Copyright (C) 1999 Tony Finch adns is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/Makefile.in b/Makefile.in index 91d04f8..b3655a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,12 @@ # Makefile - top-level Makefile -# -# This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson # +# This file is +# Copyright (C) 1997-1999 Ian Jackson +# +# It is part of adns, which is +# Copyright (C) 1997-1999 Ian Jackson +# Copyright (C) 1999 Tony Finch +# # This program is free software; you can 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) diff --git a/acconfig.h b/acconfig.h index 60f5614..748d10b 100644 --- a/acconfig.h +++ b/acconfig.h @@ -3,7 +3,12 @@ * input file for autoheader/autoconf/configure: extra stuff for config.h */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/aclocal.m4 b/aclocal.m4 index b2d9e9f..d5f21c8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,5 +1,12 @@ # aclocal.m4 - package-specific macros for autoconf # +# This file is +# Copyright (C) 1997-1999 Ian Jackson +# +# It is part of adns, which is +# Copyright (C) 1997-1999 Ian Jackson +# Copyright (C) 1999 Tony Finch +# # This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson # # This program is free software; you can redistribute it and/or modify diff --git a/client/Makefile.in b/client/Makefile.in index c03b493..02effcb 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -1,6 +1,11 @@ # client/Makefile - client program(s) Makefile # -# This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +# This file is +# Copyright (C) 1997-1999 Ian Jackson +# +# It is part of adns, which is +# Copyright (C) 1997-1999 Ian Jackson +# Copyright (C) 1999 Tony Finch # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/client/adnshost.c b/client/adnshost.c index ad6bc21..95831b7 100644 --- a/client/adnshost.c +++ b/client/adnshost.c @@ -3,7 +3,12 @@ * - useful general-purpose resolver client program */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/client/adnslogres.c b/client/adnslogres.c index bf17cca..c2ca2ef 100644 --- a/client/adnslogres.c +++ b/client/adnslogres.c @@ -4,8 +4,12 @@ */ /* * This file is - * Copyright (C) 1999 Tony Finch + * Copyright (C) 1999 Tony Finch * Copyright (C) 1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/client/adnstest.c b/client/adnstest.c index 67f287e..4abd4ff 100644 --- a/client/adnstest.c +++ b/client/adnstest.c @@ -3,7 +3,12 @@ * - simple test program, not part of the library */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/configure.in b/configure.in index 4af8606..c6e4a39 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,12 @@ # configure.in - input to autoconf # -# This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +# This file is +# Copyright (C) 1997-1999 Ian Jackson # +# It is part of adns, which is +# Copyright (C) 1997-1999 Ian Jackson +# Copyright (C) 1999 Tony Finch +# # This program is free software; you can 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) diff --git a/dynamic/Makefile.in b/dynamic/Makefile.in index 5a68a1a..5ed6388 100644 --- a/dynamic/Makefile.in +++ b/dynamic/Makefile.in @@ -1,6 +1,11 @@ # dynamic/Makefile - dynamic library Makefile # -# This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +# This file is +# Copyright (C) 1997-1999 Ian Jackson +# +# It is part of adns, which is +# Copyright (C) 1997-1999 Ian Jackson +# Copyright (C) 1999 Tony Finch # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/regress/Makefile.in b/regress/Makefile.in index 606359a..3ed85f1 100644 --- a/regress/Makefile.in +++ b/regress/Makefile.in @@ -1,6 +1,11 @@ # regress/Makefile - regression test Makefile # -# This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +# This file is +# Copyright (C) 1997-1999 Ian Jackson +# +# It is part of adns, which is +# Copyright (C) 1997-1999 Ian Jackson +# Copyright (C) 1999 Tony Finch # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/regress/harness.h.m4 b/regress/harness.h.m4 index a2e2788..12ecc3e 100644 --- a/regress/harness.h.m4 +++ b/regress/harness.h.m4 @@ -2,7 +2,12 @@ m4_dnl harness.h.m4 m4_dnl (part of complex test harness, not of the library) m4_dnl - function and other declarations -m4_dnl This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +m4_dnl This file is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl +m4_dnl It is part of adns, which is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl Copyright (C) 1999 Tony Finch m4_dnl m4_dnl This program is free software; you can redistribute it and/or modify m4_dnl it under the terms of the GNU General Public License as published by diff --git a/regress/hcommon.c.m4 b/regress/hcommon.c.m4 index 19c7ba4..b636a75 100644 --- a/regress/hcommon.c.m4 +++ b/regress/hcommon.c.m4 @@ -2,7 +2,12 @@ m4_dnl hcommon.c m4_dnl (part of complex test harness, not of the library) m4_dnl - routines used for both record and playback -m4_dnl This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +m4_dnl This file is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl +m4_dnl It is part of adns, which is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl Copyright (C) 1999 Tony Finch m4_dnl m4_dnl This program is free software; you can redistribute it and/or modify m4_dnl it under the terms of the GNU General Public License as published by diff --git a/regress/hmacros.i4 b/regress/hmacros.i4 index 9433b18..c9c3b7a 100644 --- a/regress/hmacros.i4 +++ b/regress/hmacros.i4 @@ -2,7 +2,12 @@ m4_dnl hmacros.h.m4 m4_dnl (part of complex test harness, not of the library) m4_dnl - common macros -m4_dnl This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +m4_dnl This file is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl +m4_dnl It is part of adns, which is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl Copyright (C) 1999 Tony Finch m4_dnl m4_dnl This program is free software; you can redistribute it and/or modify m4_dnl it under the terms of the GNU General Public License as published by diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4 index 8e6424f..6b08ac4 100644 --- a/regress/hplayback.c.m4 +++ b/regress/hplayback.c.m4 @@ -2,7 +2,12 @@ m4_dnl hplayback.c.m4 m4_dnl (part of complex test harness, not of the library) m4_dnl - playback routines -m4_dnl This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +m4_dnl This file is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl +m4_dnl It is part of adns, which is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl Copyright (C) 1999 Tony Finch m4_dnl m4_dnl This program is free software; you can redistribute it and/or modify m4_dnl it under the terms of the GNU General Public License as published by diff --git a/regress/hrecord.c.m4 b/regress/hrecord.c.m4 index 4344146..1e98c82 100644 --- a/regress/hrecord.c.m4 +++ b/regress/hrecord.c.m4 @@ -2,7 +2,12 @@ m4_dnl hrecord.c.m4 m4_dnl (part of complex test harness, not of the library) m4_dnl - recording routines -m4_dnl This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +m4_dnl This file is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl +m4_dnl It is part of adns, which is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl Copyright (C) 1999 Tony Finch m4_dnl m4_dnl This program is free software; you can redistribute it and/or modify m4_dnl it under the terms of the GNU General Public License as published by diff --git a/regress/hsyscalls.i4 b/regress/hsyscalls.i4 index 59206e0..9c4bdad 100644 --- a/regress/hsyscalls.i4 +++ b/regress/hsyscalls.i4 @@ -2,7 +2,12 @@ m4_dnl hsyscalls.i4 m4_dnl (part of complex test harness, not of the library) m4_dnl - list of syscalls to override/log and their args -m4_dnl This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +m4_dnl This file is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl +m4_dnl It is part of adns, which is +m4_dnl Copyright (C) 1997-1999 Ian Jackson +m4_dnl Copyright (C) 1999 Tony Finch m4_dnl m4_dnl This program is free software; you can redistribute it and/or modify m4_dnl it under the terms of the GNU General Public License as published by diff --git a/settings.make.in b/settings.make.in index 7e0a249..0967cd5 100644 --- a/settings.make.in +++ b/settings.make.in @@ -1,8 +1,13 @@ # settings.make.in - main configuration settings for Makefiles, # used by autoconf/configure to generate settings.make # -# This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +# This file is +# Copyright (C) 1997-1999 Ian Jackson # +# It is part of adns, which is +# Copyright (C) 1997-1999 Ian Jackson +# Copyright (C) 1999 Tony Finch +# # This program is free software; you can 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) diff --git a/src/Makefile.in b/src/Makefile.in index 43de7a4..75d867a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,6 +1,11 @@ # src/Makefile - library main Makefile # -# This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +# This file is +# Copyright (C) 1997-1999 Ian Jackson +# +# It is part of adns, which is +# Copyright (C) 1997-1999 Ian Jackson +# Copyright (C) 1999 Tony Finch # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/adns.h b/src/adns.h index 070659d..aec2047 100644 --- a/src/adns.h +++ b/src/adns.h @@ -3,7 +3,13 @@ * - adns user-visible API (single-threaded, without any locking) */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,11 +20,37 @@ * 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. + * + * + * For the benefit of certain LGPL'd `omnibus' software which provides + * a uniform interface to various things including adns, I make the + * following additional licence. I do this because the GPL would + * otherwise force either the omnibus software to be GPL'd or for the + * adns-using part to be distributed separately. + * + * So, you may also redistribute and/or modify adns.h (but only the + * public header file adns.h and not any other part of adns) under the + * terms of the GNU Library General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, + * Note that adns itself is GPL'd. Authors of adns-using applications + * with GPL-incompatible licences, and people who distribute adns with + * applications where the whole distribution is not GPL'd, are still + * likely to be in violation of the GPL. Anyone who wants to do this + * should contact Ian Jackson. Please note that to avoid encouraging + * people to infringe the GPL as it applies the body of adns, I think + * that if you take advantage of the special exception to redistribute + * just adns.h under the LGPL, you should retain this paragraph in its + * place in the appropriate copyright statements. + * + * + * You should have received a copy of the GNU General Public License, + * or the GNU Library General Public License, as appropriate, along + * with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * * $Id$ */ diff --git a/src/adns.make b/src/adns.make index e7ba997..d468075 100644 --- a/src/adns.make +++ b/src/adns.make @@ -1,6 +1,11 @@ # src/adns.make - library definitions, including list of object files # -# This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson +# This file is +# Copyright (C) 1997-1999 Ian Jackson +# +# It is part of adns, which is +# Copyright (C) 1997-1999 Ian Jackson +# Copyright (C) 1999 Tony Finch # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/check.c b/src/check.c index 04c5c8e..25de10d 100644 --- a/src/check.c +++ b/src/check.c @@ -3,7 +3,12 @@ * - consistency checks */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/event.c b/src/event.c index c156e75..56b570f 100644 --- a/src/event.c +++ b/src/event.c @@ -5,7 +5,12 @@ * - user-visible check/wait and event-loop-related functions */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/general.c b/src/general.c index 00a1ae8..5ebdd6a 100644 --- a/src/general.c +++ b/src/general.c @@ -4,7 +4,12 @@ * - vbuf handling */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/internal.h b/src/internal.h index b0e96c7..89327ec 100644 --- a/src/internal.h +++ b/src/internal.h @@ -5,7 +5,12 @@ * - comments regarding library data structures */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/parse.c b/src/parse.c index 5c4bdaf..9a4e0c7 100644 --- a/src/parse.c +++ b/src/parse.c @@ -3,7 +3,12 @@ * - parsing assistance functions (mainly for domains inside datagrams) */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/poll.c b/src/poll.c index 1fe28f4..fba6de5 100644 --- a/src/poll.c +++ b/src/poll.c @@ -3,7 +3,12 @@ * - wrappers for poll(2) */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/query.c b/src/query.c index ec54562..53eecd9 100644 --- a/src/query.c +++ b/src/query.c @@ -5,7 +5,12 @@ * - query submission and cancellation (user-visible and internal) */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/reply.c b/src/reply.c index 7db623b..4b3d74f 100644 --- a/src/reply.c +++ b/src/reply.c @@ -3,7 +3,12 @@ * - main handling and parsing routine for received datagrams */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/setup.c b/src/setup.c index 6ef2d12..8604f8e 100644 --- a/src/setup.c +++ b/src/setup.c @@ -4,7 +4,12 @@ * - management of global state */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/transmit.c b/src/transmit.c index fc712b1..4590a16 100644 --- a/src/transmit.c +++ b/src/transmit.c @@ -4,7 +4,12 @@ * - send queries */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/types.c b/src/types.c index f7c1810..5cc2d15 100644 --- a/src/types.c +++ b/src/types.c @@ -3,7 +3,12 @@ * - RR-type-specific code, and the machinery to call it */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- 2.30.2