.

component/ffmpeg/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../bzip2/buildout.cfg
   ../libpng/buildout.cfg
   ../patch/buildout.cfg
+  ../ncurses/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
   ../xorg/buildout.cfg
@@ -86,6 +87,10 @@ md5sum = 8e9866ad6b570c6c95c8cba48060473f
 configure-options =
   --disable-static
   --disable-gtktest
+environment =
+  PKG_CONFIG=${pkgconfig:location}/bin/pkgconfig
+  PKG_CONFIG_PATH=${ncurses:location}/lib/pkgconfig
+  LDFLAGS=-Wl,-rpath=${ncurses:location}/lib
 
 [opencore-amr]
 recipe = slapos.recipe.cmmi

component/gettext/buildout.cfg

@@ -19,6 +19,7 @@ configure-options =
   --disable-java
   --disable-native-java
   --disable-csharp
+  --disable-more-warnings
   --with-libncurses-prefix=${ncurses:location}
   --with-libxml2-prefix=${libxml2:location}
   --with-included-gettext

component/mariadb/buildout.cfg

@@ -4,6 +4,7 @@
 [buildout]
 extends =
   ../binutils/buildout.cfg
+  ../bison/buildout.cfg
   ../bzip2/buildout.cfg
   ../cmake/buildout.cfg
   ../groonga/buildout.cfg
@@ -12,10 +13,12 @@ extends =
   ../libedit/buildout.cfg
   ../libxml2/buildout.cfg
   ../lz4/buildout.cfg
+  ../m4/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
   ../patch/buildout.cfg
   ../pcre/buildout.cfg
+  ../pcre2/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../snappy/buildout.cfg
   ../xz-utils/buildout.cfg
@@ -26,12 +29,11 @@ extends =
 parts =
   mariadb
 
-[mariadb]
+[mariadb-common]
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://archive.mariadb.org//mariadb-${:version}/source/mariadb-${:version}.tar.gz
-version = 10.4.28
-md5sum = d098e9af77a26260a6a6c21a7ed0daf6
+pcre-location = ${pcre2:location}
 pre-configure =
   set '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
   grep -q "$@"
@@ -73,17 +75,14 @@ configure-options =
 #  https://lore.kernel.org/linux-btrfs/ed3642c2-682e-08a1-f18d-2d63409b7631@nexedi.com/T/
   -DWITH_FALLOCATE=NO
 ##
