rdiff-backup: version up to 1.3.4nxd5

This release should be now stable enough for release

/reviewed-on nexedi/slapos!391

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.4nxd2.tar.gz
+find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd5.tar.gz
 patches =
   ${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f
 

slapos/recipe/pbs.py

@@ -74,6 +74,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
         $RDIFF_BACKUP \\
                 --remote-schema %(remote_schema)s \\
                 --restore-as-of now \\
+                --ignore-numerical-ids \\
                 --force \\
                 %(local_dir)s \\
                 %(remote_dir)s

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.4nxd2+SlapOSPatched001'
-# but '1.3.4nxd2-SlapOSPatched001'.
-rdiff-backup = 1.3.4nxd2-SlapOSPatched001
+# 1.3.4nxd5 is invalid version string, thus pached version string is not '1.3.4nxd5+SlapOSPatched001'
+# but '1.3.4nxd5-SlapOSPatched001'.
+rdiff-backup = 1.3.4nxd5-SlapOSPatched001
 gunicorn = 19.1.1
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.4.2

stack/resilient/buildout.cfg

@@ -125,13 +125,11 @@ mode = 0644
 # Time in minutes to wait for the backup to finish
 backup_wait_time = 10
 
-[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
+[rdiff-backup]
+eggs =
+  ${rdiff-backup-build-1.3.4:egg}
 
 [versions]
-# 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
+# 1.3.4nxd5 is invalid version string, thus pached version string is not '1.3.4nxd5+SlapOSPatched001'
+# but '1.3.4nxd5-SlapOSPatched001'.
+rdiff-backup = 1.3.4nxd5-SlapOSPatched001