[rdiff-backup] Rebuild for librsync 1.0.0 (#1126712)

[Robert Scheck]

commit 5aaaeb3f2f1190daf9fb6c48d335ef8ddf1bb6a7
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Mar 2 01:02:25 2015 +0100

    Rebuild for librsync 1.0.0 (#1126712)

 rdiff-backup-1.2.8-librsync-1.0.0.patch | 20 ++++++++++++++++++++
 rdiff-backup.spec                       | 10 +++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/rdiff-backup-1.2.8-librsync-1.0.0.patch b/rdiff-backup-1.2.8-librsync-1.0.0.patch
new file mode 100644
index 0000000..ce23c8a
--- /dev/null
+++ b/rdiff-backup-1.2.8-librsync-1.0.0.patch
@@ -0,0 +1,20 @@
+Patch by Roman Tereshonkov and Kari Hautio for rdiff-backup <= 1.2.8 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).
+
+--- rdiff-backup-1.2.8/_librsyncmodule.c			2009-03-16 15:36:21.000000000 +0100
++++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0		2015-03-02 00:54:24.000000000 +0100
+@@ -59,8 +59,13 @@
+   if (sm == NULL) return NULL;
+   sm->x_attr = NULL;
+ 
++#ifdef RS_DEFAULT_STRONG_LEN
+   sm->sig_job = rs_sig_begin((size_t)blocklen,
+ 							 (size_t)RS_DEFAULT_STRONG_LEN);
++#else
++  sm->sig_job = rs_sig_begin((size_t)blocklen,
++							 (size_t)8, RS_MD4_SIG_MAGIC);
++#endif
+   return (PyObject*)sm;
+ }
+ 
diff --git a/rdiff-backup.spec b/rdiff-backup.spec
index 62ef56c..9f8f9b5 100644
--- a/rdiff-backup.spec
+++ b/rdiff-backup.spec
@@ -3,7 +3,7 @@
 Version: 1.2.8
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 URL: http://www.nongnu.org/rdiff-backup/
 Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
@@ -15,6 +15,10 @@ Patch0: http://dev.sgu.ru/rpm/rdiff-backup--popen2.patch
 # Fix to use unversioned docdirs
 #
 Patch1: rdiff-backup-1.2.8-docdir.patch
+#
+# Workaround to build with librsync >= 1.0.0
+#
+Patch2: rdiff-backup-1.2.8-librsync-1.0.0.patch
 License: GPLv2+
 Group: Applications/Archiving
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,6 +44,7 @@ differences from the previous backup will be transmitted.
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 python setup.py build
@@ -67,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/rdiff_backup-%{version}-py?.?.egg-info
 
 %changelog
+* Sun Mar 01 2015 Robert Scheck <robert at fedoraproject.org> - 1.2.8-14
+- Rebuild for librsync 1.0.0 (#1126712)
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild