Merge remote-tracking branch 'origin/master' into erp5-component

component/python-cryptography/buildout.cfg

@@ -14,6 +14,6 @@ environment = python-cryptography-env
 
 [python-cryptography-env]
 PATH = ${pkgconfig:location}/bin:%(PATH)s
-PKG_CONFIG_PATH = ${libffi:location}/lib/pkgconfig
-LD_LIBRARY_PATH = ${libffi:location}/lib
-CPATH = ${openssl:location}/include
+PKG_CONFIG_PATH = ${libffi:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
+LD_LIBRARY_PATH = ${libffi:location}/lib:${openssl:location}/lib
+CPATH = ${libffi:location}/include:${openssl:location}/include

software/backupserver/software.cfg

 [buildout]
 extends =
+  ../../component/lxml-python/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/python-cffi/buildout.cfg
+  ../../component/python-cryptography/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
@@ -37,9 +41,19 @@ parts =
 [extra-eggs]
 recipe = zc.recipe.egg
 interpreter = pythonforrssgen
+python = python2.7
 eggs =
   PyRSS2Gen
 
+[lxml-python]
+python = python2.7
+
+[python-cffi]
+python = python2.7
+
+[python-cryptography]
+python = python2.7
+
 [networkcache]
 # signature certificates of the following uploaders.
 #   Romain Courteaud