Merge branch 'master' into erp5-component

component/libiconv/buildout.cfg

@@ -2,7 +2,19 @@
 parts =
   libiconv
 
+[libiconv.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 8a20d8afe0617fce56f77537d2b84621
+download-only = true
+filename = libiconv.gets.patch
+
 [libiconv]
+virtual-depends =
+  ${libiconv.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${libiconv.gets.patch:location}/${libiconv.gets.patch:filename}
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
 md5sum = e34509b1623cec449dfeb73d7ce9c6c6

component/libiconv/libiconv.gets.patch

+--- libiconv-1.14.orig/srclib/stdio.in.h        2011-08-07 13:42:06.000000000 +0000
++++ libiconv-1.14/srclib/stdio.in.h     2013-01-09 19:56:21.115819812 +0000
+@@ -680,22 +680,7 @@
+ #endif
+ 
+ #if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gets
+-#   define gets rpl_gets
+-#  endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-#  undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#undef gets
+ #endif

slapos/recipe/request.py

@@ -131,8 +131,8 @@ class Recipe(object):
           options['instance-guid'] = self.instance.getInstanceGuid()
           # XXX: deprecated, to be removed
           options['instance_guid'] = self.instance.getInstanceGuid()
-        except slapmodule.ResourceNotReady:
-          # Backward compatibility. Old SlapOS masters don't know this.
+        except (slapmodule.ResourceNotReady, AttributeError):
+          # Backward compatibility. Old SlapOS master and core don't know this.
           self.logger.warning("Impossible to fetch instance GUID.")
     except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc:
       self._raise_request_exception = exc

software/helloworld/instance.cfg.in

@@ -18,8 +18,13 @@ offline = true
 
 
 [instance-parameter]
-# Fetches parameters defined in SlapOS Master for this instance.
-# Always the same.
+# Fetch arbitrary parameters defined by the user in SlapOS Master for his instance.
+# We use the slapconfiguration recipe with a few parameters (partition id,
+# computer id, certificate, etc).
+# It will then authenticate to SlapOS Master and fetch the instance parameters.
+# The parameters are accessible from $${instance-parameter:configuration.name-of-parameter}
+# Always the same. Just copy/paste.
+# See docstring of slapos.cookbook:slapconfiguration for more informations.
 recipe = slapos.cookbook:slapconfiguration
 computer = $${slap_connection:computer_id}
 partition = $${slap_connection:partition_id}
@@ -28,10 +33,13 @@ key = $${slap_connection:key_file}
 cert = $${slap_connection:cert_file}
 
 # Define default parameter(s) that will be used later, in case user didn't
-# specify it
-# All parameters are available through the configuration.XX syntax.
+# specify it.
 # All possible parameters should have a default.
-configuration.name = anonymous
+# In our use case, we are expecting from the user to specify one (optional) parameter: "name". We put the default value here if he doesn't specify it, so that it doesn't crash.
+configuration.name = John Doe
+# If our use case requires that the user can specify a mail address so that his instance can mail to him (for example), we can do:
+# configuration.mail-address =
+# If the user doesn't specify it, it won't break and the recipe can handle it (i.e don't send any mail for example).
 
 
 # Create all needed directories, depending on your needs

software/helloworld/software.cfg

@@ -25,6 +25,6 @@ parts =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
-# MD5 checksum can be skipped for development, but must be filled for production
-#md5sum = 
+# MD5 checksum can be skipped for development (easier to develop), but must be filled for production
+md5sum = 1fc461c00e86485bee77a942f39e3c43
 mode = 0644