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

component/slapos/buildout.cfg

@@ -3,12 +3,10 @@
 extends =
   ../../stack/slapos.cfg
   ../../stack/shacache-client.cfg
-  ../bison/buildout.cfg
   ../gdbm/buildout.cfg
   ../gettext/buildout.cfg
   ../m4/buildout.cfg
   ../python-2.7/buildout.cfg
-  ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../swig/buildout.cfg
   ../patch/buildout.cfg
@@ -62,12 +60,26 @@ input = inline:
   export PS1="[SlapOS env Active] $PS1"
 output = ${buildout:directory}/environment.sh
 
+##############################################
+# Included locally in order to permit we build
+# packages offline. 
+###############################################
+[python-openssl]
+recipe = zc.recipe.egg:custom
+egg = pyOpenSSL
+include-dirs =
+  ${openssl:location}/include/
+library-dirs =
+  ${openssl:location}/lib/
+rpath =
+  ${openssl:location}/lib/
+
+#############################################
+
 [slapos]
 recipe = z3c.recipe.scripts
 eggs =
-  ${python-cffi:egg}
-  ${python-cryptography:egg}
-  pyOpenSSL
+  ${python-openssl:egg}
   slapos.libnetworkcache
   zc.buildout
   ${lxml-python:egg}
@@ -106,19 +118,20 @@ scripts = py
 # Use setuptools-1.x for python 2.4/2.5 support
 setuptools = 1.4.2
 
+# pyOpenSSL 0.14 uses cryptograpic which is
+# incompatible with slapos package generation. 
+pyOpenSSL = 0.13.1
+
 Jinja2 = 2.7.2
 MarkupSafe = 0.19
 Werkzeug = 0.9.4
-cffi = 0.8.2
 cmd2 = 0.6.7
 collective.recipe.template = 1.11
-cryptography = 0.2.2
 itsdangerous = 0.23
 lxml = 3.3.3
 meld3 = 0.6.10
 netaddr = 0.7.10
 prettytable = 0.7.2
-pyOpenSSL = 0.14
 pyparsing = 2.0.1
 six = 1.5.2
 slapos.core = 1.0.3
@@ -139,10 +152,6 @@ cliff = 1.5.2
 # slapos.core==1.0.3
 netifaces = 0.8
 
-# Required by:
-# cffi==0.8.2
-pycparser = 2.10
-
 # Required by:
 # slapos.core==1.0.3
 requests = 2.2.1