Update Release Candidate

component/boost-lib/buildout.cfg

@@ -10,7 +10,7 @@ extends =
 [boost-lib]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://downloads.sourceforge.net/sourceforge/boost/boost_1_67_0.tar.bz2
+url = https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.bz2
 md5sum = ced776cb19428ab8488774e1415535ab
 location = @@LOCATION@@
 configure-command = ./bootstrap.sh --prefix=${:location} --without-icu $${PYTHON:+--with-python=$PYTHON}
@@ -27,5 +27,5 @@ environment =
   LZMA_LIBRARY_PATH=${xz-utils:location}/lib
 patch-options = -p1
 patches =
-  https://sources.debian.org/data/main/b/boost1.67/1.67.0-17/debian/patches/fix-ftbfs-python-3.3.patch#c85fb479d51354deafd1cc7af78f25d2
+  https://sources.debian.org/data/main/b/boost1.67/1.67.0-13+deb10u1/debian/patches/fix-ftbfs-python-3.3.patch#c85fb479d51354deafd1cc7af78f25d2
 patch-binary = ${patch:location}/bin/patch

component/cyrus-sasl/buildout.cfg

@@ -12,7 +12,7 @@ extends =
 [cyrus-sasl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
+url = https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.26/cyrus-sasl-2.1.26.tar.gz
 md5sum = a7f4e5e559a0e37b3ffc438c9456e425
 location = @@LOCATION@@
 patch-options = -p1

component/dropbear/buildout.cfg

@@ -18,7 +18,7 @@ recipe = slapos.recipe.cmmi
 md5sum = 0284ea239083f04c8b874e08e1aca243
 # XXX: We still use an old version of dropbear instead of the last one
 #      in order have all patches working.
-url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
+url = https://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
 
 configure-options =
   --with-zlib=${zlib:location}

component/fonts/buildout.cfg

@@ -31,25 +31,23 @@ md5sum = 5c781723a0d9ed6188960defba8e91cf
 # http://ipafont.ipa.go.jp/
 [ipaex-fonts]
 <= fonts-base
-url = http://dl.sourceforge.jp/ipafonts/57330/IPAexfont00201.zip
+url = https://osdn.net/frs/redir.php?f=ipafonts%2F57330%2FIPAexfont00201.zip
 md5sum = 7bf84182a04a9632268dbcb03f100d05
 
 [ipa-fonts]
 <= fonts-base
-url = http://dl.sourceforge.jp/ipafonts/51868/IPAfont00303.zip
+url = https://osdn.net/frs/redir.php?f=ipafonts%2F51868%2FIPAfont00303.zip
 md5sum = 39a828acf27790adbe4944dfb4d94bb1
 
 [ocrb-fonts]
 <= fonts-base
-url = http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Ftsukurimashou%2F56948%2Focr-0.2.zip
+url = https://osdn.net/frs/redir.php?f=tsukurimashou%2F56948%2Focr-0.2.zip
 md5sum = 9f2acd83291a31dbe053912f4115db75
 
 [android-fonts]
 <= fonts-base
-url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/f/fonts-android/fonts-android_4.3.orig.tar.xz
+url = http://archive.debian.org/debian-archive/debian/pool/main/f/fonts-android/fonts-android_4.3.orig.tar.xz
 md5sum = 2d41d5342eb5f61591ddeec5b80da74d
-environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
 
 # The DejaVu fonts are a font family based upon Bitstream Vera v1.10. Its purpose is to
 # provide a wider range of characters while maintaining the original look-and-feel

component/icu/buildout.cfg

@@ -5,7 +5,7 @@ parts = icu4c
 recipe = slapos.recipe.cmmi
 shared = true
 location = @@LOCATION@@
-url = http://download.icu-project.org/files/icu4c/58.2/icu4c-58_2-src.tgz
+url = https://github.com/unicode-org/icu/releases/download/release-58-2/icu4c-58_2-src.tgz
 md5sum = fac212b32b7ec7ab007a12dff1f3aea1
 configure-command = source/configure
 configure-options =
@@ -20,8 +20,3 @@ patches =
 
 [icu4c-58.2]
 <= icu4c
-
-[icu4c-55.1]
-<= icu4c
-url = http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-src.tgz
-md5sum = e2d523df79d6cb7855c2fbe284f4db29

component/inkscape/buildout.cfg

@@ -41,7 +41,7 @@ environment =
 [inkscape]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://inkscape.org/gallery/item/13330/inkscape-0.92.4_A6N0YOn.tar.bz2
+url = https://media.inkscape.org/dl/resources/file/inkscape-0.92.4.tar.bz2
 md5sum = ac30f6d5747fd9c620c00dad500f414f
 pkg_config_depends = ${freetype:location}/lib/pkgconfig:${gtkmm:location}/lib/pkgconfig:${gtkmm:pkg_config_depends}:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
 configure-command = ${cmake:location}/bin/cmake

component/libcap-ng/buildout.cfg

 [buildout]
-
-extends =
-  ../attr/buildout.cfg
-
 parts = libcap-ng
 
 [libcap-ng]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.8.2.tar.gz
+#url = https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${:version}.tar.gz
+# ERROR: The certificate of 'people.redhat.com' doesn't have a known issuer.
+url = http://sources.buildroot.net/libcap-ng/libcap-ng-${:version}.tar.gz
+version = 0.8.2
 md5sum = faf1ef766cf068ad1aba4008ced665f7
-location = @@LOCATION@@
 configure-options =
   --with-python=no
   --with-python3=no

component/libsodium/buildout.cfg

@@ -5,7 +5,7 @@ parts =
 [libsodium]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://download.libsodium.org/libsodium/releases/libsodium-1.0.8.tar.gz
+url = https://download.libsodium.org/libsodium/releases/old/unsupported/libsodium-1.0.8.tar.gz
 md5sum = 0a66b86fd3aab3fe4c858edcd2772760
 configure-options =
   --disable-static

component/lmsensors/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [lmsensors]
 recipe = slapos.recipe.cmmi
+url = https://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-3.3.5.tar.bz2/da506dedceb41822e64865f6ba34828a/lm_sensors-3.3.5.tar.bz2
 md5sum = da506dedceb41822e64865f6ba34828a
-url = http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-3.3.5.tar.bz2
 configure-command = true
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}

