From f7ef0bae139f071bac6bad920b035881421b5026 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 18 Mar 2015 13:21:09 +0000
Subject: testing/csync2: rebuild with librsync-1.0

---
 testing/csync2/csync2-1.34-librsync-1.0.0.patch | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 testing/csync2/csync2-1.34-librsync-1.0.0.patch

(limited to 'testing/csync2/csync2-1.34-librsync-1.0.0.patch')

diff --git a/testing/csync2/csync2-1.34-librsync-1.0.0.patch b/testing/csync2/csync2-1.34-librsync-1.0.0.patch
new file mode 100644
index 0000000000..d46653d455
--- /dev/null
+++ b/testing/csync2/csync2-1.34-librsync-1.0.0.patch
@@ -0,0 +1,35 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for csync2 <= 1.34 based on the
+patch by Roman Tereshonkov and Kari Hautio to avoid a build failure with librsync
+>= 1.0.0 (which is a security bugfix release). The discussion and solution finding
+can be found at https://bugs.launchpad.net/duplicity/+bug/1416344 (for duplicity).
+
+--- csync2-1.34/rsync.c				2007-07-24 23:04:18.000000000 +0200
++++ csync2-1.34/rsync.c.librsync-1.0.0		2015-03-02 00:18:43.000000000 +0100
+@@ -134,8 +134,13 @@
+ 
+ 	if ( isreg ) {
+ 		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
+ 		if (result != RS_DONE) {
+ 			csync_debug(0, "Internal error from rsync library!\n");
+ 			goto error;
+@@ -216,8 +221,13 @@
+ 	if ( !basis_file ) basis_file = fopen("/dev/null", "rb");
+ 
+ 	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
+ 	if (result != RS_DONE)
+ 		csync_fatal("Got an error from librsync, too bad!\n");
+ 
-- 
cgit v1.2.3