From c23fcf555ee4b69f03b76a0ffb731c3a475a77e7 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Thu, 24 Sep 2009 23:29:46 +0200
Subject: [PATCH] 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.
---
AUTHORS | 11 +++++++++--
COPYING.README | 11 +++++++----
doc/tincd.8.in | 2 +-
have.h | 2 +-
lib/dropin.c | 2 +-
lib/dropin.h | 2 +-
lib/utils.c | 2 +-
lib/utils.h | 2 +-
src/connection.c | 2 +-
src/connection.h | 2 +-
src/meta.c | 2 +-
src/net_socket.c | 1 +
src/netutl.c | 2 +-
src/netutl.h | 2 +-
src/process.c | 2 +-
src/protocol.c | 2 +-
src/protocol.h | 2 +-
src/protocol_edge.c | 3 ++-
src/protocol_misc.c | 2 +-
src/protocol_subnet.c | 1 +
src/tincd.c | 1 +
21 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index e822cb9a..15691192 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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.
diff --git a/COPYING.README b/COPYING.README
index 26b4b1db..efeb98c0 100644
--- 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.
diff --git a/doc/tincd.8.in b/doc/tincd.8.in
index 7e168fd0..358e9701 100644
--- 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
diff --git a/have.h b/have.h
index 7e2930dc..39a4dd48 100644
--- 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
diff --git a/lib/dropin.c b/lib/dropin.c
index 1c2592df..a169cf6a 100644
--- 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
diff --git a/lib/dropin.h b/lib/dropin.h
index 8c2e94a3..d1064857 100644
--- 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
diff --git a/lib/utils.c b/lib/utils.c
index 02b7b344..d7552ce0 100644
--- 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
diff --git a/lib/utils.h b/lib/utils.h
index ce726482..4f1291fd 100644
--- 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
diff --git a/src/connection.c b/src/connection.c
index 283ebd71..6d77cb56 100644
--- 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
diff --git a/src/connection.h b/src/connection.h
index 8948d4fa..5ad7fcb9 100644
--- 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
diff --git a/src/meta.c b/src/meta.c
index b59f15b0..91ebf01d 100644
--- 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
diff --git a/src/net_socket.c b/src/net_socket.c
index 8df9f380..f60f2f11 100644
--- 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
diff --git a/src/netutl.c b/src/netutl.c
index 909441e1..757bc5d8 100644
--- 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
diff --git a/src/netutl.h b/src/netutl.h
index aa2a173b..dc1fec6a 100644
--- 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
diff --git a/src/process.c b/src/process.c
index 544c2242..2ca93008 100644
--- 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
diff --git a/src/protocol.c b/src/protocol.c
index 85133954..22c5f9c1 100644
--- 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
diff --git a/src/protocol.h b/src/protocol.h
index ac86198e..6bac7110 100644
--- 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
diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 4066a30d..571304ac 100644
--- 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
diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 18ff13c8..309deffd 100644
--- 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
diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index b50cf6a3..eef7e374 100644
--- 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
diff --git a/src/tincd.c b/src/tincd.c
index 602f18b1..b0ac6f65 100644
--- 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
--
2.39.5