[duplicity/el6] Rebuild for librsync 1.0.0 (#1126712)

[Robert Scheck]

commit 75068fba950847822efe198bfedeba96cf09d154
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Mar 7 00:46:33 2015 +0100

    Rebuild for librsync 1.0.0 (#1126712)

 duplicity-0.6.25-librsync-1.0.0.patch | 20 ++++++++++++++++++++
 duplicity.spec                        |  7 ++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/duplicity-0.6.25-librsync-1.0.0.patch b/duplicity-0.6.25-librsync-1.0.0.patch
new file mode 100644
index 0000000..8f81682
--- /dev/null
+++ b/duplicity-0.6.25-librsync-1.0.0.patch
@@ -0,0 +1,20 @@
+Patch by Roman Tereshonkov and Kari Hautio for duplicity <= 0.6.25 to avoid a build failure with librsync
+>= 1.0.0 (which is a security bugfix release). https://bugs.launchpad.net/duplicity/+bug/1416344 contains
+the discussion and solution finding.
+
+--- duplicity-0.6.25/duplicity/_librsyncmodule.c			2014-10-20 21:09:10.000000000 +0200
++++ duplicity-0.6.25/duplicity/_librsyncmodule.c.librsync-1.0.0		2015-03-02 01:29:00.000000000 +0100
+@@ -67,8 +67,13 @@
+   sm = PyObject_New(_librsync_SigMakerObject, &_librsync_SigMakerType);
+   if (sm == NULL) return NULL;
+ 
++#ifdef RS_DEFAULT_STRONG_LEN
+   sm->sig_job = rs_sig_begin((size_t)blocklen,
+                              (size_t)RS_DEFAULT_STRONG_LEN);
++#else /* librsync >= 1.0.0 */
++  sm->sig_job = rs_sig_begin((size_t)blocklen,
++                             (size_t)8, RS_MD4_SIG_MAGIC);
++#endif
+   return (PyObject*)sm;
+ }
+ 
diff --git a/duplicity.spec b/duplicity.spec
index b08a35a..8414ca6 100644
--- a/duplicity.spec
+++ b/duplicity.spec
@@ -3,12 +3,13 @@
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
 Version:        0.6.22
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
 Patch0:         duplicity-0.6.22-documentation.patch
+Patch1:         duplicity-0.6.25-librsync-1.0.0.patch
 Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
 Requires:       openssh-clients, ncftp >= 3.1.9, rsync, python-boto >= 0.9d
 Requires:       python-paramiko
@@ -36,6 +37,7 @@ but not hard links.
 %prep
 %setup -q
 %patch0 -p1 -b .documentation
+%patch1 -p1 -b .librsync-1.0.0
 
 %build
 %{__python} setup.py build
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/%{name}/cacert.pem
 
 %changelog
+* Sat Mar 07 2015 Robert Scheck <robert at fedoraproject.org> - 0.6.22-4
+- Rebuild for librsync 1.0.0 (#1126712)
+
 * Fri Dec 27 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 0.6.22-3
 - Fix ssl cert enforcement (rhbz#960860)
 - Fix bogus date in changelog