Merge branch 'erp5-cluster'

Conflicts:
	software/slapos-master/instance-erp5.cfg.in
	software/slapos-master/software.cfg
	stack/erp5/buildout.cfg
	stack/erp5/instance.cfg.in

README.software.txt

+Instance descriptors
+====================
+
+.. contents::
+
+Abstract
+--------
+
+Instances generated from software release take parameters (typically to
+customise instantiation and instance behaviour) and publish results
+(typically allowing access to requester). This also applies not only to
+the root software instance, but to any instance requested by another
+instance.
+
+The structure of these values is constrained by how the Software Release
+was implemented, and must be documented so it can be used. Instance
+descriptors are intended to provide such documentation in a form
+allowing automated generation of a user interface to consult and provide
+parameters, and to consult published results.
+
+Specification
+-------------
+
+Instance parameters (=requests) and published results (=responses) are
+specified using json schemas, as defined in the following resources:
+
+- http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.20
+- http://tools.ietf.org/html/draft-zyp-json-schema-04
+- http://json-schema.org/
+
+These schema MUST ignore any technical overhead, such as
+serialisation-format-imposed layers (such as
+``<?xml ...?><instance></instance>`` level in ``xml`` serialisation,
+or the ``<prameter id="_">`` level in ``json-in-xml`` serialisation).
+
+Rules to define access to request & response schemas for a given
+software release and software type should be provided in a file whose
+name is deduced from the software release URL by appending ".json" to
+its path component. Components preceding path (scheme & netloc) MUST
+be preserved, components succeeding path (query & fragment) SHOULD be
+preserved. If a file actually resides at such URL, it MUST be valid
+json syntax and satisfy the following json schema::
+
+  {
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "Slapos Software Release instantiation descriptor",
+    "additionalProperties": false,
+    "properties": {
+      "name": {
+        "description": "A short human-friendly name for the sofware release",
+        "type": "string"
+      },
+      "description": {
+        "description": "A short description of the sofware release",
+        "type": "string"
+      },
+      "serialisation": {
+        "description": "How the parameters and results are serialised",
+        "required": true,
+        "enum": ["xml", "json-in-xml"],
+        "type": "string"
+      },
+      "software-type": {
+        "description": "Existing software types",
+        "required": true,
+        "patternProperties": {
+          ".*": {
+            "description": "Software type declaration",
+            "additionalProperties": false,
+            "properties": {
+              "description": {
+                "description": "A human-friendly description of the software type",
+                "type": "string"
+              },
+              "serialisation": {
+                "description": "How the parameters and results are serialised, if different from global setting",
+                "enum": ["xml", "json-in-xml"],
+                "type": "string"
+              },
+              "request": {
+                "required": true,
+                "description": "URL, relative to Software Release base path, of a json schema for values expected by instance of current software type",
+                "type": "string"
+              },
+              "response": {
+                "required": true,
+                "description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type",
+                "type": "string"
+              },
+              "index": {
+                "description": "Value to use instead of software type id to sort them (in order to display most relevant software types earlier in a list, for example)",
+                "type": "any"
+              }
+            },
+            "type": "object"
+          }
+        },
+        "type": "object"
+      }
+    },
+    "type": "object"
+  }
+
+Error handling
+--------------
+
+If instantiation descriptor does not exist, is not valid json or does
+not conform to this schema, it is ignored and a fall-back
+representation is used. Likewise, if a software type of an existing
+instance is not defined in software-type object or referenced schema
+does not exist or is invalid, the same fall-back representation is used
+for considered software type.
+
+A fall-back representation must allow full control to the user, without
+any guided editing: user is expected to serialise on his own and
+provides & receives raw strings as request and responses, respectively.
+
+Request schemas, when present and valid, MAY be used to validate user
+input.
+
+It SHOULD be made possible for user to violate the schema just as it is
+possible for existing instances to already violate schemas. These
+violation should be represented in a way which makes as much sense as
+possible: displaying recursively all object properties and iteratively
+all list items with as appropriate as possible fields, with a fall-back
+on free text input. These extra fields generated from existing data or
+created on-the-fly by the user MUST NOT prevent schema-conforming
+fields from being displayed and functional.
+

component/accords/buildout.cfg

