[arch-commits] Commit in rdiff-backup/trunk (2 files)

[Evangelos Foutras]

    Date: Saturday, March 14, 2015 @ 14:38:53
  Author: foutrelis
Revision: 129250

upgpkg: rdiff-backup 1.2.8-7

librsync 1.0.0 rebuild.

Added:
  rdiff-backup/trunk/rdiff-backup-1.2.8-librsync-1.0.0.patch
Modified:
  rdiff-backup/trunk/PKGBUILD

-----------------------------------------+
 PKGBUILD                                |   18 +++++++++++++++---
 rdiff-backup-1.2.8-librsync-1.0.0.patch |   20 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-14 13:31:13 UTC (rev 129249)
+++ PKGBUILD	2015-03-14 13:38:53 UTC (rev 129250)
@@ -5,7 +5,7 @@
 
 pkgname=rdiff-backup
 pkgver=1.2.8
-pkgrel=6
+pkgrel=7
 pkgdesc='A utility for local/remote mirroring and incremental backups.'
 arch=('i686' 'x86_64')
 url='http://www.nongnu.org/rdiff-backup/'
@@ -13,11 +13,23 @@
 depends=('python2' 'librsync')
 optdepends=('pylibacl: access control list support'
             'pyxattr: extended attribute support')
-source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc})
+source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        rdiff-backup-1.2.8-librsync-1.0.0.patch)
 md5sums=('1a94dc537fcf74d6a3a80bd27808e77b'
-         '3b88b18eb43ac85bc70b8dce92e958ba')
+         'SKIP'
+         '5e54a67845edd6942fcf7359c921e003')
 validpgpkeys=('B572DE9BC6537B9D5A4735B114C2601BDCA52872') # Andrew Ferguson
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../rdiff-backup-1.2.8-librsync-1.0.0.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python2 setup.py build
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 

Added: rdiff-backup-1.2.8-librsync-1.0.0.patch
===================================================================
--- rdiff-backup-1.2.8-librsync-1.0.0.patch	                        (rev 0)
+++ rdiff-backup-1.2.8-librsync-1.0.0.patch	2015-03-14 13:38:53 UTC (rev 129250)
@@ -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;
+ }
+