Update copyright information.

- Update year numbers in copyright headers. - Add copyright information for Michael Tokarev and Florian Forster to the copyright headers of files to which they have contributed significantly. - Mention Michael and Florian in AUTHORS. - Mention that tinc is GPLv3 or later if compiled with the --enable-tunemu flag.
2009-09-24 23:29:46 +02:00 · 2009-09-24 23:29:46 +02:00 · c23fcf555e
commit c23fcf555e
parent b5ccce2968
21 changed files with 36 additions and 22 deletions
--- a/11
+++ b/11
@ -1,11 +1,18 @@
 Main tinc authors:
-Guus Sliepen <guus@tinc-vpn.org>
-Ivo Timmermans (inactive)
+- Guus Sliepen <guus@tinc-vpn.org>
+- Ivo Timmermans (inactive)
+
+Significant contributions from:
+- Michael Tokarev <mjt@tls.msk.ru>
+- Florian Forster <octo@verplant.org>

 These files are from other sources:
 * lib/pidfile.h and lib/pidfile.c are by Martin Schulze, taken from
 the syslog 1.3 sources.

+* src/bsd/tunemu.c and tunemu.h are by Friedrich Schöller
+  <friedrich.schoeller@gmail.com>
+
 Also some of the macro files in the directory m4, and their
 accompanying files in lib, were taken from GNU fileutils.

--- a/COPYING.README
+++ b/COPYING.README
@ -7,8 +7,11 @@ of the GPL are met.

 The following applies to the LZO library:

-Hereby I grant a special exception to the tinc VPN project
-(http://tinc.nl.linux.org/) to link the LZO library with the OpenSSL library
-(http://www.openssl.org).
+  Hereby I grant a special exception to the tinc VPN project
+  (http://tinc.nl.linux.org/) to link the LZO library with the OpenSSL library
+  (http://www.openssl.org).

-Markus F.X.J. Oberhumer
+  Markus F.X.J. Oberhumer
+
+When tinc is compiled with the --enable-tunemu option, the resulting binary
+falls under the GPL version 3 or later.
--- a/doc/tincd.8.in
+++ b/doc/tincd.8.in
@ -1,4 +1,4 @@
-.Dd 2002-03-25
+.Dd 2009-05-18
 .Dt TINCD 8
 .\" Manual page created by:
 .\" Ivo Timmermans
--- a/have.h
+++ b/have.h
@ -1,7 +1,7 @@
 /*
    have.h -- include headers which are known to exist
    Copyright (C) 1998-2005 Ivo Timmermans
-                  2003-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2003-2009 Guus Sliepen <guus@tinc-vpn.org>

    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
--- a/lib/dropin.c
+++ b/lib/dropin.c
@ -1,7 +1,7 @@
 /*
    dropin.c -- a set of drop-in replacements for libc functions
    Copyright (C) 2000-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>

    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
--- a/lib/dropin.h
+++ b/lib/dropin.h
@ -1,7 +1,7 @@
 /*
    dropin.h -- header file for dropin.c
    Copyright (C) 2000-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>

    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
--- a/lib/utils.c
+++ b/lib/utils.c
@ -1,7 +1,7 @@
 /*
    utils.c -- gathering of some stupid small functions
    Copyright (C) 1999-2005 Ivo Timmermans <zarq@iname.com>
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>

    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
--- a/lib/utils.h
+++ b/lib/utils.h
@ -1,7 +1,7 @@
 /*
    utils.h -- header file for utils.c
    Copyright (C) 1999-2005 Ivo Timmermans <zarq@iname.com>
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>

    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
--- a/src/connection.c
+++ b/src/connection.c
@ -1,6 +1,6 @@
 /*
    connection.c -- connection list management
-    Copyright (C) 2000-2007 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
                  2000-2005 Ivo Timmermans

    This program is free software; you can redistribute it and/or modify
--- a/src/connection.h
+++ b/src/connection.h
@ -1,6 +1,6 @@
 /*
    connection.h -- header for connection.c
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
                  2000-2005 Ivo Timmermans

    This program is free software; you can redistribute it and/or modify
--- a/src/meta.c
+++ b/src/meta.c
@ -1,6 +1,6 @@
 /*
    meta.c -- handle the meta communication
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
                  2000-2005 Ivo Timmermans

    This program is free software; you can redistribute it and/or modify
--- a/src/net_socket.c
+++ b/src/net_socket.c
@ -2,6 +2,7 @@
    net_socket.c -- Handle various kinds of sockets.
    Copyright (C) 1998-2005 Ivo Timmermans,
                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2009      Florian Forster <octo@verplant.org>

    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
--- a/src/netutl.c
+++ b/src/netutl.c
@ -1,7 +1,7 @@
 /*
    netutl.c -- some supporting network utility code
    Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>

    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
--- a/src/netutl.h
+++ b/src/netutl.h
@ -1,7 +1,7 @@
 /*
    netutl.h -- header file for netutl.c
    Copyright (C) 1998-2005 Ivo Timmermans <zarq@iname.com>
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>

    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
--- a/src/process.c
+++ b/src/process.c
@ -1,7 +1,7 @@
 /*
    process.c -- process management functions
    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2007 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>

    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
--- a/src/protocol.c
+++ b/src/protocol.c
@ -1,7 +1,7 @@
 /*
    protocol.c -- handle the meta-protocol, basic functions
    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>

    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
--- a/src/protocol.h
+++ b/src/protocol.h
@ -1,7 +1,7 @@
 /*
    protocol.h -- header for protocol.c
    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>

    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
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@ -1,7 +1,8 @@
 /*
    protocol_edge.c -- handle the meta-protocol, edges
    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2009      Michael Tokarev <mjt@corpit.ru>

    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
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@ -1,7 +1,7 @@
 /*
    protocol_misc.c -- handle the meta-protocol, miscellaneous functions
    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>

    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
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@ -2,6 +2,7 @@
    protocol_subnet.c -- handle the meta-protocol, subnets
    Copyright (C) 1999-2005 Ivo Timmermans,
                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2009      Michael Tokarev <mjt@tls.msk.ru>

    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
--- a/src/tincd.c
+++ b/src/tincd.c
@ -2,6 +2,7 @@
    tincd.c -- the main file for tincd
    Copyright (C) 1998-2005 Ivo Timmermans
                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2009      Michael Tokarev <mjt@tls.msk.ru>

    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