Merge branch 'erp5' into deployment_generic_CR1094

Conflicts:
	component/mariadb/buildout.cfg
	component/sphinx/buildout.cfg
	slapos/recipe/generic_mysql/template/my.cnf.in
	software/erp5/software.cfg

component/apache-php/buildout.cfg

 [buildout]
 parts = apache-php
 
-extends = 
+extends =
   ../apache/buildout.cfg
   ../cclient/buildout.cfg
-  ../curl/buildout.cfg  
+  ../curl/buildout.cfg
   ../freetype/buildout.cfg
   ../gettext/buildout.cfg
   ../libiconv/buildout.cfg
@@ -19,8 +19,8 @@ extends =
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = hexagonit.recipe.cmmi
-url = http://fr2.php.net/distributions/php-5.3.8.tar.gz
-md5sum = f4ce40d5d156ca66a996dbb8a0e7666a
+url = http://fr2.php.net/distributions/php-5.3.10.tar.gz
+md5sum = 816259e5ca7d0a7e943e56a3bb32b17f
 configure-options =
   --with-apxs2=${apache:location}/bin/apxs
   --with-libxml-dir=${libxml2:location}
@@ -37,7 +37,7 @@ configure-options =
   --with-mysqli=mysqlnd
   --with-curl=${curl:location}
   --with-zip-dir=${zip:location}
-  --with-imap=${cclient:location}  
+  --with-imap=${cclient:location}
   --with-iconv-dir=${libiconv:location}
   --with-gettext=${gettext:location}
   --with-ldap=${openldap:location}

component/apache/buildout.cfg

@@ -13,23 +13,13 @@ extends =
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
 
-[apache-CVE-2011-3368.patch]
-recipe = hexagonit.recipe.download
-md5sum = 1ad598213480ddfc239ce6359b7b2c0b
-url = http://www.apache.org/dist/httpd/patches/apply_to_2.2.21/CVE-2011-3368.patch
-filename = ${:_buildout_section_name_}
-download-only = true
-
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.21.tar.bz2
-md5sum = 1696ae62cd879ab1d4dd9ff021a470f2
-patches =
-  ${apache-CVE-2011-3368.patch:location}/${apache-CVE-2011-3368.patch:filename}
-patch-options = -p1
+url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.bz2
+md5sum = 9fe3093194c8a57f085ff7c3fc43715f
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer

component/ghostscript/buildout.cfg

@@ -28,5 +28,5 @@ environment =
 
 [ghostscript-9]
 <= ghostscript-common
-url = http://downloads.ghostscript.com/public/ghostscript-9.04.tar.bz2
-md5sum = 9f6899e821ab6d78ab2c856f10fa3023
+url = http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2
+md5sum = 8bcef1f33ddf8a4d12b2cf8da385c191

component/haproxy/buildout.cfg

@@ -10,6 +10,6 @@ configure-command = true
 # otherwise use "generic".
 # For ARCH value, x86_64 and i[3456]86 are supported.
 make-options =
-  TARGET="$(uname -sr 2>/dev/null|grep -q '^Linux 2\.6' && echo linux26 || echo generic)"
+  TARGET="$(uname -sr 2>/dev/null|grep -Eq '^Linux (2\.6|3)' && echo linux26 || echo generic)"
   ARCH="$(uname -m 2>/dev/null|grep -E '^(x86_64|i[3456]86)$')"
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}

component/libreoffice-bin/buildout.cfg

