rdiff-backup: leave 1.0.5 as default, override for resilient stack

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]

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

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

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

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

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
+