[arch-commits] Commit in rdiff-backup/repos/community-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Sun Mar 15 21:59:38 UTC 2020
Date: Sunday, March 15, 2020 @ 21:59:37
Author: felixonmars
Revision: 598673
archrelease: copy trunk to community-x86_64
Added:
rdiff-backup/repos/community-x86_64/PKGBUILD
(from rev 598672, rdiff-backup/trunk/PKGBUILD)
rdiff-backup/repos/community-x86_64/rdiff-backup-1.2.8-librsync-1.0.0.patch
(from rev 598672, rdiff-backup/trunk/rdiff-backup-1.2.8-librsync-1.0.0.patch)
Deleted:
rdiff-backup/repos/community-x86_64/PKGBUILD
rdiff-backup/repos/community-x86_64/rdiff-backup-1.2.8-librsync-1.0.0.patch
-----------------------------------------+
PKGBUILD | 79 ++++++++++++++----------------
rdiff-backup-1.2.8-librsync-1.0.0.patch | 40 +++++++--------
2 files changed, 59 insertions(+), 60 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-15 21:59:27 UTC (rev 598672)
+++ PKGBUILD 2020-03-15 21:59:37 UTC (rev 598673)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Aaron Schaefer <aaron at elasticdog.com>
-# Contributor: Erwin Van de Velde <erwin.vandevelde at gmail.com>
-
-pkgname=rdiff-backup
-pkgver=1.2.8
-pkgrel=8
-pkgdesc='A utility for local/remote mirroring and incremental backups.'
-arch=('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)
-sha512sums=('4230bdfca7fc2a5ffd7bdc92ca899cde3276042115b4f488255a201e6ea361eab4ce4ebaae15841c357f189e1c88ad037e2727dec0a05c61b1c6016fa807739c'
- 'SKIP'
- '641894eb2527c0031d420345e8dfd4d7a0e18dc656feabf70c7200d04ea5eb533d5cd06bbaa46721a03578e2f373e0ed64643edb4edffc7f85e813d1c2812055')
-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-x86_64/PKGBUILD (from rev 598672, rdiff-backup/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-15 21:59:37 UTC (rev 598673)
@@ -0,0 +1,39 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Aaron Schaefer <aaron at elasticdog.com>
+# Contributor: Erwin Van de Velde <erwin.vandevelde at gmail.com>
+
+pkgname=rdiff-backup
+pkgver=1.3.0
+pkgrel=1
+pkgdesc='A utility for local/remote mirroring and incremental backups.'
+arch=('x86_64')
+url='https://www.nongnu.org/rdiff-backup/'
+license=('GPL')
+depends=('python2' 'librsync')
+optdepends=('pylibacl: access control list support'
+ 'pyxattr: extended attribute support')
+source=("https://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}
+ rdiff-backup-1.2.8-librsync-1.0.0.patch)
+sha512sums=('cc38ccf34ef3a006d503730791cdade6cb22c4d72ccea113da07041579e9b8015fd3b7fae717fcaf456f7df828729f2edd7584dbff498bf9a0c37edb0522ee83'
+ 'SKIP'
+ '641894eb2527c0031d420345e8dfd4d7a0e18dc656feabf70c7200d04ea5eb533d5cd06bbaa46721a03578e2f373e0ed64643edb4edffc7f85e813d1c2812055')
+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"
+}
Deleted: rdiff-backup-1.2.8-librsync-1.0.0.patch
===================================================================
--- rdiff-backup-1.2.8-librsync-1.0.0.patch 2020-03-15 21:59:27 UTC (rev 598672)
+++ rdiff-backup-1.2.8-librsync-1.0.0.patch 2020-03-15 21:59:37 UTC (rev 598673)
@@ -1,20 +0,0 @@
-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-x86_64/rdiff-backup-1.2.8-librsync-1.0.0.patch (from rev 598672, rdiff-backup/trunk/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 2020-03-15 21:59:37 UTC (rev 598673)
@@ -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;
+ }
+
More information about the arch-commits
mailing list