From 60f2a434946d020db567f43f29b38019c17ad75f Mon Sep 17 00:00:00 2001 From: Alain Takoudjou <alain.takoudjou@nexedi.com> Date: Wed, 29 Aug 2018 17:57:33 +0200 Subject: [PATCH] Revert "rdiff-backup: version up to 1.3.4nxd4" This reverts commit 9b3dfa01bffa91b3881a666103139d3ee4dea6e5 --- component/rdiff-backup/buildout.cfg | 2 +- software/backupserver/software.cfg | 4 ++-- stack/resilient/buildout.cfg | 14 ++++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/component/rdiff-backup/buildout.cfg b/component/rdiff-backup/buildout.cfg index 0cf28e9aa..2bdd162bf 100644 --- a/component/rdiff-backup/buildout.cfg +++ b/component/rdiff-backup/buildout.cfg @@ -25,7 +25,7 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1 [rdiff-backup-build-1.3.4] <= rdiff-backup-build # use our own version -find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd4.tar.gz +find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd2.tar.gz patches = ${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f diff --git a/software/backupserver/software.cfg b/software/backupserver/software.cfg index aab8174b2..66eaac882 100644 --- a/software/backupserver/software.cfg +++ b/software/backupserver/software.cfg @@ -121,9 +121,9 @@ eggs = ${rdiff-backup-build-1.3.4:egg} [versions] -# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd4+SlapOSPatched001' +# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001' # but '1.3.4nxd2-SlapOSPatched001'. -rdiff-backup = 1.3.4nxd4-SlapOSPatched001 +rdiff-backup = 1.3.4nxd2-SlapOSPatched001 gunicorn = 19.1.1 plone.recipe.command = 1.1 slapos.recipe.template = 2.4.2 diff --git a/stack/resilient/buildout.cfg b/stack/resilient/buildout.cfg index 3a4a727d0..4fb530d12 100644 --- a/stack/resilient/buildout.cfg +++ b/stack/resilient/buildout.cfg @@ -125,11 +125,13 @@ mode = 0644 # Time in minutes to wait for the backup to finish backup_wait_time = 10 -[rdiff-backup] -eggs = - ${rdiff-backup-build-1.3.4:egg} +[rdiff-backup-build] +# use our own version +find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd2.tar.gz +patches = + ${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f [versions] -# 1.3.4nxd4 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001' -# but '1.3.4nxd4-SlapOSPatched001'. -rdiff-backup = 1.3.4nxd4-SlapOSPatched001 +# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001' +# but '1.3.4nxd2-SlapOSPatched001'. +rdiff-backup = 1.3.4nxd2-SlapOSPatched001 -- 2.30.9