Update Release Candidate

component/firewalld/buildout.cfg

 [buildout]
-
 parts =
   firewalld-patch
 
@@ -44,13 +43,13 @@ environment =
 
 [dbus-python]
 recipe = slapos.recipe.cmmi
-version = 1.2.0
+version = 1.2.4
 url = http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${:version}.tar.gz
-md5sum = b09cd2d1a057cc432ce944de3fc06bf7
+md5sum = 7372a588c83a7232b4e08159bfd48fe5 
 python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages
 environment =
   PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
   DBUS_CFLAGS=-I${dbus:location}/include/dbus-1.0 -I${dbus:location}/lib/dbus-1.0/include
   DBUS_LIBS=-L${dbus:location}/lib -ldbus-1
   DBUS_GLIB_CFLAGS=-I${dbus-glib:location}/include/dbus-1.0
@@ -59,7 +58,7 @@ environment =
   LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib
   PYTHON=${python2.7:location}/bin/python2.7
   PYTHON_INCLUDES=-I${python2.7:location}/include/python2.7
-  PYTHON_LIBS=-L${python2.7:location}/lib -lpython2.7
+  PYTHON_LIBS=-L${python2.7:location}/lib -lpython2.7 -lpthread -ldl -lutil -lm
 
 [gobject-introspection]
 recipe = slapos.recipe.cmmi

software/build-rina/build.cfg

@@ -4,6 +4,7 @@ extends =
 parts =
   debuild-rina-tools
   test-rina
+download-cache = download-cache
 
 [vm-run-base]
 smp = 4
@@ -93,6 +94,7 @@ finalize =
 [test-rina]
 <= vm-run-base
   rina-tools-deps
+mount.download-cache = ${buildout:download-cache}
 mount.rina = ${irati-stack:location}
 mount.slapos = ${:_profile_base_location_}/../..
 mount.slapos.package = ${slapos.package-repository:location}
@@ -106,6 +108,7 @@ install =
   [buildout]
   extends = /mnt/slapos/software/hellorina/software.cfg
   develop = /mnt/slapos
+  download-cache = /mnt/download-cache
   [slapos-cookbook-develop]
   recipe =
   setup =

software/build-rina/runTestSuite.in

@@ -94,6 +94,7 @@ relative-paths = true
 extends = {{parameter_dict['profile_base_location']}}/build.cfg
 develop-eggs-directory = {{buildout['develop-eggs-directory']}}
 eggs-directory = {{buildout['eggs-directory']}}
+download-cache = {{parameter_dict['download-cache']}}
 
 [vm-run-base]
 environment =

software/build-rina/software.cfg

@@ -6,6 +6,11 @@ extends =
 parts =
   slapos-cookbook
   template
+download-cache = download-cache
+
+# Required for recent buildout.
+extensions -=
+  buildout-versions
 
 [template]
 recipe = slapos.recipe.template:jinja2
@@ -38,6 +43,7 @@ template = inline:
   [runTestSuite-parameters]
   environment = {{dumps(environment)}}
   vm = {{dumps(vm)}}
+  download-cache = ${buildout:download-cache}
   runTestSuite_py = ${buildout:bin-directory}/${runTestSuite_py:interpreter}
   profile_base_location = ${:_profile_base_location_}
   irati_stack = ${irati-stack:location}
@@ -71,3 +77,7 @@ packages +=
   git ca-certificates python
 # biggest and common build-deps for RINA
   dh-autoreconf pkg-config doxygen maven xmlto
+
+[versions]
+zc.buildout = 2.5.2+slapos005
+zc.recipe.egg = 2.0.3+slapos002

stack/slapos.cfg

@@ -134,7 +134,7 @@ requests = 2.11.1
 setuptools = 19.6.2
 six = 1.10.0
 slapos.cookbook = 1.0.41
-slapos.core = 1.3.17
+slapos.core = 1.3.18
 slapos.extension.strip = 0.1
 slapos.libnetworkcache = 0.14.5
 slapos.recipe.build = 0.27
@@ -144,7 +144,7 @@ unicodecsv = 0.14.1
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.core==1.3.17
+# slapos.core==1.3.18
 Flask = 0.11.1
 
 # Required by:
@@ -172,7 +172,7 @@ jsonschema = 2.5.1
 lock-file = 2.0
 
 # Required by:
-# slapos.core==1.3.15
+# slapos.core==1.3.18
 # XXX 'slapos node format' raises an exception with netifaces 0.10.5.
 netifaces = 0.10.4
 
@@ -181,15 +181,15 @@ netifaces = 0.10.4
 pycparser = 2.14
 
 # Required by:
-# slapos.core==1.3.15
+# slapos.core==1.3.18
 supervisor = 3.3.1
 
 # Required by:
-# slapos.core==1.3.15
+# slapos.core==1.3.18
 uritemplate = 3.0.0
 
 # Required by:
-# slapos.core==1.3.15
+# slapos.core==1.3.18
 zope.interface = 4.2.0
 
 [networkcache]