From 7c801a36a6a8d45e8f7e0fb6766ac3210b858a93 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sun, 22 Apr 2018 13:20:31 +0200
Subject: [PATCH] - fix building with librsync 1.0+ - rel 3

---
 csync2.spec    |  4 +++-
 librsync.patch | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 librsync.patch

diff --git a/csync2.spec b/csync2.spec
index abf4616..58cb91d 100644
--- a/csync2.spec
+++ b/csync2.spec
@@ -2,7 +2,7 @@ Summary:	Cluster sync tool
 Summary(pl.UTF-8):	Narzędzie do synchronizacji klastra
 Name:		csync2
 Version:	2.0
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://oss.linbit.com/csync2/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@ Source2:	%{name}.inet
 Source3:	%{name}.sysconfig
 Patch0:		%{name}-fix-sonames.patch
 Patch1:		%{name}-docdata.patch
+Patch2:		librsync.patch
 URL:		http://oss.linbit.com/csync2/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -102,6 +103,7 @@ klastrów HA, HPC, COW oraz farm serwerów.
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 %build
 %{__aclocal}
diff --git a/librsync.patch b/librsync.patch
new file mode 100644
index 0000000..f45cd07
--- /dev/null
+++ b/librsync.patch
@@ -0,0 +1,14 @@
+--- csync2-2.0/rsync.c~	2013-05-02 13:19:36.000000000 +0200
++++ csync2-2.0/rsync.c	2018-04-22 13:19:46.761262945 +0200
+@@ -461,7 +461,11 @@
+ 		goto out;
+ 
+ 	csync_debug(3, "Running rs_sig_file() from librsync....\n");
++#ifdef RS_DEFAULT_STRONG_LEN
+ 	result = rs_sig_file(basis_file, sig_file, RS_DEFAULT_BLOCK_LEN, RS_DEFAULT_STRONG_LEN, &stats);
++#else /* librsync >= 1.0.0 */
++	result = rs_sig_file(basis_file, sig_file,RS_DEFAULT_BLOCK_LEN, 8, RS_MD4_SIG_MAGIC, &stats);
++#endif
+ 	*sig_file_out = sig_file;
+ 	sig_file = NULL;
+ 	if (result != RS_DONE)
-- 
2.44.0