Merge remote-tracking branch 'origin/master' into x/gitlab

Conflicts:
	stack/slapos.cfg

component/firewalld/buildout.cfg

 [buildout]
 
-parts = 
+parts =
   firewalld-patch
 
-extends = 
+extends =
   ../pkgconfig/buildout.cfg
   ../autoconf/buildout.cfg
   ../automake/buildout.cfg
@@ -24,10 +24,10 @@ recipe = slapos.recipe.cmmi
 url = https://github.com/t-woerner/firewalld/archive/v0.3.14.2.tar.gz
 md5sum = b8f81b536ede502721f69300d374447b
 python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages
-configure-command = 
+pre-configure =
+  sed -i -E 's,(^SUBDIRS *=.*) doc(\b.*),\1\2,' Makefile.am
   aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal
   ./autogen.sh
-  sed -i "s#SUBDIRS = config doc po shell-completion src#SUBDIRS = config po shell-completion src#" Makefile
 
 environment =
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
@@ -49,7 +49,7 @@ python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2
 environment =
   PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  DBUS_CFLAGS=-I${dbus:location}/include/dbus-1.0 -I${dbus:location}/lib/dbus-1.0/include 
+  DBUS_CFLAGS=-I${dbus:location}/include/dbus-1.0 -I${dbus:location}/lib/dbus-1.0/include
   DBUS_LIBS=-L${dbus:location}/lib -ldbus-1
   DBUS_GLIB_CFLAGS=-I${dbus-glib:location}/include/dbus-1.0
   DBUS_GLIB_LIBS=-L${dbus-glib:location}/lib -ldbus-glib-1
@@ -62,11 +62,11 @@ environment =
 [gobject-introspection]
 recipe = slapos.recipe.cmmi
 url = https://github.com/GNOME/gobject-introspection/archive/GOBJECT_INTROSPECTION_1_45_2.tar.gz
-configure-command = 
+pre-configure =
   libtoolize -c -f
   aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal
   ./autogen.sh
-configure-options = 
+configure-options =
   --disable-static
 
 environment =
@@ -86,12 +86,10 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.10/pygobject-3.10.2.tar.xz
 python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages
-# md5sum =
-configure-command = 
+ md5sum = f311155be8510df6ad8e4edf1cb463d4
+pre-configure =
   sed -i 's#/usr/local#${gobject-introspection:location}#g' ${gobject-introspection:location}/lib/pkgconfig/gobject-introspection-1.0.pc
-  ./configure
-configure-options = 
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+configure-options =
   --disable-static
   --disable-cairo
   --with-python=${python2.7:location}/bin/python2.7
@@ -120,7 +118,7 @@ md5sum = 893752ba2e93a1e96334dfee19f884ad
 [firewalld-patch]
 recipe = plone.recipe.command
 python = ${buildout:directory}/bin/${firewalld-eggs:interpreter}
-command = 
+command =
   sed -i 's#/usr/bin/python -Es#${:python}#' ${firewalld:location}/bin/firewall-cmd
   sed -i 's#/usr/bin/python -Es#${:python}#' ${firewalld:location}/sbin/firewalld
   sed -i 's#DefaultZone=public#DefaultZone=trusted#' ${firewalld:location}/etc/firewalld/firewalld.conf
@@ -137,7 +135,7 @@ update-command = ${:command}
 [firewalld-eggs]
 recipe = zc.recipe.egg:scripts
 interpreter = python.eggs
-eggs = 
+eggs =
   decorator
   six
   ${python-slip-egg:eggs}

software/neoppod/software-common.cfg

@@ -13,20 +13,16 @@ extends =
 #LXML
     ../../component/lxml-python/buildout.cfg
 #END LXML
-    ../../component/python-2.7/buildout.cfg
-    ../../component/mariadb/buildout.cfg
     ../../component/mysql-python/buildout.cfg
     ../../component/pycrypto-python/buildout.cfg
 
 parts =
+# keep neoppod first so that ZODB3 is built correctly,
+# before any other section that would depend on it
+    neoppod
     slapos-deps-eggs
     slapos-cookbook-develop
     slapos-cookbook
-# NEO & dependencies
-    python2.7
-    mariadb
-    mysql-python
-    neoppod
 
 [slapos-deps-eggs]
 recipe = zc.recipe.egg
@@ -97,6 +93,7 @@ md5sum = febd3ed58043ce1367b86cf6e4e69700
 [neoppod]
 recipe = zc.recipe.egg
 eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb]
+  ${mysql-python:egg}
   ZODB3
 ZODB3-patches = ${:_profile_base_location_}/../../component/egg-patch/ZODB3-3.10.5.patch
 ZODB3-patch-options = -p1

software/wendelin/software-dev.cfg

