Releasing 1.0.14.

diff --git a/NEWS b/NEWS
index 4e53ba2d5c7962798a253540825b162962bdca4b..792a71f1655badfe831522e64a6fb8beb28136d2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Version 1.0.14               not released yet
+Version 1.0.14               May  8 2011
 
  * Fixed reading configuration files that do not end with a newline. Again.
 
@@ -10,6 +10,15 @@ Version 1.0.14               not released yet
 
  * Try harder to get UDP communication back after falling back to TCP.
 
+ * Initial support for attaching tinc to a VDE switch.
+
+ * DragonFly BSD support.
+
+ * Allow linking with OpenSSL 1.0.0.
+
+ Thanks to Brandon Black, Julien Muchembled, Michael Tokarev, Rumko and Timothy
+ Redaelli for their contributions to this version of tinc.
+
 Version 1.0.13               Apr 11 2010
 
  * Allow building tinc without LZO and/or Zlib.

diff --git a/README b/README
index 80cf0a68c04f772a501decdd62ce68475585d8c6..bc8bea00070b58a7ab723066bb21acd73115409b 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-This is the README file for tinc version 1.0.13. Installation
+This is the README file for tinc version 1.0.14. Installation
 instructions may be found in the INSTALL file.
 
-tinc is Copyright (C) 1998-2010 by:
+tinc is Copyright (C) 1998-2011 by:
 
 Ivo Timmermans,
 Guus Sliepen <guus@tinc-vpn.org>,
@@ -55,7 +55,7 @@ should be changed into "Device", and "Device" should be changed into
 Compatibility
 -------------
 
-Version 1.0.13 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.0.14 is compatible with 1.0pre8, 1.0 and later, but not with older
 versions of tinc.
 
 
@@ -69,14 +69,12 @@ this library is not installed on you system, configure will fail.  The
 manual in doc/tinc.texi contains more detailed information on how to
 install this library.
 
-Since 1.0pre6, the zlib library is used for optional compression. You need this
-library whether or not you plan to enable the compression. You can find it at
-http://www.gzip.org/zlib/. Because of a possible exploit in earlier versions we
-recommand that you download version 1.1.4 or later.
+Since 1.0pre6, the zlib library is used for optional compression. You can
+find it at http://www.gzip.org/zlib/. Because of a possible exploit in
+earlier versions we recommend that you download version 1.1.4 or later.
 
-Since 1.0, the lzo library is also used for optional compression. You need this
-library whether or not you plan to enable compression. You can find it at
-http://www.oberhumer.com/opensource/lzo/.
+Since 1.0, the lzo library is also used for optional compression. You can
+find it at http://www.oberhumer.com/opensource/lzo/.
 
 In order to compile tinc, you will need a GNU C compiler environment.
 

diff --git a/configure.in b/configure.in
index a19b2aa6a791218d5dc5c55ba5aa9878c3c65faa..a6dd6d691b735ec59f867fadf01775f94dcf9c31 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
 AC_INIT
 AC_CONFIG_SRCDIR([src/tincd.c])
-AM_INIT_AUTOMAKE(tinc, 1.0.13+git)
+AM_INIT_AUTOMAKE(tinc, 1.0.14)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
@@ -13,8 +13,6 @@ AM_MAINTAINER_MODE
 AC_GNU_SOURCE
 AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
 
-ALL_LINGUAS="nl"
-
 dnl Checks for programs.
 AC_PROG_CC_C99
 AC_PROG_CPP

diff --git a/src/tincd.c b/src/tincd.c
index d1dcf848444ea9077cee66058ab5158d7a6af0a2..40ac0383ee387694d2410f67e574f4d36942fc21 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -523,7 +523,7 @@ int main(int argc, char **argv) {
        if(show_version) {
                printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
                           VERSION, __DATE__, __TIME__, PROT_CURRENT);
-               printf("Copyright (C) 1998-2010 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf("Copyright (C) 1998-2011 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"