Merge branch 'master+ZODB4-wc2' into y/wc2-next

* master+ZODB4-wc2: (112 commits)
  ninja: make sure it's built using SlapOS Python
  proxysql: stop using old CMake
  version up: proxysql 2.3.2
  proxysql: bundled libinjection needs Python 2
  proxysql: small clean up
  proxysql: clean up extends
  libiconv, libmicrohttpd, proxysql: make parts shared
  java-jdk: simplify a little
  fixup! component/nxdtest: v↑  (namespaces, /tmp-on-tmpfs, cancellation)
  erp5 and erp5testnode: add software-type to software.cfg.json so that it works in panel GUI
  Revert "component/libxml2: Version up"
  Revert "component/meson: Version up"
  software/theia: Fix EPR5 resiliency test
  component/libxml2: Version up
  component/meson: Version up
  component/m4: Version up
  erp5: Change default timerserver-interval from 5s to 1s.
  slapos/obs.cfg: supports the newer version of cmmi and add some comments
  pyprog: Wrap entry-point call with sys.exit()
  Generalize how nxdtest python script is generated into pyprog recipe macro
  ...

.husky/.gitignore

+_

.husky/pre-commit

+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

component/ZODB/test-zodb4-wc2.cfg

@@ -109,7 +109,6 @@ template = inline:
 
 
 [versions]
-mock = 3.0.5
 random2 = 1.0.1
 zope.testing = 4.7
 zope.testrunner = 5.2

component/apache/buildout.cfg

@@ -125,4 +125,3 @@ environment =
 recipe = slapos.recipe.build:download
 shared = true
 url = ${:_profile_base_location_}/${:filename}
-mode = 640

component/bash/buildout.cfg

 [buildout]
-parts =
-  bash
-
 extends =
+  ../gettext/buildout.cfg
   ../ncurses/buildout.cfg
   ../patch/buildout.cfg
+parts =
+  bash
 
 [bash]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz
