From af81c436d6e11a53803747af7cc8ecfd449ccd4c Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 2 Sep 2017 21:56:17 +0200
Subject: [PATCH] Releasing 1.1pre15.
---
COPYING | 2 +-
NEWS | 25 ++++++++++++++++++++++++-
README | 6 +++---
doc/tinc.conf.5.in | 2 +-
doc/tinc.texi | 4 ++--
src/bsd/device.c | 2 +-
src/ifconfig.c | 2 +-
src/info.c | 2 +-
src/net.c | 2 +-
src/net_socket.c | 2 +-
src/openssl/cipher.c | 2 +-
src/protocol.h | 2 +-
src/protocol_key.c | 2 +-
src/uml_device.c | 2 +-
14 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/COPYING b/COPYING
index 513da315..c7a4498a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 1998-2016 Ivo Timmermans, Guus Sliepen and others.
+Copyright (C) 1998-2017 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/NEWS b/NEWS
index 674227ee..ec6add69 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,27 @@
-# Version 1.1pre13 May 1 2016
+# Version 1.1pre15 September 2 2017
+
+* Detect when the machine is resuming from suspension or hibernation.
+* When an old PID file is found, check whether the old daemon is still alive.
+* Remember scope_id for IPv6 addresses when sending UDP packets to link-local
+ addresses.
+* Ensure compatibility with OpenSSL 1.1.
+* Only log about dropped packets with debug level 5.
+* Warn when trying to generate RSA keys less than 2048 bits.
+* Use AES256 and SHA256 as the default encryption and digest algorithms.
+* Add DeviceType = fd to support tinc on Android without requiring root.
+* Support PriorityInheritance for IPv6 packets.
+* Fixes for Solaris tun/tap support.
+* Add a configurable expiration time for invitations.
+* Store invitation data after a succesful join.
+* Exit gracefully when the tun/tap device is in a bad state.
+* Add the LogLevel option.
+* AutoConnect now actively tries to heal split networks.
+
+Thanks to Etienne Dechamps, RafaÅ LeÅniak, Sean McVeigh, Vittorio Gambaletta,
+Dennis Lan, Pacien Tran-Girard, Roman Savelyev, lemoer and volth for their
+contributions to this version of tinc.
+
+# Version 1.1pre14 May 1 2016
* Add tinc.service back.
diff --git a/README b/README
index 9b29f2c5..d3b8f168 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-This is the README file for tinc version 1.1pre14. Installation
+This is the README file for tinc version 1.1pre15. Installation
instructions may be found in the INSTALL file.
-tinc is Copyright © 1998-2016 Ivo Timmermans, Guus Sliepen <guus@tinc-vpn.org>, and others.
+tinc is Copyright © 1998-2017 Ivo Timmermans, Guus Sliepen <guus@tinc-vpn.org>, and others.
For a complete list of authors see the AUTHORS file.
@@ -32,7 +32,7 @@ at your own risk.
Compatibility
-------------
-Version 1.1pre14 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.1pre15 is compatible with 1.0pre8, 1.0 and later, but not with older
versions of tinc.
When the ExperimentalProtocol option is used, tinc is still compatible with
diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index b4db2acb..cb7d1b18 100644
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -1,4 +1,4 @@
-.Dd 2016-04-11
+.Dd 2017-09-02
.Dt TINC.CONF 5
.\" Manual page created by:
.\" Ivo Timmermans
diff --git a/doc/tinc.texi b/doc/tinc.texi
index bf6d78b4..83e42c66 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-2016 Ivo Timmermans,
+Copyright @copyright{} 1998-2017 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-2016 Ivo Timmermans,
+Copyright @copyright{} 1998-2017 Ivo Timmermans,
Guus Sliepen <guus@@tinc-vpn.org> and
Wessel Dankers <wsl@@tinc-vpn.org>.
diff --git a/src/bsd/device.c b/src/bsd/device.c
index fbc75937..4a63e840 100644
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -1,7 +1,7 @@
/*
device.c -- Interaction BSD tun/tap device
Copyright (C) 2001-2005 Ivo Timmermans,
- 2001-2016 Guus Sliepen <guus@tinc-vpn.org>
+ 2001-2017 Guus Sliepen <guus@tinc-vpn.org>
2009 Grzegorz Dymarek <gregd72002@googlemail.com>
This program is free software; you can redistribute it and/or modify
diff --git a/src/ifconfig.c b/src/ifconfig.c
index 06f2c629..0b99402b 100644
--- a/src/ifconfig.c
+++ b/src/ifconfig.c
@@ -1,6 +1,6 @@
/*
ifconfig.c -- Generate platform specific interface configuration commands
- Copyright (C) 2016 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2016-2017 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/info.c b/src/info.c
index 09ca390e..2a6934b4 100644
--- a/src/info.c
+++ b/src/info.c
@@ -1,6 +1,6 @@
/*
info.c -- Show information about a node, subnet or address
- Copyright (C) 2012-2013 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2012-2017 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.c b/src/net.c
index bda92ebe..1cb467d4 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2015 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2017 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2011 Loïc Grenié <loic.grenie@gmail.com>
diff --git a/src/net_socket.c b/src/net_socket.c
index ba74195c..ac6b8402 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-2016 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2017 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2009 Florian Forster <octo@verplant.org>
diff --git a/src/openssl/cipher.c b/src/openssl/cipher.c
index a8032ea0..98033c5e 100644
--- a/src/openssl/cipher.c
+++ b/src/openssl/cipher.c
@@ -1,6 +1,6 @@
/*
cipher.c -- Symmetric block cipher handling
- Copyright (C) 2007-2016 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2007-2017 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 5cb22946..8ce4e0d3 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-2013 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2017 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_key.c b/src/protocol_key.c
index e1bb3b9b..a18cefc9 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -1,7 +1,7 @@
/*
protocol_key.c -- handle the meta-protocol, key exchange
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2014 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2017 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/uml_device.c b/src/uml_device.c
index 2a06de37..68f4cd25 100644
--- a/src/uml_device.c
+++ b/src/uml_device.c
@@ -1,7 +1,7 @@
/*
device.c -- UML network socket
Copyright (C) 2002-2005 Ivo Timmermans,
- 2002-2013 Guus Sliepen <guus@tinc-vpn.org>
+ 2002-2017 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
--
2.39.5