@@ -12,15 +12,15 @@ find-links =
 [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 = 3.4.5
+version = 3.5.0
 url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
 
 # supported architectures md5sums
-md5sum_x86 = 34786e6aa570782abac551ab092f3fb3
-md5sum_x86-64 = 2159a50daab707c02b669a83f635ff0c
+md5sum_x86 = 72421e3d6ab619b50ea941ab369bd0d4
+md5sum_x86-64 = 2ed879f33f225faff9b0b4b7a1c94155
 
 # where office code can be found?
-officedir = libreoffice3.4
+officedir = libreoffice3.5
 
 # script to install
 script =
@@ -38,7 +38,14 @@ script =
   rpmsdir = os.path.join(workdir, [q for q in os.listdir(workdir) if q == 'RPMS'][0])
   rpmlist = [os.path.join(rpmsdir, q) for q in os.listdir(rpmsdir) if q.endswith('.rpm') and 'javafilter' not in q and 'xsltfilter' not in q]
   [self.pipeCommand([[sys.executable, '${:rpm2cpio}', rpm], ['${:cpio}', '-idum']], cwd=storagedir) for rpm in rpmlist]
-  self.copyTree(os.path.join(storagedir, 'opt', '${:officedir}'), location, ['basis3.4', 'ure'])
+  self.copyTree(os.path.join(storagedir, 'opt', '${:officedir}'), location, ['ure-link'])
+  os.symlink('ure', os.path.join(location, 'ure-link'))
+  # backward compatibility for cloudooo configuration
+  os.mkdir(os.path.join(location, 'basis-link'))
+  os.symlink(os.path.join('..', 'program'), os.path.join(location, 'basis-link', 'program'))
+  # temporary workaround for https://bugs.freedesktop.org/show_bug.cgi?id=45696
+  os.unlink(os.path.join(location, 'ure', 'lib', 'libgcc_s.so.1'))
+  os.unlink(os.path.join(location, 'ure', 'lib', 'libstdc++.so.6'))
 
 # helper binaries
 cpio = ${cpio:location}/bin/cpio

component/mariadb/mroonga-1.20-mariadb.patch

 diff --git a/ha_mroonga.cc b/ha_mroonga.cc
-index 722d686..9fa7168 100644
+index 722d686..4710eda 100644
 --- a/ha_mroonga.cc
 +++ b/ha_mroonga.cc
-@@ -6930,9 +6930,14 @@ int ha_mroonga::generic_store_bulk_timestamp(Field *field, grn_obj *buf)
+@@ -249,7 +249,7 @@ static void mrn_init_encoding_map()
+   DBUG_VOID_RETURN;
+ }
+ 
+-static int mrn_change_encoding(grn_ctx *ctx, CHARSET_INFO *charset)
++static int mrn_change_encoding(grn_ctx *ctx, const CHARSET_INFO *charset)
+ {
+   MRN_DBUG_ENTER_FUNCTION();
+   if (!charset)
+@@ -6926,14 +6926,36 @@ int ha_mroonga::generic_store_bulk_float(Field *field, grn_obj *buf)
+   DBUG_RETURN(error);
+ }
+ 
++long long int ha_mroonga::get_grn_time_from_timestamp_field(Field_timestamp *field)
++{
++  MRN_DBUG_ENTER_METHOD();
++  long long int grn_time = 0;
++#ifdef MRN_TIMESTAMP_USE_TIMEVAL
++  int warnings = 0;
++  struct timeval time_value;
++  if (field->get_timestamp(&time_value, &warnings)) {
++    // XXX: Should we report warnings or MySQL does?
++  } else {
++    grn_time = GRN_TIME_PACK(time_value.tv_sec, time_value.tv_usec);
++  }
++#elif defined(MRN_TIMESTAMP_USE_MY_TIME_T)
++  unsigned long int micro_seconds;
++  my_time_t seconds = field->get_timestamp(&micro_seconds);
++  grn_time = GRN_TIME_PACK(seconds, micro_seconds);
++#else
++  my_bool is_null_value;
++  long seconds = field->get_timestamp(&is_null_value);
++  grn_time = GRN_TIME_PACK(seconds, 0);
++#endif
++  DBUG_RETURN(grn_time);
++}
++
+ int ha_mroonga::generic_store_bulk_timestamp(Field *field, grn_obj *buf)
  {
    MRN_DBUG_ENTER_METHOD();
    int error = 0;
 -  my_bool is_null_value;
    Field_timestamp *timestamp_field = (Field_timestamp *)field;
-+#ifndef MRN_MARIADB_P
-+  my_bool is_null_value;
-   long seconds = timestamp_field->get_timestamp(&is_null_value);
-+#else
-+  ulong second_part;
-+  long seconds = timestamp_field->get_timestamp(&second_part);
-+#endif
-   long long int time = GRN_TIME_PACK(seconds, 0);
+-  long seconds = timestamp_field->get_timestamp(&is_null_value);
+-  long long int time = GRN_TIME_PACK(seconds, 0);
++  long long int time = get_grn_time_from_timestamp_field(timestamp_field);
    grn_obj_reinit(ctx, buf, GRN_DB_TIME, 0);
    GRN_TIME_SET(ctx, buf, time);
-@@ -7231,7 +7236,11 @@ void ha_mroonga::storage_store_field_timestamp(Field *field,
+   DBUG_RETURN(error);
+@@ -7228,10 +7250,20 @@ void ha_mroonga::storage_store_field_timestamp(Field *field,
+                                                uint value_length)
+ {
+   long long int time = *((long long int *)value);
++  Field_timestamp *timestamp_field = (Field_timestamp *)field;
++#ifdef MRN_TIMESTAMP_USE_TIMEVAL
++  struct timeval time_value;
++  GRN_TIME_UNPACK(time, time_value.tv_sec, time_value.tv_usec);
++  timestamp_field->store_timestamp(&time_value);
++#elif defined(MRN_TIMESTAMP_USE_MY_TIME_T)
++  int32 sec, usec;
++  GRN_TIME_UNPACK(time, sec, usec);
++  timestamp_field->store_TIME(sec, usec);
++#else
    int32 sec, usec __attribute__((unused));
    GRN_TIME_UNPACK(time, sec, usec);
-   Field_timestamp *timestamp_field = (Field_timestamp *)field;
-+#ifndef MRN_MARIADB_P
+-  Field_timestamp *timestamp_field = (Field_timestamp *)field;
    timestamp_field->store_timestamp(sec);
-+#else
-+  timestamp_field->store_TIME(sec, 0);
 +#endif
  }
  
  void ha_mroonga::storage_store_field_date(Field *field,
-@@ -7283,7 +7292,11 @@ void ha_mroonga::storage_store_field_datetime(Field *field,
+@@ -7268,7 +7300,7 @@ void ha_mroonga::storage_store_field_datetime(Field *field,
+                                               uint value_length)
+ {
+   long long int time = *((long long int *)value);
+-  int32 sec, usec __attribute__((unused));
++  int32 sec, usec;
+   GRN_TIME_UNPACK(time, sec, usec);
+   struct tm date;
+   time_t sec_t = sec;
+@@ -7282,8 +7314,13 @@ void ha_mroonga::storage_store_field_datetime(Field *field,
+   mysql_date.hour = date.tm_hour;
    mysql_date.minute = date.tm_min;
    mysql_date.second = date.tm_sec;
++  mysql_date.second_part = usec;
    Field_datetime *datetime_field = (Field_datetime *)field;
-+#ifndef MRN_MARIADB_P
++#ifdef MRN_FIELD_STORE_TIME_NEED_TYPE
    datetime_field->store_time(&mysql_date, MYSQL_TIMESTAMP_DATETIME);
 +#else
 +  datetime_field->store_time(&mysql_date);
@@ -42,11 +96,11 @@ index 722d686..9fa7168 100644
  }
  
  void ha_mroonga::storage_store_field_new_date(Field *field,
-@@ -7303,7 +7316,11 @@ void ha_mroonga::storage_store_field_new_date(Field *field,
+@@ -7303,7 +7340,11 @@ void ha_mroonga::storage_store_field_new_date(Field *field,
    mysql_date.month = date.tm_mon + 1;
    mysql_date.day = date.tm_mday;
    Field_newdate *newdate_field = (Field_newdate *)field;
-+#ifndef MRN_MARIADB_P
++#ifdef MRN_FIELD_STORE_TIME_NEED_TYPE
    newdate_field->store_time(&mysql_date, MYSQL_TIMESTAMP_DATE);
 +#else
 +  newdate_field->store_time(&mysql_date);
@@ -54,3 +108,35 @@ index 722d686..9fa7168 100644
  }
  
  void ha_mroonga::storage_store_field_blob(Field *field,
+diff --git a/ha_mroonga.h b/ha_mroonga.h
+index 4e6c8ff..0642d33 100644
+--- a/ha_mroonga.h
++++ b/ha_mroonga.h
+@@ -106,6 +106,18 @@ extern "C" {
+ #  define MRN_HAVE_HA_EXTRA_PREPARE_FOR_FORCED_CLOSE
+ #endif
+ 
++#if MYSQL_VERSION_ID >= 50604
++#  define MRN_TIMESTAMP_USE_TIMEVAL
++#elif defined(MRN_MARIADB_P)
++#  define MRN_TIMESTAMP_USE_MY_TIME_T
++#else
++#  define MRN_TIMESTAMP_USE_LONG
++#endif
++
++#if 50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50604
++#  define MRN_FIELD_STORE_TIME_NEED_TYPE
++#endif
++
+ class ha_mroonga;
+ 
+ /* structs */
+@@ -402,6 +414,8 @@ private:
+                               longlong *limit,
+                               grn_obj *target_table, grn_obj *score_column);
+ 
++  long long int get_grn_time_from_timestamp_field(Field_timestamp *field);
++
+   int generic_store_bulk_string(Field *field, grn_obj *buf);
+   int generic_store_bulk_integer(Field *field, grn_obj *buf);
+   int generic_store_bulk_float(Field *field, grn_obj *buf);

component/percona-toolkit/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 recipe = hexagonit.recipe.cmmi
 depends =
   ${perl:version}
-url = http://www.percona.com/redir/downloads/percona-toolkit/2.0.2/percona-toolkit-2.0.2.tar.gz
-md5sum = 74f55df529b2527853d4d907f0175c0d
+url = http://www.percona.com/redir/downloads/percona-toolkit/2.0.3/percona-toolkit-2.0.3.tar.gz
+md5sum = 10f394c101067b6bf28427c5d4833330
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/pkgconfig/buildout.cfg

@@ -11,8 +11,8 @@ extends =
 
 [pkgconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.25.tar.gz
-md5sum = a3270bab3f4b69b7dc6dbdacbcae9745
+url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
+md5sum = 47525c26a9ba7ba14bf85e01509a7234
 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.
@@ -27,3 +27,5 @@ environment =
   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
+  GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
+  GLIB_LIBS=-L${glib:location}/lib -lglib-2.0 -lintl

component/xorg/buildout.cfg

@@ -31,6 +31,9 @@ configure-options =
   --disable-specs
   --without-xmlto
   --without-fop
+environment =
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
+  PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [xextproto]
 recipe = hexagonit.recipe.cmmi
@@ -40,6 +43,9 @@ configure-options =
   --disable-specs
   --without-xmlto
   --without-fop
+environment =
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
+  PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [xtrans]
 recipe = hexagonit.recipe.cmmi
@@ -49,6 +55,9 @@ configure-options =
   --disable-docs
   --without-xmlto
   --without-fop
+environment =
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
+  PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libXau]
 recipe = hexagonit.recipe.cmmi
@@ -57,7 +66,7 @@ md5sum = 4a2cbd83727682f9ee1c1e719bac6adb
 configure-options =
   --disable-static
 environment =
-  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [xcbproto]
@@ -94,7 +103,7 @@ recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXext-1.2.0.tar.bz2
 md5sum = 9bb236ff0193e9fc1c1fb504dd840331
 environment =
-  PKG_CONFIG_PATH=${xcbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xcbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
 # Warning: do *not* enable -fPIC CFLAGS for this library. Even if it fails and ld asks you to enable it. This will not solve your problem, and create an unexpected (by build chain) setup (all .o will be position-independant code).
 # CFLAGS=-fPIC
@@ -131,7 +140,7 @@ configure-options =
   --without-xmlto
   --without-fop
 environment =
-  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libXdmcp]
@@ -156,7 +165,7 @@ recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXinerama-1.1.1.tar.bz2
 md5sum = ecd4839ad01f6f637c6fb5327207f89b
 environment =
-  PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
 configure-options =
   --disable-static
@@ -170,7 +179,7 @@ configure-options =
   --without-xmlto
   --without-fop
 environment =
-  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libSM]
@@ -182,6 +191,6 @@ configure-options =
   --without-xmlto
   --without-fop
 environment =
-  PKG_CONFIG_PATH=${libICE:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${libICE:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
   LIBUUID_CFLAGS=-I${libuuid:location}/include

slapos/recipe/erp5/template/mysql-init-function.sql.in

-USE mysql;
-DROP FUNCTION IF EXISTS last_insert_grn_id;
-CREATE FUNCTION last_insert_grn_id RETURNS INTEGER SONAME 'ha_mroonga.so';
-DROP FUNCTION IF EXISTS sphinx_snippets;
-CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'sphinx.so';

slapos/recipe/fontconfig/template/fontconfig.cfg.in

 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+<cachedir>~/.fontconfig</cachedir>
 %(font_folder_path_snippet)s
 </fontconfig>
\ No newline at end of file

slapos/recipe/generate_erp5_tidstorage.py

@@ -57,6 +57,9 @@ class Recipe(GenericSlapRecipe):
     known_tid_storage_identifier_dict = {}
     snippet_zeo = open(self.options['snippet-zeo']).read()
     for zeo_id, zeo_configuration_list in json_data['zeo'].iteritems():
+      if not type(zeo_configuration_list) in (type([]), type(set()), type(())):
+        raise ValueError('%s passed in json is not a list, json: %s.' % (
+          zeo_configuration_list, json_data))
       storage_list = []
       a = storage_list.append
       for zeo_slave in zeo_configuration_list:

slapos/recipe/generic_zope/template/zope.conf.in

@@ -20,6 +20,11 @@ zserver-threads %(thread_amount)s
 pid-filename %(pid-filename)s
 lock-filename %(lock-filename)s
 
+# Encoding
+rest-input-encoding utf-8
+rest-output-encoding utf-8
+default-zpublisher-encoding utf-8
+
 # Temporary storage database (for sessions)
 <zodb_db temporary>
      <temporarystorage>

slapos/recipe/generic_zope_zeo_client/template/zope.conf.in

@@ -20,6 +20,11 @@ zserver-threads %(thread_amount)s
 pid-filename %(pid-filename)s
 lock-filename %(lock-filename)s
 
+# Encoding
+rest-input-encoding utf-8
+rest-output-encoding utf-8
+default-zpublisher-encoding utf-8
+
 # Temporary storage database (for sessions)
 <zodb_db temporary>
      <temporarystorage>

slapos/recipe/symbolic_link.py

@@ -54,3 +54,5 @@ class Recipe:
       path_list.append(link)
 
     return path_list
+
+  update = install

software/erp5/instance-erp5-development.cfg

@@ -125,6 +125,6 @@ recipe = slapos.cookbook:mkdirectory
 etc = $${buildout:directory}/etc
 
 [directory]
-test-ca-dir = $${rootdirectory:srv}/test-ca/
-test-instance-path = $${rootdirectory:srv}/test-instance/
-unit-test-path = $${:test-instance-path}/unit_test/
+test-ca-dir = $${rootdirectory:srv}/test-ca
+test-instance-path = $${rootdirectory:srv}/test-instance
+unit-test-path = $${:test-instance-path}/unit_test

software/erp5/instance-zope.cfg

@@ -19,8 +19,8 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
 [slap-parameter]
-# By default backend disallows the access
-access-control-string = none
+# By default, if no white list is specified, backend allows access to everyone
+access-control-string = all
 
 [publish-apache-zope-backend-connection-string]
 recipe = slapos.cookbook:publish

software/erp5/software.cfg

@@ -83,7 +83,7 @@ mode = 0644
 [template-zope]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-zope.cfg
-md5sum = 841544c8cbc14aca81cbb7acaac04210
+md5sum = 7c2d67cdcd49db3ce866d501a466f9c7
 output = ${buildout:directory}/template-zope.cfg
 mode = 0644
 
@@ -125,7 +125,7 @@ mode = 0644
 [template-erp5-development]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-erp5-development.cfg
-md5sum = 722060b6b8daed9bfb7df0c1109b976c
+md5sum = 56c7be11b384259bc7f65eabc0542b40
 output = ${buildout:directory}/template-erp5-development.cfg
 mode = 0644
 

stack/erp5.cfg

@@ -459,7 +459,7 @@ scripts =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003
+zc.buildout = 1.6.0-dev-SlapOS-004
 
 # pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs
 Acquisition = 2.13.7nxd001