From d2aa947c34658f391ee614a96f42b5048e94e010 Mon Sep 17 00:00:00 2001
From: Marco Mariani <marco.mariani@nexedi.com>
Date: Wed, 15 Oct 2014 16:40:59 +0200
Subject: [PATCH] rdiff-backup: leave 1.0.5 as default, override for resilient
 stack

---
 component/rdiff-backup/buildout.cfg | 2 ++
 software/kvm/common.cfg             | 5 ++++-
 software/kvm/software.cfg           | 1 -
 software/slaprunner/common.cfg      | 3 +++
 software/slaprunner/software.cfg    | 1 -
 stack/resilient/buildout.cfg        | 6 ++++++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/component/rdiff-backup/buildout.cfg b/component/rdiff-backup/buildout.cfg
index ea42064..6c5260b 100644
--- a/component/rdiff-backup/buildout.cfg
+++ b/component/rdiff-backup/buildout.cfg
@@ -14,6 +14,8 @@ library-dirs =
   ${librsync:location}/lib/
 rpath =
   ${librsync:location}/lib/
+# If you need another release, override this link
+# and pin the egg in the [versions] section of the stack or SR.
 find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1.0.5.tar.gz/fa2a165fa07a94be52c52e3545bc7758/rdiff-backup-1.0.5.tar.gz
 
 [rdiff-backup]
diff --git a/software/kvm/common.cfg b/software/kvm/common.cfg
index 9c4d6e9..0d88811 100644
--- a/software/kvm/common.cfg
+++ b/software/kvm/common.cfg
@@ -11,9 +11,12 @@ extends =
   ../../component/noVNC/buildout.cfg
   ../../component/openssl/buildout.cfg
   ../../component/dcron/buildout.cfg
+  ../../stack/slapos.cfg
   ../../stack/nodejs.cfg
   ../../stack/resilient/buildout.cfg
-  ../../stack/slapos.cfg
+
+# stacks are listed from most generic to most specific,
+# to avoid versioning issues
 
 parts =
   template
diff --git a/software/kvm/software.cfg b/software/kvm/software.cfg
index 97494c6..0f3dbc0 100644
--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
@@ -11,7 +11,6 @@ erp5.util = 0.4.41
 gitdb = 0.5.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
-rdiff-backup = 1.0.5
 slapos.recipe.download = 1.0.dev-r4053
 slapos.toolbox = 0.40.4
 smmap = 0.8.2
diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg
index a36e595..312974c 100644
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -21,6 +21,9 @@ extends =
   ../../stack/resilient/buildout.cfg
   ../../stack/monitor/buildout.cfg
 
+# stacks are listed from most generic to most specific,
+# to avoid versioning issues
+
 parts =
   template
   eggs
diff --git a/software/slaprunner/software.cfg b/software/slaprunner/software.cfg
index 0621546..bb35988 100644
--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -20,7 +20,6 @@ gitdb = 0.5.4
 gunicorn = 19.1.1
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
-rdiff-backup = 1.0.5
 slapos.recipe.download = 1.0.dev-r4053
 slapos.toolbox = 0.40.4
 smmap = 0.8.2
diff --git a/stack/resilient/buildout.cfg b/stack/resilient/buildout.cfg
index 969c903..4cef8cd 100644
--- a/stack/resilient/buildout.cfg
+++ b/stack/resilient/buildout.cfg
@@ -116,8 +116,14 @@ md5sum = 19ee9055de961acf402e2dfe5b9581d2
 filename = monitor-check-resilient-feed.in
 mode = 0644
 
+[rdiff-backup-build]
+# use our own version
+find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd2.tar.gz
+
 [versions]
 # Pin Jinja2 to 2.6, as 2.7 breaks current code
 Jinja2 = 2.6
 # ... And newer s.r.template requires Jinja2 >= 2.7
 slapos.recipe.template = 2.4.2
+rdiff-backup = 1.3.4nxd2
+
-- 
2.1.4