component/make/buildout.cfg

@@ -14,7 +14,7 @@ parts =
 
 [make3.81-debian]
 recipe = slapos.recipe.cmmi
-url = http://ftp.de.debian.org/debian/pool/main/m/make-dfsg/make-dfsg_3.81.orig.tar.gz
+url = http://archive.debian.org/debian-archive/debian/pool/main/m/make-dfsg/make-dfsg_3.81.orig.tar.gz
 md5sum = 7c93b1ab4680eb21c2c13f4f47741e2d
 shared = true
 patches =

component/percona-toolkit/buildout.cfg

@@ -11,7 +11,7 @@ shared = false
 <= perl-CPAN-package
 # XXX it's not on CPAN, so we use url
 version = 3.0.3
-url = https://www.percona.com/downloads/percona-toolkit/${:version}/source/tarball/percona-toolkit-${:version}.tar.gz
+url = https://downloads.percona.com/downloads/percona-toolkit/${:version}/source/tarball/percona-toolkit-${:version}.tar.gz
 md5sum = 8af181994fdf9aa984475637861098e9
 
 inc = ${perl-DBI:site_perl}:${perl-DBD-mariadb:site_perl}

component/poppler/buildout.cfg

@@ -14,7 +14,7 @@ extends =
 [poppler]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://poppler.freedesktop.org/poppler-0.43.0.tar.xz
+url = https://poppler.freedesktop.org/poppler-0.43.0.tar.xz
 md5sum = 1d2b001663119855cdfbc0713dbfb9c6
 configure-options =
   --disable-cairo-output

component/qt/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 recipe = slapos.recipe.cmmi
 shared = true
 location = @@LOCATION@@
-url = http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.gz
+url = https://download.qt.io/new_archive/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.gz
 md5sum = 7aa5841b50c411e23e31e8a6cc1c6981
 configure-command = ./configure
 configure-options =
@@ -42,7 +42,7 @@ post-install =
 # qmake binary can be reached directly from ${qt:location}/bin/qmake if [qt] is fully built
 recipe = slapos.recipe.cmmi
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-url = http://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
+url = https://download.qt.io/new_archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
 md5sum = d990ee66bf7ab0c785589776f35ba6ad
 # see https://github.com/NixOS/nixpkgs/blob/3e387c3e005c87566b5403d24c86f71f4945a79b/pkgs/development/libraries/qt-4.x/4.8/default.nix#L101
 pre-configure =

component/r-language/buildout.cfg

