Update copyright notices.

diff --git a/AUTHORS b/AUTHORS
index af11393899292f1b346d5d910e0ed91212f2138c..07939e8be535b95a37058fe3f49d6cdf0c30e890 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,20 +1,25 @@
 Main tinc authors:
+
 - Guus Sliepen <guus@tinc-vpn.org>
 - Ivo Timmermans (inactive)
 
-Significant contributions from:
-- Michael Tokarev <mjt@tls.msk.ru>
+Significant code contributions from:
+
+- Brandon Black <blblack@gmail.com>
+- Etienne Dechamps <etienne@edechamps.fr>
 - Florian Forster <octo@verplant.org>
 - Grzegorz Dymarek <gregd72002@googlemail.com>
+- Julien Muchembled <jm@jmuchemb.eu>
+- Loïc Grenié <loic.grenie@gmail.com>
 - Max Rijevski <maksuf@gmail.com>
+- Michael Tokarev <mjt@tls.msk.ru>
 - Scott Lamb <slamb@slamb.org>
-- Julien Muchembled <jm@jmuchemb.eu>
+- Sven-Haegar Koch <haegar@sdinet.de>
 - Timothy Redaelli <timothy@redaelli.eu>
-- Brandon Black <blblack@gmail.com>
-- Loïc Grenié <loic.grenie@gmail.com>
 
 These files are from other sources:
- * lib/pidfile.h and lib/pidfile.c are by Martin Schulze, taken from
+
+* 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
@@ -23,5 +28,4 @@ These files are from other sources:
 Also some of the macro files in the directory m4, and their
 accompanying files in lib, were taken from GNU fileutils.
 
-Please see the file THANKS for more information on contributions from
-users.
+Please see the file THANKS for a list of all contributors to tinc.

diff --git a/COPYING b/COPYING
index f4dd06501b6c930e3887a801be2f0532abb336b6..c3d1cebb467a75952e134320df9b19a209696348 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 1998-2013 Ivo Timmermans, Guus Sliepen and others.
+Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen and others.
 See the AUTHORS file for a complete list.
 
 This program is free software; you can redistribute it and/or modify it under

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index 25b398d95bec8cb3b392df3911567e447715f4fa..28296fb4ca9dd6ca8a54558c51f982318d4e6542 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -1,4 +1,4 @@
-.Dd 2013-01-14
+.Dd 2014-01-29
 .Dt TINC.CONF 5
 .\" Manual page created by:
 .\" Ivo Timmermans

diff --git a/doc/tinc.texi b/doc/tinc.texi
index e5a5eb58adc0d8eaae678b4f4f14b85df58683c8..c39e7c2682207adfe7ebcc2bcd16898b2ef9615e 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -15,7 +15,7 @@
 
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
 
-Copyright @copyright{} 1998-2013 Ivo Timmermans,
+Copyright @copyright{} 1998-2014 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 
@@ -43,7 +43,7 @@ permission notice identical to this one.
 @vskip 0pt plus 1filll
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
 
-Copyright @copyright{} 1998-2013 Ivo Timmermans,
+Copyright @copyright{} 1998-2014 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 

diff --git a/gui/tinc-gui b/gui/tinc-gui
index 75afd294a5f6f6db3d10c31b9515a864c1c8d4a5..f1a9bbfcaabd1a9a2d0ce512addac0603b166bb5 100755 (executable)
--- a/gui/tinc-gui
+++ b/gui/tinc-gui
@@ -1,7 +1,8 @@
 #!/usr/bin/python
 
 # tinc-gui -- GUI for controlling a running tincd
-# Copyright (C) 2009-2012 Guus Sliepen <guus@tinc-vpn.org>
+# Copyright (C) 2009-2014 Guus Sliepen <guus@tinc-vpn.org>
+#                    2014 Dennis Joachimsthaler <dennis@efjot.de>
 #
 # 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/conf.c b/src/conf.c
index fcd7c46bda64db76d34708ba98c194a318249ad5..e0d8e922fb9248eee0a11cafe0e0f4b412a9a0d8 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,10 +1,11 @@
 /*
     conf.c -- configuration code
-    Copyright (C) 1998 Robert van der Meulen
+    Copyright (C) 1998      Robert van der Meulen
                   1998-2005 Ivo Timmermans
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000      Cris van Pelt
                   2010-2011 Julien Muchembled <jm@jmuchemb.eu>
-                  2000 Cris van Pelt
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2013      Florent Clairambault <florent@clairambault.fr>
 
     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/invitation.c b/src/invitation.c
index 110e3953be34be066c0add8ce0785db69d838f09..cdef3d0480efa04278ecb834156ef9332de99ec0 100644 (file)
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -1,6 +1,6 @@
 /*
     invitation.c -- Create and accept invitations
-    Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2013-2014 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

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 428a990e2004d766f549b564dcd6723c988fc25d..0e748f85e9d965d5d5528b2129c5c610cff0d705 100644 (file)
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Windows tap driver in a MinGW environment
     Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2014 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

diff --git a/src/net.h b/src/net.h
index c32c1c149dd669f8b5fd6890b32ee474db3d7181..845fd7585ce5806166690d1c51fff0b6098da396 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,7 @@
 /*
     net.h -- header for net.c
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 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

diff --git a/src/net_setup.c b/src/net_setup.c
index daa296bd693d4318a22c4ebd4e29bf278fa15f41..fdd48348d43d861c5097c2d2943e8c7073f4f2f0 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2010      Brandon Black <blblack@gmail.com>
 

diff --git a/src/net_socket.c b/src/net_socket.c
index a41b887de35a29971c0fd6764a0dfed1e5666f97..072984bfaab51abb8d1d46a7f6773a5ce05924b6 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -1,7 +1,7 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2009      Florian Forster <octo@verplant.org>
 

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 04674e8dc9e8ff5758844e665c3ceb5fe7033741..52afa0969cffafbbc7342af42f1fda9c3ba5f6d3 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -1,7 +1,7 @@
 /*
     protocol_auth.c -- handle the meta-protocol, authentication
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 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

diff --git a/src/tincctl.c b/src/tincctl.c
index 5d37fda4463158986568461ec9be5edcd79b93c1..c3fa2fa75a1ffeb3362f5c81c498c46ab21dd6ac 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
     tincctl.c -- Controlling a running tincd
-    Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2014 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

diff --git a/src/tincd.c b/src/tincd.c
index 48f344e738ad0c97fdd30ab42bbaa87942461b2d..56ed2f0c1adb940bff41381c2419f243b9e71c67 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>
@@ -321,7 +321,7 @@ int main(int argc, char **argv) {
        if(show_version) {
                printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
                           VERSION, __DATE__, __TIME__, PROT_MAJOR, PROT_MINOR);
-               printf("Copyright (C) 1998-2013 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf("Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen and others.\n"
                                "See the AUTHORS file for a complete list.\n\n"
                                "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
                                "and you are welcome to redistribute it under certain conditions;\n"