version up pyOpenSSL 0.14.

add custom build for cryptography and cffi eggs that are required by pyOpenSSL 0.14.
pyOpenSSL is no longer binary egg.

component/python-cffi/buildout.cfg

+[buildout]
+extends =
+  ../libffi/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts =
+  python-cffi
+
+[python-cffi]
+recipe = zc.recipe.egg:custom
+egg = cffi
+environment = python-cffi-env
+library-dirs =
+  ${libffi:location}/lib/
+rpath =
+  ${libffi:location}/lib/
+
+[python-cffi-env]
+PATH = ${pkgconfig:location}/bin:%(PATH)s
+PKG_CONFIG_PATH = ${libffi:location}/lib/pkgconfig

component/python-cryptography/buildout.cfg

+[buildout]
+extends =
+  ../libffi/buildout.cfg
+  ../openssl/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts =
+  python-cryptography
+
+[python-cryptography]
+recipe = zc.recipe.egg:custom
+egg = cryptography
+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

component/python-openssl/buildout.cfg

-[buildout]
-extends =
-  ../openssl/buildout.cfg
-
-parts =
-  python-openssl
-
-[python-openssl]
-recipe = zc.recipe.egg:custom
-egg = pyOpenSSL
-include-dirs =
-  ${openssl:location}/include/
-library-dirs =
-  ${openssl:location}/lib/
-rpath =
-  ${openssl:location}/lib/

component/slapos/buildout.cfg

@@ -17,7 +17,8 @@ extends =
   ../pkgconfig/buildout.cfg
   ../popt/buildout.cfg
   ../python-2.7/buildout.cfg
-  ../python-openssl/buildout.cfg
+  ../python-cffi/buildout.cfg
+  ../python-cryptography/buildout.cfg
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../swig/buildout.cfg
@@ -91,14 +92,19 @@ output = ${buildout:directory}/environment.sh
 [lxml-python]
 python = python2.7
 
-[python-openssl]
+[python-cffi]
+python = python2.7
+
+[python-cryptography]
 python = python2.7
 
 [slapos]
 recipe = z3c.recipe.scripts
 python = python2.7
 eggs =
-  ${python-openssl:egg}
+  ${python-cffi:egg}
+  ${python-cryptography:egg}
+  pyOpenSSL
   slapos.libnetworkcache
   zc.buildout
   ${lxml-python:egg}
@@ -150,14 +156,16 @@ MarkupSafe = 0.18
 Pygments = 1.6
 Werkzeug = 0.9.4
 buildout-versions = 1.7
+cffi = 0.8.1
 cmd2 = 0.6.7
 collective.recipe.template = 1.10
+cryptography = 0.2.1
 itsdangerous = 0.23
 lxml = 3.2.3
 meld3 = 0.6.10
 netaddr = 0.7.10
 prettytable = 0.7.2
-pyOpenSSL = 0.13.1
+pyOpenSSL = 0.14
 pyparsing = 2.0.1
 setuptools = 1.1.6
 slapos.libnetworkcache = 0.13.4

software/erp5testnode/software.cfg

@@ -6,6 +6,8 @@ find-links += http://dist.repoze.org
 extends =
   ../../stack/slapos.cfg
   ../../component/python-2.7/buildout.cfg
+  ../../component/python-cffi/buildout.cfg
+  ../../component/python-cryptography/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/zip/buildout.cfg
@@ -67,6 +69,12 @@ python = python2.7
 [lxml-python]
 python = python2.7
 
+[python-cffi]
+python = python2.7
+
+[python-cryptography]
+python = python2.7
+
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
@@ -196,7 +204,9 @@ PyXML = 0.8.5
 Pygments = 1.6
 Werkzeug = 0.9.4
 buildout-versions = 1.7
+cffi = 0.8.1
 cmd2 = 0.6.7
+cryptography = 0.2.1
 erp5.util = 0.4.36
 inotifyx = 0.2.0-1
 itsdangerous = 0.23
@@ -205,7 +215,7 @@ meld3 = 0.6.10
 netaddr = 0.7.10
 plone.recipe.command = 1.1
 psutil = 1.2.1
-pyOpenSSL = 0.13.1
+pyOpenSSL = 0.14
 pyparsing = 2.0.1
 pytz = 2013.9
 slapos.core = 1.0.2.1

software/seleniumrunner/software.cfg

@@ -5,6 +5,8 @@ extends =
    ../../component/xorg/buildout.cfg
    ../../component/lxml-python/buildout.cfg
    ../../component/python-2.7/buildout.cfg
+   ../../component/python-cffi/buildout.cfg
+   ../../component/python-cryptography/buildout.cfg
    ../../component/firefox/buildout.cfg
    ../../component/dash/buildout.cfg
    ../../stack/shacache-client.cfg
@@ -26,7 +28,10 @@ unzip = true
 [lxml-python]
 python = python2.7
 
-[python-openssl]
+[python-cffi]
+python = python2.7
+
+[python-cryptography]
 python = python2.7
 
 [instance-recipe]
@@ -67,10 +72,12 @@ Jinja2 = 2.7.2
 MarkupSafe = 0.18
 Werkzeug = 0.9.4
 buildout-versions = 1.7
+cffi = 0.8.1
 cmd2 = 0.6.7
+cryptography = 0.2.1
 itsdangerous = 0.23
 meld3 = 0.6.10
-pyOpenSSL = 0.13.1
+pyOpenSSL = 0.14
 pyparsing = 2.0.1
 slapos.cookbook = 0.85
 slapos.recipe.build = 0.12

stack/slapos.cfg

@@ -12,7 +12,8 @@ extensions +=
 # Use shacache and lxml
 extends =
   ../component/lxml-python/buildout.cfg
-  ../component/python-openssl/buildout.cfg
+  ../component/python-cffi/buildout.cfg
+  ../component/python-cryptography/buildout.cfg
 
 # Separate from site eggs
 allowed-eggs-from-site-packages =
@@ -60,7 +61,9 @@ networkcache-section = networkcache
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
-  ${python-openssl:egg}
+  ${python-cffi:egg}
+  ${python-cryptography:egg}
+  pyOpenSSL
   slapos.cookbook
   cliff
   hexagonit.recipe.download