XXX several wrong local changes

component/apache-php/buildout.cfg

@@ -23,12 +23,13 @@ extends =
   ../imagemagick/buildout.cfg
   ../icu/buildout.cfg
   ../openssl/buildout.cfg
+  ../binutils/buildout.cfg
 
 [php-redis]
 recipe = slapos.recipe.cmmi
 url = https://github.com/phpredis/phpredis/archive/5.0.0.tar.gz
 md5sum = 4f11e0567a10c29394aae52a4fa8bb40
-configure-command = 
+configure-command =
   phpize && ./configure
 environment =
   PATH=${autoconf:location}/bin:${automake:location}/bin:${m4:location}/bin:${apache-php:location}/bin:%(PATH)s
@@ -37,7 +38,7 @@ environment =
 recipe = slapos.recipe.cmmi
 url = https://github.com/Imagick/imagick/archive/3.4.4.tar.gz
 md5sum = ef6cbadd834eb306bd91874a8f5dea03
-configure-command = 
+configure-command =
   phpize && ./configure
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
@@ -50,7 +51,7 @@ environment =
 recipe = slapos.recipe.cmmi
 url = https://github.com/krakjoe/apcu/archive/v5.1.17.tar.gz
 md5sum = f64b6cd5108aea63df2d5cc301c58b2b
-configure-command = 
+configure-command =
   phpize && ./configure
 configure-options =
   --with-php-config=${apache-php:location}/bin/php-config
@@ -64,8 +65,8 @@ shared = false
 
 [apache-php]
 recipe = slapos.recipe.cmmi
-url = https://www.php.net/distributions/php-7.3.6.tar.bz2
-md5sum = bde9a912fb311182cd460dad1abbc247
+url = https://www.php.net/distributions/php-7.3.15.tar.bz2
+md5sum = 04c7d233c4d55bb37036aef6c0d0c615
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-apxs2=${apache:location}/bin/apxs
@@ -110,7 +111,7 @@ configure-options =
 
 environment =
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
-  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:${binutils:location}/bin:%(PATH)s
   CPPFLAGS=-I${libzip:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu
   TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}

component/cloudooo/buildout.cfg

@@ -13,7 +13,7 @@ setup = ${cloudooo-repository:location}
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/cloudooo.git
 branch = master
-git-executable = ${git:location}/bin/git
+#git-executable = ${git:location}/bin/git
 revision = 67e233f25845335aaf191e80abae53733d1f2579
 
 [cloudooo]

component/redis/buildout.cfg

@@ -12,14 +12,16 @@ extends =
 
 [redis28]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://download.redis.io/releases/redis-2.8.24.tar.gz
 md5sum = 7b6eb6e4ccc050c351df8ae83c55a035
 configure-command = true
-prefix = 
+prefix =
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
   V=1
-make-targets = 
+  LDFLAGS="-g -no-pie"
+make-targets =
   install
   test
 environment =

component/userhosts/buildout.cfg

@@ -16,3 +16,4 @@ repository = https://lab.nexedi.com/nexedi/userhosts.git
 revision = 1d3b463e7856db6e674a06258c0840206e6a7b72
 git-executable = ${git:location}/bin/git
 location = ${buildout:parts-directory}/userhosts
+ignore-cloning-submodules = true

software/cloudooo/software.cfg

 [buildout]
 extends =
   software-common.cfg
-
+  ../../component/fish-shell/buildout.cfg
 parts =
   ${cloudooo-buildout:parts}
   template-cloudooo
+  fish-shell
 
 [cloudooo-software-parameter-dict]
 publish-url-name = cloudooo

software/erp5/software.cfg

 [buildout]
 extends =
   ../../stack/erp5/buildout.cfg
-

software/neoppod/software-common.cfg

@@ -31,6 +31,7 @@ parts =
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/neoppod.git
 git-executable = ${git:location}/bin/git
+ignore-cloning-submodules = true
 
 [neoppod-setup-env]
 PATH = ${git:location}/bin:%(PATH)s

software/nextcloud/software.cfg

@@ -17,7 +17,7 @@ mode = 0644
 url = https://download.nextcloud.com/server/releases/nextcloud-16.0.3.tar.bz2
 md5sum = d81902d2dec5d547779bec6336a438be
 
-[template-nextcloud-install.sh] 
+[template-nextcloud-install.sh]
 <= nc-download-base
 
 [template-apache-httpd]
@@ -31,7 +31,7 @@ recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/${:filename}
 rendered = ${buildout:directory}/instance-nextcloud.cfg
 extensions = jinja2.ext.do
-context = 
+context =
           key gzip_location          gzip:location
           key python3_location       python3:location
           key news_updater_location  news-updater:location

stack/erp5/buildout.cfg

@@ -311,9 +311,11 @@ jupyter-enable-default = false
 
 [erp5]
 recipe = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.com/nexedi/erp5.git
+#repository = https://lab.nexedi.com/nexedi/erp5.git
+repository = https://github.com/nexedi/erp5.git
 branch = master
 git-executable = ${git:location}/bin/git
+ignore-cloning-submodules = true
 
 [testrunner]
 # XXX: Workaround for fact ERP5Type is not an distribution and does not

stack/lamp/buildout.cfg

@@ -134,7 +134,7 @@ output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
 
 [erp5]
 # lamp stack reuses erp5 stack to have mariadb, but we don't need to checkout erp5 here.
-recipe = 
+recipe =
 location = ${buildout:parts-directory}/${:_buildout_section_name_}