This reverts commit 054386d6.

It proven to be insufficient to fix issues with PYTHON make variable
surcharging from top make.

also update apr and apt-util.

This was added in 48bcc52a (software/theia: some "better" defaults,
2019-08-30) because the default keybinding to create another cursor is
alt-click, but on ChromeOS alt-click does a right click, but:
 - not everybody use ChromeOS
 - this breaks the ctrl+click shortcut to go to definition/follow link
 - it makes SlapOS' Theia behaves differently from default Theia or vscode
 - ChromeOS users can use chrome://flags/#use-search-click-for-right-click
  (I'm using this flag and this seems perfect)

See merge request nexedi/slapos!1193

Since c53d0f43 (software/erp5: Remove create-erp5-site software-type
from json schema, 2018-01-08) instance is always created.

The default family was also processing activities, so it happened
sometimes that the zope does not respond in time because it's processing
activities. Create a dedicated activity family so that the default zope
is available to serve requests.

This makes slapos node instance slower, especially when there are many
kvm partitions on the node.

We don't really need to sleep because if qemu is not ready, promise will
fail and succeed on next run.

 - enable publisher-timeout by default, after 300s like haproxy used to do
 - make haproxy use similar timeout as publisher-timeout
 - small fixes to json schemas

See merge request nexedi/slapos!1192

When parameters are built by instance-erp5, we don't need to use .get,
because the key is supposed to be here - and if it's not here it would
be because of a bug so it's better to let the error propagate.

Since https://github.com/mroonga/mroonga/commit/35f593037c2d8f5a497349ff98f3a3ce31ee95de
install.sql has been split in install.sql and update.sql, adjust the
script to source both.

install.sql only contains INSTALL PLUGIN, it's safe to run it on every
update (that's what we always did).

This fixes a regression that mroonga user functions were no longer
available after d0589a41 (version up: MariaDB 10.3.35/10.4.25, groonga
12.0.4, mroonga 12.04, groonga-normalizer-mysql 1.1.8, 2022-06-10)

Instead of having an hardcoded timeout that users will hit anyway even
if they increase publisher timeout, set this timeout value to be
slightly higher than publisher timeout. This way publisher-timeout can
be used to allow longer requests and it's generally more consistent.

We already had haproxy configured to stop serving requests longer than
this duration, but the requests was still being processed by zope.

By adding such default in publisher-timeout, zope will stop processing
the request after the timeout.

This is slightly different behavior, because before this change the
request was still being processed, even if the client did not get the
response it may make change to databases.
Users who want to keep the previous behavior can request with
publisher-timeout parameter null.

When objects are not supposed to accept extra properties, setting
additionalProperties to false allows schema validator to detect typos
in key names, or usage obsolete keys.

See merge request nexedi/slapos!1190

Thanks to migration to json-in-xml serialisation some lower level bugs has
been discovered with value types in the profiles, so simply fix it.

default and kvm-cluster software types are now json-in-xml, so they accept
and return json-in-xml.

Update tests to show that xml and json-in-xml serialization works.

Note: There was invective to publish with pure XML serialisation, but it is
wrong idea because:

 1) serialisation in the software.cfg.json is provided for both ways
 2) requesting instances with given serialisation by profiles expect same
    serialisation

Request resilient instances with serialised, as they reply with json-in-xml.

Fixes this warning when running test:

    UserWarning: Error validating request parameters against schema definition:
    RefResolutionError unknown url type: 'instance-input-schema.json'

jsonschema (the python library) support this kind of refs when using
version draft-06 but not when using draft-04.

json-language-features (from theia text editor) does not understands
file.json#/ references, it complains:

    $ref '/' in 'file://...' can not be resolved.(768)

but not using the trailing / works fine

b'💥' is a SyntaxError in python.

Instead, switch to accessing options from option variable and apply
this to other options from this part.

This fixes this issue:

    While:
      Installing switch-softwaretype.
      Installing favicon.ico.

    An internal error occurred due to a bug in either zc.buildout or in a
    recipe being used:
    Traceback (most recent call last):
      File "zc.buildout-2.7.1+slapos019-py3.7.egg/zc/buildout/buildout.py", line 2360, in main
        getattr(buildout, command)(args)
      File "zc.buildout-2.7.1+slapos019-py3.7.egg/zc/buildout/buildout.py", line 640, in install
        self._install_parts(install_args)
      File "zc.buildout-2.7.1+slapos019-py3.7.egg/zc/buildout/buildout.py", line 820, in _install_parts
        installed_files = self[part]._call(recipe.install)
      File "zc.buildout-2.7.1+slapos019-py3.7.egg/zc/buildout/buildout.py", line 1668, in _call
        return f()
      File "slapos.cookbook-1.0.244-py3.7.egg/slapos/recipe/switch_softwaretype.py", line 108, in install
        sub_buildout.install([])
      File "zc.buildout-2.7.1+slapos019-py3.7.egg/zc/buildout/buildout.py", line 640, in install
        self._install_parts(install_args)
      File "zc.buildout-2.7.1+slapos019-py3.7.egg/zc/buildout/buildout.py", line 820, in _install_parts
        installed_files = self[part]._call(recipe.install)
      File "zc.buildout-2.7.1+slapos019-py3.7.egg/zc/buildout/buildout.py", line 1668, in _call
        return f()
      File "slapos.recipe.build-0.54-py3.7.egg/slapos/recipe/build/__init__.py", line 268, in install
        return self._shared.install(self.__install)
      File "slapos.recipe.build-0.54-py3.7.egg/slapos/recipe/__init__.py", line 150, in install
        install()
      File "slapos.recipe.build-0.54-py3.7.egg/slapos/recipe/build/__init__.py", line 278, in __install
        self._exec(self._install)
      File "slapos.recipe.build-0.54-py3.7.egg/slapos/recipe/build/__init__.py", line 261, in _exec
        code = compile(script, self.name, 'exec')
      File "favicon.ico", line 6
    SyntaxError: bytes can only contain ASCII literal characters.

See merge request nexedi/slapos!1183