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.

diff --git a/AUTHORS b/AUTHORS
index e822cb9a39923c75c5a6967bc1020989aa81c69c..156911920aa6518563d8b31575d7e6453605fe3c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,18 @@
 Main tinc authors:
 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.
 
 
 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.
 
 Also some of the macro files in the directory m4, and their
 accompanying files in lib, were taken from GNU fileutils.
 

diff --git a/COPYING.README b/COPYING.README
index 26b4b1db4bca4e919de6b4a52f8af51dd19a636b..efeb98c0662e9b62f16864598b00b4f313ce7de9 100644 (file)
--- a/COPYING.README
+++ b/COPYING.README
@@ -7,8 +7,11 @@ of the GPL are met.
 
 The following applies to the LZO library:
 
 
 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.

diff --git a/doc/tincd.8.in b/doc/tincd.8.in
index 7e168fd0c1e41d34b0ed4a7ff8185267c480ead3..358e9701b12e44e45e812b9e4215d72f5c3de6ed 100644 (file)
--- 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
 .Dt TINCD 8
 .\" Manual page created by:
 .\" Ivo Timmermans

diff --git a/have.h b/have.h
index 7e2930dcbbca15e95162f5a052a11cbd98f0d657..39a4dd48987aff4b97c3256d3bafeea8be7d6cd3 100644 (file)
--- 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
 /*
     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
 
     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/lib/dropin.c b/lib/dropin.c
index 1c2592dfd5231b4d43751fa1a241250d29c767b4..a169cf6ad6c6a4b263a2aa26f27bf11d5589c4dd 100644 (file)
--- 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,
 /*
     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
 
     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/lib/dropin.h b/lib/dropin.h
index 8c2e94a36d05e6e9c3e9ccae8f2c7c682e9a8f87..d10648578f54108146cb4b1a1d3fe2cd5e26e4b1 100644 (file)
--- 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,
 /*
     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
 
     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/lib/utils.c b/lib/utils.c
index 02b7b3443e626c268bead9bff0bccd03f094b596..d7552ce0ce3d5511d291a4520713b5f363462f40 100644 (file)
--- 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>
 /*
     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
 
     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/lib/utils.h b/lib/utils.h
index ce7264829c7d8fd5e50114537ef09e1f96719229..4f1291fd537447f748f768fd09a863f759087d83 100644 (file)
--- 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>
 /*
     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
 
     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/connection.c b/src/connection.c
index 283ebd7127d2462a8cc3ff3b3ddedf3347f659b6..6d77cb560aba0497f9f32fc3012e7d42307cdf23 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,6 +1,6 @@
 /*
     connection.c -- connection list management
 /*
     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
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify

diff --git a/src/connection.h b/src/connection.h
index 8948d4fae885589205c74c7c2348a79f071a8f05..5ad7fcb9d04524e75f971bc2d7e7cd3bace4c629 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,6 +1,6 @@
 /*
     connection.h -- header for connection.c
 /*
     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
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify

diff --git a/src/meta.c b/src/meta.c
index b59f15b09443f47596d8e60454686e262c5298b7..91ebf01dfeadeaa6cd1b711f45f41e24c0f36190 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,6 +1,6 @@
 /*
     meta.c -- handle the meta communication
 /*
     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
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify

diff --git a/src/net_socket.c b/src/net_socket.c
index 8df9f38075356632ab778336e9966689bbfa027f..f60f2f110a276af30a7d8a60ea8700665ea168cc 100644 (file)
--- 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>
     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
 
     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/netutl.c b/src/netutl.c
index 909441e1320101340bf3af7a2b2d209dd1d09ea6..757bc5d8052596b31584a2793363698e4db7fe97 100644 (file)
--- 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
 /*
     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
 
     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/netutl.h b/src/netutl.h
index aa2a173b412f0653488f55abe6f200baee1754ea..dc1fec6a74376710dd28ae24fb45cb80fbc5fd94 100644 (file)
--- 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>
 /*
     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
 
     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/process.c b/src/process.c
index 544c2242fcce5bec1c845b520ba0bbf889ea809b..2ca93008af942ac7fb3f769dc833004294c4de8c 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
     Copyright (C) 1999-2005 Ivo Timmermans,
 /*
     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
 
     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/protocol.c b/src/protocol.c
index 85133954b89ad642675c480c4e9756a21d5c6640..22c5f9c1a90019e9f905754026ae8e09d4891162 100644 (file)
--- 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,
 /*
     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
 
     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/protocol.h b/src/protocol.h
index ac86198eff14eaeb06db30f7032469d70ad732a8..6bac7110743645c3b590ffef9a27b357eb589354 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,7 +1,7 @@
 /*
     protocol.h -- header for protocol.c
     Copyright (C) 1999-2005 Ivo Timmermans,
 /*
     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
 
     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/protocol_edge.c b/src/protocol_edge.c
index 4066a30db18e359438e73d1edc95f45b9690078b..571304ac620acf9d3d8e636f225182113e2a30aa 100644 (file)
--- 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,
 /*
     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
 
     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/protocol_misc.c b/src/protocol_misc.c
index 18ff13c8de4bfb05a101666af22f2246f209d1a2..309deffdba29eeae2cd80f5df65e78a0c71c0b28 100644 (file)
--- 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,
 /*
     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
 
     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/protocol_subnet.c b/src/protocol_subnet.c
index b50cf6a348cd4d0367902f615d3df57e5b576552..eef7e37430f9d8d5e8f2c8c10f688d19ceedd737 100644 (file)
--- 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>
     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
 
     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/tincd.c b/src/tincd.c
index 602f18b1ff99a0c7f6167e529f517393e47c0061..b0ac6f65fb681e258b3075a446bb556adbc4a7f5 100644 (file)
--- 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>
     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
 
     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