-md5sum = 81348932d5da294953e15d4814c74dd1
+url-prefix = https://ftp.gnu.org/pub/gnu/bash/bash-5.1
+url = ${:url-prefix}.tar.gz
+md5sum = bb91a17fd6c9032c26d0b2b78b50aff5
+patch-binary = ${patch:location}/bin/patch
+patch-prefix = ${:url-prefix}-patches/bash51
 patches =
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-001#1ab682b4e36afa4cf1b426aa7ac81c0d
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-002#8fc22cf50ec85da00f6af3d66f7ddc1b
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-003#a41728eca78858758e26b5dea64ae506
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-004#bf8d53d227829d67235927689a03cc7a
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-005#c0c00935c8b8ffff76e8ab77e7be7d15
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-006#6f01e364cd092faa28dd7119f47ddb5f
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-007#dcf471d222bcd83283d3094e6ceeb6f8
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-008#f7553416646dc26c266454c78a916d36
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-009#7e73d2151f4064b484a4ba2c4b09960e
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-010#a275463d21735bb6d7161f9fbd320d8f
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-011#c17103ee20420d77e46b224c8d3fceda
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-012#3e2a057a19d02b3f92a3a09eacbc03ae
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-013#fb377143a996d4ff087a2771bc8332f9
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-014#1a1aaecc99a9d0cbc310e8e247dcc8b6
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-015#4f04387458a3c1b4d460d199f49991a8
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-016#90e759709720c4f877525bebc9d5dc06
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-017#11e4046e1b86070f6adbb7ffc89641be
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-018#cd5a9b46f5bea0dc0248c93c7dfac011
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-019#cff4dc024d9d3456888aaaf8a36ca774
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-020#167839c5f147347f4a03d88ab97ff787
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-021#1d350671c48dec30b34d8b81f09cd79d
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-022#11c349af66a55481a3215ef2520bec36
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-023#b3cb0d80fd0c47728264405cbb3b23c7
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-024#b5ea5600942acceb4b6f07313d2de74e
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-025#193c06f578d38ffdbaebae9c51a7551f
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-026#922578e2be7ed03729454e92ee8d3f3a
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-027#8ff6948b16f2db5c29b1b9ae1085bbe7
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-028#dd51fa67913b5dca45a702b672b3323f
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-029#0729364c977ef4271e9f8dfafadacf67
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-030#efb709fdb1368945513de23ccbfae053
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-031#236df1ac1130a033ed0dbe2d2115f28f
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-032#2360f7e79cfb28526f80021025ea5909
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-033#b551c4ee7b8713759e4143499d0bbd48
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-034#c9a56fbe0348e05a886dff97f2872b74
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-035#e564e8ab44ed1ca3a4e315a9f6cabdc9
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-036#b00ff66c41a7c0f06e191200981980b0
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-037#be2a7b05f6ae560313f3c9d5f7127bda
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-038#61e0522830b24fbe8c0d1b010f132470
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-039#a4775487abe958536751c8ce53cdf6f9
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-040#80d3587c58854e226055ef099ffeb535
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-041#20bf63eef7cb441c0b1cc49ef3191d03
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-042#70790646ae61e207c995e44931390e50
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-043#855a46955cb251534e80b4732b748e37
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-044#29623d3282fcbb37e1158136509b5bb8
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-045#4473244ca5abfd4b018ea26dc73e7412
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-046#7e5fb09991c077076b86e0e057798913
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-047#8483153bad1a6f52cadc3bd9a8df7835
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-048#e9f5dc12a32b2e0d3961344e794f92b3
+  ${:patch-prefix}-001#57641ddbf92fca25df92a443e36f285a
+  ${:patch-prefix}-002#aed44842ed1a05fcfc3ef146991fdaef
+  ${:patch-prefix}-003#bf96455600a86420d69f5166575192dd
+  ${:patch-prefix}-004#d2c524dba0eea5dc5f00849cc84376a0
+  ${:patch-prefix}-005#5081278e6c35154e28d09f582251c529
+  ${:patch-prefix}-006#f4a8bcda4b7bd2c72b29c107027608a3
+  ${:patch-prefix}-007#bf7816d63ee0476054bf18a488d8bb1b
+  ${:patch-prefix}-008#7e5a30d864f834953b22a55c01c8690b
+  ${:patch-prefix}-009#8e35f11cbfcefe2c07c64d00601fd713
+  ${:patch-prefix}-010#d78ad19986c0355a8d67c9a0e82ad4aa
+  ${:patch-prefix}-011#2416386b5ee94e499ccbf71f6fd4aebd
+  ${:patch-prefix}-012#879b2d8a03162faebb7234c4cd57c5cd
 configure-options =
   --with-curses
 environment =
   CPPFLAGS=-I${ncurses:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
-  PATH=${patch:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:%(PATH)s

component/bazel/buildout.cfg

@@ -9,16 +9,14 @@ parts =
 do-not-strip-path = ${buildout:parts-directory}/bazel/bin/bazel
 
 [zulu]
-recipe = hexagonit.recipe.download
-ignore-existing = true
+recipe = slapos.recipe.build:download-unpacked
+shared = true
 url = http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-linux_x64.tar.gz
 md5sum = e5f4b1d997e50ffe4998c68c8ec45403
-strip-top-level-dir = true
 
 [template-bazel-crosstool]
 recipe = slapos.recipe.template:jinja2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 640
 filename = bazel_tools_cpp_CROSSTOOL
 template = ${:_profile_base_location_}/${:filename}.in
 rendered = ${:location}/${:filename}
@@ -29,7 +27,6 @@ context =
 [template-bazel-src-main-cpp-build]
 recipe = slapos.recipe.template:jinja2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 640
 filename = bazel_src_main_cpp_BUILD
 template = ${:_profile_base_location_}/${:filename}.in
 rendered = ${:location}/${:filename}

component/boa/buildout.cfg

-[buildout]
-extends =
-  ../patch/buildout.cfg
-
-parts = boa
-
-[boa-patch-ENOSYS]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-servers/boa/files/boa-0.94.14_rc21-ENOSYS.patch?revision=1.1
-filename = boa-0.94.14_rc21-ENOSYS.patch
-md5sum = 7206b342195961501ed1eae38486e5db
-download-only = true
-
-
-[boa]
-recipe = slapos.recipe.build
-url = http://www.boa.org/boa-0.94.14rc21.tar.gz
-md5sum = e24b570bd767a124fcfb40a34d148ba9
-patches =
-    ${boa-patch-ENOSYS:location}/${boa-patch-ENOSYS:filename}
-install =
-    import shutil
-    import os
-    url = self.download(self.options['url'], self.options['md5sum'])
-    extract_dir = self.extract(url)
-    workdir = guessworkdir(extract_dir)
-    self.applyPatchList(self.options.get('patches'), '-p1', cwd=workdir)
-    call(['./configure'], cwd=workdir)
-    call(['make'], cwd=workdir)
-    # Installation of boa. Manually, no make install
-    bindir = os.path.join(location, 'bin')
-    os.makedirs(bindir)
-    for name in 'boa', 'boa_indexer':
-      path = os.path.join(bindir, name)
-      shutil.copyfile(os.path.join(workdir, 'src', name), path)
-      os.chmod(path, 0755)
-environment =
-  PATH=${patch:location}/bin:%(PATH)s

component/chromedriver/buildout.cfg

@@ -71,7 +71,7 @@ version =
 md5sum-x86_64 =
 
 recipe = slapos.recipe.build
-x86-64 = https://chromedriver.storage.googleapis.com/${:version}/chromedriver_linux64.zip ${:md5sum-x86_64}
+x86_64-linux-gnu = https://chromedriver.storage.googleapis.com/${:version}/chromedriver_linux64.zip ${:md5sum-x86_64}
 library =
   ${nss:location}/lib
   ${nspr:location}/lib
@@ -79,6 +79,6 @@ library =
 path =
 install =
   import os, shutil
-  extract_dir = self.extract(self.download(*options[guessPlatform()].split()))
+  extract_dir = self.extract(self.download(*options[multiarch()].split()))
   os.mkdir(location)
   shutil.copy(os.path.join(extract_dir, 'chromedriver'), location)

component/chromium/buildout.cfg

@@ -116,7 +116,7 @@ md5sum-x86_64 =
 
 recipe = slapos.recipe.build
 
-x86-64 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${:revision_x86-64}%2Fchrome-linux.zip?generation=${:generation-x86_64}&alt=media ${:md5sum-x86_64}
+x86_64-linux-gnu = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${:revision_x86-64}%2Fchrome-linux.zip?generation=${:generation-x86_64}&alt=media ${:md5sum-x86_64}
 
 
 library =
@@ -167,7 +167,7 @@ library =
 path =
   ${fontconfig:location}/bin
 install =
-  url, md5sum = self.options[guessPlatform()].split()
+  url, md5sum = self.options[multiarch()].split()
   extract_dir = self.extract(self.download(url, md5sum))
   self.copyTree(guessworkdir(extract_dir), location)
   # XXX adjust some permissions

component/cmake/buildout.cfg

@@ -14,8 +14,3 @@ md5sum = c0feb5855604f68b09bdb3acb623619e
 environment =
   CMAKE_INCLUDE_PATH=${ncurses:location}/include:${openssl:location}/include
   CMAKE_LIBRARY_PATH=${ncurses:location}/lib:${openssl:location}/lib
-
-[cmake-3.18]
-<= cmake
-url = https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz
-md5sum = 0380beaee1c39a22455db02651abe7be

component/consul/buildout.cfg

 [buildout]
-
-
 parts =
   consul
 
 [consul]
-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).
-url_x86-64 = https://releases.hashicorp.com/consul/0.8.3/consul_0.8.3_linux_amd64.zip
-url_x86 = https://releases.hashicorp.com/consul/0.8.3/consul_0.8.3_linux_386.zip
-
-# supported architectures md5sums
-md5sum_x86 = dfdc0eedd79baab7e6bc56c1582fd02e
-md5sum_x86-64 = d6bc0898ea37ae2198370a9e1978d1bb
-
-install =
-  import shutil
-  platform = guessPlatform()
-  url = options['url_' + platform]
-  md5sum = options['md5sum_' + platform]
-  extract_dir = self.extract(self.download(url, md5sum))
-  shutil.move(extract_dir, location)
+recipe = slapos.recipe.build:download-unpacked
+version = 0.8.3
+base = https://releases.hashicorp.com/consul/${:version}/consul_${:version}
+i386-linux-gnu   = ${:base}_linux_386.zip    dfdc0eedd79baab7e6bc56c1582fd02e
+x86_64-linux-gnu = ${:base}_linux_amd64.zip  d6bc0898ea37ae2198370a9e1978d1bb

component/curl/buildout.cfg

@@ -10,6 +10,7 @@ extends =
   ../zstd/buildout.cfg
   ../zlib/buildout.cfg
   ../nghttp2/buildout.cfg
+  ../ca-certificates/buildout.cfg
 parts =
   curl
 
@@ -38,6 +39,7 @@ configure-options =
   --disable-alt-svc
   --with-zlib=${zlib:location}
   --with-ssl=${openssl:location}
+  --with-ca-path=${openssl:location}/etc/ssl/certs
   --without-gnutls
   --without-polarssl
   --without-mbedtls

component/firefox/buildout.cfg

@@ -136,8 +136,8 @@ recipe = slapos.recipe.build
 slapos_promise =
   file:firefox
 
-x86 = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 ${:i686-md5sum}
-x86-64 = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 ${:x86_64-md5sum}
+i386-linux-gnu = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 ${:i686-md5sum}
+x86_64-linux-gnu = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 ${:x86_64-md5sum}
 
 library =
   ${alsa:location}/lib
@@ -185,7 +185,7 @@ path =
   ${fontconfig:location}/bin
 
 install =
-  url, md5sum = options[guessPlatform()].split()
+  url, md5sum = options[multiarch()].split()
   extract_dir = self.extract(self.download(url, md5sum))
   self.copyTree(guessworkdir(extract_dir), location)
   ${:post-install}
@@ -243,11 +243,11 @@ x86_64-md5sum = 4a185d3179862a35104603b9274452e7
 recipe = slapos.recipe.build
 location = ${buildout:bin-directory}/${:_buildout_section_name_}
 
-x86 = https://github.com/mozilla/geckodriver/releases/download/v${:version}/geckodriver-v${:version}-linux32.tar.gz ${:i686-md5sum}
-x86-64 = https://github.com/mozilla/geckodriver/releases/download/v${:version}/geckodriver-v${:version}-linux64.tar.gz ${:x86_64-md5sum}
+i386-linux-gnu = https://github.com/mozilla/geckodriver/releases/download/v${:version}/geckodriver-v${:version}-linux32.tar.gz ${:i686-md5sum}
+x86_64-linux-gnu = https://github.com/mozilla/geckodriver/releases/download/v${:version}/geckodriver-v${:version}-linux64.tar.gz ${:x86_64-md5sum}
 
 install =
   import shutil
-  url, md5sum = options[guessPlatform()].split()
+  url, md5sum = options[multiarch()].split()
   extract_dir = self.extract(self.download(url, md5sum))
   shutil.copy(extract_dir + '/geckodriver', location)

component/firewalld/buildout.cfg

@@ -103,10 +103,8 @@ environment =
   GI_LIBS=-L${gobject-introspection:location}/lib -lgirepository-1.0
 
 [trusted-config]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = https://raw.githubusercontent.com/t-woerner/firewalld/v0.3.14/config/zones/trusted.xml
-download-only = true
+recipe = slapos.recipe.build:download
+url = https://raw.githubusercontent.com/t-woerner/firewalld/v0.3.14/config/zones/${:filename}
 filename = trusted.xml
 md5sum = 893752ba2e93a1e96334dfee19f884ad
 

component/fontconfig/buildout.cfg

@@ -33,4 +33,3 @@ environment =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 640

component/golang/buildout.cfg

@@ -6,6 +6,7 @@ extends =
   ../git/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../swig/buildout.cfg
+  ../patch/buildout.cfg
   ./buildout.hash.cfg
 
 parts = gowork go
@@ -22,10 +23,19 @@ make-targets= cd src && unset GOBIN && ./all.bash && cp -alf .. ${:location}
 # some testdata files have an issue with slapos.extension.strip.
 post-install = ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
 environment =
-  PATH=${swig:location}/bin:%(PATH)s
+  PATH=${swig:location}/bin:${patch:location}/bin:%(PATH)s
   GOROOT_FINAL=${:location}
   ${:environment-extra}
 
+# TestChown and TestSCMCredentials currently fail in a user-namespace
+# https://github.com/golang/go/issues/42525
+# the patches apply to go >= 1.12
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/skip-chown-tests.patch#d4e3c8ef83788fb2a5d80dd75034786f
+  ${:_profile_base_location_}/fix-TestSCMCredentials.patch#1d8dbc97cd579e03fafd8627d48f1c59
+
+
 [golang14]
 <= golang-common
 # https://golang.org/doc/install/source#bootstrapFromSource
@@ -34,6 +44,9 @@ md5sum = dbf727a4b0e365bf88d97cbfde590016
 environment-extra =
 make-targets= cd src && unset GOBIN && ./make.bash && cp -alf .. ${:location}
 
+# skip-chown-tests.patch does not apply to go1.4, but we don't run go1.4 tests.
+patches =
+
 
 [golang1.12]
 <= golang-common
@@ -109,7 +122,6 @@ environment-extra =
 recipe  = slapos.recipe.template:jinja2
 exe     = ${buildout:bin-directory}/go
 rendered= ${:exe}
-mode    = 755
 template= inline:
   #!/bin/sh -e
   . ${gowork:env.sh}

component/golang/fix-TestSCMCredentials.patch

+From 385ca858ac89efccffd557eccc1113281306bd88 Mon Sep 17 00:00:00 2001
+From: Kirill Smelkov <kirr@nexedi.com>
+Date: Mon, 6 Dec 2021 22:50:27 +0300
+Subject: [PATCH] syscall: tests: Fix TestSCMCredentials for `unshare -Umc`
+
+---
+ src/syscall/creds_test.go | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/syscall/creds_test.go b/src/syscall/creds_test.go
+index c1a8b516e8..ed6e80c0c3 100644
+--- a/src/syscall/creds_test.go
++++ b/src/syscall/creds_test.go
+@@ -78,8 +78,10 @@ func TestSCMCredentials(t *testing.T) {
+ 			if sys, ok := err.(*os.SyscallError); ok {
+ 				err = sys.Err
+ 			}
+-			if err != syscall.EPERM {
+-				t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
++			// can get EINVAL instead of EPERM under `unshare -Umc` because uid0 is not mapped and maps to -1
++			// see also https://github.com/golang/go/issues/42525
++			if !(err == syscall.EPERM || err == syscall.EINVAL) {
++				t.Fatalf("WriteMsgUnix failed with %v, want EPERM/EINVAL", err)
+ 			}
+ 		}
+ 
+-- 
+2.30.2
+

component/golang/skip-chown-tests.patch

+From: regnat <rg@regnat.ovh>
+Date: Wed, 3 Nov 2021 10:17:28 +0100
+Subject: [PATCH] Disable the chown tests
+
+See https://github.com/golang/go/issues/42525 and
+https://github.com/NixOS/nix/issues/3245
+---
+ os/os_unix_test.go | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/os/os_unix_test.go b/os/os_unix_test.go
+index 51693fd..0936542 100644
+--- a/src/os/os_unix_test.go
++++ b/src/os/os_unix_test.go
+@@ -40,6 +40,7 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+ }
+ 
+ func TestChown(t *testing.T) {
++	t.Skipf("https://github.com/golang/go/issues/42525")
+ 	// Use TempDir() to make sure we're on a local file system,
+ 	// so that the group ids returned by Getgroups will be allowed
+ 	// on the file. On NFS, the Getgroups groups are
+@@ -83,6 +84,7 @@ func TestChown(t *testing.T) {
+ }
+ 
+ func TestFileChown(t *testing.T) {
++	t.Skipf("https://github.com/golang/go/issues/42525")
+ 	// Use TempDir() to make sure we're on a local file system,
+ 	// so that the group ids returned by Getgroups will be allowed
+ 	// on the file. On NFS, the Getgroups groups are
+@@ -126,6 +128,7 @@ func TestFileChown(t *testing.T) {
+ }
+ 
+ func TestLchown(t *testing.T) {
++	t.Skipf("https://github.com/golang/go/issues/42525")
+ 	// Use TempDir() to make sure we're on a local file system,
+ 	// so that the group ids returned by Getgroups will be allowed
+ 	// on the file. On NFS, the Getgroups groups are
+-- 
+2.31.1

component/helloweb/buildout.cfg

@@ -34,11 +34,10 @@ install =
 [helloweb-go]
 # we already have gowork/bin/helloweb with helloweb Go build.
 # Add bin/helloweb-go that runs go version of helloweb without any environment preset needed.
-recipe  = collective.recipe.template
-output  = ${buildout:bin-directory}/${:_buildout_section_name_}
-mode    = 0755
-input   = inline:
-    #!/bin/sh
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
+template =
+    inline:#!/bin/sh -e
     . ${gowork:env.sh}
     exec helloweb "$@"
 
@@ -71,7 +70,7 @@ scripts = helloweb=helloweb-python
 # rubygemsrecipe with fixed url and this way pinned rubygems version
 recipe  = rubygemsrecipe
 url     = https://rubygems.org/rubygems/rubygems-2.5.2.zip
-ruby-location = ${ruby2.1:location}
+ruby-location = ${ruby:location}
 ruby-executable = ${:ruby-location}/bin/ruby
 gems    = bundler==1.11.2
 
@@ -93,15 +92,14 @@ path    = ${helloweb:location}/ruby/
 
 configure-command = :
 make-binary =
-make-targets= cd ${:path} && ${bundler:bundle} install
+make-targets= ${bundler:bundle} install
 
 
 [helloweb-ruby]
 # NOTE slapos.cookbook:wrapper also works, but currently _only_ in instance
-recipe  = collective.recipe.template
-output  = ${buildout:bin-directory}/${:_buildout_section_name_}
-mode    = 0755
-input   = inline:
-    #!/bin/sh
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
+template =
+    inline:#!/bin/sh -e
     export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile
     exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@"

component/java-jdk/buildout.cfg

@@ -26,8 +26,7 @@ configure-command = :
 make-binary = :
 post-install =
   mv * %(location)s
-  for file in %(location)s/bin/* %(location)s/lib/*.so ; do
-    echo appending rpath to $file
-    ${patchelf:location}/bin/patchelf --set-rpath %(rpath)s $file
-  done
+  cd %(location)s
+  set -x
+  ${patchelf:location}/bin/patchelf --set-rpath %(rpath)s bin/* lib/*.so
 rpath = ${zlib:location}/lib:${alsa:location}/lib:${freetype:location}/lib:${libpng:location}/lib:${libXrender:location}/lib:${libXtst:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXext:location}/lib:${libXdmcp:location}/lib:${libXi:location}/lib:${libxcb:location}/lib:@@LOCATION@@/lib:@@LOCATION@@/lib/server

component/json-c/0001-Remove-unused-variable-size.patch

-From 3859e99f50abe11a8dade28efa9ea3d99dfaac11 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petar=20Koreti=C4=87?= <petar.koretic@gmail.com>
-Date: Fri, 11 Apr 2014 10:03:40 +0200
-Subject: [RFC 1/2] Remove unused variable 'size'
-
----
- json_tokener.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/json_tokener.c b/json_tokener.c
-index 19de8ef..9a76293 100644
---- a/json_tokener.c
-+++ b/json_tokener.c
-@@ -352,12 +352,10 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
- 
-     case json_tokener_state_inf: /* aka starts with 'i' */
-       {
--	int size;
- 	int size_inf;
- 	int is_negative = 0;
- 
- 	printbuf_memappend_fast(tok->pb, &c, 1);
--	size = json_min(tok->st_pos+1, json_null_str_len);
- 	size_inf = json_min(tok->st_pos+1, json_inf_str_len);
- 	char *infbuf = tok->pb->buf;
- 	if (*infbuf == '-')
--- 
-2.5.0
-

component/json-c/0002-Fix-uninitialised-variable-compile-warning-and-also-.patch

-From 89ae583a8624fad6be4a7d1da084b0c410e4fc63 Mon Sep 17 00:00:00 2001
-From: Stuart Walsh <stu@ipng.org.uk>
-Date: Tue, 31 Mar 2015 12:23:03 +0100
-Subject: [RFC 2/2] Fix uninitialised variable compile warning, and also fix
- unused-when-used warning
-
----
- json_object.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/json_object.h b/json_object.h
-index 200ac40..e6c6a4f 100644
---- a/json_object.h
-+++ b/json_object.h
-@@ -339,8 +339,8 @@ extern void json_object_object_del(struct json_object* obj, const char *key);
- #if defined(__GNUC__) && !defined(__STRICT_ANSI__) && __STDC_VERSION__ >= 199901L
- 
- # define json_object_object_foreach(obj,key,val) \
--	char *key; \
--	struct json_object *val __attribute__((__unused__)); \
-+	char *key = NULL; \
-+	struct json_object *val = NULL; \
- 	for(struct lh_entry *entry ## key = json_object_get_object(obj)->head, *entry_next ## key = NULL; \
- 		({ if(entry ## key) { \
- 			key = (char*)entry ## key->k; \
--- 
-2.5.0
-

component/json-c/buildout.cfg

-[buildout]
-extends =
-  ../patch/buildout.cfg
-
-parts =
-  json-c
-
-[json-c-patch-base]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-
-[json-c-patch-3859e99f50abe11a8dade28efa9ea3d99dfaac11]
-< = json-c-patch-base
-filename = 0001-Remove-unused-variable-size.patch
-md5sum = e8ebc602fbab128d22f1216cb15c4626
-
-[json-c-patch-89ae583a8624fad6be4a7d1da084b0c410e4fc63]
-< = json-c-patch-base
-filename = 0002-Fix-uninitialised-variable-compile-warning-and-also-.patch
-md5sum = 5525ab9ee78157ce6d6100e374ac7767
-
-[json-c]
-recipe = slapos.recipe.cmmi
-url = https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12.tar.gz
-md5sum = 3ca4bbb881dfc4017e8021b5e0a8c491
-patch-options = -p1
-patches =
-  ${json-c-patch-3859e99f50abe11a8dade28efa9ea3d99dfaac11:location}/${json-c-patch-3859e99f50abe11a8dade28efa9ea3d99dfaac11:filename}
-  ${json-c-patch-89ae583a8624fad6be4a7d1da084b0c410e4fc63:location}/${json-c-patch-89ae583a8624fad6be4a7d1da084b0c410e4fc63:filename}
-environment =
-  PATH=${patch:location}/bin:%(PATH)s

component/jupyter-py2/buildout.cfg

@@ -22,8 +22,6 @@ python_executable = ${buildout:bin-directory}/${:interpreter}
 [download-file-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-download-only = true
-mode = 0644
 
 [jupyter-notebook-config]
 <= download-file-base
@@ -44,7 +42,6 @@ mode = 0644
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/${:filename}
 rendered = ${buildout:directory}/template.cfg
-mode = 0644
 context =
   key bin_directory buildout:bin-directory
   key develop_eggs_directory buildout:develop-eggs-directory

component/jupyter-py2/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-jupyter-notebook]
 filename = instance.cfg.in
-md5sum = 1d5fe6cc4e48672ae7be1c223794a932
+md5sum = 357f28614a13cdbf00a29a83cbfd2642
 
 [jupyter-notebook-config]
 filename = jupyter_notebook_config.py.jinja

component/jupyter-py2/instance.cfg.in

@@ -37,10 +37,6 @@ key_file = ${generate-certificate:key_file}
 logfile = ${directory:log}/jupyter_notebook.log
 notebook_dir = ${directory:notebook_dir}
 
-[dynamic-jinja2-template-base]
-recipe = slapos.recipe.template:jinja2
-mode = 0644
-
 [generate-certificate]
 ; TODO: there is a slapos recipe to generate certificates. Use it instead
 recipe = plone.recipe.command
@@ -76,10 +72,9 @@ environment =
   LANG=C.UTF-8
 
 [jupyter-notebook-config]
-<= dynamic-jinja2-template-base
+recipe = slapos.recipe.template:jinja2
 template = {{ jupyter_config_location }}/{{ jupyter_config_filename }}
 rendered = ${directory:jupyter_config_dir}/jupyter_notebook_config.py
-mode = 0744
 context =
   raw config_cfg ${buildout:directory}/knowledge0.cfg
 
@@ -134,7 +129,7 @@ link-binary = {{ erp5_kernel_location }}/{{ erp5_kernel_filename }}
 target-directory = ${directory:erp5_kernel_dir}
 
 [kernel-json]
-<= dynamic-jinja2-template-base
+recipe = slapos.recipe.template:jinja2
 template = {{ kernel_json_location }}/{{ kernel_json_filename }}
 rendered = ${directory:erp5_kernel_dir}/kernel.json
 # Use python2.7 executable bin file for kernel config

component/libiconv/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
 parts =
   libiconv
 
-[libiconv.gets.patch]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 8a20d8afe0617fce56f77537d2b84621
-download-only = true
-filename = libiconv.gets.patch
-
 [libiconv]
-virtual-depends =
-  ${libiconv.gets.patch:md5sum}
+patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =
-  ${libiconv.gets.patch:location}/${libiconv.gets.patch:filename}
+  ${:_profile_base_location_}/libiconv.gets.patch#8a20d8afe0617fce56f77537d2b84621
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
 md5sum = e34509b1623cec449dfeb73d7ce9c6c6

component/libmicrohttpd/buildout.cfg

@@ -10,6 +10,7 @@ parts =
 
 [libmicrohttpd]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.70.tar.gz
 md5sum = dcd6045ecb4ea18c120afedccbd1da74
 configure-options =

component/libreoffice-bin/buildout.cfg

@@ -20,10 +20,12 @@ officedir = libreoffice5.2
 install =
   import os
   import sys
-  ARCH_DIR_MAP = { 'x86': 'x86', 'x86-64': 'x86_64' }
-  platform = guessPlatform()
-  url = options['url'] % (ARCH_DIR_MAP[platform], platform)
-  md5sum = options['md5sum_' + platform]
+  arch = {
+    'i386-linux-gnu': ('x86', 'x86'),
+    'x86_64-linux-gnu': ('x86_64', 'x86-64'),
+  }[multiarch()]
+  url = options['url'] % arch
+  md5sum = options['md5sum_' + arch[1]]
   extract_dir = self.extract(self.download(url, md5sum))
   workdir = guessworkdir(extract_dir)
   storagedir = os.path.join(workdir, 'storage')

component/m4/buildout.cfg

 [buildout]
 extends =
   ../xz-utils/buildout.cfg
-  ../patch/buildout.cfg
 parts =
   m4
 
 [m4]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz
-md5sum = 730bb15d96fffe47e148d1e09235af82
+url = http://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.xz
+md5sum = 0d90823e1426f1da2fd872df0311298d
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
-patch-binary = ${patch:location}/bin/patch
-patch-options = -p1
-patches =
-  https://sources.debian.org/data/main/m/m4/1.4.18-5/debian/patches/01-fix-ftbfs-with-glibc-2.28.patch#058a786425e507f911649205b61ffcac

component/matplotlib/buildout.cfg

@@ -14,7 +14,6 @@ recipe = slapos.recipe.template:jinja2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 template = ${:_profile_base_location_}/${:filename}
 rendered = ${matplotlibrc:location}/matplotlibrc
-mode = 0644
 backend = agg
 context =
   key backend matplotlibrc:backend

component/memcached/buildout.cfg

-[buildout]
-parts = memcached
-extends =
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
-  ../libevent/buildout.cfg
-
-[memcached-fix-array-subscript-is-above-array-bounds]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-filename = memcached-1.4-fix-array-subscript-is-above-array-bounds.patch
-download-only = true
-md5sum = 472508b9a4b6c0b9f5d6f2abce3444e3
-
-[memcached-gcc-4.4.patch]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-filename = memcached-gcc-4.4.patch
-download-only = true
-md5sum = fd98d0cbfc4d3a25ac9808472fbe62f8
-
-[memcached]
-recipe = slapos.recipe.cmmi
-url = http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz
-md5sum = b7104e269511621c2777367d6d6315fe
-patches =
-  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename} ${memcached-gcc-4.4.patch:location}/${memcached-gcc-4.4.patch:filename}
-patch-options = -p1
-configure-command =
-  aclocal
-  autoheader
-  automake --foreign
-  autoconf
-  ./configure
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --with-libevent=${libevent:location}
-  --disable-docs
-environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s
-  LDFLAGS =-Wl,-rpath=${libevent:location}/lib

component/memcached/memcached-1.4-fix-array-subscript-is-above-array-bounds.patch

-Took originally from OpenSuse spec. Needed on opensuse to avoid "error: array subscript is above array bounds"
---- memcached-orig/memcached.c
-+++ memcached-new/memcached.c	2010/05/06 11:40:56
-@@ -2335,15 +2335,18 @@
- inline static void process_stats_detail(conn *c, const char *command) {
-     assert(c != NULL);
- 
--    if (strcmp(command, "on") == 0) {
-+    char on[] = "on";
-+    char off[] = "off";
-+    char dump[] = "dump";
-+    if (strcmp(command, on) == 0) {
-         settings.detail_enabled = 1;
-         out_string(c, "OK");
-     }
--    else if (strcmp(command, "off") == 0) {
-+    else if (strcmp(command, off) == 0) {
-         settings.detail_enabled = 0;
-         out_string(c, "OK");
-     }
--    else if (strcmp(command, "dump") == 0) {
-+    else if (strcmp(command, dump) == 0) {
-         int len;
-         char *stats = stats_prefix_dump(&len);
-         write_and_free(c, stats, len);

component/memcached/memcached-gcc-4.4.patch

-# In OpenSuse 11.2, 'gcc -dumpversion' returns '4.4', not '4.4.*'.
---- memcached-1.4.8/configure.ac.orig
-+++ memcached-1.4.8/configure.ac
-@@ -502,7 +502,7 @@
-   GCC_VERSION=`$CC -dumpversion`
-   CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
-   case $GCC_VERSION in
--    4.4.*)
-+    4.4 | 4.4.*)
-     CFLAGS="$CFLAGS -fno-strict-aliasing"
-     ;;
-   esac

component/ncurses/buildout.cfg

 [buildout]
-extends =
-  ../patch/buildout.cfg
 parts =
   ncurses
 
@@ -9,13 +7,10 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://ftp.gnu.org/gnu/ncurses/ncurses-6.2.tar.gz
 md5sum = e812da327b1c2214ac1aed440ea3ae8d
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/ncurses-5.9-gcc-5.patch#57f4cd0cc0c0a42a5ddb2167f9546d72
 configure-options =
-  --prefix=@@LOCATION@@
+  --prefix=%(location)s
   --enable-pc-files
-  --with-pkg-config-libdir=@@LOCATION@@/lib/pkgconfig
+  --with-pkg-config-libdir=%(location)s/lib/pkgconfig
   --with-shared
   --without-ada
   --without-manpages
@@ -36,6 +31,5 @@ post-install =
 # pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
 environment =
   LDCONFIG=/bin/echo
-  PATH=${patch:location}/bin:%(PATH)s
 make-options =
   -j1

component/ncurses/ncurses-5.9-gcc-5.patch

-https://bugs.gentoo.org/545114
-
-extracted from the upstream change (which had many unrelated commits in one)
-
-From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
-From: "Thomas E. Dickey" <dickey@invisible-island.net>
-Date: Sun, 7 Dec 2014 03:10:09 +0000
-Subject: [PATCH] ncurses 5.9 - patch 20141206
-
-+ modify MKlib_gen.sh to work around change in development version of
-  gcc introduced here:
-	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
-  (reports by Marcus Shawcroft, Maohui Lei).
-
-diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
-index d8cc3c9..b91398c 100755
---- a/ncurses/base/MKlib_gen.sh
-+++ b/ncurses/base/MKlib_gen.sh
-@@ -474,11 +474,22 @@ sed -n -f $ED1 \
- 	-e 's/gen_$//' \
- 	-e 's/  / /g' >>$TMP
- 
-+cat >$ED1 <<EOF
-+s/  / /g
-+s/^ //
-+s/ $//
-+s/P_NCURSES_BOOL/NCURSES_BOOL/g
-+EOF
-+
-+# A patch discussed here:
-+#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-+# introduces spurious #line markers.  Work around that by ignoring the system's
-+# attempt to define "bool" and using our own symbol here.
-+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
-+cat $ED2 >$TMP
-+
- $preprocessor $TMP 2>/dev/null \
--| sed \
--	-e 's/  / /g' \
--	-e 's/^ //' \
--	-e 's/_Bool/NCURSES_BOOL/g' \
-+| sed -f $ED1 \
- | $AWK -f $AW2 \
- | sed -f $ED3 \
- | sed \

component/neon/buildout.cfg

-[buildout]
-parts =
-  neon
-extends =
-  ../libxml2/buildout.cfg
-  ../openssl/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../zlib/buildout.cfg
-
-[neon]
-recipe = slapos.recipe.cmmi
-shared = true
-url = http://www.webdav.org/neon/neon-0.29.5.tar.gz
-md5sum = ff369e69ef0f0143beb5626164e87ae2
-configure-options =
-  --disable-static
-  --enable-shared
-  --with-ssl=openssl
-  --without-expat
-  --without-gssapi
-  --with-libxml2
-  --enable-threadsafe-ssl=posix
-  --disable-nls
-
-environment =
-  PATH=${libxml2:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
-  CPPFLAGS=-I${openssl:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libxml2:location}/lib

component/ninja/buildout.cfg

 [buildout]
+extends =
+  ../defaults.cfg
 parts =
   ninja
 
@@ -8,8 +10,8 @@ shared = true
 version = 1.10.2
 url = https://github.com/ninja-build/ninja/archive/refs/tags/v${:version}.tar.gz
 md5sum = 639f75bc2e3b19ab893eaf2c810d4eb4
-configure-command = ./configure.py
-configure-options = --bootstrap
+configure-command = ${python:executable} configure.py
+configure-options = --bootstrap --verbose
 make-binary = true
 post-install =
   set %(location)s/bin

component/nxdtest/buildout.cfg

 [buildout]
 extends =
   ../pygolang/buildout.cfg
+  ../util-linux/buildout.cfg
+  ../python-prctl/buildout.cfg
   ../git/buildout.cfg
 
 
+# nxdtest is bin/ program to run nxdtest.
+# use ${nxdtest:exe} to run it.
 [nxdtest]
-recipe  = zc.recipe.egg:scripts
-eggs    = ${pygolang:egg}
-          ${nxdtest-egg:egg}
-scripts = nxdtest
-# convenience for nxdtest users
+<= pyprog
 exe     = ${buildout:bin-directory}/nxdtest
+entry   = nxdtest:main
+eggs    = ${nxdtest-egg:egg}
+initialization =
+  # $PATH for unshare and mount
+  import os
+  path = os.environ.get('PATH', '')
+  if path != '':
+    path = ':' + path
+    os.environ['PATH'] = '${util-linux:location}/bin' + path
+
 
 [nxdtest-egg]
 recipe  = zc.recipe.egg:develop
 setup   = ${nxdtest-repository:location}
 egg     = nxdtest
+depends = ${python-prctl:egg}
 
 [nxdtest-repository]
 recipe  = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/nxdtest.git
-revision = 9f413221
+revision = 6f75fa90
 location = ${buildout:parts-directory}/nxdtest
 git-executable = ${git:location}/bin/git

component/nxdtest/test.cfg

@@ -17,7 +17,7 @@ egg = nxdtest[test]
 [python-interpreter]
 eggs +=
   ${pytest:eggs}
-  ${nxdtest:eggs}
+  ${nxdtest-egg:egg}
 
 # env.sh for interpreter to be on $PATH.
 [nxdtest-env.sh]

component/ocropus/buildout.cfg

-[buildout]
-extends =
-  ../patch/buildout.cfg
-
-parts = ocropus
-
-[ocropus-patch-scons]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-download-only = true
-filename = ocropus.SConstruct-local-installation.patch
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 08710ec022f3ce13e5c0b584dfee2c1c
-
-[ocropus]
-recipe = slapos.recipe.cmmi
-url = http://www.nexedi.org/static/packages/source/ocropus/ocropus-0.4.4.tar.gz
-md5sum = 1485dbe9aab27574bfe3c8b4395cf3ce
-configure-options =
-  ${iulib:location}
-patches = ${ocropus-patch-scons:location}/${ocropus-patch-scons:filename}
-patch-options = -p1
-environment =
-  PATH=${patch:destination_directory}:${scons-bin:destination_directory}:%(PATH)s
-
-[scons-local]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = http://prdownloads.sourceforge.net/scons/scons-local-2.0.1.tar.gz
-
-[scons-bin]
-recipe = plone.recipe.command
-destination_directory = ${scons-local:location}
-command =
-  ln -sf ${scons-local:location}/scons.py ${:destination_directory}/scons
-
-[iulib-patch-scons]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-download-only = true
-filename = iulib.SConstruct-libtiff-detection.patch
-url = ${:_profile_base_location_}/${:filename}
-md5sum = dbbdf909814fb84ffe47e2ff59980db7
-
-[iulib]
-recipe = slapos.recipe.cmmi
-url = http://www.nexedi.org/static/packages/source/ocropus/iulib-0.4.4.tar.gz
-md5sum = 3d9754dbd64c56029ce1cd7c2f61894c
-# workaround http://code.google.com/p/iulib/issues/detail?id=27
-patches = ${iulib-patch-scons:location}/${iulib-patch-scons:filename}
-patch-options = -p1
-environment =
-  PATH=${patch:destination_directory}:${scons-bin:destination_directory}:%(PATH)s

component/ocropy/buildout.cfg

@@ -13,14 +13,14 @@ extends =
 parts = ocropy
 
 [ocropy-eng-traineddata]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download
+shared = true
 filename = en-default.pyrnn.gz
 md5sum = cedd140c7d7650e910f0550ad0f04727
-download-only = true
-url = https://raw.githubusercontent.com/zuphilip/ocropy-models/master/en-default.pyrnn.gz
+url = https://raw.githubusercontent.com/zuphilip/ocropy-models/master/${:filename}
 
 [ocropy-env]
-OCROPY_MODEL_PATH = ${ocropy-eng-traineddata:location}/${ocropy-eng-traineddata:filename}
+OCROPY_MODEL_PATH = ${ocropy-eng-traineddata:target}
 HOME = ${ocropy:egg}
 
 [ocropy]

component/oood/buildout.cfg

-# OpenOffice.org daemon software buildout
-[buildout]
-extends = ../openoffice-bin/buildout.cfg
-parts +=
-  oood
-
-[oood]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = http://www.nexedi.org/static/tarballs/oood/oood-r36294.tar.gz
-md5sum = 9e71251eea4b310fd6bd4ebf8abf890e
-strip-top-level-dir = true

component/openssh/buildout.cfg

@@ -24,8 +24,8 @@ patch-options = -p1
 patches =
   ${:_profile_base_location_}/no_create_privsep_path.patch#6ab983d16c9b4caf111c737dcad6ec9b
 environment = 
-  CPPFLAGS=-I${zlib:location}/include -I${openssl-1.0:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib
+  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
 configure-options = 
   --prefix=${:location}
   --exec-prefix=${:location}

component/packer/buildout.cfg

 [buildout]
-
 parts =
   packer
 
 [packer]
-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).
-url_x86-64 = https://releases.hashicorp.com/packer/${:version}/packer_${:version}_linux_amd64.zip
-url_x86 = https://releases.hashicorp.com/packer/${:version}/packer_${:version}_linux_386.zip
+recipe = slapos.recipe.build:download-unpacked
 version = 0.7.5
-
-# supported architectures md5sums
-md5sum_x86 = a545108a0ccfde7c1e74de6c4e6fdded
-md5sum_x86-64 = f343d709b84db494e8d6ec38259aa4a6
-
-install =
-  import shutil
-  platform = guessPlatform()
-  url = options['url_' + platform]
-  md5sum = options['md5sum_' + platform]
-  extract_dir = self.extract(self.download(url, md5sum))
-  shutil.move(extract_dir, location)
+base = https://releases.hashicorp.com/packer/${:version}/packer_${:version}
+i386-linux-gnu   = ${:base}_linux_386.zip    a545108a0ccfde7c1e74de6c4e6fdded
+x86_64-linux-gnu = ${:base}_linux_amd64.zip  f343d709b84db494e8d6ec38259aa4a6

component/perl/buildout.cfg

@@ -124,6 +124,5 @@ template = inline:
   exec ${perl:location}/bin/perl \
   {% for item in inc -%}{% if item %}  -I "{{ item }}" \
   {% endif %}{% endfor %}  "$@"
-mode = 0755
 rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
 perl-bin = ${:rendered}

component/phantomjs/buildout.cfg

@@ -10,13 +10,13 @@ recipe = slapos.recipe.build
 slapos_promise =
   file:phantomjs-slapos
 
-x86 = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-i686.tar.bz2 9c1426eef5b04679d65198b1bdd6ef88
-x86-64 = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 f278996c3edd0e8d8ec4893807f27d71
+base = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux
+i386-linux-gnu   = ${:base}-i686.tar.bz2   9c1426eef5b04679d65198b1bdd6ef88
+x86_64-linux-gnu = ${:base}-x86_64.tar.bz2 f278996c3edd0e8d8ec4893807f27d71
 
 install =
   import os
-  url, md5sum = options[guessPlatform()].split()
-  extract_dir = self.extract(self.download(url, md5sum))
+  extract_dir = self.extract(self.download(*options[multiarch()].split()))
   workdir = guessworkdir(extract_dir)
   self.copyTree(workdir, location)
   with open(os.path.join(location, "phantomjs-slapos"), 'w') as wrapper:

component/proftpd/buildout.cfg

 # http://www.proftpd.org/ - Highly configurable GPL-licensed FTP server software
-#
-# Because it uses collective.recipe.environment this components needs slapos.core >= 1.4.7
-# ( grid: do not hide `$USER` when running buildout )
-#
+
 [buildout]
 extends = 
   ../openssl/buildout.cfg
@@ -15,11 +12,12 @@ extends =
   ../zstd/buildout.cfg
 
 # proftpd server
-[proftpd-environment]
-recipe = collective.recipe.environment
-
-[proftpd-grp]
-recipe = collective.recipe.grp
+[proftpd-info]
+recipe = slapos.recipe.build
+init =
+  import grp, os, pwd
+  options['USER'] = pwd.getpwuid(os.getuid())[0]
+  options['GROUP'] = grp.getgrgid(os.getgid())[0]
 
 [proftpd]
 recipe = slapos.recipe.cmmi
@@ -36,12 +34,16 @@ 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
-  install_user=${proftpd-environment:USER}
-  install_group=${proftpd-grp:GROUP}
+  install_user=${proftpd-info:USER}
+  install_group=${proftpd-info:GROUP}
 patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/0001-mod_rlimit-don-t-change-PR_SET_DUMPABLE-flag.patch#6e58a7a429ff96a51812dc9835e4c227
+post-install =
+  sed -i '1c\
+  #!${perl:location}/bin/perl
+  ' %(prefix)s/bin/ftpasswd
 
 # mod_auth_web: a proftpd module to authenticate users against an HTTP service
 [proftpd-mod_auth_web-repository]
@@ -63,16 +65,6 @@ command =
   ${proftpd-mod_auth_web-repository:location}/mod_auth_web.c
 location=${proftpd:location}/libexec/mod_auth_web.so
 
-
-# ftpasswd: a perl script to manage a proftpd AuthUserFile
-[ftpasswd]
-recipe = slapos.recipe.build:download
-url = https://raw.githubusercontent.com/proftpd/proftpd/v1.3.6/contrib/ftpasswd
-md5sum = 4a47df2cab86d8de7077a445bb416f31
-download-only = true
-mode = 0755
-
-
 [proftpd-output]
 # Shared binary location to ease migration
 recipe = plone.recipe.command
@@ -82,8 +74,7 @@ command = ${coreutils-output:test} -x ${:proftpd} -a -x ${:ftpasswd}
 modules-deps =
   ${proftpd-mod_auth_web:recipe}
 
-perl = ${perl:location}/bin/perl
-ftpasswd = ${ftpasswd:target}
+ftpasswd = ${proftpd:location}/bin/ftpasswd
 proftpd = ${proftpd:location}/sbin/proftpd
 prxs = ${proftpd:location}/bin/prxs
 ftpdctl = ${proftpd:location}/bin/ftpdctl

component/proxysql/buildout.cfg

@@ -2,54 +2,49 @@
 extends =
   ../autoconf/buildout.cfg
   ../automake/buildout.cfg
-  ../libtool/buildout.cfg
-  ../cmake/buildout.cfg
-  ../openssl/buildout.cfg
-  ../patch/buildout.cfg
-  ../git/buildout.cfg
-  ../openssl/buildout.cfg
   ../bzip2/buildout.cfg
-  ../perl/buildout.cfg
-  ../gnutls/buildout.cfg
+  ../cmake/buildout.cfg
   ../curl/buildout.cfg
+  ../git/buildout.cfg
   ../gnutls/buildout.cfg
-  ../libzip/buildout.cfg
-  ../m4/buildout.cfg
-  ../pcre/buildout.cfg
   ../jemalloc/buildout.cfg
   ../libmicrohttpd/buildout.cfg
+  ../libtool/buildout.cfg
+  ../m4/buildout.cfg
+  ../openssl/buildout.cfg
+  ../patch/buildout.cfg
+  ../pcre/buildout.cfg
+  ../perl/buildout.cfg
+# https://github.com/libinjection/libinjection/issues/4
+  ../python-2.7/buildout.cfg
 
 parts =
   proxysql
 
 [proxysql]
 recipe = slapos.recipe.cmmi
-version = v2.0.12
+shared = true
+version = v2.3.2
 url = https://github.com/sysown/proxysql/archive/${:version}.tar.gz
-md5sum = 70ec17fe73703a25730fdd44b6bc3ef5
-prefix = @@LOCATION@@
-# Patch installation path for SlapOS
-pre-configure =
-  mkdir -p ${:prefix}/bin ${:prefix}/etc/init.d ${:prefix}/lib/systemd/system
-  sed -ri "
-    s#(\s)/usr/bin#\1${:prefix}/bin#g
-    s#(\s)/etc#\1${:prefix}/etc#g
-    s#(\s)/usr/lib#\1${:prefix}/lib#
-    s#(\s)/var/lib#\1${:prefix}/lib#g
-    s#(\s)useradd#\1echo useradd#g
-    s#(\s)systemctl#\1echo systemctl#g
-    s#(\s)chkconfig#\1echo chkconfig#g
-    s#(\s)update-rc.d#\1echo update-rc.d#g" Makefile
-
+md5sum = 969129ac43c9f64641509891a116e0e1
 configure-command = true
+make-options = GIT_VERSION=${:version}
+# The install target does not honor DESTDIR:
+# let's forget it and only install what we need.
+make-targets = src/proxysql
+post-install =
+  install -Dt %(location)s/bin %(make-targets)s
 environment =
-  GIT_VERSION=${:version}
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${libgcrypt:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
-  PATH=${m4:location}/bin:${libtool:location}/bin:${libgcrypt:location}/bin:${curl:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${bzip2:location}/bin:${autoconf:location}/bin:${git:location}/bin:${automake:location}/bin:${patch:location}/bin:${cmake-3.18:location}/bin:%(PATH)s
+  PATH=${m4:location}/bin:${libtool:location}/bin:${libgcrypt:location}/bin:${curl:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${bzip2:location}/bin:${autoconf:location}/bin:${git:location}/bin:${automake:location}/bin:${patch:location}/bin:${cmake:location}/bin:%(PATH)s:${python2.7:location}/bin
   CXXFLAGS=-I${openssl:location}/include -I${gnutls:location}/include -I${zlib:location}/include
   CFLAGS=-I${gnutls:location}/include
   LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath=${curl:location}/lib -L${libtool:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${curl:location}/lib -L${pcre:location}/lib -L${jemalloc:location}/lib -L${libmicrohttpd:location}/lib
-  CMAKE_INCLUDE_PATH=${openssl:location}/include:${gnutls:location}/include:${curl:location}/include:${pcre:location}/include:${jemalloc:location}/include:${libmicrohttpd:location}/include
-  CMAKE_LIBRARY_PATH=${openssl:location}/lib:${gnutls:location}/lib:${curl:location}/lib:${pcre:location}/lib:${jemalloc:location}/lib:${libmicrohttpd:location}/lib
+  CMAKE_INCLUDE_PATH=${openssl:location}/include:${gnutls:location}/include:${curl:location}/include:${pcre:location}/include:${jemalloc:location}/include:${libmicrohttpd:location}/include:${zlib:location}/include
+  CMAKE_LIBRARY_PATH=${openssl:location}/lib:${gnutls:location}/lib:${curl:location}/lib:${pcre:location}/lib:${jemalloc:location}/lib:${libmicrohttpd:location}/lib:${zlib:location}/lib
   LIBTOOL=libtool
   ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${libtool:location}/share/aclocal
+patch-options = -p1
+patches =
+# PR #3402 (mariadb_client: backport patch to fix syntax error in cmake 3.20)
+  https://github.com/sysown/proxysql/commit/a3cfa56d257219f7610cd5711045bb5d84485a91.patch

component/pure-ftpd/buildout.cfg

@@ -3,8 +3,9 @@ parts = pure-ftpd
 
 [pure-ftpd]
 recipe = slapos.recipe.cmmi
-url = https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.49.tar.bz2
-md5sum = b7025f469711d88bd84a3518f67c1470 
+url = https://github.com/jedisct1/pure-ftpd/releases/download/${:version}/pure-ftpd-${:version}.tar.bz2
+version = 1.0.50
+md5sum = f55af39fc85edceba4b02ee4fa116d00
 
 # See https://download.pureftpd.org/pub/pure-ftpd/doc/README for more configurations
 # We need the trick about UPLOAD_PIPE_FILE and UPLOAD_PIPE_LOCK so that the files are created inside the $CWD/var/run

component/pygolang/buildout.cfg

@@ -49,5 +49,64 @@ initialization =
 scripts = ${:interpreter}
 
 
+# pyprog provides macro recipe to build python programs.
+#
+# Contrary to zc.recipe.egg:scripts it generates scripts that are run with
+# sys.executable being correctly set. In particular it is valid to spawn
+# sys.executable from inside the program and assume that all specified eggs are
+# still accessible and can be imported.
+#
+# Usage example:
+#
+#   [myprog]
+#   <= pyprog
+#   exe = ${buildout:bin-directory}/myprog
+#   entry = my.py.mod:main
+#   eggs = ...
+[pyprog]
+recipe = slapos.recipe.build
+initialization =
+depends =
+_name = ${:_buildout_section_name_}
+init =
+  name   = options['_name']  # options['_buildout_section_name_'] does not work
+  exe    = options['exe']
+  entry  = options['entry']
+  eggs   = options['eggs']
+  pyinit = options['initialization']
+
+  options['depends'] += '$${.%s.pyprog:recipe}' % name
+
+  # mod:func -> 'from mod import func; sys.exit(func())'
+  mod, func = entry.split(':')
+  entry_run = 'from %s import %s; sys.exit(%s())' % (mod, func, func)
+
+  # indent pyinit with '  '
+  __pyinit = '\n'.join(['  '+_ for _ in pyinit.splitlines()])
+
+  self.buildout.parse("""
+  # .X.pyprog is python program to start and run entry
+  # it uses .X.pyexe as underlying python interpreter
+  [.%(name)s.pyprog]
+  recipe  = slapos.recipe.template:jinja2
+  exe     = %(exe)s
+  rendered= $${:exe}
+  mode    = 755
+  template=
+    inline:
+    #!$${.%(name)s.pyexe:exe}
+    import sys
+  %(__pyinit)s
+    %(entry_run)s
+
+  # .X.pyexe is python interpreter used by .X.pyprog
+  [.%(name)s.pyexe]
+  <= python-interpreter
+  eggs += %(eggs)s
+  interpreter = $${:_buildout_section_name_}
+  exe = $${buildout:bin-directory}/$${:interpreter}
+  """ % locals())
+
+
 [versions]
-pygolang = 0.0.8
+pygolang = 0.0.9

component/pytest/buildout.cfg

@@ -16,3 +16,4 @@ eggs    = ${pytest:eggs}
 [versions]
 pytest  = 4.6.11:whl
 pytest-timeout = 1.4.2
+pytest-mock = 2.0.0:whl

component/python-prctl/buildout.cfg

+[buildout]
+extends =
+  ../libcap/buildout.cfg
+
+[python-prctl]
+recipe = zc.recipe.egg:custom
+egg = python-prctl
+include-dirs =
+  ${libcap:location}/include
+library-dirs =
+  ${libcap:location}/lib
+rpath =
+  ${:library-dirs}
+
+# setup.py also calls cpp directly to verify for sys/capabilities.h
+environment = python-prctl-env
+[python-prctl-env]
+C_INCLUDE_PATH=${libcap:location}/include
+
+
+[versions]
+python-prctl = 1.8.1

component/qemu-kvm/buildout.cfg

@@ -72,11 +72,6 @@ archive = ${:version}
 <= debian-netinst-base
 arch = amd64
 
-[debian-amd64-wheezy-netinst.iso]
-<= debian-amd64-netinst-base
-version = 7.11.0
-md5sum = 096c1c18b44c269808bd815d58c53c8f
-
 [debian-amd64-jessie-netinst.iso]
 <= debian-amd64-netinst-base
 version = 8.11.1

component/ruby/buildout.cfg

@@ -25,21 +25,10 @@ environment =
   PKG_CONFIG_PATH=${libyaml:location}/lib/
 
 
-[ruby2.1]
-<= ruby-common
-url = http://ftp.ruby-lang.org/pub/ruby/2.1/ruby-2.1.8.tar.xz
-md5sum = f18ed96bd1d5890f97a17d0d17aaefdd
-
-
-[ruby2.2]
-<= ruby-common
-url = http://ftp.ruby-lang.org/pub/ruby/2.2/ruby-2.2.2.tar.xz
-md5sum = dbce9b9d79d90f213ba8d448b0b6ed86
-
 [ruby2.3]
 <= ruby-common
 url = http://ftp.ruby-lang.org/pub/ruby/2.3/ruby-2.3.8.tar.xz
 md5sum = 927e1857f3dd5a1bdec26892dbae2a05
 
 [ruby]
-<= ruby2.2
+<= ruby2.3

component/slapos/obs.cfg

 [buildout]
 # You need to define rootdir and destdir on an upper level
+#
+# rootdir is where the parts will be installed by the debian package (e.g. /opt/slapos)
+# destdir is where we can put the files during compilation (e.g. /tmp/build-slapos)
+# buildout MUST BE launched in $destdir/$rootdir (this is enforced by an assert)
+#
+# in this file, we teach many packages to use prefix = $rootdir/parts/package and we
+# set DESTDIR = $destdir so in reality the files land in $destdir/$rootdir/parts/package
+# which is EXACTLY what cmmi recipe uses by default (buildout run dir/parts/package)
+# that's why everything is working
+#
+# please be careful when touching this file
+
 #rootdir = %TARGET_DIRECTORY%
 #destdir = %BUILD_ROOT_DIRECTORY%
-#builddir = %BUILD_DIRECTORY%
+
 extends =
   buildout.cfg
 
@@ -13,34 +25,24 @@ extensions =
 extends-cache = extends-cache
 download-cache = download-cache
 
-# Uguu, upstream buildout.cfg must be patched as it works the other way
-# around from a packager point of view at least, thus at the end static
-# path, such as Python HOME directory, are wrong...
-#
-# Currently:
-# ./configure --prefix=BUILD_DIRECTORY && make install
-# Instead of:
-# ./configure --prefix=INSTALL_DIRECTORY && make install DESTDIR=BUILD_DIRECTORY
+[python]
+init +=
+  buildout = self.buildout['buildout']
+  assert buildout['directory'] == buildout['destdir'] + buildout['rootdir'], (
+    "Buildout MUST BE launched in destdir/rootdir (currently launched in %s but should be launched in %s)",
+	 buildout['directory'], buildout['destdir'] + buildout['rootdir'])
+
 [python2.7]
 configure-options +=
   --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
 environment +=
   DESTDIR=${buildout:destdir}
 
-[gettext]
-# Add gettext library path to RPATH as its binaries are used to build
-# glib for example
-environment =
-  PATH=${perl:location}/bin:${lunzip:location}/bin:%(PATH)s
-  CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include
-  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${buildout:builddir}/parts/${:_buildout_section_name_}/lib
-
 [bison]
 configure-options +=
   --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
 make-options +=
   DESTDIR=${buildout:destdir}
-
 environment +=
   PERL5LIB=${perl:location}/lib/5.28.1/
 
@@ -62,7 +64,6 @@ environment +=
 
 
 [dbus]
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options +=
   --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
 make-options +=
@@ -74,7 +75,6 @@ post-install =
   mkdir -p ${buildout:destdir}/parts/${:_buildout_section_name_}/var/run/dbus
 
 [dbus-glib]
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 environment +=
   LD_LIBRARY_PATH=${dbus:location}/lib
   DBUS_CFLAGS=-I${dbus:location}/include/dbus-1.0 -I${dbus:location}/lib/dbus-1.0/include
@@ -92,21 +92,13 @@ post-install =
   sed -i 's#${dbus:location}/lib/libdbus-1.la#/opt/slapos/parts/dbus/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
 
 [openssl]
+shared = false
 prefix = ${buildout:rootdir}/parts/${:_buildout_section_name_}
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 make-options +=
   INSTALL_PREFIX=${buildout:destdir}
   DESTDIR=${buildout:destdir}
- 
-environment =
+environment +=
   PERL5LIB=${perl:location}/lib/5.28.1/
-  PERL=${perl:location}/bin/perl
-
-[bison-go]
-<= bison
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-make-options =
 
 [gobject-introspection]
 pre-configure =
@@ -115,10 +107,8 @@ configure-options +=
   --enable-shared
 environment +=
   PERL5LIB=${perl:location}/lib/5.28.1/
-
 post-install =
   sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config
-  rm -rf ${bison-go:location}
 
 [pygobject3]
 pre-configure +=
@@ -126,18 +116,6 @@ pre-configure +=
 post-install =
   sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config
 
-[ncurses]
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --with-shared
-  --without-ada
-  --without-manpages
-  --without-tests
-  --without-normal
-  --without-debug
-  --without-gpm
-  --enable-rpath
-
 [flex]
 environment +=
  BISON_PKGDATADIR=${bison:location}/share/bison/
@@ -154,7 +132,6 @@ post-install =
   sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.28.1/*-linux-thread-multi/Config.pm
 
 [perl]
-location = ${buildout:destdir}/parts/perl
 configure-command =
   sh Configure -des \
     -Dprefix=${buildout:rootdir}/parts/${:_buildout_section_name_} \

component/subversion/buildout.cfg

@@ -6,7 +6,6 @@ extends =
   ../apache/buildout.cfg
   ../libexpat/buildout.cfg
   ../libuuid/buildout.cfg
-  ../neon/buildout.cfg
   ../openssl/buildout.cfg
   ../patch/buildout.cfg
   ../perl/buildout.cfg
@@ -14,7 +13,6 @@ extends =
   ../serf/buildout.cfg
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
-  ../swig/buildout.cfg
   ../lz4/buildout.cfg
 parts =
   subversion
@@ -55,45 +53,3 @@ environment =
   PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${serf:location}/lib/pkgconfig
   CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
   LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${serf:location}/lib -Wl,-rpath=${lz4:location}/lib
-
-[subversion-1.9]
-recipe = hexagonit.recipe.cmmi
-shared = true
-url = http://www.apache.org/dist/subversion/subversion-1.7.9.tar.gz
-md5sum = dfb083e8bfac88aa28d606168b08e4ff
-configure-options =
-  --disable-static
-  --with-apr=${apache:location}/bin/apr-1-config
-  --with-apr-util=${apache:location}/bin/apu-1-config
-  --with-apxs=${apache:location}/bin/apxs
-  --with-zlib=${zlib:location}
-  --with-sqlite=${sqlite3:location}
-  --with-neon=${neon:location}
-  --with-swig=${swig:location}/bin/swig
-  --without-berkeley-db
-  --without-sasl
-  --without-apr_memcache
-  --without-gnome-keyring
-  --without-kwallet
-  --without-jdk
-  --without-jikes
-  --without-junit
-  --without-ctypesgen
-  --without-ruby-sitedir
-  --without-ruby-test-verbose
-  --disable-nls
-
-# it seems that parallel build sometimes fails.
-make-options =
-  -j1
-
-make-targets =
-  install
-  swig-py
-  install-swig-py
-
-environment =
-  PATH=${pkgconfig:location}/bin:${neon:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl-1.0:location}/lib/pkgconfig:${neon:location}/lib/pkgconfig
-  CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
-  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib

component/theia/buildout.cfg

+[buildout]
+extends =
+  ../java-jdk/buildout.cfg
+  ../libsecret/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../patchelf/buildout.cfg
+  ../yarn/buildout.cfg
+  download-plugins.cfg
+  buildout.hash.cfg
+
+
+[preloadTemplate.html]
+recipe = slapos.recipe.build:download
+shared = true
+url = ${:_profile_base_location_}/${:_buildout_section_name_}
+
+[yarn.lock]
+recipe = slapos.recipe.build:download
+shared = true
+url = ${:_profile_base_location_}/${:_buildout_section_name_}
+
+[theia]
+recipe = slapos.recipe.cmmi
+shared = true
+path = ${yarn.lock:location}
+# To regenerate yarn.lock, use package.json instead
+# path = ${package.json:location}
+environment =
+  TMPDIR=@@LOCATION@@/tmp
+  PATH=${nodejs:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libsecret:pkg-config-path}
+  LDFLAGS=-Wl,-rpath=${libsecret:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${glib:location}/lib
+pre-configure =
+  mkdir -p $TMPDIR
+  echo '${package.json:content}' > %(location)s/package.json
+  # To regenerate yarn.lock, comment the line below
+  cp yarn.lock %(location)s
+configure-command = true
+make-binary = cd %(location)s && ${yarn:location}/bin/yarn
+make-targets = theia build
+post-install =
+  # On Debian 9 the -rpath are not taken into account by yarn build for unknown reasons
+  cd %(location)s/node_modules/keytar/build/Release
+  ${patchelf:location}/bin/patchelf --set-rpath \
+    ${libsecret:location}/lib:${gettext:location}/lib:${glib:location}/lib \
+    keytar.node
+
+[theia-wrapper]
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
+template =
+  inline:
+  #!/bin/sh
+  cd ${theia:location}
+  exec ${yarn:location}/bin/yarn theia start "$@"
+
+[theia-open]
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
+template =
+  inline:
+  #!/bin/sh
+  exec ${nodejs:location}/bin/node ${theia:location}/node_modules/.bin/theia-open "$@"
+
+[theia-plugins]
+recipe = slapos.recipe.build
+urls = ${theia-download-plugins:urls}
+install =
+  import os
+  for line in options['urls'].splitlines():
+    extension_name, url, md5sum = line.split()
+    extract_dir = self.extract(self.download(url, md5sum))
+    destination_dir = os.path.join(options['location'], extension_name)
+    self.copyTree(guessworkdir(extract_dir), destination_dir)
+    os.chmod(destination_dir, 0o750)
+
+[package.json]
+content =
+  {
+      "private": true,
+      "theia": {
+          "backend": {
+              "config": {
+                  "warnOnPotentiallyInsecureHostPattern": false
+              }
+          },
+          "frontend": {
+              "config": {
+                  "applicationName": "Theia SlapOS",
+                  "preferences": {
+                      "application.confirmExit": "always",
+                      "files.associations": {
+                          "*.cfg": "zc-buildout"
+                      },
+                      "files.enableTrash": false,
+                      "files.exclude": {
+                          "**.pyc": true,
+                          "**.egg-info": true,
+                          "__pycache__": true,
+                          ".git": true,
+                          ".env": true,
+                          "**/node_modules/**": true
+                      },
+                      "files.watcherExclude": {
+                          "**/.eggs/**": true,
+                          "**/.env/**": true,
+                          "**/.git/**": true,
+                          "**/node_modules/**": true
+                      },
+                      "editor.multiCursorModifier": "ctrlCmd",
+                      "editor.tabSize": 2,
+                      "plantuml.server": "https://plantuml.host.vifib.net/svg/",
+                      "plantuml.render": "PlantUMLServer",
+                      "gitlens.remotes": [{ "domain": "lab.nexedi.com", "type": "GitLab" }],
+                      "java.home": "${java-jdk:location}"
+                  },
+                  "warnOnPotentiallyInsecureHostPattern": false
+              }
+          },
+          "generator": {
+              "config": {
+                  "preloadTemplate": "${preloadTemplate.html:target}"
+              }
+          }
+      },
+      "dependencies": {
+          "@theia/bulk-edit": "latest",
+          "@theia/callhierarchy": "latest",
+          "@theia/console": "latest",
+          "@theia/core": "latest",
+          "@theia/debug": "latest",
+          "@theia/editor": "latest",
+          "@theia/editor-preview": "latest",
+          "@theia/file-search": "latest",
+          "@theia/filesystem": "latest",
+          "@theia/getting-started": "latest",
+          "@theia/keymaps": "latest",
+          "@theia/markers": "latest",
+          "@theia/messages": "latest",
+          "@theia/metrics": "latest",
+          "@theia/mini-browser": "latest",
+          "@theia/monaco": "latest",
+          "@theia/navigator": "latest",
+          "@theia/outline-view": "latest",
+          "@theia/output": "latest",
+          "@theia/plugin-dev": "latest",
+          "@theia/plugin-ext": "latest",
+          "@theia/plugin-ext-vscode": "latest",
+          "@theia/preferences": "latest",
+          "@theia/preview": "latest",
+          "@theia/process": "latest",
+          "@theia/property-view": "latest",
+          "@theia/scm": "latest",
+          "@theia/scm-extra": "latest",
+          "@theia/search-in-workspace": "latest",
+          "@theia/task": "latest",
+          "@theia/terminal": "latest",
+          "@theia/timeline": "latest",
+          "@theia/typehierarchy": "latest",
+          "@theia/userstorage": "latest",
+          "@theia/variable-resolver": "latest",
+          "@theia/vsx-registry": "latest",
+          "@theia/workspace": "latest",
+          "@perrinjerome/theia-open": "latest",
+          "@perrinjerome/theia-open-cli": "latest"
+      },
+      "devDependencies": {
+          "@theia/cli": "latest"
+      }
+  }

component/theia/buildout.hash.cfg

+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+
+[preloadTemplate.html]
+_update_hash_filename_ = preloadTemplate.html
+md5sum = 8157c22134200bd862a07c6521ebf799
+
+[yarn.lock]
+_update_hash_filename_ = yarn.lock
+md5sum = 067d2db611b21f77885f3adfd7f81453

component/libatlas/buildout.cfg → component/unstable/libatlas/buildout.cfg

@@ -13,7 +13,6 @@ filename = lapack-${:version}.tgz
 url = http://www.netlib.org/lapack/${:filename}
 md5sum = b1d3e3e425b2e44a06760ff173104bdf
 download-only = true
-mode = 0644
 
 [libatlas]
 recipe = slapos.recipe.cmmi

component/util-linux/buildout.cfg

@@ -24,7 +24,7 @@ configure-options =
   --disable-makeinstall-chown
   --disable-makeinstall-setuid
   --disable-more
-  --disable-mount
+  --enable-mount
   --disable-nls
   --disable-pivot_root
   --disable-pylibmount
@@ -36,7 +36,7 @@ configure-options =
   --without-tinfo
   --disable-tls
   --disable-ul
-  --disable-unshare
+  --enable-unshare
   --disable-uuidd
   --disable-wall
   --without-libiconv-prefix

component/vm-img/debian.cfg

@@ -32,6 +32,17 @@ late-command =
 # a DNS proxy on both IPv4 and IPv6 without translating queries to what the
 # host supports.
   dpkg -P rdnssd
+# Fix partially Let's Encrypt certificate on old OS due to expired root CA.
+# This is enough for Python but not wget.
+  dpkg --compare-versions 20200601~ le `dpkg-query -f '$${Version}' -W ca-certificates 2>/dev/null ||echo 1:0` || (
+    set ca-certificates_20200601~deb9u2_all.deb
+    wget http://security.debian.org/debian-security/pool/updates/main/c/ca-certificates/$1
+    echo 6cb3ce4329229d71a6f06b9f13c710457c05a469012ea31853ac300873d5a3e1 $1 |sha256sum -c
+    dpkg -i $1
+    rm $1
+    cd /etc/ssl/certs
+    rm DST_Root_CA_X3.pem 2e5ac55d.0 12d55845.0
+  )
   mount |grep -q 'on / .*\bdiscard\b' || ! type fstrim || {
     apt-get clean
     sync
@@ -40,10 +51,6 @@ late-command =
 debconf.debconf =
   debconf/frontend noninteractive
   debconf/priority critical
-debian-wheezy/preseed.apt-setup/services-select = volatile
-debian-wheezy/preseed.mirror/country = manual
-debian-wheezy/preseed.mirror/http/hostname = archive.debian.org
-debian-wheezy/preseed.mirror/http/directory = /debian
 debian-jessie/preseed.mirror/country = manual
 debian-jessie/preseed.mirror/http/hostname = archive.debian.org
 debian-jessie/preseed.mirror/http/directory = /debian
@@ -61,10 +68,6 @@ x86_64.initrd = install.amd/initrd.gz
 <= debian-stable
 x86_64.iso = debian-amd64-testing-netinst.iso
 
-[debian-wheezy]
-<= debian-stable
-x86_64.iso = debian-amd64-wheezy-netinst.iso
-
 [debian-jessie]
 <= debian-stable
 x86_64.iso = debian-amd64-jessie-netinst.iso

component/vnu/buildout.cfg

@@ -6,11 +6,10 @@ parts =
   vnu
 
 [vnu]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-strip-top-level-dir = true
-url = https://github.com/validator/validator/releases/download/17.11.1/vnu.war_17.11.1.zip
-md5sum = 2af6dec153a5011cd6fcc85ce5fb599d
+recipe = slapos.recipe.build:download-unpacked
+shared = true
+url = https://github.com/validator/validator/releases/download/20.6.30/vnu.war_20.6.30.zip
+md5sum = af595613407034da0797e4d10c03b6a2
 
 [vnu-output]
 # Shared binary location to ease migration

component/wkhtmltopdf/buildout.cfg

@@ -16,19 +16,13 @@ parts =
 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).
-url_x86-64 = http://download.gna.org/wkhtmltopdf/0.12/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz
-url_x86 = http://download.gna.org/wkhtmltopdf/0.12/0.12.4/wkhtmltox-0.12.4_linux-generic-i386.tar.xz
-
-# supported architectures md5sums
-md5sum_x86 = ce1a2c0b2cf786ccc5d5828c42c99ddd
-md5sum_x86-64 = 96b7306cebb9e65355f69f7ab63df68b
+base = http://download.gna.org/wkhtmltopdf/0.12/0.12.4/wkhtmltox-0.12.4_linux-generic
+i386-linux-gnu   = ${:base}-i386.tar.xz  ce1a2c0b2cf786ccc5d5828c42c99ddd
+x86_64-linux-gnu = ${:base}-amd64.tar.xz 96b7306cebb9e65355f69f7ab63df68b
 
 install =
   import os,shutil, sys, tempfile
-  platform = guessPlatform()
-  url = options['url_' + platform]
-  md5sum = options['md5sum_' + platform]
-  path = self.download(url, md5sum)
+  path = self.download(*options[multiarch()].split())
   extract_dir = tempfile.mkdtemp(self.name)
   self.cleanup_dir_list.append(extract_dir)
   self.logger.debug('Created working directory %s', extract_dir)

component/xpdf/buildout.cfg

-[buildout]
-parts = xpdf
-
-[xpdf]
-<= xpdf-3.02
-
-[xpdf-patch-download]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ftp://ftp.foolabs.com/pub/xpdf/${:filename}
-download-only = true
-
-[xpdf-3.02pl1.patch]
-<= xpdf-patch-download
-filename = xpdf-3.02pl1.patch
-md5sum = 877118786dfe27d1b7aa5a6759cc6e45
-
-[xpdf-3.02pl2.patch]
-<= xpdf-patch-download
-filename = xpdf-3.02pl2.patch
-md5sum = 3a5cb165ae66781e0b21e6219ae06795
-
-[xpdf-3.02pl3.patch]
-<= xpdf-patch-download
-filename = xpdf-3.02pl3.patch
-md5sum = 581963ede0fb5715e1a69f01b5b8ce63
-
-[xpdf-3.02pl4.patch]
-<= xpdf-patch-download
-filename = xpdf-3.02pl4.patch
-md5sum = 70b752716798dd341a4bf890df5f6fdc
-
-[xpdf-3.02pl5.patch]
-<= xpdf-patch-download
-filename = xpdf-3.02pl5.patch
-md5sum = 504902ca5e9d66c67eed03636ec6b163
-
-[xpdf-3.02]
-recipe = slapos.recipe.cmmi
-md5sum = 599dc4cc65a07ee868cf92a667a913d2
-url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz
-configure-options =
-  --without-x
-patch-options = -p1
-patches =
-  ${xpdf-3.02pl1.patch:location}/${xpdf-3.02pl1.patch:filename}
-  ${xpdf-3.02pl2.patch:location}/${xpdf-3.02pl2.patch:filename}
-  ${xpdf-3.02pl3.patch:location}/${xpdf-3.02pl3.patch:filename}
-  ${xpdf-3.02pl4.patch:location}/${xpdf-3.02pl4.patch:filename}
-  ${xpdf-3.02pl5.patch:location}/${xpdf-3.02pl5.patch:filename}

component/xz-utils/buildout.cfg

@@ -5,7 +5,7 @@ parts =
 [xz-utils]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://tukaani.org/xz/xz-5.2.5.tar.bz2
+url = https://tukaani.org/xz/xz-5.2.5.tar.bz2
 md5sum = 33ab3ef79aa1146b83b778210e7b0a54
 configure-options =
   --disable-static

component/yarn/buildout.cfg

@@ -24,14 +24,19 @@ yarn-download = ${yarn-download-1.16.0:location}
 yarn-download = ${yarn-download-1.3.2:location}
 
 [yarn-wrapper]
-recipe = slapos.recipe.template:jinja2
-rendered = ${:location}/bin/yarn
-template = inline:
+recipe = slapos.recipe.build
+shared = true
+content =
   #!/bin/sh
   PATH=${nodejs:location}/bin/:$PATH
   exec ${:yarn-download}/bin/yarn $@
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-bin-yarn = ${:rendered}
+install =
+  import os
+  bin = os.path.join(options['location'], 'bin')
+  os.makedirs(bin)
+  with open(os.path.join(bin, 'yarn'), 'w') as f:
+    os.fchmod(f.fileno(), 0o755)
+    f.write(options['content'])
 
 [yarn-download]
 recipe = slapos.recipe.build:download-unpacked

component/zodbtools/test-common.cfg

@@ -42,5 +42,4 @@ template = inline:
 
 
 [versions]
-mock = 3.0.5
 freezegun = 1.0.0

format-json

@@ -10,7 +10,7 @@ Usage::
 
 """
 
-import os
+from __future__ import print_function
 import sys
 import json
 import collections
@@ -19,15 +19,15 @@ import collections
 def main():
   exit_code = 0
   for f in sys.argv[1:]:
-    print 'Processing %s' % (f,)
-    with open(f, 'rb') as infile:
+    print('Processing', f,)
+    with open(f) as infile:
       try:
         obj = json.load(infile, object_pairs_hook=collections.OrderedDict)
       except ValueError as e:
         exit_code = 1
-        print e
+        print(e, file=sys.stderr)
       else:
-        with open(f, 'wb') as outfile:
+        with open(f, 'w') as outfile:
           json.dump(obj, outfile, sort_keys=False, indent=2, separators=(',', ': '))
           outfile.write('\n')
   sys.exit(exit_code)

package.json

 {
-  "dependencies": {
-    "husky": "^1.1.2",
-    "lint-staged": "^7.3.0"
-  },
   "lint-staged": {
     "*.json": [
-      "python2 ./format-json",
-      "git add"
+      "./format-json"
     ],
     "{component,software,stack}/**": [
-      "python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"python2\", \"./update-hash\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'",
+      "python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"./update-hash\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'",
       "python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"git\", \"add\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'"
     ]
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
+  "devDependencies": {
+    "husky": "^7.0.0",
+    "lint-staged": "^12.1.2"
+  },
+  "scripts": {
+    "prepare": "husky install && git config merge.tool update-hash-mergetool && git config mergetool.update-hash-mergetool.cmd './update-hash-mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"' && git config mergetool.update-hash-mergetool.trustExitCode true"
   }
 }

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.217'
+version = '1.0.220'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 
@@ -64,7 +64,6 @@ setup(name=name,
       install_requires=[
         'enum34; python_version<"3.4"',  # for inotify-simple
         'jsonschema',
-        'hexagonit.recipe.download',
         'netaddr', # to manipulate on IP addresses
         'setuptools', # namespaces
         'inotify_simple',
@@ -78,7 +77,6 @@ setup(name=name,
       entry_points={
         'zc.buildout': [
           'addresiliency = slapos.recipe.addresiliency:Recipe',
-          'accords = slapos.recipe.accords:Recipe',
           'apacheperl = slapos.recipe.apacheperl:Recipe',
           'apachephp = slapos.recipe.apachephp:Recipe',
           'apachephpconfigure = slapos.recipe.apachephpconfigure:Recipe',
@@ -91,8 +89,6 @@ setup(name=name,
           'check_parameter = slapos.recipe.check_parameter:Recipe',
           'cloud9 = slapos.recipe.cloud9:Recipe',
           'cloudooo.test = slapos.recipe.erp5_test:CloudoooRecipe',
-          'condor = slapos.recipe.condor:Recipe',
-          'condor.submit = slapos.recipe.condor:AppSubmit',
           'copyfilelist = slapos.recipe.copyfilelist:Recipe',
           'cron = slapos.recipe.dcron:Recipe',
           'cron.d = slapos.recipe.dcron:Part',
@@ -126,7 +122,6 @@ setup(name=name,
           'neoppod.admin = slapos.recipe.neoppod:Admin',
           'neoppod.master = slapos.recipe.neoppod:Master',
           'neoppod.storage = slapos.recipe.neoppod:Storage',
-          'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
           'notifier = slapos.recipe.notifier:Recipe',
           'notifier.callback = slapos.recipe.notifier:Callback',
           'notifier.notify = slapos.recipe.notifier:Notify',
@@ -161,8 +156,6 @@ setup(name=name,
           'slapconfiguration = slapos.recipe.slapconfiguration:Recipe',
           'slapconfiguration.serialised = slapos.recipe.slapconfiguration:Serialised',
           'slapconfiguration.jsondump = slapos.recipe.slapconfiguration:JsonDump',
-          'slapcontainer = slapos.recipe.container:Recipe',
-          'sphinx= slapos.recipe.sphinx:Recipe',
           'squid = slapos.recipe.squid:Recipe',
           'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
           'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
@@ -181,9 +174,6 @@ setup(name=name,
           'zero-knowledge.read = slapos.recipe.zero_knowledge:ReadRecipe',
           'zero-knowledge.write = slapos.recipe.zero_knowledge:WriteRecipe'
         ],
-        'slapos.recipe.nosqltestbed.plugin': [
-          'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',
-        ],
       },
       extras_require=extras_require,
       test_suite='slapos.test',

slapos/recipe/accords/__init__.py

-##############################################################################
-#
-# Copyright (c) 2011 Vifib SARL 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.
-#
-##############################################################################
-import os
-import shutil
-from slapos.recipe.librecipe import GenericSlapRecipe
-import shutil
-import subprocess
-import sys
-
-class Recipe(GenericSlapRecipe):
-  def _install(self):
-    path_list = []
-    accords_location = self.buildout['accordsdirectory']['accords']
-
-    parameter_dict = dict(
-        userid=self.options['userid'],
-        tenantname=self.options['tenantname'],
-        password=self.options['password'],
-        domain=self.options['domain'],
-        openstack_url=self.options['openstack_url'],
-        python_location=sys.executable,
-        accords_location=accords_location,
-        manifest_name=self.options['manifest-name'],
-        # XXX this is workaround
-        accords_lib_directory=self.options['accords_lib_directory'],
-        computer_id = self.computer_id,
-        computer_partition_id = self.computer_partition_id,
-        server_url = self.server_url,
-        software_release_url = self.software_release_url,
-        key_file = self.key_file,
-        cert_file = self.cert_file,
-        path = '%s:%s' % (self.options['accords_bin_directory'],
-            os.environ.get('PATH', '')),
-    )
-    # Generate os-config.xml
-    os_config_file = self.createFile(self.options['os-config'],
-        self.substituteTemplate(self.getTemplateFilename('os_config.xml.in'),
-        parameter_dict))
-    path_list.append(os_config_file)
-
-    # Put modified accords configuration file
-    accords_configuration_parameter_dict = dict(
-        listen_ip = self.options['listen-ip']
-    )
-    accords_configuration_file_location = self.createFile(
-        self.options['accords-configuration-file'],
-        self.substituteTemplate(self.getTemplateFilename('accords.ini.in'),
-        accords_configuration_parameter_dict))
-    path_list.append(accords_configuration_file_location)
-
-    # XXX is it dangerous?
-    security_path = os.path.join(accords_location, 'security')
-    if os.path.exists(security_path):
-      shutil.rmtree(security_path)
-
-    # Initiate configuration
-    subprocess.check_call('./accords-config',
-                          cwd=accords_location
-    )
-
-    # Generate manifest
-    manifest_origin_location = self.options['manifest-source']
-    manifest_location = self.options['manifest-destination']
-
-    shutil.copy(manifest_origin_location, manifest_location)
-    path_list.append(manifest_location)
-
-    # Generate wrapper
-    wrapper_location = self.createPythonScript(self.options['accords-wrapper'],
-        __name__ + '.accords.runAccords',
-        (parameter_dict,))
-    path_list.append(wrapper_location)
-
-    # Generate helper for debug
-    self.createExecutable(
-        self.options['testos-wrapper'],
-        self.substituteTemplate(self.getTemplateFilename('testos.in'),
-            parameter_dict)
-    )
-
-    return path_list

slapos/recipe/accords/accords.py

-#!%(python_location)s
-
-##############################################################################
-#
-# Copyright (c) 2010 Vifib SARL 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.
-#
-##############################################################################
-import os
-from slapos import slap
-import signal
-import subprocess
-from subprocess import Popen
-import sys
-import time
-
-def runAccords(accords_conf):
-  """Launch ACCORDS, parse manifest, broker manifest, send connection
-     informations to SlapOS Master. Destroy instance and stops ACCORDS at
-     SIGTERM."""
-  computer_id = accords_conf['computer_id']
-  computer_partition_id = accords_conf['computer_partition_id']
-  server_url = accords_conf['server_url']
-  software_release_url = accords_conf['software_release_url']
-  key_file = accords_conf['key_file']
-  cert_file = accords_conf['cert_file']
-  accords_lib_directory = accords_conf['accords_lib_directory']
-  accords_location = accords_conf['accords_location']
-  manifest_name = accords_conf['manifest_name']
-
-  environment = dict(
-     LD_LIBRARY_PATH=accords_lib_directory,
-     PATH=accords_conf['path'],
-     HOME=accords_location,
-  )
-
-  # Set handler to stop ACCORDS when end of world comes
-  # XXX use subprocess.check_call and add exception handlers
-  def sigtermHandler(signum, frame):
-    Popen(['./co-command', 'stop', '/service/*'],
-        cwd=accords_location, env=environment).communicate()
-    Popen(['./co-stop'],
-        cwd=accords_location, env=environment).communicate()
-    sys.exit(0)
-
-  signal.signal(signal.SIGTERM, sigtermHandler)
-
-  # Launch ACCORDS, parse & broke manifest to deploy instance
-  print 'Starting ACCORDS and friends...'
-  subprocess.check_call(['./co-start'],cwd=accords_location, env=environment)
-  print 'Parsing manifest...'
-  subprocess.check_call(['./co-parser', manifest_name],
-      cwd=accords_location, env=environment)
-  print 'Brokering manifest...'
-  subprocess.check_call(['./co-broker', manifest_name],
-      cwd=accords_location, env=environment)
-  print 'Done.'
-
-  # Parse answer
-  # XXX
-  connection_dict = dict(connection='hardcoded')
-
-  # Send information about published service to SlapOS Master
-  slap_connection = slap.slap()
-  slap_connection.initializeConnection(server_url, key_file, cert_file)
-  computer_partition = slap_connection.registerComputerPartition(computer_id,
-      computer_partition_id)
-  computer_partition.setConnectionDict(connection_dict)
-
-  # Go to sleep, wait kill
-  while(True):
-    time.sleep(60)

slapos/recipe/accords/template/accords.ini.in

-# REST host (default: 127.0.0.1)
-resthost=%(listen_ip)s
-
-# REST port (default: 8086)
-#restport=8086
-
-# Target (default: ./accords.xml)
-#target=accords.xml
-
-# Acitvate TLS (default: 0)
-#tls=0
-
-# Activate monitoring (default: 1)
-#monitor=1
-
-# Trace (default: 1)
-#trace=1
-
-# Threads (default:1)
-#threads=1
-
-# Be verbose (default: 1)
-#verbose=0
-
-# Debug (default: 1)
-#debug=1
-
-# Domain (default: occi)
-#domain=occi
-
-# Operator (default: accords)
-#operator=accords
-
-# Password (default: co-system)
-#password=co-system

slapos/recipe/accords/template/coips.xml.in

-<?xml version="1.0" encoding="UTF8"?>
-<manifest name="coips:model" xmlns="http://www.compatibleone.fr/schemes/cords.xsd">
-
-<description>Infrastructure profile used by production tool</description>
-	
-<node name="coips:model">
-<infrastructure name="coips:model">
-<compute name="coips:model" cores="1" speed="1GHz" architecture="x686" memory="1GB"/>
-<storage name="coips:model" size="10GB" type="SATA"/>
-<network name="coips:model" vlan="true" label="database"/>
-</infrastructure>
-</node> 
-
-
-</manifest>
\ No newline at end of file

slapos/recipe/accords/template/os_config.xml.in

-<os_configs>
-  <os_config
-    id="e1f892e3-slap-slap-slap-9354b95d3b17"
-    name="slaposrecipe"
-    description="Configuration of Account used by slapos recipe"
-    user="%(userid)s"
-    password="%(password)s"
-    authenticate=""
-    agent="CompatibleOne/OpenStackClient/1.0a.0.01"
-    host="%(openstack_url)s"
-    version="v1.1"
-    namespace="%(domain)s"
-    base=""
-    tls="0"
-    current="0"
-  />
-</os_configs>

slapos/recipe/accords/template/testos.in

-#!/bin/sh
-
-export PATH=%(path)s
-
-export ENO_HOST=%(openstack_url)s
-export ENO_USER=%(userid)s
-export ENO_PASS=%(password)s
-export ENO_VERSION=v1.1
-export ENO_TENANT=%(tenantname)s
-
-testos --host $ENO_HOST --password $ENO_PASS --user $ENO_USER --version $ENO_VERSION --tenant $ENO_TENANT $1 $2 $3 $4 $5 $6 $7

slapos/recipe/condor/configure.py

-##############################################################################
-#
-# Copyright (c) 2010 Vifib SARL 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.
-#
-##############################################################################
-
-import os
-import subprocess
-import time
-
-def submitJob(submit, submit_file, appdir, appname, sig_install):
-  """Run condor_submit (if needed) for job deployment"""
-  time.sleep(10)
-  print "Check if needed to submit %s job's" % appname
-  if not os.path.exists(sig_install):
-    print "Nothing for install or update...Exited"
-    return
-  # '-a', "log = out.log", '-a', "error = error.log",
-  launch_args = submit, '-verbose', submit_file
-  process = subprocess.Popen(launch_args, stdout=subprocess.PIPE,
-              stderr=subprocess.STDOUT, cwd=appdir)
-  result = process.communicate()[0]
-  if process.returncode is None or process.returncode != 0:
-    print "Failed to execute condor_submit.\nThe error was: %s" % result
-  else:
-    os.unlink(sig_install)
-
-def condorStart(condor_reconfig, start_bin):
-  """Start Condor if deamons is currently stopped"""
-  if subprocess.call(condor_reconfig):
-    #process failled to reconfig condor that mean that condor deamons is not curently started
-    subprocess.call(start_bin)