aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-03-18 13:18:42 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-03-18 13:50:24 +0000
commit54252930687e5adf0de0ec3d4ff63ebcc8276bad (patch)
tree6d9fb7eb5d413750b5f3d2f7337b2e203a3786ed
parent85a152083a1c9c95cd948041b4f9b4ddcc4c72e3 (diff)
downloadaports-54252930687e5adf0de0ec3d4ff63ebcc8276bad.tar.bz2
aports-54252930687e5adf0de0ec3d4ff63ebcc8276bad.tar.xz
main/rdiff-backup: rebuild with librsync-1.0
-rw-r--r--main/rdiff-backup/APKBUILD20
-rw-r--r--main/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch20
2 files changed, 37 insertions, 3 deletions
diff --git a/main/rdiff-backup/APKBUILD b/main/rdiff-backup/APKBUILD
index 78d2ce8537..0747150e86 100644
--- a/main/rdiff-backup/APKBUILD
+++ b/main/rdiff-backup/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
pkgname=rdiff-backup
pkgver=1.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="A backup utility that maintains extra reverse diffs so that files can be restored from previous backups."
url="http://www.gnu.org/savannah-checkouts/non-gnu/rdiff-backup/"
arch="all"
@@ -10,8 +10,17 @@ license="GPL2+"
depends=""
makedepends="librsync-dev python-dev"
subpackages="$pkgname-doc"
-source="http://savannah.nongnu.org/download/rdiff-backup/$pkgname-$pkgver.tar.gz"
+source="http://savannah.nongnu.org/download/rdiff-backup/$pkgname-$pkgver.tar.gz rdiff-backup-1.2.8-librsync-1.0.0.patch"
+
_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
+}
build() {
cd "$_builddir"
@@ -23,4 +32,9 @@ package() {
python setup.py install --prefix=/usr --root="$pkgdir" || return 1
}
-md5sums="e3ec506c01e12b693adb79751daa7c63 rdiff-backup-1.3.3.tar.gz"
+md5sums="e3ec506c01e12b693adb79751daa7c63 rdiff-backup-1.3.3.tar.gz
+5e54a67845edd6942fcf7359c921e003 rdiff-backup-1.2.8-librsync-1.0.0.patch"
+sha256sums="ee030ce638df0eb1047cf72578e0de15d9a3ee9ab24da2dc0023e2978be30c06 rdiff-backup-1.3.3.tar.gz
+a00d993d5ffea32d58a73078fa20c90c1c1c6daa0587690cec0e3da43877bf12 rdiff-backup-1.2.8-librsync-1.0.0.patch"
+sha512sums="e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280 rdiff-backup-1.3.3.tar.gz
+641894eb2527c0031d420345e8dfd4d7a0e18dc656feabf70c7200d04ea5eb533d5cd06bbaa46721a03578e2f373e0ed64643edb4edffc7f85e813d1c2812055 rdiff-backup-1.2.8-librsync-1.0.0.patch"
diff --git a/main/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch b/main/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch
new file mode 100644
index 0000000000..ce23c8a812
--- /dev/null
+++ b/main/rdiff-backup/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;
+ }
+