From 3aa8ed1182a97363726077d4fadb701568b66706 Mon Sep 17 00:00:00 2001
From: Axel Kittenberger <axkibe@gmail.com>
Date: Fri, 7 Jun 2013 13:40:54 +0200
Subject: [PATCH]  * fixing ssh port overwriting the last rsync option  *
 preparing 2.1.5

---
 ChangeLog            | 12 ++++++++++++
 configure.ac         |  2 +-
 default-rsyncssh.lua |  4 ++--
 lsyncd.lua           |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf66fed..0deb2ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+07-07-2013: 2.1.5
+	enhancement: Added rsync options: bwlimit, timeout
+	fix: Specifying ssh port no longer overwrites the last rsync option
+	fix: rsync option password_file is now accepted
+	fix: onAttrib is accepted again
+	fix: -log Exec now prints now fully all arguments
+	fix: configure script lua detection now includes math lib to workaround 
+	     wrongly created "needs COMPAT_ALL" messages.
+	fix: repaired variable replacement for layer 3 scripts
+	change: a2x is no longer checked by configure script.
+			should not be needed when building from tarball
+
 24-11-2012: 2.1.4
 	fix: making ssh custom port changes work with ssh and rsync
 
diff --git a/configure.ac b/configure.ac
index 0ef3245..034fc34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 #AC_PREREQ(2.60)
-AC_INIT(lsyncd, 2.1.4, axkibe@gmail.com)
+AC_INIT(lsyncd, 2.1.5, axkibe@gmail.com)
 AM_INIT_AUTOMAKE([foreign])
 
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/default-rsyncssh.lua b/default-rsyncssh.lua
index 1fccec8..90732f6 100644
--- a/default-rsyncssh.lua
+++ b/default-rsyncssh.lua
@@ -306,11 +306,11 @@ rsyncssh.prepare = function( config, level )
 		computedN = computedN + 2
 
 		local rsyncc = config.rsync._computed
-		rsyncc[ #rsyncc ] = '--rsh=ssh -p ' .. cssh.port
+		rsyncc[ #rsyncc + 1 ] = '--rsh=ssh -p ' .. cssh.port
 	end
 
 	-- appends a slash to the targetdir if missing
-	if string.sub(config.targetdir, -1) ~= '/' then
+	if string.sub( config.targetdir, -1 ) ~= '/' then
 		config.targetdir = config.targetdir .. '/'
 	end
 
diff --git a/lsyncd.lua b/lsyncd.lua
index f73e8e2..527210b 100644
--- a/lsyncd.lua
+++ b/lsyncd.lua
@@ -30,7 +30,7 @@ if lsyncd_version then
 	lsyncd.terminate( -1 )
 end
 
-lsyncd_version = '2.1.4'
+lsyncd_version = '2.1.5'
 
 --
 -- Hides the core interface from user scripts.