-CMAKE_CFLAGS = -I${bzip2:location}/include -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${libedit:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${lz4:location}/include -I${snappy:location}/include -I${zstd:location}/include
-CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${libedit:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${lz4:location}/lib:${snappy:location}/lib:${zstd:location}/lib
+CMAKE_CFLAGS = -I${bzip2:location}/include -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${libedit:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${lz4:location}/include -I${snappy:location}/include -I${zstd:location}/include
+CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${:pcre-location}/lib:${libedit:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${lz4:location}/lib:${snappy:location}/lib:${zstd:location}/lib
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  CMAKE_INCLUDE_PATH=${bzip2:location}/include:${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${libedit:location}/include:${xz-utils:location}/include:${zlib:location}/include:${unixodbc:location}/include:${lz4:location}/include:${snappy:location}/include:${zstd:location}/include
+  CMAKE_INCLUDE_PATH=${bzip2:location}/include:${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${:pcre-location}/include:${libedit:location}/include:${xz-utils:location}/include:${zlib:location}/include:${unixodbc:location}/include:${lz4:location}/include:${snappy:location}/include:${zstd:location}/include
   CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
-  LDFLAGS=-L${bzip2:location}/lib -L${jemalloc:location}/lib -L${libaio:location}/lib -L${pcre:location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib -L${unixodbc:location}/lib -L${lz4:location}/lib -L${snappy:location}/lib -L${zstd:location}/lib
-  PATH=${patch:location}/bin:%(PATH)s
-patch-options = -p1
-patches =
-  https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.34-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
+  LDFLAGS=-L${bzip2:location}/lib -L${jemalloc:location}/lib -L${libaio:location}/lib -L${:pcre-location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib -L${unixodbc:location}/lib -L${lz4:location}/lib -L${snappy:location}/lib -L${zstd:location}/lib
+  PATH=${bison:location}/bin:${m4:location}/bin:${patch:location}/bin:%(PATH)s
 post-install =
   ldd=`ldd %(location)s/lib/plugin/ha_rocksdb.so`
   for x in ${lz4:location} ${snappy:location} ${zstd:location}
@@ -92,6 +91,34 @@ post-install =
   set -- wsrep-lib/wsrep-API/*/wsrep_api.h
   install -DpT $1 %(location)s/$1
   cp -a wsrep-lib/include %(location)s/wsrep-lib
+  cp -a storage/perfschema/libperfschema.a %(location)s/lib
+
+[mariadb-10.4]
+<= mariadb-common
+version = 10.4.32
+md5sum = f5ce8167e5ede5aaeec8f7475f120c19
+pcre-location = ${pcre:location}
+patch-options = -p1
+patches =
+  https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.34-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
+
+[mariadb-10.5]
+<= mariadb-common
+version = 10.5.23
+md5sum = cc89da1cb931bc920f3b0492cb7f1657
+
+[mariadb-10.6]
+<= mariadb-common
+version = 10.6.16
+md5sum = 3eb1e80e0e2c055686aeb5e900cfe94e
+
+[mariadb-10.11]
+<= mariadb-common
+version = 10.11.6
+md5sum = 71c8ef8b36221e348cecb9d13e6718e5
+
+[mariadb]
+<= mariadb-10.4
 
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.

component/proftpd/buildout.cfg

@@ -7,6 +7,7 @@ extends =
   ../zlib/buildout.cfg
   ../curl/buildout.cfg
   ../libtool/buildout.cfg
+  ../ncurses/buildout.cfg
   ../git/buildout.cfg
   ../patch/buildout.cfg
   ../zstd/buildout.cfg
@@ -32,8 +33,8 @@ configure-options =
   --with-modules=mod_sftp:mod_ban:mod_rewrite
 environment =
   CFLAGS=-DPR_RUN_DIR=\"/proc/self/cwd/var\"
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${ncurses:location}/include -I${openssl:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
   install_user=${proftpd-info:USER}
   install_group=${proftpd-info:GROUP}
 patch-binary = ${patch:location}/bin/patch

component/r-language/buildout.cfg

@@ -10,6 +10,14 @@ extends =
 parts =
   r-language
 
+[libtirpc]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://downloads.sourceforge.net/libtirpc/libtirpc-1.3.4.tar.bz2
+md5sum = 375dbe7ceb2d0300d173fb40321b49b6
+configure-options =
+  --disable-gssapi
+
 [r-language]
 recipe = slapos.recipe.cmmi
 url = https://cran.r-project.org/src/base/R-3/R-3.2.1.tar.gz
@@ -31,5 +39,5 @@ configure-options =
   --without-ICU
   --without-x
 environment =
-  CPPFLAGS=-I${bzip2:location}/include -I${openblas:location}/include -I${pcre:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${xz-utils:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openblas:location}/lib -Wl,-rpath=${openblas:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${bzip2:location}/include -I${openblas:location}/include -I${pcre:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${libtirpc:location}/include
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openblas:location}/lib -Wl,-rpath=${openblas:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libtirpc:location}/lib  -Wl,-rpath=${libtirpc:location}/lib

component/tcl/buildout.cfg

@@ -10,7 +10,7 @@ md5sum = 0e4358aade2f5db8a8b6f2f6d9481ec2
 shared = true
 environment =
   CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -lm
 pre-configure = rm -r pkgs/*/
 configure-command = unix/configure
 configure-options =

component/trafficserver/buildout.cfg

@@ -48,7 +48,8 @@ patches =
   ${:_profile_base_location_}/trafficserver-9.1.1-via-string-rapid-cdn.patch#8c39243d7525222385d5964485734f99
 environment =
   PATH=${libtool:location}/bin:${make:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${luajit:location}/lib  -lm
+  LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${luajit:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -lm
+  CURSES_CFLAGS=-I${ncurses:location}/include
 
 make-target =
   check

component/util-linux/buildout.cfg

 [buildout]
 extends =
   ../perl/buildout.cfg
+  ../ncurses/buildout.cfg
   ../libcap-ng/buildout.cfg
+  ../pkgconfig/buildout.cfg
   ../xz-utils/buildout.cfg
 
 [util-linux]
@@ -41,15 +43,15 @@ configure-options =
   --disable-wall
   --without-libiconv-prefix
   --without-libintl-prefix
-  --without-ncurses
   --without-slang
   --without-selinux
   --without-audit
   --with-cap-ng=${libcap-ng:location}
 environment =
-  PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib
-  CFLAGS=-I${libcap-ng:location}/include
+  PATH=${perl:location}/bin:${xz-utils:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  CFLAGS=-I${libcap-ng:location}/include -I${ncurses:location}/include
+  PKG_CONFIG_PATH=${ncurses:location}/lib/pkgconfig
 
 [libuuid]
 # libuuid is inside util-linux source code with only libuuid feature enabled.
@@ -60,7 +62,6 @@ configure-options =
   --enable-libuuid
   --without-libiconv-prefix
   --without-libintl-prefix
-  --without-ncurses
   --without-slang
   --without-pam
   --without-selinux
@@ -68,3 +69,5 @@ configure-options =
 
 environment =
   PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  CFLAGS=-I${ncurses:location}/include

software/dream/software.cfg

@@ -42,7 +42,6 @@ command =
   cd ${dream-repository.git:location}
   PATH=${git:location}/bin:${nodejs:location}/bin:$PATH
   npm install .
-update_command = ${:command}
 
 [versions]
 rpy2 = 2.4.0

software/galene/instance-default-input-schema.json

@@ -14,6 +14,13 @@
       "description": "Use a password for presenter",
       "type": "boolean",
       "default": true
+    },
+    "ice-servers.json": {
+      "title": "Content of ice-servers.json",
+      "description": "Raw content of ice-servers.json (see at the end of https://galene.org/INSTALL.html)",
+      "type": "string",
+      "textarea": true,
+      "default": "[{\"urls\":[\"stun:turn-paris-rapidspace.api.nexedi.net:443\"]}]"
     }
   }
 }

software/galene/software-base.cfg

-[buildout]
-extends =
-  ../../component/golang/buildout.cfg
-  ../../component/openssl/buildout.cfg
-  ../../stack/slapos.cfg
-  ../../stack/monitor/buildout.cfg
-  buildout.hash.cfg
-
-parts =
-  slapos-cookbook
-  eggs
-  template
-  template-default
-
-# eggs for instance.cfg
-[eggs]
-recipe  = zc.recipe.egg
-eggs    =
-    plone.recipe.command
-    collective.recipe.template
-
-
-[galene]
-<= go-git-package
-go.importpath = lab.nexedi.com/nexedi/galene
-repository = https://lab.nexedi.com/nexedi/galene.git
-revision = galene-ptt-0.6.4
-
-[gowork]
-install =
-    ${galene:location}:./...
-environment =
-   CGO_ENABLED = 0
-buildflags = -ldflags='-s -w'
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:directory}/template.cfg
-
-[template-default]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:directory}/template-default.cfg

software/galene/software-ptt.cfg

 [buildout]
 extends =
-  software-base.cfg
+  software.cfg
 
 [galene]
-<= go-git-package
-go.importpath = lab.nexedi.com/nexedi/galene
-repository = https://lab.nexedi.com/nexedi/galene.git
 revision = galene-ptt-0.6.4

software/galene/software.cfg

 [buildout]
 extends =
-  software-base.cfg
+  ../../component/golang/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../stack/slapos.cfg
+  ../../stack/monitor/buildout.cfg
+  buildout.hash.cfg
+
+parts =
+  slapos-cookbook
+  eggs
+  template
+  template-default
+
+# eggs for instance.cfg
+[eggs]
+recipe  = zc.recipe.egg
+eggs    =
+    plone.recipe.command
+    collective.recipe.template
+
+
+[galene]
+<= go-git-package
+go.importpath = lab.nexedi.com/nexedi/galene
+repository = https://lab.nexedi.com/nexedi/galene.git
+revision = galene-ptt-0.6.4
+
+[gowork]
+install =
+    ${galene:location}:./...
+environment =
+   CGO_ENABLED = 0
+buildflags = -ldflags='-s -w'
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/template.cfg
+
+[template-default]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/template-default.cfg
 
 [galene]
 <= go-git-package

software/galene/test/testPTT.py

+##############################################################################
+#
+# Copyright (c) 2019 Nexedi SA 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.
+#
+##############################################################################
+from __future__ import unicode_literals
+
+import os
+import requests
+
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
+
+
+setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '../software-ptt.cfg')))
+
+
+class TestGalene(SlapOSInstanceTestCase):
+  __partition_reference__ = 'G'
+
+  def setUp(self):
+    self.connection_parameters = self.computer_partition.getConnectionParameterDict()
+
+  def test_url_get(self):
+    resp = requests.get(self.connection_parameters['url'], verify=False)
+    self.assertEqual(requests.codes.ok, resp.status_code)
+

software/gitlab/software.cfg

@@ -135,7 +135,7 @@ git-executable = ${git:location}/bin/git
 <= git-repository
 repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
 # 9.5.10 + NXD patches:
-revision = v9.5.10-12-g74c9f9fe7f9
+revision = v9.5.10-13-g2b98fc27fd2
 location = ${buildout:parts-directory}/gitlab
 
 [gitlab-shell-repository]
@@ -187,7 +187,7 @@ configure-command = cd ${:path} &&
 
 make-binary =
 make-targets= cd ${:path} &&
-    ${:bundle} install --deployment  --without development test mysql aws kerberos
+    ${:bundle} install --deployment  --without development test mysql aws kerberos ed25519
 environment =
   PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s

software/theia/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = 9658a11340c018de816d0de40683706a
 
 [instance-import]
 _update_hash_filename_ = instance-import.cfg.jinja.in
-md5sum = 6520d2aa0c1c6094cbf276080594ec1a
+md5sum = c8d1be7aee980deb0f0d1a3126c9b9da
 
 [instance-export]
 _update_hash_filename_ = instance-export.cfg.jinja.in

software/theia/instance-import.cfg.jinja.in

 {%- set parameter_dict = dict(default_parameter_dict, **parameter_dict) -%}
 {%- set additional_frontend = parameter_dict['additional-frontend-guid'] -%}
+{%- set namebase = parameter_dict['namebase'] -%}
+{%- set theia_number = parameter_dict['number'] -%}
+{%- set theia_id = '%s%s' % (namebase, theia_number) -%}
+{%- set frontend_name = parameter_dict['frontend-name'] -%}
 
 [buildout]
 extends = {{ theia_instance_cfg }}
@@ -16,16 +20,16 @@ parts +=
 # The import template then expects to receive it in
 # slap-parameter:namebase
 [slap-parameter]
-namebase = {{ parameter_dict['namebase'] }}
+namebase = {{ namebase }}
 
 
 # Change frontend name to avoid conflicts
 [remote-frontend]
-name = Import {{ parameter_dict['frontend-name'] }}
+name = {{ frontend_name }} for {{ theia_id }}
 
 {% if additional_frontend -%}
 [remote-additional-frontend]
-name = Import {{ parameter_dict['additional-frontend-name'] }}
+name = {{ parameter_dict['additional-frontend-name'] }} for {{ theia-id }}
 {%- endif %}
 
 

stack/slapos.cfg

@@ -300,7 +300,7 @@ simplegeneric = 0.8.1
 singledispatch = 3.4.0.3
 six = 1.16.0
 slapos.cookbook = 1.0.329
-slapos.core = 1.10.4
+slapos.core = 1.10.5
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.25
 slapos.rebootstrap = 4.5
@@ -353,6 +353,8 @@ zope.interface = 5.4.0
 zope.testing = 4.7
 zope.testrunner = 5.2
 
+[versions:sys.version_info < (3,8)]
+typing-extensions = 4.7.1:whl
 
 [versions:python2]
 attrs = 18.2.0