From 06a4a8c153407b690a3ce3f0e7fdaa8568ccb1a3 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 7 Feb 2014 20:38:48 +0100 Subject: [PATCH 1/1] Update copyright notices. --- AUTHORS | 20 ++++++++++++-------- COPYING | 2 +- doc/tinc.conf.5.in | 2 +- doc/tinc.texi | 4 ++-- gui/tinc-gui | 3 ++- src/conf.c | 7 ++++--- src/invitation.c | 2 +- src/mingw/device.c | 2 +- src/net.h | 2 +- src/net_setup.c | 2 +- src/net_socket.c | 2 +- src/protocol_auth.c | 2 +- src/tincctl.c | 2 +- src/tincd.c | 4 ++-- 14 files changed, 31 insertions(+), 25 deletions(-) diff --git a/AUTHORS b/AUTHORS index af113938..07939e8b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,20 +1,25 @@ Main tinc authors: + - Guus Sliepen - Ivo Timmermans (inactive) -Significant contributions from: -- Michael Tokarev +Significant code contributions from: + +- Brandon Black +- Etienne Dechamps - Florian Forster - Grzegorz Dymarek +- Julien Muchembled +- Loïc Grenié - Max Rijevski +- Michael Tokarev - Scott Lamb -- Julien Muchembled +- Sven-Haegar Koch - Timothy Redaelli -- Brandon Black -- Loïc Grenié 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 f4dd0650..c3d1cebb 100644 --- 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 25b398d9..28296fb4 100644 --- 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 e5a5eb58..c39e7c26 100644 --- 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 and Wessel Dankers . @@ -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 and Wessel Dankers . diff --git a/gui/tinc-gui b/gui/tinc-gui index 75afd294..f1a9bbfc 100755 --- 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 +# Copyright (C) 2009-2014 Guus Sliepen +# 2014 Dennis Joachimsthaler # # 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 fcd7c46b..e0d8e922 100644 --- 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 + 2000 Cris van Pelt 2010-2011 Julien Muchembled - 2000 Cris van Pelt + 2000-2013 Guus Sliepen + 2013 Florent Clairambault 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 110e3953..cdef3d04 100644 --- a/src/invitation.c +++ b/src/invitation.c @@ -1,6 +1,6 @@ /* invitation.c -- Create and accept invitations - Copyright (C) 2013 Guus Sliepen + Copyright (C) 2013-2014 Guus Sliepen 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 428a990e..0e748f85 100644 --- 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 + 2002-2014 Guus Sliepen 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 c32c1c14..845fd758 100644 --- 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 + 2000-2014 Guus Sliepen 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 daa296bd..fdd48348 100644 --- 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 + 2000-2014 Guus Sliepen 2006 Scott Lamb 2010 Brandon Black diff --git a/src/net_socket.c b/src/net_socket.c index a41b887d..072984bf 100644 --- 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 + 2000-2014 Guus Sliepen 2006 Scott Lamb 2009 Florian Forster diff --git a/src/protocol_auth.c b/src/protocol_auth.c index 04674e8d..52afa096 100644 --- 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 + 2000-2014 Guus Sliepen 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 5d37fda4..c3fa2fa7 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -1,6 +1,6 @@ /* tincctl.c -- Controlling a running tincd - Copyright (C) 2007-2013 Guus Sliepen + Copyright (C) 2007-2014 Guus Sliepen 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 48f344e7..56ed2f0c 100644 --- 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 + 2000-2014 Guus Sliepen 2008 Max Rijevski 2009 Michael Tokarev 2010 Julien Muchembled @@ -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" -- 2.20.1