Date: Saturday, March 14, 2015 @ 14:39:01
Author: foutrelis
Revision: 129251
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
rdiff-backup/repos/community-staging-i686/
rdiff-backup/repos/community-staging-i686/PKGBUILD
(from rev 129250, rdiff-backup/trunk/PKGBUILD)
rdiff-backup/repos/community-staging-i686/rdiff-backup-1.2.8-librsync-1.0.0.patch
(from rev 129250,
rdiff-backup/trunk/rdiff-backup-1.2.8-librsync-1.0.0.patch)
rdiff-backup/repos/community-staging-x86_64/
rdiff-backup/repos/community-staging-x86_64/PKGBUILD
(from rev 129250, rdiff-backup/trunk/PKGBUILD)
rdiff-backup/repos/community-staging-x86_64/rdiff-backup-1.2.8-librsync-1.0.0.patch
(from rev 129250,
rdiff-backup/trunk/rdiff-backup-1.2.8-librsync-1.0.0.patch)
------------------------------------------------------------------+
community-staging-i686/PKGBUILD | 40
++++++++++
community-staging-i686/rdiff-backup-1.2.8-librsync-1.0.0.patch | 20 +++++
community-staging-x86_64/PKGBUILD | 40
++++++++++
community-staging-x86_64/rdiff-backup-1.2.8-librsync-1.0.0.patch | 20 +++++
4 files changed, 120 insertions(+)
Copied: rdiff-backup/repos/community-staging-i686/PKGBUILD (from rev 129250,
rdiff-backup/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-03-14 13:39:01 UTC (rev 129251)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Aaron Schaefer <aa...@elasticdog.com>
+# Contributor: Erwin Van de Velde <erwin.vandeve...@gmail.com>
+
+pkgname=rdiff-backup
+pkgver=1.2.8
+pkgrel=7
+pkgdesc='A utility for local/remote mirroring and incremental backups.'
+arch=('i686' 'x86_64')
+url='http://www.nongnu.org/rdiff-backup/'
+license=('GPL')
+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}
+ rdiff-backup-1.2.8-librsync-1.0.0.patch)
+md5sums=('1a94dc537fcf74d6a3a80bd27808e77b'
+ '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}"
+
+ python2 setup.py install --root="${pkgdir}" -O1
+
+ # Fix for FS#18848
+ sed -i 's|python2|python2 -W ignore::DeprecationWarning|'
"${pkgdir}/usr/bin/rdiff-backup"
+}
Copied:
rdiff-backup/repos/community-staging-i686/rdiff-backup-1.2.8-librsync-1.0.0.patch
(from rev 129250, rdiff-backup/trunk/rdiff-backup-1.2.8-librsync-1.0.0.patch)
===================================================================
--- community-staging-i686/rdiff-backup-1.2.8-librsync-1.0.0.patch
(rev 0)
+++ community-staging-i686/rdiff-backup-1.2.8-librsync-1.0.0.patch
2015-03-14 13:39:01 UTC (rev 129251)
@@ -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;
+ }
+
Copied: rdiff-backup/repos/community-staging-x86_64/PKGBUILD (from rev 129250,
rdiff-backup/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-03-14 13:39:01 UTC (rev 129251)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Aaron Schaefer <aa...@elasticdog.com>
+# Contributor: Erwin Van de Velde <erwin.vandeve...@gmail.com>
+
+pkgname=rdiff-backup
+pkgver=1.2.8
+pkgrel=7
+pkgdesc='A utility for local/remote mirroring and incremental backups.'
+arch=('i686' 'x86_64')
+url='http://www.nongnu.org/rdiff-backup/'
+license=('GPL')
+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}
+ rdiff-backup-1.2.8-librsync-1.0.0.patch)
+md5sums=('1a94dc537fcf74d6a3a80bd27808e77b'
+ '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}"
+
+ python2 setup.py install --root="${pkgdir}" -O1
+
+ # Fix for FS#18848
+ sed -i 's|python2|python2 -W ignore::DeprecationWarning|'
"${pkgdir}/usr/bin/rdiff-backup"
+}
Copied:
rdiff-backup/repos/community-staging-x86_64/rdiff-backup-1.2.8-librsync-1.0.0.patch
(from rev 129250, rdiff-backup/trunk/rdiff-backup-1.2.8-librsync-1.0.0.patch)
===================================================================
--- community-staging-x86_64/rdiff-backup-1.2.8-librsync-1.0.0.patch
(rev 0)
+++ community-staging-x86_64/rdiff-backup-1.2.8-librsync-1.0.0.patch
2015-03-14 13:39:01 UTC (rev 129251)
@@ -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;
+ }
+