+[buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../git/buildout.cfg
+  ../openssl/buildout.cfg
+  ../libuuid/buildout.cfg
+
+parts = accords
+
+[accords-source]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.gitorious.ow2.org/ow2-compatibleone/accords-platform.git
+
+[accords]
+# Part of Compatible One project
+# http://gitorious.ow2.org/ow2-compatibleone/accords-platform
+recipe = hexagonit.recipe.cmmi
+#url = http://gitorious.ow2.org/ow2-compatibleone/accords-platform/archive-tarball/master
+path = ${accords-source:location}/
+#md5sum = 
+# Replaces autogen.sh
+configure-command =
+  ./clean
+  libtoolize -c -f
+  aclocal -I ${libtool:location}/share/aclocal
+  automake -c -a -f --add-missing
+  autoreconf --install
+  ./configure
+configure-options =
+  --with-ssl=${openssl:location}
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+environment =
+  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include
+  LDFLAGS =-Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
+  LIBTOOL=libtool
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
+
+# Accords makefile does not install necessary scripts. Let's copy it
+[accords-scripts]
+recipe = plone.recipe.command
+requires = ${accords:location}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+origin = ${accords-source:location}/scripts
+destination = ${:location}
+command = ([ -e ${:origin}/co-broker ] && [ ! -e ${:destination}/co-broker ] && mkdir ${:destination} && cp -r ${:origin} ${:destination})

component/apache/buildout.cfg

@@ -17,15 +17,15 @@ extends =
 
 [apr]
 recipe = hexagonit.recipe.download
-version = 1.5.0
-md5sum = cc93bd2c12d0d037f68e21cc6385dc31
+version = 1.5.1
+md5sum = 5486180ec5a23efb5cae6d4292b300ab
 url = https://archive.apache.org/dist/apr/apr-${:version}.tar.bz2
 
 [apr-util]
 recipe = hexagonit.recipe.download
-version = 1.5.3
+version = 1.5.4
 url = https://archive.apache.org/dist/apr/apr-util-${:version}.tar.bz2
-md5sum = 6f3417691c7a27090f36e7cf4d94b36e
+md5sum = 2202b18f269ad606d70e1864857ed93c
 
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
@@ -109,9 +109,9 @@ make-targets =
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-version = 2.2.27
+version = 2.2.29
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 8faef0decf3fa7e69b2568eb2105a3d8
+md5sum = 579342fdeaa7b8b68d17fee91f8fab6e
 patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias

component/bash/buildout.cfg

@@ -9,6 +9,37 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz
 md5sum = 81348932d5da294953e15d4814c74dd1
+patches =
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-001#1ab682b4e36afa4cf1b426aa7ac81c0d
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-002#8fc22cf50ec85da00f6af3d66f7ddc1b
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-003#a41728eca78858758e26b5dea64ae506
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-004#bf8d53d227829d67235927689a03cc7a
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-005#c0c00935c8b8ffff76e8ab77e7be7d15
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-006#6f01e364cd092faa28dd7119f47ddb5f
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-007#dcf471d222bcd83283d3094e6ceeb6f8
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-008#f7553416646dc26c266454c78a916d36
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-009#7e73d2151f4064b484a4ba2c4b09960e
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-010#a275463d21735bb6d7161f9fbd320d8f
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-011#c17103ee20420d77e46b224c8d3fceda
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-012#3e2a057a19d02b3f92a3a09eacbc03ae
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-013#fb377143a996d4ff087a2771bc8332f9
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-014#1a1aaecc99a9d0cbc310e8e247dcc8b6
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-015#4f04387458a3c1b4d460d199f49991a8
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-016#90e759709720c4f877525bebc9d5dc06
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-017#11e4046e1b86070f6adbb7ffc89641be
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-018#cd5a9b46f5bea0dc0248c93c7dfac011
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-019#cff4dc024d9d3456888aaaf8a36ca774
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-020#167839c5f147347f4a03d88ab97ff787
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-021#1d350671c48dec30b34d8b81f09cd79d
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-022#11c349af66a55481a3215ef2520bec36
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-023#b3cb0d80fd0c47728264405cbb3b23c7
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-024#b5ea5600942acceb4b6f07313d2de74e
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-025#193c06f578d38ffdbaebae9c51a7551f
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-026#922578e2be7ed03729454e92ee8d3f3a
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-027#8ff6948b16f2db5c29b1b9ae1085bbe7
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-028#dd51fa67913b5dca45a702b672b3323f
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-029#0729364c977ef4271e9f8dfafadacf67
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-030#efb709fdb1368945513de23ccbfae053
 configure-options =
   --with-curses
 environment =

component/ca-certificates/buildout.cfg

@@ -11,10 +11,10 @@ parts =
 
 [ca-certificates]
 recipe = slapos.recipe.cmmi
-version = 20140325
+version = 20141019
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.xz
 patch-binary = ${patch:location}/bin/patch
-md5sum = 0436aba482091da310bd762e1deca8b4
+md5sum = f619282081c8bfc65ea64c37fa5285ed
 patches =
   ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
 patch-options = -p0

component/cloudooo/buildout.cfg

@@ -5,14 +5,9 @@ extends =
 parts =
   cloudooo
 
-develop +=
-  ${:parts-directory}/cloudooo-repository
-
-[cloudooo-check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
+[cloudooo-develop]
+recipe = zc.recipe.egg:develop
+setup = ${cloudooo-repository:location}
 
 [cloudooo-repository]
 recipe = slapos.recipe.build:gitclone
@@ -22,7 +17,6 @@ git-executable = ${git:location}/bin/git
 
 [cloudooo]
 recipe = zc.recipe.egg
-extra-paths = ${cloudooo-repository:location}
 eggs =
   ${lxml-python:egg}
   PasteScript
@@ -39,4 +33,3 @@ scripts =
   paster=cloudooo_paster
   runCloudoooUnitTest
   runCloudoooTestSuite
-ugly-depend-on = ${cloudooo-repository:recipe} ${cloudooo-repository:repository} ${cloudooo-check-recipe:command}

component/curl/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 
 [curl]
 recipe = slapos.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.37.1.tar.bz2
-md5sum = 95c627abcf6494f5abe55effe7cd6a57
+url = http://curl.haxx.se/download/curl-7.39.0.tar.bz2
+md5sum = 1efecb5b0e43c17d968f0d228bbbbbbd
 configure-options =
   --disable-static
   --disable-ldap

component/dbus/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 
 [dbus]
 recipe = slapos.recipe.cmmi
-url = http://dbus.freedesktop.org/releases/dbus/dbus-1.8.6.tar.gz
-md5sum = 6a08ba555d340e9dfe2d623b83c0eea8
+url = http://dbus.freedesktop.org/releases/dbus/dbus-1.8.8.tar.gz
+md5sum = b9f4a18ee3faa1e07c04aa1d83239c43
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options =
   --disable-static

component/file/buildout.cfg

@@ -8,8 +8,8 @@ extends =
 
 [file]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.astron.com/pub/file/file-5.19.tar.gz
-md5sum = e3526f59023f3f7d1ffa4d541335edab
+url = ftp://ftp.astron.com/pub/file/file-5.20.tar.gz
+md5sum = 5d5e13eb3e0e13839da869a31790faf2
 configure-options =
   --disable-static
 environment =

component/firefox/buildout.cfg

@@ -26,12 +26,12 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 30.0
+version = 33.1
 
 # MD5SUMs are available at :
 # https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/MD5SUMS
-x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 469be1f0aaf537f16e17c324bb5baa6b
-x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 a4979b84a7d68f77d4109282a468f041
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 1106b9c56da48a3e5c5ef965fea70078
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 4201d94f32b6b778456e5681cdcacd76
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
@@ -42,7 +42,7 @@ script =
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!${dash:location}/bin/dash
   cd %(location)s
-  export LD_LIBRARY_PATH=%(location)s:${alsa:location}/lib:${atk:location}/lib:${bzip2:location}/lib:${cairo:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXrender:location}/lib:${libXt:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libtool:location}/lib:${libuuid:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${pango:location}/lib:${p11-kit:location}/lib:${pixman:location}/lib:${xfixes:location}/lib:${zlib:location}/lib
+  export LD_LIBRARY_PATH=%(location)s:${alsa:location}/lib:${atk:location}/lib:${bzip2:location}/lib:${cairo:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcomposite:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXrender:location}/lib:${libXt:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libtool:location}/lib:${libuuid:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${p11-kit:location}/lib:${pango:location}/lib:${pixman:location}/lib:${xdamage:location}/lib:${xfixes:location}/lib:${zlib:location}/lib
   export PATH=${fontconfig:location}/bin:$PATH
   exec %(location)s/firefox $*""")
   wrapper.close()

component/gcc/buildout.cfg

@@ -4,6 +4,7 @@
 extends =
   ../m4/buildout.cfg
   ../gmp/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zip/buildout.cfg
 
 parts =
@@ -11,90 +12,92 @@ parts =
 
 [mpfr]
 recipe = slapos.recipe.cmmi
-url = http://www.mpfr.org/mpfr-3.0.1/mpfr-3.0.1.tar.bz2
-md5sum = bfbecb2eacb6d48432ead5cfc3f7390a
+url = http://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.xz
+md5sum = e3d203d188b8fe60bb6578dd3152e05c
 configure-options =
-  --with-gmp=${gmp-4:location}
+  --with-gmp=${gmp:location}
   --disable-static
 environment =
-  LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib
+  PATH=${xz-utils:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${gmp:location}/lib
 
 [mpc]
 recipe = slapos.recipe.cmmi
-url = http://www.multiprecision.org/mpc/download/mpc-0.9.tar.gz
-md5sum = 0d6acab8d214bd7d1fbbc593e83dd00d
+url = http://ftp.gnu.org/gnu/mpc/mpc-1.0.2.tar.gz
+md5sum = 68fadff3358fb3e7976c7a398a0af4c3
 configure-options =
-  --with-gmp=${gmp-4:location}
+  --with-gmp=${gmp:location}
   --with-mpfr=${mpfr:location}
   --disable-static
 environment =
-  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib
+  LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpfr:location}/lib
 
-[ppl]
+[isl]
 recipe = slapos.recipe.cmmi
-# we should use version 0.10.x for gcc-4.5
-url = http://bugseng.com/products/ppl/download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2
-md5sum = 5667111f53150618b0fa522ffc53fc3e
+url = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.12.2.tar.bz2
+md5sum = e039bfcfb6c2ab039b8ee69bf883e824
 configure-options =
-  --with-libgmp-prefix=${gmp-4:location}
-  --with-libgmpxx-prefix=${gmp-4:location}
+  --with-gmp-prefix=${gmp:location}
   --disable-static
 environment =
-  PATH=${m4:location}/bin:%(PATH)s
-  LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib
+  LDFLAGS=-Wl,-rpath=${gmp:location}/lib
 
-[cloog-ppl]
+[cloog]
 recipe = slapos.recipe.cmmi
-url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.9.tar.gz
-md5sum = 806e001d1b1a6b130069ff6274900af5
+url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-0.18.1.tar.gz
+md5sum = e34fca0540d840e5d0f6427e98c92252
 configure-options =
-  --with-gmp=${gmp-4:location}
-  --with-ppl=${ppl:location}
+  --with-gmp-prefix=${gmp:location}
+  --with-isl-prefix=${isl:location}
   --disable-static
 environment =
-  PATH=${m4:location}/bin:%(PATH)s
-  LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${ppl:location}/lib
+  LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${isl:location}/lib
 
-[gcc]
+[gcc-common]
 recipe = slapos.recipe.cmmi
-url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
-md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
-patches =
-  ${:_profile_base_location_}/gcc-multiarch.patch#819e6735270c8a432b0512b49f40219f
-patch-options = -p2
-configure-command = make clean \\; make distclean \\; ./configure
+url = http://ftp.gnu.org/gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2
+md5sum = 4df8ee253b7f3863ad0b86359cd39c43
+# make install does not work when several core are used
+make-targets = install -j1
+
+[gcc]
+<= gcc-common
 configure-options =
   --disable-bootstrap
-  --enable-languages="c,c++"
   --disable-multilib
-  --with-gmp=${gmp-4:location}
+  --with-gmp=${gmp:location}
   --with-mpfr=${mpfr:location}
   --with-mpc=${mpc:location}
-  --with-ppl=${ppl:location}
-  --with-cloog=${cloog-ppl:location}
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --enable-languages="c,c++"
+  --with-isl=${isl:location}
+  --with-cloog=${cloog:location}
 environment =
-  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
-# make install does not work when several core are used
-make-targets = install -j1
+  LDFLAGS=-Wl,-rpath=${cloog:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${isl:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
 
 [gcc-minimal]
-recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-core-4.5.4.tar.bz2
-md5sum = ca62e442629a9a7710f5d797bf1b521c
-patches =
-  ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
-patch-options = -p2
+<= gcc-common
 configure-options =
   --disable-bootstrap
-  --enable-languages=c
   --disable-multilib
-  --with-gmp=${gmp-4:location}
+  --with-gmp=${gmp:location}
   --with-mpfr=${mpfr:location}
   --with-mpc=${mpc:location}
-  --without-ppl
+  --enable-languages=c
+  --without-isl
   --without-cloog
 environment =
-  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib
-# make install does not work when several core are used
-make-targets = install -j1
+  LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
+
+[gcc-fortran]
+<= gcc-common
+configure-options =
+  --disable-bootstrap
+  --disable-multilib
+  --with-gmp=${gmp:location}
+  --with-mpfr=${mpfr:location}
+  --with-mpc=${mpc:location}
+  --enable-languages="c,c++,fortran"
+  --with-isl=${isl:location}
+  --with-cloog=${cloog:location}
+environment =
+  LDFLAGS=-Wl,-rpath=${cloog:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${isl:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib

component/gcc/gcc-java-pre-4.4.patch

-Patch for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50888
-
---- a/src/libjava/libjava/prims.cc.orig	2012-01-20 11:30:18.586157610 +0100
-+++ b/src/libjava/libjava/prims.cc	2012-01-20 11:30:58.192770947 +0100
-@@ -38,6 +38,14 @@
- #endif
- 
- #ifndef DISABLE_GETENV_PROPERTIES
-+#ifdef __GLIBC__
-+/* glibc 2.15+ provides even for C++ inline optimized ::isspace etc.
-+   Unfortunately those inlines are throw (), and call a function pointer
-+   (which is throw () too, but with -fnon-call-exceptions this results
-+   in a __cxa_call_unexpected call.  This macro disables the optimized
-+   version.  */
-+#define __NO_CTYPE 1
-+#endif
- #include <ctype.h>
- #include <java-props.h>
- #define PROCESS_GCJ_PROPERTIES process_gcj_properties()
---- a/src/libjava/prims.cc.orig	2012-01-20 11:30:23.042818341 +0100
-+++ b/src/libjava/prims.cc	2012-01-20 11:31:01.389433254 +0100
-@@ -38,6 +38,14 @@
- #endif
- 
- #ifndef DISABLE_GETENV_PROPERTIES
-+#ifdef __GLIBC__
-+/* glibc 2.15+ provides even for C++ inline optimized ::isspace etc.
-+   Unfortunately those inlines are throw (), and call a function pointer
-+   (which is throw () too, but with -fnon-call-exceptions this results
-+   in a __cxa_call_unexpected call.  This macro disables the optimized
-+   version.  */
-+#define __NO_CTYPE 1
-+#endif
- #include <ctype.h>
- #include <java-props.h>
- #define PROCESS_GCJ_PROPERTIES process_gcj_properties()

component/gettext/buildout.cfg

@@ -10,8 +10,8 @@ extends =
 
 [gettext]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.2.tar.xz
-md5sum = 1e6a827f5fbd98b3d40bd16b803acc44
+url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.3.tar.xz
+md5sum = 092c3f460553ceb4a638ff81d36434c4
 
 configure-options =
   --disable-static

component/ghostscript/buildout.cfg

@@ -33,8 +33,8 @@ environment =
 
 [ghostscript-9]
 <= ghostscript-common
-url = http://downloads.ghostscript.com/public/ghostscript-9.14.tar.bz2
-md5sum = 75f2e8ab8891d052ade9b64eb4eb5294
+url = http://downloads.ghostscript.com/public/ghostscript-9.15.tar.bz2
+md5sum = 0ee21d975c67a4883ba66bcc332418f5
 
 [ghostscript-fonts]
 recipe = hexagonit.recipe.download

component/glib/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 
 [glib]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/glib/2.38/glib-2.38.2.tar.xz
-md5sum = 26d1d08e478fc48c181ca8be44f5b69f
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/glib-2.40.0.tar.xz
+md5sum = 05fb7cb17eacbc718e90366a1eae60d9
 configure-options =
   --disable-static
   --disable-selinux
@@ -22,7 +22,7 @@ environment =
   PATH=${gettext:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-  LIBFFI_CFLAGS=-I${libffi:location}/lib/libffi-${libffi:version}/include
+  LIBFFI_CFLAGS=-I${libffi:location}/include
   LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
 
 [x86-cygwin-glib]

component/glibmm/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [glibmm]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.39/glibmm-2.39.3.tar.xz
-md5sum = 4cd63bdb100b4ddc4c69504d1cec62f7
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/glibmm-2.40.0.tar.xz
+md5sum = f62754f4f5c9030f8ff43c7ed20556c2
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig
 configure-options =
   --disable-documentation

component/gmp/buildout.cfg

@@ -6,21 +6,6 @@ extends =
 parts =
   gmp
 
-# we should use version 4.x for ppl-0.10
-[gmp-4]
-recipe = slapos.recipe.cmmi
-url = ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2
-md5sum = dd60683d7057917e34630b4a787932e8
-# GMP does not correctly detect achitecture so it have to be given
-# as slapos.recipe.cmmi is using shell expansion in subproceses
-# backticks are working
-configure-options =
-  --build=`uname -m`-linux
-  --enable-cxx
-  --disable-static
-environment =
-  PATH=${m4:location}/bin:%(PATH)s
-
 [gmp]
 recipe = slapos.recipe.cmmi
 version = 6.0.0a

component/gnutls/buildout.cfg

@@ -11,13 +11,13 @@ parts = gnutls
 
 [gpg-error]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.13.tar.bz2
-md5sum = fe0cfa7e15262ef8fdeee366109e9ff6
+url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.17.tar.bz2
+md5sum = b4f8d8b9ff14aed41f279aa844563539
 
 [gcrypt]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.1.tar.bz2
-md5sum = a5a5060dc2f80bcac700ab0236ea47dc
+url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.2.tar.bz2
+md5sum = b54395a93cb1e57619943c082da09d5f
 configure-options =
   --with-gpg-error-prefix=${gpg-error:location}
 environment =
@@ -26,8 +26,8 @@ environment =
 
 [gnutls]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.16.tar.xz
-md5sum = d9a3fb49121b49bc332bfe9c3f49b005
+url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.20.tar.xz
+md5sum = 637ef52191bf87a597240a49cc533972
 configure-options =
   --disable-static
   --disable-libdane

component/groonga/buildout.cfg

@@ -11,9 +11,12 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-version = 4.0.4
-url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
-md5sum = b00411d2efae3ddf03eb1ecb8575177f
+url = http://packages.groonga.org/source/groonga/groonga-4.0.7.tar.gz
+md5sum = 5d11546f921377d040f700bb74f1d7e4
+# temporary patch to respect more tokens in natural language mode.
+patches =
+  ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
+patch-options = -p1
 configure-options =
   --disable-static
   --disable-glibtest

component/groonga/groonga.patch

+diff --git a/lib/ii.c b/lib/ii.c
+index d10b84d..e20bdce 100644
+--- a/lib/ii.c
++++ b/lib/ii.c
+@@ -5695,7 +5695,9 @@ grn_ii_similar_search(grn_ctx *ctx, grn_ii *ii,
+     ? (optarg->similarity_threshold > GRN_HASH_SIZE(h)
+        ? GRN_HASH_SIZE(h)
+        : optarg->similarity_threshold)
+-    : (GRN_HASH_SIZE(h) >> 3) + 1;
++    : (GRN_HASH_SIZE(h) < 8
++       ? GRN_HASH_SIZE(h)
++       : ((GRN_HASH_SIZE(h) - 8) >> 3) + 8);
+   if (GRN_HASH_SIZE(h)) {
+     grn_id j, id;
+     int w2, rep;

component/gtk-2/buildout.cfg

@@ -50,8 +50,8 @@ environment =
 
 [harfbuzz]
 recipe = slapos.recipe.cmmi
-url = http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.28.tar.bz2
-md5sum = accbeb679f39d839038b95a87e40870e
+url = http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.35.tar.bz2
+md5sum = 531ee8650626ecddcd90b2a4637e31d4
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}
 configure-options =
   --disable-static
@@ -65,8 +65,8 @@ environment =
 
 [pango]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/pango/1.36/pango-1.36.1.tar.xz
-md5sum = 9e0d3a1ea395172f8c39ba98a4d2081a
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/pango-1.36.3.tar.xz
+md5sum = d9532826e95bdb374355deebc42441bb
 pkg_config_depends = ${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
 configure-options =
   --disable-static
@@ -79,7 +79,7 @@ environment =
 
 [gdk-pixbuf]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.7.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/gdk-pixbuf-2.30.7.tar.xz
 md5sum = 1195d26f14adfe99ff0878d37678a70a
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}
 configure-options =
@@ -96,8 +96,8 @@ environment =
 
 [atk]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/atk/2.11/atk-2.11.5.tar.xz
-md5sum = 4981a8f1e4627c07b00905216889439b
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/atk-2.12.0.tar.xz
+md5sum = 930238dec55fdbf8eda9975b44f07b76
 environment =
   PATH=${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
@@ -106,8 +106,8 @@ environment =
 
 [gtk-2]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.22.tar.xz
-md5sum = 5fbbfb7637bbd571a572a2dae0e736d2
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/gtk+-2.24.23.tar.xz
+md5sum = 0be39fbed4ca125645175cd6e22f2548
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig
 configure-options =
   --disable-static

component/gtkmm/buildout.cfg

@@ -30,7 +30,7 @@ environment =
 
 [pangomm]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnome.org/pub/gnome/sources/pangomm/2.34/pangomm-2.34.0.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/pangomm-2.34.0.tar.xz
 md5sum = 2c702caede167323c9ed9eed2b933098
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${glibmm:location}/lib/pkgconfig:${glibmm:pkg_config_depends}:${cairomm:location}/lib/pkgconfig
 configure-options =
@@ -43,7 +43,7 @@ environment =
 
 [atkmm]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/atkmm/2.22/atkmm-2.22.7.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/atkmm-2.22.7.tar.xz
 md5sum = fec7db3fc47ba2e0c95d130ec865a236
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:
 configure-options =

component/gzip/buildout.cfg

@@ -10,3 +10,12 @@ url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.6.tar.xz
 md5sum = da981f86677d58a106496e68de6f8995
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
+patch-options = -p1
+# The --rsyncable patch is from debian/ubuntu,
+# specifically https://launchpad.net/ubuntu/+source/gzip/1.6-3ubuntu1
+# It is required to minimize the bandwidth used by rsync.
+# For an explanation, see http://beeznest.wordpress.com/2005/02/03/rsyncable-gzip/
+# Hunks for .texi files have been removed to avoid a dependency on makeinfo.
+patches =
+  ${:_profile_base_location_}/rsyncable.diff#0587af03a5580e2b7b4007469ee2b601
+

component/haproxy/buildout.cfg

@@ -11,8 +11,8 @@ parts = haproxy
 
 [haproxy]
 recipe = slapos.recipe.cmmi
-url = http://www.haproxy.org/download/1.5/src/haproxy-1.5.3.tar.gz
-md5sum = e999a547d57445d5a5ab7eb6a06df9a1
+url = http://www.haproxy.org/download/1.5/src/haproxy-1.5.8.tar.gz
+md5sum = 7bffa1afa069d90ce03b7cd9aa0557cd
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/hookbox/buildout.cfg

 [buildout]
 parts =
   hookbox
-find-links =
-  http://www.nexedi.org/static/packages/source/
+
 versions = versions
 
 [versions]

component/icu/buildout.cfg

@@ -9,3 +9,6 @@ url = http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz
 md5sum = ea93970a0275be6b42f56953cd332c17
 configure-command = source/configure
 configure-options = --prefix=${:location}
+
+[icu]
+<= icu4c

component/inkscape/buildout.cfg

@@ -34,12 +34,9 @@ environment =
 
 [inkscape]
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/inkscape/files/inkscape/0.48.4/inkscape-0.48.4.tar.bz2
-md5sum = 47bd8546e42ba396624eef9eb66b9b6c
+url = http://sourceforge.net/projects/inkscape/files/inkscape/0.48.5/inkscape-0.48.5.tar.bz2
+md5sum = 431cda5cd40cd4fdf2b89db1bdcce61f
 pkg_config_depends = ${gtkmm:location}/lib/pkgconfig:${gtkmm:pkg_config_depends}:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
-patch-options = -p0
-patches =
-  ${:_profile_base_location_}/inkscape-0.48.4.patch#1bdb1154e98c08cb676445b625d7cec0
 configure-options =
   --disable-lcms
   --without-gnome-vfs

component/inkscape/inkscape-0.48.4.patch

---- src/widgets/desktop-widget.h~       2011-07-08 20:25:09.000000000 +0200
-+++ src/widgets/desktop-widget.h        2014-01-17 13:22:48.503773743 +0100
-@@ -239,7 +239,7 @@
- private:
-     GtkWidget *tool_toolbox;
-     GtkWidget *aux_toolbox;
--    GtkWidget *commands_toolbox,;
-+    GtkWidget *commands_toolbox;
-     GtkWidget *snap_toolbox;
- 
-     static void init(SPDesktopWidget *widget);

component/java/buildout.cfg

@@ -3,51 +3,31 @@
 parts =
   java
 
-[jdk-6u27-no-user-interaction-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-filename = jdk-6u27-no-user-interaction.patch
-md5sum = 4c4303240647a114d07f3c411b2e6b5b
-
 [java]
 <= java-re
 
 [java-re]
-<= java-re-1.6.0
-
-[java-sdk]
-<= java-sdk-1.6.0
+<= java-re-7
 
-[java-re-1.6.0]
+[java-re-7]
 recipe = slapos.recipe.build
 slapos_promisee =
   directory:bin
   directory:lib
   directory:man
   directory:plugin
-  directory:javaws
   file:lib/rt.jar
   file:bin/java
-# http://java.com/en/download/manual_v6.jsp
-x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68284 7eda40e790de1a907d591b62949b6e72
-x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68286 839548714931443ba89719a995ece846
+# http://java.com/en/download/manual_java7.jsp
+x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=97798 90a6b9e2a32d06c18a3f16b485f0d1ea
+x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=97800 7605134662f6c87131eca5745895fe84
 script =
-  import glob
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  download_file = self.download(self.options['url'], self.options.get('md5sum'))
-  extract_dir = tempfile.mkdtemp(self.name)
-  os.chdir(extract_dir)
-  (download_dir, filename) = os.path.split(download_file)
-  auto_extract_bin = os.path.join(extract_dir, filename)
-  shutil.move(download_file, auto_extract_bin)
-  os.chmod(auto_extract_bin, 0755)
-  subprocess.call([auto_extract_bin])
-  self.cleanup_dir_list.append(extract_dir)
+  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
   workdir = guessworkdir(extract_dir)
-  self.copyTree(glob.glob(os.path.join(workdir, "jre1.6.0_*"))[0], "%(location)s")
+  self.copyTree(workdir, "%(location)s")
 
-[java-re-1.7.0]
+[java-re-8]
 recipe = slapos.recipe.build
 slapos_promisee =
   directory:bin
@@ -56,9 +36,9 @@ slapos_promisee =
   directory:plugin
   file:lib/rt.jar
   file:bin/java
-# http://java.com/en/download/manual.jsp?locale=en
-x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68234 ea99bedd9db33e9e2970f4b70abd1e4b
-x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68236 5aa9bd26cdf1fa6afd2b15826b4ba139
+# http://java.com/en/download/manual_java7.jsp
+x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=97358 22d970566c418499d331a2099d77c548
+x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=97360 f4f7f7335eaf2e7b5ff455abece9d5ed
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
   extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))

component/jemalloc/buildout.cfg

+[buildout]
+extends = ../readline/buildout.cfg
+parts =
+  jemalloc
+
+[jemalloc]
+recipe = slapos.recipe.cmmi
+url = http://www.canonware.com/download/jemalloc/jemalloc-3.6.0.tar.bz2
+md5sum = e76665b63a8fddf4c9f26d2fa67afdf2
+configure-options =
+  --disable-static
+  --enable-readline
+environment =
+  CPPFLAGS=-I${readline:location}/include -I${ncurses:location}/include
+  LDFLAGS=-L${buildout:parts-directory}/${:_buildout_section_name_} -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib

component/kumo/buildout.cfg

@@ -6,7 +6,6 @@ extends =
   ../zlib/buildout.cfg
 
 parts = kumo
-find-links = http://www.nexedi.org/static/packages/source/
 
 [kumo]
 recipe = slapos.recipe.cmmi

component/libatlas/add-rpath.patch

+--- ATLAS/CONFIG/src/config.c.orig	2014-07-10 18:22:02.000000000 +0200
++++ ATLAS/CONFIG/src/config.c	2014-08-22 13:28:04.990976246 +0200
+@@ -455,10 +455,10 @@
+ 
+    if (OSIsWin(OS))
+       OSextra = "-lgcc";
+-   i = strlen(path) + strlen(libnam) + strlen(OSextra) + 2 + 2 + 1 + 1 + 1;
++   i = strlen(path) * 2 + strlen(libnam) + strlen(OSextra) + 2 + 11 + 2 + 1 + 1 + 1 + 1;
+    sp = malloc(i*sizeof(char));
+    assert(sp);
+-   sprintf(sp, "-L%s -l%s %s", path, libnam, OSextra);
++   sprintf(sp, "-L%s -Wl,-rpath=%s -l%s %s", path, path, libnam, OSextra);
+    return(sp);
+ }
+ 

component/libatlas/buildout.cfg

+[buildout]
+parts =
+  libatlas
+
+[lapack-download]
+recipe = hexagonit.recipe.download
+version = 3.5.0
+filename = lapack-${:version}.tgz
+url = http://www.netlib.org/lapack/${:filename}
+md5sum = b1d3e3e425b2e44a06760ff173104bdf
+download-only = true
+mode = 0644
+
+[libatlas]
+recipe = slapos.recipe.cmmi
+version = 3.10.2
+url = http://downloads.sourceforge.net/project/math-atlas/Stable/${:version}/atlas${:version}.tar.bz2
+md5sum = a4e21f343dec8f22e7415e339f09f6da
+# http://stackoverflow.com/questions/14592401/atlas-install-really-need-to-get-past-cpu-throttle-check
+# http://sourceforge.net/p/math-atlas/support-requests/886/
+patches =
+  ${:_profile_base_location_}/skip-throttle-check.patch#17c8471d67c99fac80ace05273ce0817
+  ${:_profile_base_location_}/add-rpath.patch#44672b68960a14b3fb4970cd1e76f8fe
+patch-options = -p1
+configure-command =
+  mkdir build
+  cd build
+  ../configure
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --with-netlib-lapack-tarfile=${lapack-download:location}/${lapack-download:filename}
+  --shared
+  -b "$(uname -m | grep -q 64 && echo 64 || echo 32)"
+  -Fa alg '-fPIC'
+make-options =
+  -C build
+environment =
+  PATH=${gcc-fortran:location}/bin:%(PATH)s
+  LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64

component/libatlas/skip-throttle-check.patch

+diff --git a/CONFIG/src/probe_arch.c b/CONFIG/src/probe_arch.c
+index 75edef9..f440bf6 100644
+--- a/CONFIG/src/probe_arch.c
++++ b/CONFIG/src/probe_arch.c
+@@ -238,8 +238,7 @@ int main(int nargs, char **args)
+       printf("CPU MHZ=%d\n",
+              ProbeOneInt(OS, asmd, targ, "-m", "CPU MHZ=", &sure));
+    if (flags & Pthrottle)
+-      printf("CPU THROTTLE=%d\n",
+-             ProbeOneInt(OS, asmd, targ, "-t", "CPU THROTTLE=", &sure));
++      printf("CPU THROTTLE=0\n");
+    if (flags & P64)
+    {
+       if (asmd == gas_x86_64)

component/libffi/buildout.cfg

@@ -4,10 +4,13 @@ parts =
 
 [libffi]
 recipe = slapos.recipe.cmmi
-version = 3.0.13
+version = 3.1
 url = ftp://sourceware.org/pub/libffi/libffi-${:version}.tar.gz
-md5sum = 45f3b6dbc9ee7c7dfbbbc5feba571529
+md5sum = f5898b29bbfd70502831a212d9249d10
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/includedir.diff#e430307d16a0d215a24ec2acff23d184
 configure-options =
   --disable-static
 # on x86_64 OpenSuse, libraries are installed under parts/libffi/lib64.

component/libffi/includedir.diff

+Index: b/libffi.pc.in
+===================================================================
+--- a/libffi.pc.in
++++ b/libffi.pc.in
+@@ -2,10 +2,10 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ toolexeclibdir=@toolexeclibdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=@includedir@
+ 
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
+ Version: @PACKAGE_VERSION@
+-Libs: -L${toolexeclibdir} -lffi
++Libs: -L${libdir} -lffi
+ Cflags: -I${includedir}
+Index: b/include/Makefile.am
+===================================================================
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
+ DISTCLEANFILES=ffitarget.h
+ EXTRA_DIST=ffi.h.in ffi_common.h
+ 
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+Index: b/include/Makefile.in
+===================================================================
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -314,7 +314,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+ DISTCLEANFILES = ffitarget.h
+ EXTRA_DIST = ffi.h.in ffi_common.h
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+ all: all-am
+ 

component/libpng/buildout.cfg

@@ -23,10 +23,10 @@ md5sum = 4efba67fa5aa2b785c6fcec2cc3e90c9
 
 [libpng15]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.18.tar.xz
-md5sum = 23fb6a0e9f4dbaab7b34b6fd317a4f2d
+url = http://download.sourceforge.net/libpng/libpng-1.5.19.tar.xz
+md5sum = 1e2afb372b9979b2133829ee8136f30f
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.6.12.tar.xz
-md5sum = ee752da8aa75076500e4cf31318e636e
+url = http://download.sourceforge.net/libpng/libpng-1.6.14.tar.xz
+md5sum = aefd9fda2178acab908707737174a0cd

component/libreoffice-bin/buildout.cfg

@@ -6,20 +6,17 @@ extends =
 parts =
   libreoffice-bin
 
-find-links =
-  http://www.nexedi.org/static/packages/source/
-
 [libreoffice-bin]
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-version = 4.2.5.2
+version = 4.3.4.1
 url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz
 # supported architectures md5sums
-md5sum_x86 = 43b8a8e27fa655d487123c59e97083bc
-md5sum_x86-64 = 0da0e833b3ee2227c25db2c658bd96cc
+md5sum_x86 = 6fddbe8508fd2e6d5b942ad360013da2
+md5sum_x86-64 = b3b0eab681d2cd2d22e3c065530b36c2
 
 # where office code can be found?
-officedir = libreoffice4.2
+officedir = libreoffice4.3
 
 # script to install
 script =

component/librsvg/buildout.cfg

@@ -12,7 +12,7 @@ extends =
 
 [libcroco]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.8.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/libcroco-0.6.8.tar.xz
 md5sum = 767e73c4174f75b99695d4530fd9bb80
 configure-options =
   --disable-static
@@ -23,7 +23,7 @@ environment =
 
 [librsvg]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-2.40.2.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/librsvg-2.40.2.tar.xz
 md5sum = acdecdb9f08f3bf662a68bf7dafb8b82
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${zlib:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig
 configure-options =

component/libsigc/buildout.cfg

@@ -9,7 +9,7 @@ parts =
 
 [libsigc]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.3/libsigc++-2.3.1.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/libsigc++-2.3.1.tar.xz
 md5sum = 06a0569e8ba161d3428e7daa838682f8
 configure-options =
   --disable-documentation

component/libtasn1/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [libtasn1]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-4.0.tar.gz
-md5sum = d3d2d9bce3b6668b9827a9df52635be1
+url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.2.tar.gz
+md5sum = 414df906df421dee0a5cf7548788d153
 configure-options =
   --disable-static
   --disable-gtk-doc-html

component/mariadb/buildout.cfg

@@ -4,26 +4,26 @@
 [buildout]
 extends =
   ../cmake/buildout.cfg
-  ../zlib/buildout.cfg
   ../groonga/buildout.cfg
+  ../jemalloc/buildout.cfg
   ../libaio/buildout.cfg
   ../libevent/buildout.cfg
+  ../libxml2/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
+  ../pcre/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../readline/buildout.cfg
-  ../libxml2/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts =
   mariadb
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 10.0.13
+version = 10.0.14
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 7b2e88864b51d7d0607dc37abb8a0adb
-# compile directory is required to build mysql plugins.
-keep-compile-dir = true
+md5sum = 80fea71de54a9cfa7f5508df53d3f06d
 patch-options = -p0
 patches =
   ${:_profile_base_location_}/mariadb_10.0.8_create_system_tables__no_test.patch#a176d491cf45fccd53ee397c70393bc4
@@ -37,34 +37,40 @@ configure-options =
   -DWITH_ZLIB=system
   -DWITH_READLINE=0
   -DWITH_PIC=1
+  -DWITH_PCRE=system
   -DENABLE_DTRACE=0
   -DWITH_EXTRA_CHARSETS=complex
   -DWITH_EMBEDDED_SERVER=0
   -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
   -DWITHOUT_DAEMON_EXAMPLE=1
-  -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-  -DCMAKE_CXX_FLAGS="-I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-  -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
+  -DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${zlib:location}/include"
+  -DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${zlib:location}/include"
+  -DCMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${zlib:location}/lib
   -DWITHOUT_TOKUDB=true
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  CMAKE_INCLUDE_PATH=${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline5:location}/include:${zlib:location}/include
-  CMAKE_LIBRARY_PATH=${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
-  LDFLAGS=-L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${zlib:location}/lib
+  CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${zlib:location}/include
+  CMAKE_LIBRARY_PATH=${libaio:location}/lib:{libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${zlib:location}/lib
+  LDFLAGS=-L${jemalloc:location}/lib -Wl,-rpath=${jemalloc:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${pcre:location}/lib -L${zlib:location}/lib
 
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/mroonga/mroonga-4.04.tar.gz
-md5sum = a89987dad7b3e1d99014492e6135eec6
+url = http://packages.groonga.org/source/mroonga/mroonga-4.07.tar.gz
+md5sum = fcfca7934b1f8df981fca579d3cd41bd
+configure-command = mkdir fake_mariadb_source && ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql && ./configure
 configure-options =
-  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --with-mysql-source=fake_mariadb_source
   --with-mysql-config=${mariadb:location}/bin/mysql_config
   --disable-static
   --disable-document
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/mroonga_boolean.patch#36645770ae612515b74b90884ecc59fc
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${groonga:location}/include/groonga
+  CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include
   LDFLAGS=-L${groonga:location}/lib
   PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig

component/mariadb/mroonga_boolean.patch

+diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
+index dd9967d..c105a62 100644
+--- a/ha_mroonga.cpp
++++ b/ha_mroonga.cpp
+@@ -7678,7 +7678,7 @@ grn_rc ha_mroonga::generic_ft_init_ext_prepare_expression_in_boolean_mode(
+ 
+   const char *keyword, *keyword_original;
+   uint keyword_length, keyword_length_original;
+-  grn_operator default_operator = GRN_OP_OR;
++  grn_operator default_operator = GRN_OP_ADJUST;
+   grn_bool weight_specified = false;
+   keyword = keyword_original = key->ptr();
+   keyword_length = keyword_length_original = key->length();

component/mesa/buildout.cfg

 [buildout]
 extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../bison/buildout.cfg
+  ../flex/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../libtool/buildout.cfg
+  ../pkgconfig/buildout.cfg
   ../xorg/buildout.cfg
 
 parts =
   mesa
 
-[libdrm]
-#does not seem to compile with -jX
-recipe = slapos.recipe.cmmi
-url = http://dri.freedesktop.org/libdrm/libdrm-2.4.26.tar.bz2
-md5sum = 062569426773f69b11a47a7712bba770
-configure-options = 
-  --enable-nouveau-experimental-api
-environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${xorg-libpthread-stubs:location}/lib/pkgconfig:${pciaccess:location}/lib/pkgconfig
-
-
 [mesa]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.freedesktop.org//pub/mesa/7.11/MesaLib-7.11.tar.bz2
-md5sum = ff03aca82d0560009a076a87c888cf13
+url = ftp://ftp.freedesktop.org/pub/mesa/10.3.2/MesaLib-10.3.2.tar.bz2
+md5sum = c0a2a975899c4e7485124b388c16cd2f
 configure-options =
   --disable-static
-  --disable-driglx-direct
-  --disable-glu
-  --disable-glw
-  --disable-glut
+  --disable-dri
+  --disable-dri3
   --disable-egl
+  --disable-gbm
+  --disable-xvmc
+  --disable-vdpau
+  --enable-xlib-glx
+  --disable-gallium-gbm
+  --disable-shared-glapi
+  --disable-driglx-direct
   --disable-gallium-llvm
   --with-gallium-drivers=
   --with-dri-drivers=
-  --with-expat=${libexpat:location}
-  --with-driver=xlib
 environment =
-  PATH=${pkgconfig:location}/bin:${makedepend:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${libdrm:location}/lib/pkgconfig:${dri2proto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${pciaccess:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig
-  CPPFLAGS=-I${libexpat:location}/include -I${libdrm:location}/include/libdrm -I${libdrm:location}/include -I${xproto:location}/include -I${libX11:location}/include -I${libXext:location}/include/ -I${xextproto:location}/include
-  LDFLAGS=-L${libexpat:location}/lib
-  PYTHON=${buildout:executable}
+  PATH=${autoconf:location}/bin:${bison:location}/bin:${flex:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  PYTHON2=${buildout:executable}
+  ACLOCAL=${automake:location}/bin/aclocal -I${libtool:location}/share/aclocal -I${pkgconfig:location}/share/aclocal
+  AUTOCONF=${autoconf:location}/bin/autoconf
+  AUTOMAKE=${automake:location}/bin/automake
+
+[glu]
+recipe = slapos.recipe.cmmi
+# tar.bz2 cannot be well extracted why ?
+url = ftp://ftp.freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz
+md5sum = bbc57d4fe3bd3fb095bdbef6fcb977c4
+configure-options =
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${mesa:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig

component/messagepack/buildout.cfg

 [buildout]
 parts = messagepack
-find-links = http://www.nexedi.org/static/packages/source/
 
 [messagepack]
 recipe = slapos.recipe.cmmi

component/nginx/buildout.cfg

 [buildout]
 extends =
-  ../pcre/buildout.cfg
-  ../zlib/buildout.cfg
-  ../openssl/buildout.cfg
   ../coreutils/buildout.cfg
   ../git/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../openssl/buildout.cfg
+  ../pcre/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts = nginx-output
 
-[nginx]
+[nginx-common]
 recipe = slapos.recipe.cmmi
-url = http://nginx.org/download/nginx-1.7.2.tar.gz
-md5sum = 68949a7a0bad4615e9b737fc4e6047f2
+url = http://nginx.org/download/nginx-1.7.6.tar.gz
+md5sum = dd444e5333e0d324bec480e2ff67870a
+
+[nginx]
+<= nginx-common
 configure-options=
   --with-ipv6
   --with-http_ssl_module
   --with-mail
   --with-mail_ssl_module
-  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
-  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include"
+  --with-ld-opt="-L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  --with-cc-opt="-I ${openssl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
 
-[webdav-module]
+[nginx-dav-ext-module]
 recipe = hexagonit.recipe.download
-url = https://github.com/arut/nginx-dav-ext-module/archive/master.zip
+url = https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz
 strip-top-level-dir = true
-#md5sum =
+md5sum = 2cb502dbda335be4ebd5fed0b3182bae
 mode = 0644
 
 [nginx-webdav]
-recipe = slapos.recipe.cmmi
-url = http://nginx.org/download/nginx-1.5.3.tar.gz
-md5sum = 1e735dd6a6ade2b5c20e924b67c3d355
+<= nginx-common
 configure-options =
   --with-ipv6
   --with-http_ssl_module
   --with-mail
   --with-mail_ssl_module
-  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L ${libexpat:location}/lib"
-  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include -I ${libexpat:location}/include"
+  --error-log-path=var/log/nginx.error.log
+  --with-ld-opt=" -L ${libexpat:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  --with-cc-opt="-I ${libexpat:location}/include -I ${openssl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
   --with-http_dav_module 
-  --add-module='${webdav-module:location}'
+  --add-module='${nginx-dav-ext-module:location}'
 
 [nginx-output]
 # Shared binary location to ease migration
@@ -50,12 +53,6 @@ command = ${coreutils-output:test} -x ${:nginx} -a -f ${:mime}
 nginx = ${nginx:location}/sbin/nginx
 mime = ${nginx:location}/conf/mime.types
 
-
-[nginx-unstable]
-<= nginx
-url = http://nginx.org/download/nginx-1.3.15.tar.gz
-md5sum = ded252047393c79a31b0862e9166a065
-
 [hexaglobe-nginx-module]
 recipe = hexagonit.recipe.download
 url = http://easicloud-p.cdn.hexaglobe.net/nginx-easicloud.tar.gz

component/numpy/buildout.cfg

+[buildout]
+
+extends =
+  ../gcc/buildout.cfg
+  ../libatlas/buildout.cfg
+
+version = versions
+
+[numpy-env]
+PATH = ${gcc-fortran:location}/bin:%(PATH)s
+BLAS = ${libatlas:location}/lib/libcblas.a
+LAPACK = ${libatlas:location}/lib/liblapack.a
+ATLAS = ${libatlas:location}/lib/libatlas.a
+
+[numpy]
+recipe = zc.recipe.egg:custom
+egg = numpy
+environment = numpy-env
+# no need to add libatlas location because they are statically linked.
+rpath =
+  ${gcc-fortran:location}/lib
+  ${gcc-fortran:location}/lib64

component/openoffice-bin/buildout.cfg

 [buildout]
 parts =
   openoffice-bin
-find-links =
-  http://www.nexedi.org/static/packages/source/
 
 [openoffice-bin]
 # XXX: This section and recipe have to be reviewed against using

component/openssl/buildout.cfg

@@ -16,8 +16,8 @@ parts =
 
 [openssl]
 recipe = slapos.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1i.tar.gz
-md5sum = c8dc151a671b9b92ff3e4c118b174972
+url = https://www.openssl.org/source/openssl-1.0.1j.tar.gz
+md5sum = f7175c9cd3c39bb1907ac8bba9df8ed3
 patch-binary = ${patch:location}/bin/patch
 patches =
   ${:_profile_base_location_}/openssl-nodoc.patch#b4887a7b4e18402447bc6227d2493b92

component/p11-kit/buildout.cfg

@@ -9,8 +9,8 @@ extends =
 
 [p11-kit]
 recipe = slapos.recipe.cmmi
-url = http://p11-glue.freedesktop.org/releases/p11-kit-0.20.2.tar.gz
-md5sum = 757b97ee4ac0ce598661a90cd784c4f1
+url = http://p11-glue.freedesktop.org/releases/p11-kit-0.21.1.tar.gz
+md5sum = 4eea22e3b58643de141990deaae6646b
 configure-options =
   --disable-static
   --disable-doc-html

component/pcre/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [pcre]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.35.tar.bz2
-md5sum = 6aacb23986adccd9b3bc626c00979958
+url = http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.36.tar.bz2
+md5sum = b767bc9af0c20bc9c1fe403b0d41ad97
 configure-options =
   --disable-static
   --enable-unicode-properties

component/percona-toolkit/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 
 [percona-toolkit]
 recipe = slapos.recipe.cmmi
-version = 2.2.10
-url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz
-md5sum = 9a5f464942c1aafe89a982c031e5e9fa
+version = 2.2.12
+url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/tarball/percona-toolkit-${:version}.tar.gz
+md5sum = 7c39b06b97ebab97ae5d3c78d1186258
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/phantomjs/buildout.cfg

@@ -15,8 +15,8 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-x86 = https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-i686.tar.bz2 2e94dcad7660d24309abe01011461693
-x86-64 = https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2 8075fa873d8741c7ae9093c80a589a1f
+x86 = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-i686.tar.bz2 9c1426eef5b04679d65198b1bdd6ef88
+x86-64 = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 f278996c3edd0e8d8ec4893807f27d71
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')

component/pillow/buildout.cfg

 [buildout]
 extends =
   ../freetype/buildout.cfg
+  ../jbigkit/buildout.cfg
+  ../lcms/buildout.cfg
   ../libjpeg/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../webp/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -12,13 +16,25 @@ recipe = zc.recipe.egg:custom
 egg = Pillow
 include-dirs =
   ${freetype:location}/include
+  ${jbigkit:location}/include
+  ${lcms2:location}/include
   ${libjpeg:location}/include
+  ${libtiff:location}/include
+  ${webp:location}/include
   ${zlib:location}/include
 library-dirs =
   ${freetype:location}/lib
+  ${jbigkit:location}/lib
+  ${lcms2:location}/lib
   ${libjpeg:location}/lib
+  ${libtiff:location}/lib
+  ${webp:location}/lib
   ${zlib:location}/lib
 rpath =
   ${freetype:location}/lib
+  ${jbigkit:location}/lib
+  ${lcms2:location}/lib
   ${libjpeg:location}/lib
+  ${libtiff:location}/lib
+  ${webp:location}/lib
   ${zlib:location}/lib

component/pkgconfig/buildout.cfg

@@ -14,19 +14,19 @@ extends =
 
 [pkgconfig]
 recipe = slapos.recipe.cmmi
-url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz
-md5sum = 5392b4e3372879c5bf856173b418d6a2
+url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
+md5sum = aa3c86e67551adc3ac865160e34a2a0d
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # build pkg-config twice so that second configure can use pkg-config
 # to compute GLIB_CFLAGS and GLIB_LIBS.
 configure-command =
-  ./configure --prefix=${:location} --with-installed-glib --with-installed-popt && make && make install && ./configure
+  ./configure --prefix=${:location} --with-installed-glib --with-installed-popt && make && ./configure
 configure-options =
   --prefix=${:location}
   --with-installed-glib
   --with-installed-popt
 environment =
-  PATH=${:location}/bin:%(PATH)s
+  PATH=.:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
   CPPFLAGS=-I${glib:location}/include -I${popt:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib

component/python-cryptography/buildout.cfg

 [buildout]
 extends =
-  ../libffi/buildout.cfg
   ../openssl/buildout.cfg
   ../pkgconfig/buildout.cfg
 
@@ -11,9 +10,17 @@ parts =
 recipe = zc.recipe.egg:custom
 egg = cryptography
 environment = python-cryptography-env
+setup-eggs = ${python-cryptography-prep:eggs}
 
 [python-cryptography-env]
 PATH = ${pkgconfig:location}/bin:%(PATH)s
-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
+PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig
+LD_LIBRARY_PATH = ${openssl:location}/lib
+CPATH = ${openssl:location}/include
+
+[python-cryptography-prep]
+recipe = zc.recipe.egg
+eggs =
+  ${python-cffi:egg}
+  pycparser
+  six

component/rdiff-backup/buildout.cfg

@@ -14,6 +14,8 @@ library-dirs =
   ${librsync:location}/lib/
 rpath =
   ${librsync:location}/lib/
+# If you need another release, override this link
+# and pin the egg in the [versions] section of the stack or SR.
 find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1.0.5.tar.gz/fa2a165fa07a94be52c52e3545bc7758/rdiff-backup-1.0.5.tar.gz
 
 [rdiff-backup]

component/readline/buildout.cfg

@@ -7,6 +7,21 @@ parts =
 [readline5]
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
+patches =
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-001#9d4d41622aa9b230c57f68548ce87d8f
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-002#f03e512d14206e37f7d6a748b56b9476
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-003#252b42d8750f1a94b6bdf086612dceb2
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-004#a32333c2e603a3ed250514e91050e552
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-005#8106796c09b789523a3a78ab69c04b6d
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-006#512188e2bf0837f7eca19dbf71f182ae
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-007#ac17aca62eb6fb398c9f2fe9de540aff
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-008#2484c392db021905f112cf97a94dfd4c
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-009#fc6eb35d07914fae5c57d49c12483ff7
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-010#7a2bf3dc7ac7680b1461a5701100e91b
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-011#ef6cef6822663470f6ac8c517c5a7ec6
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-012#e3e9f441c8111589855bc363e5640f6c
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-013#3e2e5f543ed268a68fd1fa839faade1a
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-014#a1be30e1c6f1099bb5fcef00a2631fb8
 md5sum = e39331f32ad14009b9ff49cc10c5e751
 configure-options =
   --enable-multibyte
@@ -14,8 +29,17 @@ configure-options =
 
 [readline]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz
-md5sum = 67948acb2ca081f23359d0256e9a271c
+url = http://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz
+md5sum = 33c8fb279e981274f485fd91da77e94a
+patches =
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-001#4343f5ea9b0f42447f102fb61576b398
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-002#700295212f7e2978577feaee584afddb
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-003#af4963862f5156fbf9111c2c6fa86ed7
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-004#11f9def89803a5052db3ba72394ce14f
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-005#93721c31cd225393f80cb3aadb165544
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-006#71dc6ecce66d1489b96595f55d142a52
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-007#062a08ed60679d3c4878710b3d595b65
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-008#ee1c04072154826870848d8b218d7b04
 configure-options =
   --enable-multibyte
   --disable-static

component/ruby/buildout.cfg

@@ -7,6 +7,10 @@ extends =
   ../readline/buildout.cfg
   ../ncurses/buildout.cfg
   ../libyaml/buildout.cfg
+  ../openssl/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../readline/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts = ruby
 
@@ -15,13 +19,15 @@ recipe = slapos.recipe.cmmi
 url = http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
 md5sum = bc0c715c69da4d1d8bd57069c19f6c0e
 configure-options =
-  --enable-shared --enable-rpath
+  --enable-shared --enable-rpath --disable-install-doc
+  --enable-pthread --enable-ipv6
+  --with-ext=bigdecimal,continuation,curses,date,digest,dl,etc,fcntl,iconv,io,json,nkf,openssl,pathname,psych,pty,racc,readline,ripper,sdbm,socket,stringio,strscan,syck,syslog,zlib
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw  -I${gdbm:location}/include -I${openssl:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${libyaml:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib  -L${gdbm:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libyaml:location}/lib   -Wl,-rpath=${ncurses:location}/lib  -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib
+  PKG_CONFIG_PATH=${libyaml:location}/lib/
 
 [ruby-1.9]
 <= ruby-1.9.3
 
 [ruby]
-<= ruby-1.9

component/slapos/buildout.cfg

@@ -2,7 +2,6 @@
 [buildout]
 extends =
   ../../stack/slapos.cfg
-  ../../stack/shacache-client.cfg
   ../gdbm/buildout.cfg
   ../gettext/buildout.cfg
   ../m4/buildout.cfg
@@ -79,7 +78,9 @@ rpath =
 [slapos]
 recipe = z3c.recipe.scripts
 eggs =
-  ${python-openssl:egg}
+  ${python-cffi:egg}
+  ${python-cryptography:egg}
+  pyOpenSSL
   slapos.libnetworkcache
   zc.buildout
   ${lxml-python:egg}
@@ -115,12 +116,5 @@ interpreter = py
 scripts = py
 
 [versions]
-# 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
-
 collective.recipe.template = 1.11
 z3c.recipe.scripts = 1.0.1

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = slapos.recipe.cmmi
-url = http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz
-md5sum = 0544ef6d7afd8ca797935ccc2685a9ed
+url = http://www.sqlite.org/2014/sqlite-autoconf-3080701.tar.gz
+md5sum = 8ee4541ebb3e5739e7ef5e9046e30063
 configure-options =
   --disable-static
   --enable-readline

component/squid/buildout.cfg

@@ -9,8 +9,8 @@ extends =
 
 [squid]
 recipe = hexagonit.recipe.cmmi
-url = http://www1.at.squid-cache.org/Versions/v3/3.4/squid-3.4.4.tar.gz
-md5sum = b36ab3696485a86b43d9194ac9b6b7fe
+url = http://www.squid-cache.org/Versions/v3/3.4/squid-3.4.7.tar.bz2
+md5sum = 9951034b10f7ee0f45a95cfae61c57c2
 configure-options =
   --disable-dependency-tracking
   --disable-translation

component/trafficserver/buildout.cfg

@@ -20,8 +20,8 @@ parts =
 
 [trafficserver]
 recipe = slapos.recipe.cmmi
-url = http://apache.claz.org/trafficserver/trafficserver-4.2.1.1.tar.bz2
-md5sum = 7d154544c4953973570b4713a78cb0cb
+url = http://apache.claz.org/trafficserver/trafficserver-4.2.2.tar.bz2
+md5sum = e2249555837f4f7196d3189716b2828a
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-openssl=${openssl:location}

component/w3-validator/buildout.cfg

@@ -15,9 +15,6 @@ extends =
 
 parts = w3-validator
 
-find-links =
-  http://www.nexedi.org/static/packages/source/
-
 versions = versions
 
 [versions]

component/wget/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 
 [wget]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/wget/wget-1.15.tar.xz
-md5sum = 7a279d5ac5594919124d5526e7143e28
+url = http://ftp.gnu.org/gnu/wget/wget-1.16.tar.xz
+md5sum = fe102975ab3a6c049777883f1bb9ad07
 configure-options =
   --enable-ipv6
   --enable-opie
@@ -24,7 +24,7 @@ patch-options =
   -p1
 
 patches =
-  ${:_profile_base_location_}/wget-doc.makefile.patch#2b89644c63a0dfe96290471d28a554f2
+  ${:_profile_base_location_}/wget-doc.makefile.patch#aabcc1695c7fb65ac44f295e04a2db78
 
 environment =
   PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s

component/wget/wget-doc.makefile.patch

@@ -4,8 +4,8 @@
  ACLOCAL_AMFLAGS = -I m4
  
  # subdirectories in the distribution
--SUBDIRS = lib src doc po tests util
-+SUBDIRS = lib src po tests util
+-SUBDIRS = lib src doc po tests util testenv
++SUBDIRS = lib src po tests util testenv
  
  EXTRA_DIST = ChangeLog.README MAILING-LIST \
               msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
@@ -15,8 +15,8 @@
  ACLOCAL_AMFLAGS = -I m4
  
  # subdirectories in the distribution
--SUBDIRS = lib src doc po tests util
-+SUBDIRS = lib src po tests util
+-SUBDIRS = lib src doc po tests util testenv
++SUBDIRS = lib src po tests util testenv
  EXTRA_DIST = ChangeLog.README MAILING-LIST \
               msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
               msdos/Makefile.WC ABOUT-NLS \

component/xorg/buildout.cfg

@@ -465,6 +465,21 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libXt:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig:${libSM:location}/lib/pkgconfig
 
+[compositeproto]
+recipe = slapos.recipe.cmmi
+url = http://www.x.org/releases/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
+md5sum = 98482f65ba1e74a08bf5b056a4031ef0
+
+[libXcomposite]
+recipe = slapos.recipe.cmmi
+url = http://www.x.org/releases/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2
+md5sum = a60e0b5c276d0aa9e2d3b982c98f61c8
+configure-options =
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${compositeproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig
+
 [libXcursor]
 recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2

schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Slapos Software Release instantiation descriptor",
+  "additionalProperties": false,
+  "properties": {
+    "name": {
+      "description": "A short human-friendly name for the sofware release",
+      "type": "string"
+    },
+    "description": {
+      "description": "A short description of the sofware release",
+      "type": "string"
+    },
+    "serialisation": {
+      "description": "How the parameters and results are serialised",
+      "required": true,
+      "enum": ["xml", "json-in-xml"],
+      "type": "string"
+    },
+    "software-type": {
+      "description": "Existing software types",
+      "required": true,
+      "patternProperties": {
+        ".*": {
+          "description": "Software type declaration",
+          "additionalProperties": false,
+          "properties": {
+            "description": {
+              "description": "A human-friendly description of the software type",
+              "type": "string"
+            },
+            "serialisation": {
+              "description": "How the parameters and results are serialised, if different from global setting",
+              "enum": ["xml", "json-in-xml"],
+              "type": "string"
+            },
+            "request": {
+              "required": true,
+              "description": "URL, relative to Software Release base path, of a json schema for values expected by instance of current software type",
+              "type": "string"
+            },
+            "response": {
+              "required": true,
+              "description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type",
+              "type": "string"
+            },
+            "index": {
+              "description": "Value to use instead of software type id to sort them (in order to display most relevant software types earlier in a list, for example)",
+              "type": "any"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    }
+  },
+  "type": "object"
+}
+

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.87'
+version = '0.92'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -52,6 +52,7 @@ setup(name=name,
       packages=find_packages(),
       include_package_data=True,
       install_requires=[
+        'jsonschema',
         'hexagonit.recipe.download',
         'lxml', # for full blown python interpreter
         'netaddr', # to manipulate on IP addresses
@@ -69,6 +70,7 @@ setup(name=name,
       entry_points={
         'zc.buildout': [
           'addresiliency = slapos.recipe.addresiliency:Recipe',
+          'accords = slapos.recipe.accords:Recipe',
           'agent = slapos.recipe.agent:Recipe',
           'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
           'apacheperl = slapos.recipe.apacheperl:Recipe',
@@ -90,6 +92,7 @@ setup(name=name,
           'condor = slapos.recipe.condor:Recipe',
           'condor.submit = slapos.recipe.condor:AppSubmit',
           'configurationfile = slapos.recipe.configurationfile:Recipe',
+          'copyfilelist = slapos.recipe.copyfilelist:Recipe',
           'cron = slapos.recipe.dcron:Recipe',
           'cron.d = slapos.recipe.dcron:Part',
           'davstorage = slapos.recipe.davstorage:Recipe',
@@ -186,12 +189,13 @@ setup(name=name,
           'slapmonitor = slapos.recipe.slapmonitor:MonitorRecipe',
           'slapmonitor-xml = slapos.recipe.slapmonitor:MonitorXMLRecipe',
           'slapreport = slapos.recipe.slapreport:Recipe',
-          'softwaretype = slapos.recipe.softwaretype:Recipe',
+          'softwaretype = slapos.recipe.softwaretype:Recipe', # BBB
           'sphinx= slapos.recipe.sphinx:Recipe',
           'squid = slapos.recipe.squid:Recipe',
           'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
           'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
           'stunnel = slapos.recipe.stunnel:Recipe',
+          'switch-softwaretype = slapos.recipe.switch_softwaretype:Recipe',
           'symbolic.link = slapos.recipe.symbolic_link:Recipe',
           'tidstorage = slapos.recipe.tidstorage:Recipe',
           'trac = slapos.recipe.trac:Recipe',
@@ -214,5 +218,7 @@ setup(name=name,
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',
         ],
       },
+      test_suite='slapos.test',
+      test_requires=[ 'jsonschema' ],
     )
 

sla.schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Slapos Software Release instantiation descriptor",
+  "additionalProperties": false,
+  "properties": {
+    "instance_guid": {
+      "description": "XXX",
+      "type": "string"
+    },
+    "computer_guid": {
+      "description": "XXX",
+      "type": "string"
+    }
+  }
+}
\ No newline at end of file

slapos/recipe/accords/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+import shutil
+from slapos.recipe.librecipe import GenericSlapRecipe
+import shutil
+import subprocess
+import sys
+
+class Recipe(GenericSlapRecipe):
+  def _install(self):
+    path_list = []
+    accords_location = self.buildout['accordsdirectory']['accords']
+
+    parameter_dict = dict(
+        userid=self.options['userid'],
+        tenantname=self.options['tenantname'],
+        password=self.options['password'],
+        domain=self.options['domain'],
+        openstack_url=self.options['openstack_url'],
+        python_location=sys.executable,
+        accords_location=accords_location,
+        manifest_name=self.options['manifest-name'],
+        # XXX this is workaround
+        accords_lib_directory=self.options['accords_lib_directory'],
+        computer_id = self.computer_id,
+        computer_partition_id = self.computer_partition_id,
+        server_url = self.server_url,
+        software_release_url = self.software_release_url,
+        key_file = self.key_file,
+        cert_file = self.cert_file,
+        path = '%s:%s' % (self.options['accords_bin_directory'],
+            os.environ.get('PATH', '')),
+    )
+    # Generate os-config.xml
+    os_config_file = self.createFile(self.options['os-config'],
+        self.substituteTemplate(self.getTemplateFilename('os_config.xml.in'),
+        parameter_dict))
+    path_list.append(os_config_file)
+
+    # Put modified accords configuration file
+    accords_configuration_parameter_dict = dict(
+        listen_ip = self.options['listen-ip']
+    )
+    accords_configuration_file_location = self.createFile(
+        self.options['accords-configuration-file'],
+        self.substituteTemplate(self.getTemplateFilename('accords.ini.in'),
+        accords_configuration_parameter_dict))
+    path_list.append(accords_configuration_file_location)
+
+    # XXX is it dangerous?
+    security_path = os.path.join(accords_location, 'security')
+    if os.path.exists(security_path):
+      shutil.rmtree(security_path)
+
+    # Initiate configuration
+    subprocess.check_call('./accords-config',
+                          cwd=accords_location
+    )
+
+    # Generate manifest
+    manifest_origin_location = self.options['manifest-source']
+    manifest_location = self.options['manifest-destination']
+
+    shutil.copy(manifest_origin_location, manifest_location)
+    path_list.append(manifest_location)
+
+    # Generate wrapper
+    wrapper_location = self.createPythonScript(self.options['accords-wrapper'],
+        '%s.accords.runAccords' % __name__,
+        parameter_dict)
+    path_list.append(wrapper_location)
+
+    # Generate helper for debug
+    self.createExecutable(
+        self.options['testos-wrapper'],
+        self.substituteTemplate(self.getTemplateFilename('testos.in'),
+            parameter_dict)
+    )
+
+    return path_list

slapos/recipe/accords/accords.py

+#!%(python_location)s
+
+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+from slapos import slap
+import signal
+import subprocess
+from subprocess import Popen
+import sys
+import time
+
+def runAccords(accords_conf):
+  """Launch ACCORDS, parse manifest, broker manifest, send connection
+     informations to SlapOS Master. Destroy instance and stops ACCORDS at
+     SIGTERM."""
+  computer_id = accords_conf['computer_id']
+  computer_partition_id = accords_conf['computer_partition_id']
+  server_url = accords_conf['server_url']
+  software_release_url = accords_conf['software_release_url']
+  key_file = accords_conf['key_file']
+  cert_file = accords_conf['cert_file']
+  accords_lib_directory = accords_conf['accords_lib_directory']
+  accords_location = accords_conf['accords_location']
+  manifest_name = accords_conf['manifest_name']
+
+  environment = dict(
+     LD_LIBRARY_PATH=accords_lib_directory,
+     PATH=accords_conf['path'],
+     HOME=accords_location,
+  )
+
+  # Set handler to stop ACCORDS when end of world comes
+  # XXX use subprocess.check_call and add exception handlers
+  def sigtermHandler(signum, frame):
+    Popen(['./co-command', 'stop', '/service/*'],
+        cwd=accords_location, env=environment).communicate()
+    Popen(['./co-stop'],
+        cwd=accords_location, env=environment).communicate()
+    sys.exit(0)
+
+  signal.signal(signal.SIGTERM, sigtermHandler)
+
+  # Launch ACCORDS, parse & broke manifest to deploy instance
+  print 'Starting ACCORDS and friends...'
+  subprocess.check_call(['./co-start'],cwd=accords_location, env=environment)
+  print 'Parsing manifest...'
+  subprocess.check_call(['./co-parser', manifest_name],
+      cwd=accords_location, env=environment)
+  print 'Brokering manifest...'
+  subprocess.check_call(['./co-broker', manifest_name],
+      cwd=accords_location, env=environment)
+  print 'Done.'
+
+  # Parse answer
+  # XXX
+  connection_dict = dict(connection='hardcoded')
+
+  # Send information about published service to SlapOS Master
+  slap_connection = slap.slap()
+  slap_connection.initializeConnection(server_url, key_file, cert_file)
+  computer_partition = slap_connection.registerComputerPartition(computer_id,
+      computer_partition_id)
+  computer_partition.setConnectionDict(connection_dict)
+
+  # Go to sleep, wait kill
+  while(True):
+    time.sleep(60)

slapos/recipe/accords/template/accords.ini.in

+# REST host (default: 127.0.0.1)
+resthost=%(listen_ip)s
+
+# REST port (default: 8086)
+#restport=8086
+
+# Target (default: ./accords.xml)
+#target=accords.xml
+
+# Acitvate TLS (default: 0)
+#tls=0
+
+# Activate monitoring (default: 1)
+#monitor=1
+
+# Trace (default: 1)
+#trace=1
+
+# Threads (default:1)
+#threads=1
+
+# Be verbose (default: 1)
+#verbose=0
+
+# Debug (default: 1)
+#debug=1
+
+# Domain (default: occi)
+#domain=occi
+
+# Operator (default: accords)
+#operator=accords
+
+# Password (default: co-system)
+#password=co-system
\ No newline at end of file

slapos/recipe/accords/template/coips.xml.in

+<?xml version="1.0" encoding="UTF8"?>
+<manifest name="coips:model" xmlns="http://www.compatibleone.fr/schemes/cords.xsd">
+
+<description>Infrastructure profile used by production tool</description>
+	
+<node name="coips:model">
+<infrastructure name="coips:model">
+<compute name="coips:model" cores="1" speed="1GHz" architecture="x686" memory="1GB"/>
+<storage name="coips:model" size="10GB" type="SATA"/>
+<network name="coips:model" vlan="true" label="database"/>
+</infrastructure>
+</node> 
+
+
+</manifest>
\ No newline at end of file

slapos/recipe/accords/template/os_config.xml.in

+<os_configs>
+  <os_config
+    id="e1f892e3-slap-slap-slap-9354b95d3b17"
+    name="slaposrecipe"
+    description="Configuration of Account used by slapos recipe"
+    user="%(userid)s"
+    password="%(password)s"
+    authenticate=""
+    agent="CompatibleOne/OpenStackClient/1.0a.0.01"
+    host="%(openstack_url)s"
+    version="v1.1"
+    namespace="%(domain)s"
+    base=""
+    tls="0"
+    current="0"
+  />
+</os_configs>
\ No newline at end of file

slapos/recipe/accords/template/testos.in

+#!/bin/sh
+
+export PATH=%(path)s
+
+export ENO_HOST=%(openstack_url)s
+export ENO_USER=%(userid)s
+export ENO_PASS=%(password)s
+export ENO_VERSION=v1.1
+export ENO_TENANT=%(tenantname)s
+
+testos --host $ENO_HOST --password $ENO_PASS --user $ENO_USER --version $ENO_VERSION --tenant $ENO_TENANT $1 $2 $3 $4 $5 $6 $7

slapos/recipe/addresiliency/__init__.py

@@ -40,44 +40,8 @@ class Recipe(GenericSlapRecipe):
     def _install(self):
         path_list = []
 
-        confpath = os.path.join(self.options['etc'], 'bully.conf')
-
-        ip_list = self.parameter_dict['ip-list']
-        print 'Creating bully configuration with ips : %s\n' % ip_list
-
-        conf = self.createFile(confpath,
-                               self.substituteTemplate(
-                               self.getTemplateFilename('bully.conf.in'),
-                               {
-                                   'self_id': int(self.parameter_dict['number']),
-                                   'ip_list': ip_list
-                                   }
-                               ))
-        path_list.append(conf)
-
         slap_connection = self.buildout['slap-connection']
 
-        if self.optionIsTrue('enable-bully-service', default=False):
-            bully_dir = self.options['services']
-        else:
-            bully_dir = self.options['bin']
-
-        bully_wrapper = self.createPythonScript(
-            name=os.path.join(bully_dir, self.options['wrapper-bully']),
-            absolute_function='slapos.recipe.addresiliency.bully.run',
-            arguments={
-                'confpath': confpath,
-                'server_url': slap_connection['server-url'],
-                'key_file': slap_connection.get('key-file'),
-                'cert_file': slap_connection.get('cert-file'),
-                'computer_id': slap_connection['computer-id'],
-                'partition_id': slap_connection['partition-id'],
-                'software': slap_connection['software-release-url'],
-                'namebase': self.parameter_dict['namebase'],
-            })
-
-        path_list.append(bully_wrapper)
-
         takeover_wrapper = self.createPythonScript(
             name=os.path.join(self.options['bin'], self.options['wrapper-takeover']),
             absolute_function='slapos.recipe.addresiliency.takeover.run',

slapos/recipe/addresiliency/bully.py

-# -*- coding: utf-8 -*-
-
-import logging
-import Queue
-import socket
-import thread
-import time
-
-import slapos.recipe.addresiliency.renamer
-import slapos
-
-log = logging.getLogger(__name__)
-logging.basicConfig(level=logging.DEBUG)
-
-
-BASE_PORT = 50000
-SLEEPING_MINS = 2           # XXX was 30, increase after testing
-
-MSG_PING = 'ping'
-MSG_HALT = 'halt'
-MSG_VICTORY = 'victory'
-
-MSG_OK = 'ok'
-
-STATE_NORMAL = 'normal'
-STATE_WAITINGCONFIRM = 'waitingConfirm'
-STATE_ELECTION = 'election'
-STATE_REORGANIZATION = 'reorganization'
-
-
-
-## Leader is always number 0
-
-class ResilientInstance(object):
-
-    def __init__(self, comm, renamer, confpath):
-        self.comm = comm
-        self.participant_id = 0
-        self.state = STATE_NORMAL
-        self.halter_id = 0
-        self.inElection = False
-        self.alive = True
-
-        self.mainCanal = self.comm.create_canal([MSG_PING, MSG_HALT, MSG_VICTORY])
-
-        self.renamer = renamer
-        self.okCanal = self.comm.create_canal([MSG_OK])
-        self.confpath = confpath
-        self.loadConnectionInfo()
-
-    def loadConnectionInfo(self):
-        params = open(self.confpath, 'r').readlines()
-        self.total_participants = len(params[0].split())
-        new_id = int(params[1])
-        if self.participant_id != new_id:
-            self.halter_id = new_id
-            self.participant_id = new_id 
-        log.debug('I am {} of {}'.format(self.participant_id, self.total_participants))
-
-    ## Needs to be changed to use the master
-    def aliveManagement(self):
-        while self.alive:
-            log.info('XXX sleeping for %d minutes' % SLEEPING_MINS)
-            time.sleep(SLEEPING_MINS*60)
-            if self.participant_id == 0:
-                continue
-            self.comm.send(MSG_PING, 0)
-            message, sender = self.okCanal.get()
-            if message:
-                continue
-            self.election()
-
-    def listen(self):
-        while self.alive:
-            self.comm.recv()
-
-    def main(self):
-        while self.alive:
-            message, sender = self.mainCanal.get()
-            if message == MSG_PING:
-                self.comm.send(MSG_OK, sender)
-
-            elif message == MSG_HALT:
-                self.state = STATE_WAITINGCONFIRM
-                self.halter_id = int(sender)
-                self.comm.send(MSG_OK, sender)
-
-            elif message == MSG_VICTORY:
-                if int(sender) == self.halter_id and self.state == STATE_WAITINGCONFIRM:
-                    log.info('{} thinks {} is the leader'.format(self.participant_id, sender))
-                    self.comm.send(MSG_OK, sender)
-                self.state = STATE_NORMAL
-
-    def election(self):
-        self.inElection = True
-        self.loadConnectionInfo()
-        # Check if I'm the highest instance alive
-        for higher in range(self.participant_id + 1, self.total_participants):
-            self.comm.send(MSG_PING, higher)
-            message, sender = self.okCanal.get()
-            if message:
-                log.info('{} is alive ({})'.format(higher, self.participant_id))
-                self.inElection = False
-                return False
-            continue
-
-        if not self.alive:
-            return False
-
-        # I should be the new coordinator, halt those below me
-        log.info('Should be ME : {}'.format(self.participant_id))
-        self.state = STATE_ELECTION
-        self.halter_id = self.participant_id
-        ups = []
-        for lower in range(self.participant_id):
-            self.comm.send(MSG_HALT, lower)
-            message, sender = self.okCanal.get()
-            if message:
-                ups.append(lower)
-
-        #Broadcast Victory
-        self.state = STATE_REORGANIZATION
-        for up in ups:
-            self.comm.send(MSG_VICTORY, up)
-            message, sender = self.okCanal.get()
-            if message:
-                continue
-            log.info('Something is wrong... let\'s start over')
-            return self.election()
-        self.state = STATE_NORMAL
-        self.active = True
-        log.info('{} Is THE LEADER'.format(self.participant_id))
-
-        self.renamer.failover()
-
-        self.inElection = False
-
-        return True
-
-
-
-class FilteredCanal(object):
-
-    def __init__(self, accept, timeout):
-        self.accept = accept
-        self.queue = Queue.Queue()
-        self.timeout = timeout
-
-    def append(self, message, sender):
-        if message in self.accept:
-            self.queue.put([message, sender])
-
-    def get(self):
-        try:
-            return self.queue.get(timeout=self.timeout)
-        except Queue.Empty:
-            return [None, None]
-
-
-
-class Wrapper(object):
-
-    def __init__(self, confpath, timeout=20):
-        self.canals = []
-        self.ips = []
-        self.participant_id = 0
-        self.timeout = timeout
-        self.confpath = confpath
-        self.getConnectionInfo()
-        self.socket = None
-
-    def getConnectionInfo(self):
-        params = open(self.confpath, 'r').readlines()
-        self.ips = params[0].split()
-        self.participant_id = int(params[1])
-        log.debug('I am {} of {}'.format(self.participant_id, self.ips))
-
-    def start(self):
-        self.getConnectionInfo()
-        self.socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-        self.socket.bind((self.ips[self.participant_id], BASE_PORT + self.participant_id))
-        self.socket.listen(5)
-
-    def send(self, message, number):
-        self.getConnectionInfo()
-        try:
-            s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-            s.connect((self.ips[number], BASE_PORT + number))
-            s.send(message + (' {}\n'.format(self.participant_id)))
-        except (socket.error, socket.herror, socket.gaierror, socket.timeout):
-            pass
-        finally:
-            s.close()
-
-    def create_canal(self, accept):
-        created = FilteredCanal(accept, self.timeout)
-        self.canals.append(created)
-        return created
-
-    def recv(self):
-        client, _ = self.socket.accept()
-        client_message = client.recv(1024)
-        if client_message:
-            message, sender = client_message.split()
-            for canal in self.canals:
-                canal.append(message, int(sender))
-
-
-
-
-def run(args):
-    confpath = args.pop('confpath')
-
-    renamer = slapos.recipe.addresiliency.renamer.Renamer(server_url = args.pop('server_url'),
-                                                          key_file = args.pop('key_file'),
-                                                          cert_file = args.pop('cert_file'),
-                                                          computer_guid = args.pop('computer_id'),
-                                                          partition_id = args.pop('partition_id'),
-                                                          software_release = args.pop('software'),
-                                                          namebase = args.pop('namebase'))
-
-    if args:
-        raise ValueError('Unknown arguments: %s' % ', '.join(args))
-
-    wrapper = Wrapper(confpath=confpath, timeout=20)
-
-    computer = ResilientInstance(wrapper, renamer=renamer, confpath=confpath)
-
-    # idle waiting for connection infos
-    while computer.total_participants < 2:
-        computer.loadConnectionInfo()
-        time.sleep(30)
-
-    log.info('Starting')
-
-    computer.comm.start()
-    thread.start_new_thread(computer.listen, ())
-    thread.start_new_thread(computer.aliveManagement, ())
-
-    computer.main()
-

slapos/recipe/addresiliency/template/bully.conf.in

-%(ip_list)s
-%(self_id)s

slapos/recipe/addresiliency/template/bully.py.in

-#!%(executable)s
-
-import select
-import socket
-import threading
-import time
-import sys
-
-sys.path[:] = %(syspath)s
-
-import slapos
-from slapos import slap as slapmodule
-
-port = 50000
-size = 1024
-wait = True
-
-
-def loadConnectionInfos():
-  connectionInfos = {}
-  file = open('%(confpath)s', 'r')
-  params = file.read().split('\n')
-  file.close()
-  ip_list = [x.strip("' ") for x in params[0].strip('[],').split(',')]
-  connectionInfos['self_id'] = int(params[1])
-
-  connectionInfos['server_list'] = \
-      [(i, ip_list[i]) for i in range(len(ip_list))]
-
-  connectionInfos['self_ip'] = ip_list[connectionInfos['self_id']]
-
-  return connectionInfos
-
-
-def rename_broken_and_stop():
-  try:
-    slap = slapmodule.slap()
-    slap.initializeConnection('%(server_url)s',
-                              '%(key_file)s',
-                              '%(cert_file)s')
-    computer_partition = slap.registerComputerPartition(computer_guid='%(computer_id)s',
-                                                        partition_id='%(partition_id)s')
-    broken = computer_partition.request(software_release='%(software)s',
-                                        software_type='frozen',
-                                        partition_reference='%(namebase)s0')
-
-    broken.rename('broken-%%s' %% (time.strftime("%%d-%%b_%%H:%%M:%%S", time.gmtime())))
-    broken.stopped()
-    computer_partition.rename('%(namebase)s0')
-    print 'renaming done\n'
-  except slapos.slap.slap.ServerError:
-    print 'Internal server error\n'
-
-def election():
-  global wait
-  connection = loadConnectionInfos()
-  message = "%%s, %%s" %% (connection['self_id'], "Election")
-  victory = True
-
-  for (remote_id, addr) in connection['server_list']:
-    if remote_id > connection['self_id']:
-      try:
-        s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-        s.connect((addr, port + remote_id))
-        s.send(message)
-        reply = s.recv(size)
-        if reply == "%%s, %%s" %% (remote_id, "Alive"):
-          victory = False
-      except (socket.error, socket.herror, socket.gaierror, socket.timeout):
-        pass
-      finally:
-        s.close()
-
-  if victory:
-    wait = True
-    for (remote_id, addr) in connection['server_list']:
-      if remote_id < connection['self_id']:
-        try:
-          s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-          s.connect((addr, port + remote_id))
-          s.send("%%s, %%s" %% (connection['self_id'], "Victory"))
-        except (socket.error, socket.herror, socket.gaierror, socket.timeout):
-          pass
-        finally:
-          s.close()
-    rename_broken_and_stop()
-
-
-def failure_detect():
-  global wait
-  connection = loadConnectionInfos()
-  while True:
-    time.sleep(30)
-    if wait:
-      print 'waiting 30 minutes\n'
-      time.sleep(30 * 60)
-      wait = False
-    if not connection['server_list'][0]:
-      continue
-    (remote_id, addr) = connection['server_list'][0]
-    try:
-      s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-      s.connect((addr, port + remote_id))
-      s.close()
-    except (socket.error, socket.herror, socket.gaierror, socket.timeout):
-      s.close()
-      election()
-
-failure_detect_thread = threading.Thread(target=failure_detect)
-failure_detect_thread.start()
-
-connection = loadConnectionInfos()
-s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-s.bind((connection['self_ip'], port + connection['self_id']))
-s.listen(5)
-#election()
-while True:
-  force_election = False
-  client, _ = s.accept()
-  client_message = client.recv(1024)
-  if client_message:
-    client_id, message = client_message.split(', ')
-    client_id = eval(client_id)
-    if message == "Victory":
-      wait = True
-      print "%%s wins" %% client_id
-    elif message == "Election":
-      print "%%s starts an election" %% client_id
-      if client_id < connection['self_id']:
-        client.send("%%s, %%s" %% (connection['self_id'], "Alive"))
-        force_election = True
-  client.close()
-  if force_election:
-    election()

slapos/recipe/addresiliency/template/bully_new.py.in

-#!%(executable)s
-
-import logging
-import os
-import socket
-import sys
-import thread
-import time
-
-sys.path[:] = %(syspath)s
-
-from slapos import slap as slapmodule
-import slapos
-
-BASE_PORT = 50000
-SLEEPING_MINS = 2
-
-log = logging.getLogger(__name__)
-logging.basicConfig(level=logging.DEBUG)
-
-
-
-class Renamer(object):
-    def __init__(self, server_url, key_file, cert_file, computer_guid,
-                 partition_id, software_release, namebase):
-        self.server_url = server_url
-        self.key_file = key_file
-        self.cert_file = cert_file
-        self.computer_guid = computer_guid
-        self.partition_id = partition_id
-        self.software_release = software_release
-        self.namebase = namebase
-
-    def _failover(self):
-        slap = slapmodule.slap()
-        slap.initializeConnection(self.server_url,
-                                  self.key_file,
-                                  self.cert_file)
-        computer_partition = slap.registerComputerPartition(computer_guid=self.computer_guid,
-                                                            partition_id=self.partition_id)
-        broken = computer_partition.request(software_release=self.software_release,
-                                            software_type='frozen',
-                                            partition_reference=self.namebase+'0')
-
-        broken.rename('broken-{}'.format(time.strftime("%%d-%%b_%%H:%%M:%%S", time.gmtime())))
-        broken.stopped()
-        computer_partition.rename(self.namebase+'0')
-
-    def failover(self):
-        try:
-            log.info('renaming done')
-        except slapos.slap.slap.ServerError:
-            log.info('Internal server error')
-
-
-
-## Leader is always number 0
-
-class ResilientInstance(object):
-
-    def __init__(self, comm, renamer, confpath):
-        self.comm = comm
-        self.id = 0
-        self.state = 'normal'
-        self.halter = 0
-        self.inElection = False
-        self.alive = True
-        self.lastPing = time.clock()
-
-        self.mainCanal = self.comm.canal(['ping', 'halt', 'victory'])
-
-        self.renamer = renamer
-        self.okCanal = self.comm.canal(['ok'])
-        self.confpath = confpath
-        self.loadConnectionInfos()
-
-    def loadConnectionInfos(self):
-        file = open(self.confpath, 'r')
-        params = file.read().split('\n')
-        file.close()
-        self.nbComp = len([x.strip("' ") for x in params[0].strip('[],').split(',')])
-        new_id = int(params[1])
-        if self.id != new_id:
-            self.halter = new_id
-            self.id = new_id 
-
-    ## Needs to be changed to use the master
-    def aliveManagement(self):
-        while self.alive:
-            log.info('XXX sleeping for %%d minutes' %% SLEEPING_MINS)
-            time.sleep(SLEEPING_MINS*60)
-            if self.id == 0:
-                continue
-            self.comm.send('ping', 0)
-            message, sender = self.okCanal.get()
-            if message:
-                continue
-            self.election()
-
-    def listen(self):
-        while self.alive:
-            self.comm.recv()
-
-    def main(self):
-        while self.alive:
-            message, sender = self.mainCanal.get()
-            if message == 'ping':
-                self.comm.send('ok', sender)
-
-            elif message == 'halt':
-                self.state = 'waitingConfirm'
-                self.halter = sender
-                self.comm.send('ok', sender)
-
-            elif message == 'victory':
-                if int(sender) == int(self.halter) and self.state == 'waitingConfirm':
-                    log.info('{} thinks {} is the leader'.format(self.id, sender))
-                    self.comm.send('ok', sender)
-                self.state = 'normal'
-
-    def election(self):
-        self.inElection = True
-        self.loadConnectionInfos()
-        #Check if I'm the highest instance alive
-        for higher in range(self.id + 1, self.nbComp):
-            self.comm.send('ping', higher)
-            message, sender = self.okCanal.get()
-            if message:
-                log.info('{} is alive ({})'.format(higher, self.id))
-                self.inElection = False
-                return False
-            continue
-
-        if not self.alive:
-            return False
-
-        #I should be the new coordinator, halt those below me
-        log.info('Should be ME : {}'.format(self.id))
-        self.state = 'election'
-        self.halter = self.id
-        ups = []
-        for lower in range(self.id):
-            self.comm.send('halt', lower)
-            message, sender = self.okCanal.get()
-            if message:
-                ups.append(lower)
-
-        #Broadcast Victory
-        self.state = 'reorganization'
-        for up in ups:
-            self.comm.send('victory', up)
-            message, sender = self.okCanal.get()
-            if message:
-                continue
-            log.info('Something is wrong... let\'s start over')
-            return self.election()
-        self.state = 'normal'
-        self.active = True
-        log.info('{} Is THE LEADER'.format(self.id))
-
-        self.renamer.failover()
-
-        self.inElection = False
-
-        return True
-
-
-class FilteredCanal(object):
-
-    def __init__(self, accept, timeout):
-        self.accept = accept
-        self.list = []
-        self.lock = thread.allocate_lock()
-        self.timeout = timeout
-
-    def append(self, message, sender):
-        if message in self.accept:
-            self.lock.acquire()
-            self.list.append([message, sender])
-            self.lock.release()
-
-    def get(self):
-        start = time.clock()
-        while (time.clock() - start < self.timeout):
-            self.lock.acquire()
-            if self.list:
-                self.lock.release()
-                return self.list.pop(0)
-            self.lock.release()
-        return [None, None]
-
-
-class Wrapper(object):
-
-    def __init__(self, confpath, timeout=20):
-        self.canals = []
-        self.ips = []
-        self.id = 0
-        self.timeout = timeout
-        self.confpath = confpath
-        self.getConnectionInfos()
-        self.socket = None
-
-    def getConnectionInfos(self):
-        file = open(self.confpath, 'r')
-        params = file.read().split('\n')
-        file.close()
-        self.ips = [x.strip("' ") for x in params[0].strip('[],').split(',')]
-        self.id = int(params[1])
-
-    def start(self):
-        self.getConnectionInfos()
-        self.socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-        self.socket.bind((self.ips[self.id], BASE_PORT + self.id))
-        self.socket.listen(5)
-
-    def send(self, message, number):
-        self.getConnectionInfos()
-        try:
-            s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-            s.connect((self.ips[number], BASE_PORT + number))
-            s.send(message + (' {}\n'.format(self.id)))
-        except (socket.error, socket.herror, socket.gaierror, socket.timeout):
-            pass
-        finally:
-            s.close()
-
-    def canal(self, accept):
-        created = FilteredCanal(accept, self.timeout)
-        self.canals.append(created)
-        return created
-
-    def recv(self):
-        client, _ = self.socket.accept()
-        client_message = client.recv(1024)
-        if client_message:
-            message, sender = client_message.split()
-            for canal in self.canals:
-                canal.append(message, int(sender))
-
-
-
-def main():
-
-    renamer = Renamer(server_url = '%(server_url)s',
-                      key_file = '%(key_file)s',
-                      cert_file = '%(cert_file)s',
-                      computer_guid = '%(computer_id)s',
-                      partition_id = '%(partition_id)s',
-                      software_release = '%(software)s',
-                      namebase = '%(namebase)s')
-
-    confpath = '%(confpath)s'
-
-    wrapper = Wrapper(confpath=confpath, timeout=20)
-
-    computer = ResilientInstance(wrapper, renamer=renamer, confpath=confpath)
-
-    #idle waiting for connection infos
-    while computer.nbComp < 2 :
-        computer.loadConnectionInfos()
-        time.sleep(30)
-
-    log.info('Starting')
-
-    computer.comm.start()
-    thread.start_new_thread(computer.listen, ())
-    thread.start_new_thread(computer.main, ())
-    thread.start_new_thread(computer.aliveManagement, ())
-
-    while True:
-        # XXX tight loop
-        continue
-
-
-if __name__ == '__main__':
-    main()
-

slapos/recipe/copyfilelist.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+import logging
+import shutil
+
+class Recipe:
+  def __init__(self, buildout, name, options):
+    self.buildout = buildout
+    self.name = name
+    self.options = options
+    self.logger = logging.getLogger(self.name)
+
+  def install(self):
+    """
+    Copy files to selected directory.
+    """
+    path_list = []
+    target_directory = self.options['target-directory']
+    for original_file_location in self.options['file-list'].split():
+      path, name = os.path.split(original_file_location)
+      destination_file_location = os.path.join(target_directory, name)
+      if os.path.exists(destination_file_location):
+        os.remove(destination_file_location)
+      shutil.copy(original_file_location, destination_file_location)
+      self.logger.debug('Created copy %r -> %r' % (
+          original_file_location,
+          destination_file_location))
+      path_list.append(destination_file_location)
+
+    return path_list

slapos/recipe/dcron.py

@@ -26,11 +26,8 @@
 ##############################################################################
 import os
 
-if __name__ == '__main__': # Hack to easily run test below.
-  GenericBaseRecipe = object
-else:
-  from slapos.recipe.librecipe import GenericBaseRecipe
-  from zc.buildout import UserError
+from slapos.recipe.librecipe import GenericBaseRecipe
+from zc.buildout import UserError
 
 class Recipe(GenericBaseRecipe):
 
@@ -131,41 +128,3 @@ def systemd_to_cron(spec):
           raise ValueError
   return ' '.join(spec)
 
-def test(self):
-  def _(systemd, cron):
-    self.assertEqual(systemd_to_cron(systemd), cron)
-  _("Sat,Mon-Thu,Sun", "0 0 * * 0,1-4,6")
-  _("mon,sun *-* 2,1:23", "23 2,1 * * 0,1")
-  _("Wed, 17:48", "48 17 * * 3")
-  _("Wed-Sat,Tue 10-* 1:2", "2 1 * 10 2,3-6")
-  _("*-*-7 0:0:0", "0 0 7 * *")
-  _("10-15", "0 0 15 10 *")
-  _("monday *-12-* 17:00", "00 17 * 12 1")
-  _("12,14,13,12:20,10,30", "20,10,30 12,14,13,12 * * *") # TODO: sort
-  _("*-1/2-1,3 *:30", "30 * 1,3 1/2 *")
-  _("03-05 08:05", "05 08 05 03 *")
-  _("08:05:00", "05 08 * * *")
-  _("05:40", "40 05 * * *")
-  _("Sat,Sun 12-* 08:05", "05 08 * 12 0,6")
-  _("Sat,Sun 08:05", "05 08 * * 0,6")
-
-  def _(systemd):
-    self.assertRaises(Exception, systemd_to_cron, systemd)
-  _("test")
-  _("")
-  _("7")
-  _("121212:1:2")
-
-  _("Wed *-1")
-  _("08:05:40")
-  _("2003-03-05")
-
-  _("0-1"); _("13-1"); _("6/4-1"); _("5/8-1")
-  _("1-0"); _("1-32"); _("1-4/3"); _("1-14/18")
-  _("24:0");_("9/9:0"); _("8/16:0")
-  _("0:60"); _("0:22/22"); _("0:15/45")
-
-if __name__ == '__main__':
-  import unittest
-  unittest.TextTestRunner().run(type('', (unittest.TestCase,), {
-    'runTest': test})())

slapos/recipe/dropbear.py

@@ -112,6 +112,8 @@ class Recipe(GenericBaseRecipe):
     dropbear_cmd.extend(['-p', binding_address])
     # Single user mode
     dropbear_cmd.append('-n')
+    # Keep connection alive for 5 minutes
+    dropbear_cmd.extend(['-K', '300'])
 
     if 'dss-keyfile' in self.options:
       dropbear_cmd.extend(['-d', self.options['dss-keyfile']])

slapos/recipe/librecipe/generic.py

@@ -155,7 +155,7 @@ class GenericBaseRecipe(object):
           pidfile=%s
           if [ -e $pidfile ]; then
             pid=$(cat $pidfile)
-            if [ ! -z $(ps -p "$pid" | grep $(basename %s)) ]; then
+            if [ ! -z "$(ps -p $pid | grep $(basename %s))" ]; then
               echo "Already running with pid $pid."
               exit 1
             else

slapos/recipe/notifier.py

@@ -86,6 +86,7 @@ class Notify(GenericBaseRecipe):
                               command=notifier_binary,
                               parameters=parameters,
                               pidfile=pidfile,
+                              parameters_extra=True,
                               comments=[
                                   '',
                                   'Call an executable and send notification(s).',

slapos/recipe/request.py

@@ -25,6 +25,7 @@
 #
 ##############################################################################
 import logging
+from zc.buildout import UserError
 from slapos.recipe.librecipe import wrap, JSON_SERIALISED_MAGIC_KEY
 import json
 from slapos import slap as slapmodule
@@ -33,12 +34,6 @@ import traceback
 
 DEFAULT_SOFTWARE_TYPE = 'RootSoftwareInstance'
 
-def getListOption(option_dict, key, default=()):
-  result = option_dict.get(key, default)
-  if isinstance(result, basestring):
-    result = result.split()
-  return result
-
 class Recipe(object):
   """
   Request a partition to a slap master.
@@ -104,19 +99,20 @@ class Recipe(object):
     self.logger = logging.getLogger(name)
     software_url = options['software-url']
     name = options['name']
-    return_parameters = getListOption(options, 'return')
+    return_parameters = options.get('return', '').split()
     if not return_parameters:
       self.logger.debug("No parameter to return to main instance."
         "Be careful about that...")
     software_type = options.get('software-type', DEFAULT_SOFTWARE_TYPE)
-    filter_kw = dict(
-      (x, options['sla-' + x]) for x in getListOption(options, 'sla')
-      if options['sla-' + x]
-    )
-    partition_parameter_kw = self._filterForStorage(dict(
-      (x, options['config-' + x])
-      for x in getListOption(options, 'config')
-    ))
+    if 'config' in options or 'sla' in options:
+      raise UserError("'config' & 'sla' options are obsolete."
+                      " Clean up your software release.")
+    filter_kw = {k[4:]: v
+      for k, v in options.iteritems()
+      if k.startswith('sla-') and v}
+    partition_parameter_kw = self._filterForStorage({k[7:]: v
+      for k, v in options.iteritems()
+      if k.startswith('config-')})
     slave = options.get('slave', 'false').lower() in \
       librecipe.GenericBaseRecipe.TRUE_VALUES
 
@@ -267,7 +263,6 @@ class RequestEdge(Recipe):
       # Request will have its own copy of options dict
       local_options = original_options.copy()
       local_options['name'] = '%s-%s' % (country, name)
-      local_options['sla'] = "region"
       local_options['sla-region'] = country
 
       self.request_dict[country] = Recipe(buildout, name, local_options)

slapos/recipe/switch_softwaretype.py

+##############################################################################
+#
+# Copyright (c) 2014 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly advised to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+##############################################################################
+
+import os, subprocess, sys
+
+class Recipe:
+
+  def __init__(self, buildout, name, options):
+    self.buildout = buildout
+    self.options = options
+    self.name = name
+    self.software_type = buildout["slap-configuration"]["slap-software-type"]
+    section, key = self.options[self.software_type].split(":")
+    self.base = self.buildout[section][key]
+
+  def install(self):
+    # XXX-Antoine: We gotta find a better way to do this. I tried to check
+    # out how slapgrid-cp was running buildout. But it is worse than that.
+    args = sys.argv[:]
+    for x in self.buildout["slap-connection"].iteritems():
+      args.append("slap-connection:%s=%s" % x)
+    for x in "directory", "eggs-directory", "develop-eggs-directory":
+      args.append("buildout:%s=%s" % (x, self.buildout["buildout"][x]))
+    args.append("buildout:installed=.installed-%s.cfg" % self.name)
+    # Options.get (from zc.buildout) should deserialize.
+    try:
+      override = self.options["override"][self.software_type]
+    except (KeyError, TypeError):
+      buildout = self.base
+    else:
+      # unfortunately, buildout:extends does not work when given at command line
+      buildout = os.path.join(self.buildout["buildout"]["parts-directory"],
+                              self.name + ".cfg")
+      with open(override) as src, open(buildout, "w", 0) as dst:
+        dst.write("[buildout]\nextends = %s\n\n" % self.base + src.read())
+    subprocess.check_call(args + ["-oc", buildout])
+    return []
+
+  update = install

slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in

@@ -197,6 +197,7 @@ ListenIP=%(ip)s
 # Range: 1-30
 # Default:
 # Timeout=3
+Timeout=15
 
 ### Option: Include
 #	You may include individual files or all files in a directory in the configuration file.

slapos/test/metaschema.json

+{
+    "id": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "Core schema meta-schema",
+    "definitions": {
+        "schemaArray": {
+            "type": "array",
+            "minItems": 1,
+            "items": { "$ref": "#" }
+        },
+        "positiveInteger": {
+            "type": "integer",
+            "minimum": 0
+        },
+        "positiveIntegerDefault0": {
+            "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
+        },
+        "simpleTypes": {
+            "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
+        },
+        "stringArray": {
+            "type": "array",
+            "items": { "type": "string" },
+            "minItems": 1,
+            "uniqueItems": true
+        }
+    },
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string",
+            "format": "uri"
+        },
+        "$schema": {
+            "type": "string",
+            "format": "uri"
+        },
+        "title": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "default": {},
+        "multipleOf": {
+            "type": "number",
+            "minimum": 0,
+            "exclusiveMinimum": true
+        },
+        "maximum": {
+            "type": "number"
+        },
+        "exclusiveMaximum": {
+            "type": "boolean",
+            "default": false
+        },
+        "minimum": {
+            "type": "number"
+        },
+        "exclusiveMinimum": {
+            "type": "boolean",
+            "default": false
+        },
+        "maxLength": { "$ref": "#/definitions/positiveInteger" },
+        "minLength": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "pattern": {
+            "type": "string",
+            "format": "regex"
+        },
+        "additionalItems": {
+            "anyOf": [
+                { "type": "boolean" },
+                { "$ref": "#" }
+            ],
+            "default": {}
+        },
+        "items": {
+            "anyOf": [
+                { "$ref": "#" },
+                { "$ref": "#/definitions/schemaArray" }
+            ],
+            "default": {}
+        },
+        "maxItems": { "$ref": "#/definitions/positiveInteger" },
+        "minItems": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "uniqueItems": {
+            "type": "boolean",
+            "default": false
+        },
+        "maxProperties": { "$ref": "#/definitions/positiveInteger" },
+        "minProperties": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "required": { "$ref": "#/definitions/stringArray" },
+        "additionalProperties": {
+            "anyOf": [
+                { "type": "boolean" },
+                { "$ref": "#" }
+            ],
+            "default": {}
+        },
+        "definitions": {
+            "type": "object",
+            "additionalProperties": { "$ref": "#" },
+            "default": {}
+        },
+        "properties": {
+            "type": "object",
+            "additionalProperties": { "$ref": "#" },
+            "default": {}
+        },
+        "patternProperties": {
+            "type": "object",
+            "additionalProperties": { "$ref": "#" },
+            "default": {}
+        },
+        "dependencies": {
+            "type": "object",
+            "additionalProperties": {
+                "anyOf": [
+                    { "$ref": "#" },
+                    { "$ref": "#/definitions/stringArray" }
+                ]
+            }
+        },
+        "enum": {
+            "type": "array",
+            "minItems": 1,
+            "uniqueItems": true
+        },
+        "type": {
+            "anyOf": [
+                { "$ref": "#/definitions/simpleTypes" },
+                {
+                    "type": "array",
+                    "items": { "$ref": "#/definitions/simpleTypes" },
+                    "minItems": 1,
+                    "uniqueItems": true
+                }
+            ]
+        },
+        "allOf": { "$ref": "#/definitions/schemaArray" },
+        "anyOf": { "$ref": "#/definitions/schemaArray" },
+        "oneOf": { "$ref": "#/definitions/schemaArray" },
+        "not": { "$ref": "#" }
+    },
+    "dependencies": {
+        "exclusiveMaximum": [ "maximum" ],
+        "exclusiveMinimum": [ "minimum" ]
+    },
+    "default": {}
+}

slapos/test/recipe/test_dcron.py

+import unittest
+from slapos.recipe.dcron import systemd_to_cron
+
+class TestDcron(unittest.TestCase):
+  def test(self):
+    def _(systemd, cron):
+      self.assertEqual(systemd_to_cron(systemd), cron)
+    _("Sat,Mon-Thu,Sun", "0 0 * * 0,1-4,6")
+    _("mon,sun *-* 2,1:23", "23 2,1 * * 0,1")
+    _("Wed, 17:48", "48 17 * * 3")
+    _("Wed-Sat,Tue 10-* 1:2", "2 1 * 10 2,3-6")
+    _("*-*-7 0:0:0", "0 0 7 * *")
+    _("10-15", "0 0 15 10 *")
+    _("monday *-12-* 17:00", "00 17 * 12 1")
+    _("12,14,13,12:20,10,30", "20,10,30 12,14,13,12 * * *") # TODO: sort
+    _("*-1/2-1,3 *:30", "30 * 1,3 1/2 *")
+    _("03-05 08:05", "05 08 05 03 *")
+    _("08:05:00", "05 08 * * *")
+    _("05:40", "40 05 * * *")
+    _("Sat,Sun 12-* 08:05", "05 08 * 12 0,6")
+    _("Sat,Sun 08:05", "05 08 * * 0,6")
+
+    def _(systemd):
+      self.assertRaises(Exception, systemd_to_cron, systemd)
+    _("test")
+    _("")
+    _("7")
+    _("121212:1:2")
+
+    _("Wed *-1")
+    _("08:05:40")
+    _("2003-03-05")
+
+    _("0-1"); _("13-1"); _("6/4-1"); _("5/8-1")
+    _("1-0"); _("1-32"); _("1-4/3"); _("1-14/18")
+    _("24:0");_("9/9:0"); _("8/16:0")
+    _("0:60"); _("0:22/22"); _("0:15/45")

slapos/test/recipe/test_pbs.py

+
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+
+from slapos.recipe import pbs
+
+
+class PBSTest(unittest.TestCase):
+
+    def new_recipe(self):
+        buildout = {
+                'buildout': {
+                    'bin-directory': '',
+                    'find-links': '',
+                    'allow-hosts': '',
+                    'develop-eggs-directory': '',
+                    'eggs-directory': '',
+                    'python': 'testpython',
+                    },
+                 'testpython': {
+                     'executable': sys.executable,
+                     },
+                 'slap-connection': {
+                     'computer-id': '',
+                     'partition-id': '',
+                     'server-url': '',
+                     'software-release-url': '',
+                     }
+                }
+
+        options = {
+                'rdiffbackup-binary': ''
+                }
+
+        return pbs.Recipe(buildout=buildout, name='pbs', options=options)
+
+    def test_push(self):
+        recipe = self.new_recipe()
+
+        with tempfile.NamedTemporaryFile() as rdiff_wrapper:
+            recipe.wrapper_push(remote_schema='TEST_REMOTE_SCHEMA',
+                                local_dir='TEST_LOCAL_DIR',
+                                remote_dir='TEST_REMOTE_DIR',
+                                rdiff_wrapper_path=rdiff_wrapper.name)
+            content = rdiff_wrapper.read()
+            self.assertIn('--remote-schema TEST_REMOTE_SCHEMA', content)
+            self.assertIn('TEST_LOCAL_DIR', content)
+            self.assertIn('TEST_REMOTE_DIR', content)
+
+    def test_pull(self):
+        recipe = self.new_recipe()
+
+        with tempfile.NamedTemporaryFile() as rdiff_wrapper:
+            recipe.wrapper_pull(remote_schema='TEST_REMOTE_SCHEMA',
+                                local_dir='TEST_LOCAL_DIR',
+                                remote_dir='TEST_REMOTE_DIR',
+                                rdiff_wrapper_path=rdiff_wrapper.name,
+                                remove_backup_older_than='TEST_OLDER')
+            content = rdiff_wrapper.read()
+            self.assertIn('--remote-schema TEST_REMOTE_SCHEMA', content)
+            self.assertIn('TEST_LOCAL_DIR', content)
+            self.assertIn('TEST_REMOTE_DIR', content)
+            self.assertIn('--remove-older-than TEST_OLDER', content)
+
+    def test_invalid_type(self):
+        recipe = self.new_recipe()
+
+        entry = {
+                'url': 'http://url.to.something/',
+                'type': 'invalid'
+                }
+
+        self.assertRaisesRegexp(ValueError,
+                                'type parameter must be either pull or push',
+                                recipe.add_slave, entry=entry, known_hosts_file={})
+
+    def test_install(self):
+        recipe = self.new_recipe()
+
+        promises_directory = tempfile.mkdtemp()
+        wrappers_directory = tempfile.mkdtemp()
+        directory = tempfile.mkdtemp()
+        feeds_directory = tempfile.mkdtemp()
+        run_directory = tempfile.mkdtemp()
+        cron_directory = tempfile.mkdtemp()
+
+        recipe.options.update({
+            'promises-directory': promises_directory,
+            'wrappers-directory': wrappers_directory,
+            'sshclient-binary': 'TEST_SSH_CLIENT',
+            'directory': directory,
+            'notifier-binary': 'TEST_NOTIFIER',
+            'feeds': feeds_directory,
+            'notifier-url': 'http://url.to.notifier/',
+            'run-directory': run_directory,
+            'cron-entries': cron_directory,
+            'known-hosts': 'TEST_KNOWN_HOSTS',
+            'slave-instance-list': '''[
+                {
+                 "url": "http://url.to.pull/",
+                 "type": "pull",
+                 "notification-id": "pulltest",
+                 "server-key": "TEST_SERVER_KEY",
+                 "name": "TEST_NAME",
+                 "notify": "http://url.to.notify/",
+                 "frequency": "TEST_FREQUENCY"
+                    }, {
+                 "url": "http://url.to.push/",
+                 "type": "push",
+                 "notification-id": "pushtest",
+                 "server-key": "TEST_SERVER_KEY",
+                 "name": "TEST_NAME",
+                 "notify": "http://url.to.notify/",
+                 "frequency": "TEST_FREQUENCY"
+                        }
+                ]
+                '''
+            })
+
+        recipe._install()
+
+        self.assertItemsEqual(os.listdir(promises_directory),
+                              ['pulltest', 'pushtest'])
+
+        self.assertItemsEqual(os.listdir(wrappers_directory),
+                              ['pulltest_raw', 'pulltest', 'pushtest_raw', 'pushtest'])
+
+        self.assertItemsEqual(os.listdir(directory),
+                              ['TEST_NAME'])
+
+        self.assertItemsEqual(os.listdir(feeds_directory),
+                              ['pulltest', 'pushtest'])
+
+        self.assertItemsEqual(os.listdir(run_directory),
+                              [])
+
+        self.assertItemsEqual(os.listdir(cron_directory),
+                              ['pulltest', 'pushtest'])
+
+        shutil.rmtree(promises_directory)
+        shutil.rmtree(wrappers_directory)
+        shutil.rmtree(directory)
+        shutil.rmtree(feeds_directory)
+        shutil.rmtree(run_directory)
+        shutil.rmtree(cron_directory)
+
+

slapos/test/schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Slapos Software Release instantiation descriptor",
+  "additionalProperties": false,
+  "properties": {
+    "name": {
+      "description": "A short human-friendly name for the sofware release",
+      "type": "string"
+    },
+    "description": {
+      "description": "A short description of the sofware release",
+      "type": "string"
+    },
+    "serialisation": {
+      "description": "How the parameters and results are serialised",
+      "require": true,
+      "enum": ["xml", "json-in-xml"],
+      "type": "string"
+    },
+    "software-type": {
+      "description": "Existing software types",
+      "require": true,
+      "patternProperties": {
+        ".*": {
+          "description": "Software type declaration",
+          "additionalProperties": false,
+          "properties": {
+            "title": {
+              "description": "A human-friendly title of the software type",
+              "type": "string"
+            },
+            "description": {
+              "description": "A human-friendly description of the software type",
+              "type": "string"
+            },
+            "serialisation": {
+              "description": "How the parameters and results are serialised, if different from global setting",
+              "enum": ["xml", "json-in-xml"],
+              "type": "string"
+            },
+            "request": {
+              "require": true,
+              "description": "URL, relative to Software Release base path, of a json schema for values expected by instance of current software type",
+              "type": "string"
+            },
+            "response": {
+              "require": true,
+              "description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type",
+              "type": "string"
+            },
+            "index": {
+              "description": "Value to use instead of software type id to sort them (in order to display most relevant software types earlier in a list, for example)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    }
+  },
+  "type": "object"
+}
+

slapos/test/test_json_schema.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import unittest
+import os
+import glob
+import json
+import slapos.test
+import jsonschema
+
+
+def getSchemaValidator(filename):
+  schema_json_file = "/".join(slapos.test.__file__.split("/")[:-1])
+  schema_json_file += "/%s" % filename
+  with open(schema_json_file, "r") as json_file:
+    json_dict = json.loads(json_file.read())
+    json_file.close()
+  return json_dict
+
+def createTest(path, json_dict):
+  def run(self, *args, **kwargs):
+    with open(path, "r") as json_file:
+      self.assertEquals(jsonschema.validate(json.loads(json_file.read()), json_dict), None)
+      json_file.close()
+
+  return run
+
+def generateSoftwareCfgTest():
+  json_dict = getSchemaValidator("schema.json")
+  base_path = "/".join(slapos.test.__file__.split("/")[:-3])
+  for path in glob.glob("%s/software/*/software.cfg.json" % base_path):
+    test_name = "test_%s_software_cfg_json" % path.split("/")[-2]
+    setattr(TestJSONSchemaValidation, test_name , createTest(path, json_dict)) 
+
+
+def generateJSONSchemaTest():
+  json_dict = getSchemaValidator("metaschema.json")
+  base_path = "/".join(slapos.test.__file__.split("/")[:-3])
+  for path in glob.glob("%s/software/*/*schema.json" % base_path):
+    software_type = path.split("/")[-2]
+    filename = path.split("/")[-1].replace("-", "_").replace(".", "_")
+    test_name = "test_schema_%s_%s" % (software_type, filename)
+    setattr(TestJSONSchemaValidation, test_name , createTest(path, json_dict)) 
+
+class TestJSONSchemaValidation(unittest.TestCase):
+  pass
+
+generateSoftwareCfgTest()
+generateJSONSchemaTest()
+
+if __name__ == '__main__':
+  unittest.main()

slapos/test/test_recipe.py

+import os
+import sys
+import unittest
+
+def additional_tests():
+  """
+  Load all recipe tests. test file must be called or finished by "test_recipe.py".
+  """
+  setup_file = sys.modules['__main__'].__file__
+  setup_directory = os.path.abspath(os.path.dirname(setup_file))
+  recipe_directory = os.path.join(setup_directory, 'slapos', 'test', 'recipe')
+  return unittest.defaultTestLoader.discover(recipe_directory)
+

software/agent/software.cfg

@@ -60,63 +60,3 @@ eggs =
   slapos.core
   slapos.toolbox[agent]
   erp5.util
-
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Cedric de Saint Martin
-#   Rafael Monnerat
-#   Test agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAOcKrOH/2Da6MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjk3MCAXDTEyMDYyNjAzMDU1MVoYDzIxMTIwNjAyMDMwNTUxWjAT
-  MREwDwYDVQQDDAhDT01QLTI5NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  xzbOGlcoin2q+Mtp52r26Njliz2aoxIXbnOBUyDc/OGtk9nWA5uBtTc2zwR17um6
-  KV0bGyvuBA78XcvU+AIV/5s0ohBAX7yjRKmEhAYcFvov3EyWSdjOrqqo4qFSzOrK
-  sVQBlxIDpjQBH4F3lf6dBv6/M+tCT3iSv3aOZbsG0E8CAwEAAaNQME4wHQYDVR0O
-  BBYEFLqtrfTu+BIVt+TFiRUkIoiWIYrxMB8GA1UdIwQYMBaAFLqtrfTu+BIVt+TF
-  iRUkIoiWIYrxMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc8N5P5gW
-  Jrdk9gF/3Cpp6THDiy93+WcuAm7zFwXPFNttJtFKMNObP2YRZvsQkvjezfrZoRBF
-  j8LgKB3tZCbBj+HDj+AeD+q9V+cqMFLKc6LezvQYUuum6bZdfUNnPv1K1ULYSPjq
-  /jsRBbabCWSXqxR6gYEM6ooauj3udBMXhHE=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----