@@ -12,7 +12,7 @@ parts =
 
 [r-language]
 recipe = slapos.recipe.cmmi
-url = http://cran.univ-paris1.fr/src/base/R-3/R-3.2.1.tar.gz
+url = https://cran.r-project.org/src/base/R-3/R-3.2.1.tar.gz
 md5sum = c2aac8b40f84e08e7f8c9068de9239a3
 configure-options =
   --enable-R-shlib

component/socat/buildout.cfg

@@ -8,7 +8,7 @@ parts =
 [socat]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.dest-unreach.org/socat/download/socat-${:version}.tar.gz
+url = http://www.dest-unreach.org/socat/download/Archive/socat-${:version}.tar.gz
 version = 1.7.3.2
 md5sum = aec3154f7854580cfab0c2d81e910519
 environment =

component/tig/buildout.cfg

 # Tig: text-mode interface for Git
-# http://jonas.nitro.dk/tig/
+# https://jonas.github.io/tig/
 
 [buildout]
 extends =
+  ../libiconv/buildout.cfg
   ../ncurses/buildout.cfg
 
 [tig]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://jonas.nitro.dk/tig/releases/tig-2.1.tar.gz
-md5sum = d6c237aba2c03d85897da79789fd6104
+url = https://github.com/jonas/tig/releases/download/tig-2.5.5/tig-2.5.5.tar.gz
+md5sum = 0902ba706e8efaf6c2087d8b66393375
 environment =
-  CFLAGS=-I${ncurses:location}/include
-  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  CFLAGS=-I${ncurses:location}/include -I${libiconv:location}/include
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${libiconv:location}/lib -Wl,-rpath=${libiconv:location}/lib

component/wkhtmltopdf/buildout.cfg

@@ -13,7 +13,7 @@ parts =
 
 [wkhtmltopdf]
 recipe = slapos.recipe.build
-url = http://download.gna.org/wkhtmltopdf/0.12/0.12.4/wkhtmltox-0.12.4_${:_url}.tar.xz
+url = https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_${:_url}.tar.xz
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
 install =

component/xorg/buildout.cfg

@@ -134,7 +134,7 @@ environment =
 [libXext]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.x.org/pub/individual/lib/libXext-1.3.3.tar.bz2
+url = https://ftp.x.org/pub/individual/lib/libXext-1.3.3.tar.bz2
 md5sum = 52df7c4c1f0badd9f82ab124fb32eb97
 pkg_config_depends = ${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}
 environment =
@@ -206,7 +206,7 @@ configure-options =
 [fixesproto]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.x.org/releases/X11R7.7/src/everything/fixesproto-5.0.tar.bz2
+url = https://www.x.org/releases/X11R7.7/src/everything/fixesproto-5.0.tar.bz2
 md5sum = e7431ab84d37b2678af71e29355e101d
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
@@ -215,7 +215,7 @@ environment =
 [bigreqsproto]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.x.org/releases/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
+url = https://www.x.org/releases/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
 md5sum = 1a05fb01fa1d5198894c931cf925c025
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
@@ -224,7 +224,7 @@ environment =
 [xcmiscproto]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.x.org/releases/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
+url = https://www.x.org/releases/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
 md5sum = 5f4847c78e41b801982c8a5e06365b24
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
@@ -233,7 +233,7 @@ environment =
 [damageproto]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.x.org/releases/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
+url = https://www.x.org/releases/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
 md5sum = 998e5904764b82642cc63d97b4ba9e95
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
@@ -261,7 +261,7 @@ environment =
 [renderproto]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.x.org/releases/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
+url = https://www.x.org/releases/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
 md5sum = a914ccc1de66ddeb4b611c6b0686e274
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
@@ -292,7 +292,7 @@ environment =
 [recordproto]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.x.org/releases/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2
+url = https://www.x.org/releases/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2
 md5sum = 1b4e5dede5ea51906f1530ca1e21d216
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
@@ -301,7 +301,7 @@ environment =
 [resourceproto]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.x.org/releases/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2
+url = https://www.x.org/releases/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2
 md5sum = cfdb57dae221b71b2703f8e2980eaaf4
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
@@ -310,7 +310,7 @@ environment =
 [xineramaproto]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.x.org/releases/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
+url = https://www.x.org/releases/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
 md5sum = 9959fe0bfb22a0e7260433b8d199590a
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
@@ -396,7 +396,7 @@ environment =
 [renderext]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2
