component/librsync: version up 2.0.0.

54d95d6a · Kazuhiko Shiozaki · 342cb840 · 54d95d6a · 54d95d6a · 54d95d6a
Commit 54d95d6a authored Feb 20, 2017 by Kazuhiko Shiozaki
14 changed files
--- a/component/librsync/buildout.cfg
+++ b/component/librsync/buildout.cfg
 [buildout]
 extends =
  ../bzip2/buildout.cfg
+  ../cmake/buildout.cfg
+  ../patch/buildout.cfg
+  ../perl/buildout.cfg
  ../popt/buildout.cfg
  ../zlib/buildout.cfg
 parts =
@@ -8,11 +11,19 @@ parts =

 [librsync]
 recipe = slapos.recipe.cmmi
-url = http://downloads.sourceforge.net/sourceforge/librsync/librsync-0.9.7.tar.gz
-md5sum = 24cdb6b78f45e0e83766903fd4f6bc84
+url = https://github.com/librsync/librsync/archive/v2.0.0.tar.gz
+md5sum = cbda9c3eba21bcf2d56a4080ba7a5dc4
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/librsync-2.0.0-issue50.patch#5bac5363646a2c2ec6d2c4b26ca4cd7f
+configure-command = ${cmake:location}/bin/cmake
 configure-options =
-  --disable-static
-  --enable-shared
+  -DCMAKE_INSTALL_PREFIX=${:location}
+  -DCMAKE_INSTALL_RPATH=${:location}/lib:${bzip2:location}/lib:${popt:location}/lib:${zlib:location}/lib
+make-options =
+  VERBOSE=1
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include -I${popt:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib
+  PATH=${perl:location}/bin:%(PATH)s
+  CMAKE_INCLUDE_PATH=${bzip2:location}/include:${popt:location}/include:${zlib:location}/include
+  CMAKE_LIBRARY_PATH=${bzip2:location}/lib:${popt:location}/lib:${zlib:location}/lib
--- a/component/librsync/librsync-2.0.0-issue50.patch
+++ b/component/librsync/librsync-2.0.0-issue50.patch
+--- librsync-2.0.0/src/search.c	2017-02-20 13:39:48.012922600 +0100
+++ librsync-2.0.0/src/search.c	2017-02-20 13:41:43.661880014 +0100
+@@ -218,7 +218,7 @@
+ 	    r = m;
+     }
+ 
+-    if (l == r) {
+    if ((l == r) && (l <= bucket->r)) {
+ 	int i = sig->targets[l].i;
+ 	rs_block_sig_t *b = &(sig->block_sigs[i]);
+ 	if (weak_sum != b->weak_sum)
--- a/component/rdiff-backup/buildout.cfg
+++ b/component/rdiff-backup/buildout.cfg
@@ -8,6 +8,10 @@ parts =
 [rdiff-backup-build]
 recipe = zc.recipe.egg:custom
 egg = rdiff-backup
+patches =
+  ${:_profile_base_location_}/rdiff-backup-1.2.8-librsync-1.0.0.patch#5e54a67845edd6942fcf7359c921e003
+patch-options = -p1
+patch-binary = ${patch:location}/bin/patch
 include-dirs =
  ${librsync:location}/include/
 library-dirs =

--- a/component/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch
+++ b/component/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch
+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;
+ }
+ 
--- a/software/apache-frontend/software.cfg
+++ b/software/apache-frontend/software.cfg
@@ -13,7 +13,7 @@ ecdsa = 0.13
 gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
-rdiff-backup = 1.0.5
+rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 2.8
 slapos.toolbox = 0.64
 smmap = 0.9.0

--- a/software/backupserver/software.cfg
+++ b/software/backupserver/software.cfg
@@ -117,7 +117,7 @@ output = ${buildout:directory}/template.cfg
 mode = 0644

 [versions]
-rdiff-backup = 1.0.5
+rdiff-backup = 1.0.5+SlapOSPatched001
 gunicorn = 19.1.1
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.4.2

--- a/software/html5as/software.cfg
+++ b/software/html5as/software.cfg
@@ -71,7 +71,7 @@ apache-libcloud = 0.12.3
 async = 0.6.1
 gitdb = 0.5.4
 pycrypto = 2.6
-rdiff-backup = 1.0.5
+rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.40.4
 smmap = 0.8.2

--- a/software/kumofs/software.cfg
+++ b/software/kumofs/software.cfg
@@ -40,5 +40,5 @@ output = ${buildout:directory}/template.cfg
 mode = 0644

 [versions]
-rdiff-backup = 1.0.5
+rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 2.4.2
--- a/software/mysql-5.1/software.cfg
+++ b/software/mysql-5.1/software.cfg
@@ -44,5 +44,5 @@ output = ${buildout:directory}/template.cfg
 mode = 0644

 [versions]
-rdiff-backup = 1.0.5
+rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 2.2
--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
@@ -88,7 +88,7 @@ Paste = 2.0.2
 PasteScript = 2.0.2
 WSGIUtils = 0.7
 python-magic = 0.4.6
-rdiff-backup = 1.0.5
+rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 2.8

 # Required by:

--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -615,7 +615,7 @@ zope.dottedname = 4.1.0
 Products.PluggableAuthService = 1.9.0

 # we are still using this old stable version.
-rdiff-backup = 1.0.5
+rdiff-backup = 1.0.5+SlapOSPatched001

 # use newest version of slapos.cookbook
 slapos.cookbook =

--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -187,7 +187,7 @@ async = 0.6.1
 gitdb = 0.5.4
 mysqlclient = 1.3.9
 pycrypto = 2.6
-rdiff-backup = 1.0.5
+rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.40.4
 smmap = 0.8.2

--- a/stack/resilient/buildout.cfg
+++ b/stack/resilient/buildout.cfg
@@ -138,8 +138,10 @@ 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
+patches =
+  ${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f

 [versions]
-rdiff-backup = 1.3.4nxd2
-
-
+# 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
--- a/stack/resilient/rdiff-backup-1.3.4-librsync-1.0.0.patch
+++ b/stack/resilient/rdiff-backup-1.3.4-librsync-1.0.0.patch
+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.3.4/rdiff_backup/_librsyncmodule.c			2009-03-16 15:36:21.000000000 +0100
+++ rdiff-backup-1.3.4/rdiff_backup/_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;
+ }
+