@@ -11,7 +11,3 @@ parts += wendelin.core-dev
 # tell erp5 to use -dev eggs instead of released ones
 eggs -= ${wendelin.core:egg}
 eggs += ${wendelin.core-dev:egg}
-
-# kill -USR1 <runzope-pid>    ->  traceback of all threads -> stdout
-#                                 ( logged to slappartX/.slappartX_zope-Y.log )
-        Products.signalstack

software/wendelin/software.cfg

@@ -56,6 +56,6 @@ scipy = 0.15.1
 pandas = 0.16.1
 msgpack-python = 0.4.6
 numpy = 1.9.2
-wendelin.core = 0.4
+wendelin.core = 0.5
 ipython = 3.2.0
 matplotlib = 1.4.3

stack/erp5/buildout.cfg

@@ -183,7 +183,7 @@ md5sum = dd779e54d22105702aa72cadc994d957
 [template-mariadb-initial-setup]
 <= download-base
 filename = mariadb_initial_setup.sql.in
-md5sum = b8d2d9af0c4cab45c8337aeac28d5fae
+md5sum = 6465212fdc7fe9076a0c929d9f14da14
 
 [template-create-erp5-site]
 <= download-base
@@ -570,9 +570,7 @@ Products.DCWorkflow-patch-options = -p1
 
 [zodbanalyze]
 recipe = zc.recipe.egg
-eggs =
-  ZODB3
-  erp5.util
+eggs = erp5.util
 entry-points =
   zodbanalyze=erp5.util.zodbanalyze:main
 scripts = zodbanalyze

stack/erp5/mariadb_initial_setup.sql.in

@@ -6,10 +6,10 @@ DROP FUNCTION IF EXISTS sphinx_snippets;
 #CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'ha_sphinx.so';
 
 {% macro database(name, user, password) -%}
-CREATE DATABASE IF NOT EXISTS {{ name }};
+CREATE DATABASE IF NOT EXISTS `{{ name }}`;
 {% if user -%}
-GRANT ALL PRIVILEGES ON {{ name }}.* TO {{ user }}@'%' IDENTIFIED BY '{{ password }}';
-GRANT ALL PRIVILEGES ON {{ name }}.* TO {{ user }}@'localhost' IDENTIFIED BY '{{ password }}';
+GRANT ALL PRIVILEGES ON `{{ name }}`.* TO `{{ user }}`@`%` IDENTIFIED BY '{{ password }}';
+GRANT ALL PRIVILEGES ON `{{ name }}`.* TO `{{ user }}`@localhost IDENTIFIED BY '{{ password }}';
 {%- endif %}
 {% endmacro -%}
 

stack/slapos.cfg

@@ -9,9 +9,6 @@ python = python2.7
 # Note that if you want a develop version of slapos-cookbook from a git
 # checkout, you must add both slapos-cookbook-develop and slapos-cookbook in parts
 
-# Explicitly disable download-cache
-# download-cache =
-
 # Generate list of automatically chosen eggs version
 extensions +=
   buildout-versions
@@ -122,6 +119,7 @@ cliff = 1.15.0
 cmd2 = 0.6.8
 collective.recipe.template = 1.11
 cryptography = 1.0.2
+decorator = 4.0.4
 idna = 2.0
 inotifyx = 0.2.2
 itsdangerous = 0.24
@@ -129,6 +127,7 @@ lxml = 3.4.4
 meld3 = 1.0.2
 netaddr = 0.7.18
 pbr = 1.8.1
+plone.recipe.command = 1.1
 prettytable = 0.7.2
 psutil = 3.2.2
 pyOpenSSL = 0.15.1
@@ -140,7 +139,7 @@ setuptools = 18.1
 simplejson = 3.8.0
 six = 1.10.0
 slapos.cookbook = 1.0.9
-slapos.core = 1.3.11
+slapos.core = 1.3.12
 slapos.extension.strip = 0.1
 slapos.libnetworkcache = 0.14.5
 slapos.recipe.build = 0.21
@@ -150,7 +149,7 @@ unicodecsv = 0.14.1
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.core==1.3.11
+# slapos.core==1.3.12
 Flask = 0.10.1
 
 # Required by:
@@ -183,7 +182,7 @@ jsonschema = 2.5.1
 lock-file = 2.0
 
 # Required by:
-# slapos.core==1.3.11
+# slapos.core==1.3.12
 netifaces = 0.10.4
 
 # Required by:
@@ -191,15 +190,15 @@ netifaces = 0.10.4
 pycparser = 2.14
 
 # Required by:
-# slapos.core==1.3.11
+# slapos.core==1.3.12
 supervisor = 3.1.3
 
 # Required by:
-# slapos.core==1.3.11
+# slapos.core==1.3.12
 uritemplate = 0.6
 
 # Required by:
-# slapos.core==1.3.11
+# slapos.core==1.3.12
 zope.interface = 4.1.3
 
 [networkcache]