+url = https://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2
 md5sum = d43c2afc69937655d13c02588c9ff974
 
 [libXrender]
@@ -537,7 +537,7 @@ environment =
 [compositeproto]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.x.org/releases/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
+url = https://www.x.org/releases/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
 md5sum = 98482f65ba1e74a08bf5b056a4031ef0
 
 [libXcomposite]

software/re6stnet/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 71531ed9c9b79fa769ab367e7ea2d2a5
 
 [template-re6stnet]
 filename = instance-re6stnet.cfg.in
-md5sum = 98f86d2a10d909215ae88ba6a602da27
+md5sum = a9cd303d17c4f07ad11fc8099afeed24
 
 [template-apache-conf]
 filename = apache.conf.in
@@ -26,4 +26,4 @@ md5sum = 3d55f7c9c4fc7279f06bfe6313a78a4b
 
 [template-re6st-registry-conf]
 filename = re6st-registry.conf.in
-md5sum = feb4b3318f37414d1bf3d16a03aec93d
+md5sum = 28ffb7a742e293139814f1324ff003ff

software/re6stnet/instance-re6stnet-input-schema.json

@@ -84,6 +84,11 @@
       "title": "Git backup repository",
       "description": "URL of Git repository where backups are pushed. Nothing is pushed if empty.",
       "type": "string"
+    },
+    "community-conf": {
+      "title": "Community configuration",
+      "textarea": true,
+      "type": "string"
     }
   }
 }

software/re6stnet/instance-re6stnet.cfg.in

@@ -83,6 +83,15 @@ hello = {{ slapparameter_dict.get('hello', 15) }}
 min-protocol = {{ slapparameter_dict.get('min-protocol', -1) }}
 encrypt = {{ slapparameter_dict.get('encrypt', 'False') }}
 same-country = {{ slapparameter_dict.get('same-country', '') }}
+{%- set community = slapparameter_dict.get('community-conf') %}
+{%- if community %}
+community-path = ${re6st-community-conf:output}
+
+[re6st-community-conf]
+recipe = slapos.recipe.template
+inline = {{ dumps(community) }}
+output = ${re6stnet-dirs:conf}/community.conf
+{%- endif %}
 
 [re6st-registry-conf]
 recipe = slapos.recipe.template:jinja2
@@ -90,20 +99,6 @@ template = {{ parameter_dict['template-re6st-registry-conf'] }}
 rendered = ${re6stnet-dirs:conf}/registry.conf
 context = section parameter_dict re6st-registry-conf-dict
 
-depends = ${re6st-compat:recipe}
-[re6st-compat]
-recipe = slapos.recipe.build
-update =
-  import errno, os
-  res6stnet = self.buildout['directory']['srv'] + '/res6stnet'
-  try:
-    os.rename(res6stnet + '/registry', self.buildout['re6stnet-dirs']['data'])
-  except OSError as e:
-    if e.errno != errno.ENOENT:
-      raise
-  else:
-    os.rmdir(res6stnet)
-
 [re6st-registry-wrapper]
 recipe = slapos.cookbook:wrapper
 wrapper-path = ${directory:services}/re6st-registry

software/re6stnet/re6st-registry.conf.in

@@ -30,3 +30,6 @@ max-clients {{ parameter_dict['max-clients'] }}
 {% if parameter_dict.get('same-country') -%}
 same-country {{ parameter_dict['same-country'] }}
 {% endif -%}
+{% if parameter_dict.get('community-path') -%}
+community {{ parameter_dict['community-path'] }}
+{% endif -%}

software/re6stnet/software.cfg.json

@@ -6,6 +6,7 @@
     "default": {
       "title": "Default",
       "description": "Re6st registry",
+      "serialisation": "json-in-xml",
       "request": "instance-re6stnet-input-schema.json",
       "response": "instance-re6stnet-output-schema.json",
       "index": 0

stack/slapos.cfg

@@ -189,11 +189,11 @@ setproctitle = 1.1.10
 setuptools-dso = 1.7
 rubygemsrecipe  = 0.4.3
 six = 1.12.0
-slapos.cookbook = 1.0.236
+slapos.cookbook = 1.0.237
 slapos.core = 1.7.5
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
-slapos.libnetworkcache = 0.23
+slapos.libnetworkcache = 0.24
 slapos.rebootstrap = 4.5
 slapos.recipe.build = 0.54
 slapos.recipe.cmmi = 0.19