Skip to content

slapos
slapos
Commit 4bd3dca4 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Update Release Candidate

parents 4d892d6d 905c1288
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1149 additions and 1051 deletions
component/aspell/buildout.cfg
View file @ 4bd3dca4
...@@ -33,6 +33,8 @@ recipe = slapos.recipe.cmmi ...@@ -33,6 +33,8 @@ recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://ftp.gnu.org/gnu/aspell/aspell-0.60.7.tar.gz url = https://ftp.gnu.org/gnu/aspell/aspell-0.60.7.tar.gz
md5sum = 8ef2252609c511cd2bb26f3a3932ef28 md5sum = 8ef2252609c511cd2bb26f3a3932ef28
configure-options =
--enable-curses="-lncursesw -ltinfow"
environment = environment =
PATH=${patch:location}/bin:${perl:location}/bin:%(PATH)s PATH=${patch:location}/bin:${perl:location}/bin:%(PATH)s
CPPFLAGS=-I${ncurses:location}/include CPPFLAGS=-I${ncurses:location}/include
......
component/bash/buildout.cfg
View file @ 4bd3dca4
...@@ -27,8 +27,6 @@ patches = ...@@ -27,8 +27,6 @@ patches =
${:patch-prefix}-010#d78ad19986c0355a8d67c9a0e82ad4aa ${:patch-prefix}-010#d78ad19986c0355a8d67c9a0e82ad4aa
${:patch-prefix}-011#2416386b5ee94e499ccbf71f6fd4aebd ${:patch-prefix}-011#2416386b5ee94e499ccbf71f6fd4aebd
${:patch-prefix}-012#879b2d8a03162faebb7234c4cd57c5cd ${:patch-prefix}-012#879b2d8a03162faebb7234c4cd57c5cd
configure-options =
--with-curses
environment = environment =
CPPFLAGS=-I${ncurses:location}/include CPPFLAGS=-I${ncurses:location}/include
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
......
component/coreutils/buildout.cfg
View file @ 4bd3dca4
...@@ -9,8 +9,8 @@ parts = ...@@ -9,8 +9,8 @@ parts =
[coreutils] [coreutils]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://ftp.gnu.org/gnu/coreutils/coreutils-9.0.tar.xz url = https://ftp.gnu.org/gnu/coreutils/coreutils-9.4.tar.xz
md5sum = 0d79ae8a6124546e3b94171375e5e5d0 md5sum = 459e9546074db2834eefe5421f250025
configure-options = configure-options =
--disable-libcap --disable-libcap
--without-selinux --without-selinux
......
component/curl/buildout.cfg
View file @ 4bd3dca4
...@@ -9,6 +9,7 @@ extends = ...@@ -9,6 +9,7 @@ extends =
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
../zstd/buildout.cfg ../zstd/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
../libidn/buildout.cfg
../nghttp2/buildout.cfg ../nghttp2/buildout.cfg
../ngtcp2/buildout.cfg ../ngtcp2/buildout.cfg
../nghttp3/buildout.cfg ../nghttp3/buildout.cfg
...@@ -52,7 +53,7 @@ configure-options = ...@@ -52,7 +53,7 @@ configure-options =
--without-libssh2 --without-libssh2
--without-libssh --without-libssh
--without-librtmp --without-librtmp
--without-libidn2 --with-libidn2=${libidn2:location}
--with-nghttp2=${nghttp2:location} --with-nghttp2=${nghttp2:location}
--without-ngtcp2 --without-ngtcp2
--without-nghttp3 --without-nghttp3
...@@ -72,8 +73,8 @@ WITH = ...@@ -72,8 +73,8 @@ WITH =
environment = environment =
PATH=${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${:OPENSSL}/lib/pkgconfig:${nghttp2:location}/lib/pkgconfig${:PKG_CONFIG_PATH} PKG_CONFIG_PATH=${:OPENSSL}/lib/pkgconfig:${nghttp2:location}/lib/pkgconfig:${libidn2:location}/lib/pkgconfig${:PKG_CONFIG_PATH}
LDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${:OPENSSL}/lib -Wl,-rpath=${nghttp2:location}/lib -Wl,-rpath=${zstd:location}/lib ${:LDFLAGS} LDFLAGS=-Wl,-rpath=${libidn2:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${:OPENSSL}/lib -Wl,-rpath=${nghttp2:location}/lib -Wl,-rpath=${zstd:location}/lib ${:LDFLAGS}
[curl-http3] [curl-http3]
<= curl <= curl
......
component/dash/buildout.cfg
View file @ 4bd3dca4
...@@ -7,8 +7,8 @@ parts = dash-output ...@@ -7,8 +7,8 @@ parts = dash-output
[dash] [dash]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.tar.gz url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.12.tar.gz
md5sum = 027236e48b9202607b1418fee42c473e md5sum = 57222b768b84003ea4b801e5d5e0e52b
configure-options = configure-options =
--disable-static --disable-static
--disable-fnmatch --disable-fnmatch
......
component/findutils/buildout.cfg
View file @ 4bd3dca4
[buildout] [buildout]
extends = extends =
../coreutils/buildout.cfg ../coreutils/buildout.cfg
../xz-utils/buildout.cfg
parts = parts =
findutils-output findutils-output
[findutils] [findutils]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://ftp.debian.org/debian/pool/main/f/findutils/findutils_4.8.0.orig.tar.xz url = http://ftp.debian.org/debian/pool/main/f/findutils/findutils_4.9.0.orig.tar.xz
md5sum = eeefe2e6380931a77dfa6d9350b43186 md5sum = 4a4a547e888a944b2f3af31d789a1137
environment =
PATH=${xz-utils:location}/bin:%(PATH)s
[findutils-output] [findutils-output]
# Shared binary location to ease migration # Shared binary location to ease migration
......
component/freetype/buildout.cfg
View file @ 4bd3dca4
...@@ -7,6 +7,7 @@ extends = ...@@ -7,6 +7,7 @@ extends =
../libpng/buildout.cfg ../libpng/buildout.cfg
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
../xz-utils/buildout.cfg
parts = parts =
freetype freetype
...@@ -24,7 +25,7 @@ configure-options = ...@@ -24,7 +25,7 @@ configure-options =
--without-brotli --without-brotli
--without-librsvg --without-librsvg
environment = environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${:pkg_config_depends} PKG_CONFIG_PATH=${:pkg_config_depends}
CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
component/gdbm/buildout.cfg
View file @ 4bd3dca4
...@@ -5,9 +5,9 @@ parts = ...@@ -5,9 +5,9 @@ parts =
[gdbm] [gdbm]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
version = 1.22 version = 1.23
url = http://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz url = http://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
md5sum = 0bbd38f12656e4728e2f7c4708aec014 md5sum = 8551961e36bf8c70b7500d255d3658ec
configure-options = configure-options =
--disable-static --disable-static
--enable-libgdbm-compat --enable-libgdbm-compat
......
component/gettext/buildout.cfg
View file @ 4bd3dca4
...@@ -11,8 +11,8 @@ extends = ...@@ -11,8 +11,8 @@ extends =
[gettext] [gettext]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.lz url = https://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.3.tar.lz
md5sum = 65c9a4d0a2d180e3c2afc2b3440382ef md5sum = 9f4f1b1432fec4aab29fea004347c9b4
configure-options = configure-options =
--disable-static --disable-static
......
component/ghostscript/buildout.cfg
View file @ 4bd3dca4
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
extends = extends =
../fontconfig/buildout.cfg ../fontconfig/buildout.cfg
../freetype/buildout.cfg ../freetype/buildout.cfg
../libidn/buildout.cfg
../libjpeg/buildout.cfg ../libjpeg/buildout.cfg
../libtiff/buildout.cfg ../libtiff/buildout.cfg
../libxml2/buildout.cfg ../libxml2/buildout.cfg
../patch/buildout.cfg
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../tesseract/buildout.cfg ../tesseract/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
...@@ -16,24 +18,24 @@ recipe = slapos.recipe.cmmi ...@@ -16,24 +18,24 @@ recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10020/ghostscript-10.02.0.tar.xz url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10020/ghostscript-10.02.0.tar.xz
md5sum = 80c1cdfada72f2eb5987dc0d590ea5b2 md5sum = 80c1cdfada72f2eb5987dc0d590ea5b2
pkg_config_depends = ${libtiff:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends} pkg_config_depends = ${libidn:location}/lib/pkgconfig:${libtiff:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
# XXX --with-tessdata work arounds a slaprunner bug of having softwares installed in a path containing // # XXX --with-tessdata work arounds a slaprunner bug of having softwares installed in a path containing //
configure-options = configure-options =
--disable-cups --disable-cups
--disable-threadsafe
--with-system-libtiff --with-system-libtiff
--without-libidn
--without-so --without-so
--without-x --without-x
--with-drivers=FILES --with-drivers=FILES
--with-tessdata=$(python -c 'print("""${:tessdata-location}""".replace("//", "/"))') --with-tessdata=$(python -c 'print("""${:tessdata-location}""".replace("//", "/"))')
environment = environment =
PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${patch:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${:pkg_config_depends} PKG_CONFIG_PATH=${:pkg_config_depends}
CFLAGS=-I${libjpeg:location}/include CFLAGS=-I${libjpeg:location}/include
LDFLAGS=-Wl,-rpath=${fontconfig:location}/lib -Wl,-rpath=${freetype:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib LDFLAGS=-Wl,-rpath=${libidn:location}/lib -Wl,-rpath=${fontconfig:location}/lib -Wl,-rpath=${freetype:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib
LD_LIBRARY_PATH=${fontconfig:location}/lib:${freetype:location}/lib:${libtiff:location}/lib:${libxml2:location}/lib LD_LIBRARY_PATH=${libidn:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libtiff:location}/lib:${libxml2:location}/lib
patches =
https://github.com/ArtifexSoftware/ghostpdl/commit/f8a4030a319705b9402b386a0ada8dd00b8181d3.patch#7b6dcda1cf19e639994921713fb41277
patch-options = -p1
# configure gives priority to local jpeg library and refuse mixing local libjpeg with "system" libtiff. # configure gives priority to local jpeg library and refuse mixing local libjpeg with "system" libtiff.
# We remove this local jpeg library source folder so that configure picks up the slapos versions of these libraries. # We remove this local jpeg library source folder so that configure picks up the slapos versions of these libraries.
pre-configure = rm -r jpeg pre-configure = rm -r jpeg
......
component/gmp/buildout.cfg
View file @ 4bd3dca4
...@@ -9,9 +9,9 @@ parts = ...@@ -9,9 +9,9 @@ parts =
[gmp] [gmp]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
version = 6.2.1 version = 6.3.0
url = https://gmplib.org/download/gmp/gmp-${:version}.tar.xz url = https://gmplib.org/download/gmp/gmp-${:version}.tar.xz
md5sum = 0b82665c4a92fd2ade7440c13fcaa42b md5sum = 956dc04e864001a9c22429f761f2c283
configure-options = configure-options =
--disable-assembly --disable-assembly
--host=none-pc-linux-gnu --host=none-pc-linux-gnu
......
component/gtk-2/buildout.cfg
View file @ 4bd3dca4
...@@ -59,7 +59,7 @@ configure-options = ...@@ -59,7 +59,7 @@ configure-options =
--with-freetype --with-freetype
--with-icu --with-icu
environment = environment =
PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${:pkg_config_depends} PKG_CONFIG_PATH=${:pkg_config_depends}
LDFLAGS=-Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${icu4c:location}/lib -Wl,-rpath=${glib:location}/lib LDFLAGS=-Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${icu4c:location}/lib -Wl,-rpath=${glib:location}/lib
...@@ -71,6 +71,8 @@ md5sum = 1b767c259c3cd8e0c8496970f63c22dc ...@@ -71,6 +71,8 @@ md5sum = 1b767c259c3cd8e0c8496970f63c22dc
configure-options = configure-options =
--enable-shared --enable-shared
--disable-static --disable-static
environment =
PATH=${xz-utils:location}/bin:%(PATH)s
[pango] [pango]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
......
component/gzip/buildout.cfg
View file @ 4bd3dca4
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
[gzip] [gzip]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://ftp.gnu.org/pub/gnu/gzip/gzip-1.12.tar.xz url = https://ftp.gnu.org/pub/gnu/gzip/gzip-1.13.tar.xz
md5sum = 9608e4ac5f061b2a6479dc44e917a5db md5sum = d5c9fc9441288817a4a0be2da0249e29
environment = environment =
PATH=${xz-utils:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:%(PATH)s
component/kerberos/buildout.cfg
View file @ 4bd3dca4
[buildout] [buildout]
extends = extends =
../bison/buildout.cfg ../bison/buildout.cfg
../m4/buildout.cfg
../openssl/buildout.cfg
parts = parts =
kerberos kerberos
...@@ -18,4 +20,6 @@ configure-options = ...@@ -18,4 +20,6 @@ configure-options =
--without-tcl --without-tcl
--without-keyutils --without-keyutils
environment = environment =
PATH=${bison:location}/bin:%(PATH)s PATH=${m4:location}/bin:${bison:location}/bin:%(PATH)s
CPPFLAGS=-I${openssl:location}/include
LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${openssl:location}/lib
component/libexpat/buildout.cfg
View file @ 4bd3dca4
...@@ -7,8 +7,8 @@ parts = ...@@ -7,8 +7,8 @@ parts =
[libexpat] [libexpat]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.lz url = https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.lz
md5sum = 074cab91a2f27dc8cd6c282effaa8ffd md5sum = 4add8675872d4b923d9b7871dc0f24d3
configure-options = configure-options =
--disable-static --disable-static
--without-xmlwf --without-xmlwf
......
component/libfastjson/buildout.cfg
View file @ 4bd3dca4
...@@ -10,8 +10,8 @@ parts = ...@@ -10,8 +10,8 @@ parts =
[libfastjson] [libfastjson]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://github.com/rsyslog/libfastjson/archive/v0.99.9.tar.gz url = https://github.com/rsyslog/libfastjson/archive/refs/tags/v1.2304.0.tar.gz
md5sum = 3c45e6efc838cd364588d6d1822c4ea8 md5sum = 87f7752570bb8f878faafa5367df9b15
shared = true shared = true
pre-configure = pre-configure =
autoreconf -fvi -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal -I ${automake:location}/share/aclocal autoreconf -fvi -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal -I ${automake:location}/share/aclocal
......
component/libidn/buildout.cfg 0 → 100644
View file @ 4bd3dca4
# GNU Libidn is a fully documented implementation of the Stringprep,
# Punycode and IDNA 2003 specifications
[libidn]
recipe = slapos.recipe.cmmi
shared = true
url = https://ftp.gnu.org/gnu/libidn/libidn-1.41.tar.gz
md5sum = 2cbff2f75f904328ac507af576b07197
[libidn2]
recipe = slapos.recipe.cmmi
shared = true
url = https://ftp.gnu.org/gnu/libidn/libidn2-2.3.4.tar.gz
md5sum = a12109804fc9c5d7fb31f068c66655b8
component/libtool/buildout.cfg
View file @ 4bd3dca4
...@@ -7,8 +7,8 @@ parts = libtool ...@@ -7,8 +7,8 @@ parts = libtool
[libtool] [libtool]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
md5sum = 1bfb9b923f2c1339b4d2ce1807064aa5 md5sum = 2fc0b6ddcd66a89ed6e45db28fa44232
url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.xz url = https://ftp.gnu.org/gnu/libtool/libtool-2.4.7.tar.xz
configure-options = configure-options =
--disable-static --disable-static
environment = environment =
......
component/libxml2/buildout.cfg
View file @ 4bd3dca4
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
extends = extends =
../perl/buildout.cfg ../perl/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
../xz-utils/buildout.cfg
parts = parts =
libxml2 libxml2
...@@ -20,5 +21,5 @@ configure-options = ...@@ -20,5 +21,5 @@ configure-options =
--without-lzma --without-lzma
--with-zlib=${zlib:location} --with-zlib=${zlib:location}
environment = environment =
PATH=${perl:location}/bin:%(PATH)s PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
LDFLAGS=-Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${zlib:location}/lib
component/libxslt/buildout.cfg
View file @ 4bd3dca4
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
extends = extends =
../libxml2/buildout.cfg ../libxml2/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
../xz-utils/buildout.cfg
parts = parts =
libxslt libxslt
...@@ -22,3 +23,4 @@ configure-options = ...@@ -22,3 +23,4 @@ configure-options =
environment = environment =
CPPFLAGS=-I${zlib:location}/include CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
PATH=${xz-utils:location}/bin:%(PATH)s
component/logrotate/buildout.cfg
View file @ 4bd3dca4
...@@ -8,8 +8,8 @@ parts = logrotate ...@@ -8,8 +8,8 @@ parts = logrotate
[logrotate] [logrotate]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/logrotate/logrotate/releases/download/3.18.1/logrotate-3.18.1.tar.xz url = https://github.com/logrotate/logrotate/releases/download/3.21.0/logrotate-3.21.0.tar.xz
md5sum = 07d5aba26c350f9ab5730c25a7277751 md5sum = 6c15f45efc3475a576c4f7e6cc481b2c
# BBB this is only for backward-compatibility. # BBB this is only for backward-compatibility.
configure-options = configure-options =
--with-selinux=no --with-selinux=no
......
component/lua/buildout.cfg
View file @ 4bd3dca4
...@@ -8,8 +8,8 @@ parts = ...@@ -8,8 +8,8 @@ parts =
[lua] [lua]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://www.lua.org/ftp/lua-5.4.3.tar.gz url = http://www.lua.org/ftp/lua-5.4.6.tar.gz
md5sum = ef63ed2ecfb713646a7fcc583cf5f352 md5sum = 25a429319dff20dfbfb9956c2b5be911
configure-command = true configure-command = true
make-options = make-options =
"$(uname -sr 2>/dev/null|grep -Eq '^Linux' && echo linux || echo posix)" "$(uname -sr 2>/dev/null|grep -Eq '^Linux' && echo linux || echo posix)"
......
component/lz4/buildout.cfg
View file @ 4bd3dca4
...@@ -6,6 +6,6 @@ parts = ...@@ -6,6 +6,6 @@ parts =
[lz4] [lz4]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/lz4/lz4/archive/v1.9.3.tar.gz url = https://github.com/lz4/lz4/releases/download/v1.9.4/lz4-1.9.4.tar.gz
md5sum = 3a1ab1684e14fc1afc66228ce61b2db3 md5sum = e9286adb64040071c5e23498bf753261
configure-command = true configure-command = true
component/ncurses/buildout.cfg
View file @ 4bd3dca4
...@@ -5,13 +5,16 @@ parts = ...@@ -5,13 +5,16 @@ parts =
[ncurses] [ncurses]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://ftp.gnu.org/gnu/ncurses/ncurses-6.2.tar.gz url = http://ftp.gnu.org/gnu/ncurses/ncurses-6.4.tar.gz
md5sum = e812da327b1c2214ac1aed440ea3ae8d md5sum = 5a62487b5d4ac6b132fe2bf9f8fad29b
configure-options = configure-options =
--prefix=%(location)s --prefix=%(location)s
--enable-pc-files --enable-pc-files
--disable-termcap
--with-pkg-config-libdir=%(location)s/lib/pkgconfig --with-pkg-config-libdir=%(location)s/lib/pkgconfig
--with-shared --with-shared
--with-termlib
--with-versioned-syms
--without-ada --without-ada
--without-manpages --without-manpages
--without-tests --without-tests
...@@ -28,6 +31,7 @@ post-install = ...@@ -28,6 +31,7 @@ post-install =
mv ncursesw/* . mv ncursesw/* .
rm -r ncurses ncursesw rm -r ncurses ncursesw
ln -s . ncursesw ln -s . ncursesw
echo 'GROUP( libtinfo.so )' > %(location)s/lib/libtermcap.so
# pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user # pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
environment = environment =
LDCONFIG=/bin/echo LDCONFIG=/bin/echo
......
component/nghttp2/buildout.cfg
View file @ 4bd3dca4
[buildout] [buildout]
extends = extends =
../defaults.cfg
../automake/buildout.cfg ../automake/buildout.cfg
../libtool/buildout.cfg ../libtool/buildout.cfg
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
...@@ -10,11 +11,12 @@ parts = ...@@ -10,11 +11,12 @@ parts =
[nghttp2] [nghttp2]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/nghttp2/nghttp2/archive/v1.40.0.tar.gz url = https://github.com/nghttp2/nghttp2/releases/download/v1.57.0/nghttp2-1.57.0.tar.xz
md5sum = ef3c6983e0de2f16b523460c812fe598 md5sum = 1525d4966622500f119017dc057c76c8
pre-configure = pre-configure =
autoreconf -fisv -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal autoreconf -fisv -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal
automake automake
autoconf autoconf
environment = environment =
PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${xz-utils:location}/bin:%(PATH)s
PYTHON=${python3:executable}
component/nghttp3/buildout.cfg
View file @ 4bd3dca4
...@@ -7,8 +7,8 @@ extends = ...@@ -7,8 +7,8 @@ extends =
[nghttp3] [nghttp3]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/ngtcp2/nghttp3/archive/refs/tags/v0.9.0.tar.gz url = https://github.com/ngtcp2/nghttp3/archive/refs/tags/v0.15.0.tar.gz
md5sum = e0eb54109d0d511268b9e2cf6aec4044 md5sum = b9af99d8db0d48f91fc075dcbd837019
pre-configure = pre-configure =
autoreconf -fisv -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal autoreconf -fisv -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal
automake automake
......
component/nginx/buildout.cfg
View file @ 4bd3dca4
...@@ -11,8 +11,8 @@ parts = nginx-output ...@@ -11,8 +11,8 @@ parts = nginx-output
[nginx-common] [nginx-common]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://nginx.org/download/nginx-1.22.1.tar.gz url = https://nginx.org/download/nginx-1.25.2.tar.gz
md5sum = 8296d957561aeed0261d9be4d3decaec md5sum = e0fc592d9721b7fccc2c959b45008ade
[nginx] [nginx]
<= nginx-common <= nginx-common
...@@ -61,8 +61,8 @@ mime = ${nginx:location}/conf/mime.types ...@@ -61,8 +61,8 @@ mime = ${nginx:location}/conf/mime.types
[nginx-push-stream-module] [nginx-push-stream-module]
recipe = slapos.recipe.build:download-unpacked recipe = slapos.recipe.build:download-unpacked
shared = true shared = true
url = https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.5.tar.gz url = https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz
md5sum = 9bb5237a93c957130aaf7033ed3c0989 md5sum = c8f18a4a7f7c871291c823aace50e1f9
[nginx-push-stream] [nginx-push-stream]
<= nginx-common <= nginx-common
......
component/nodejs/buildout.cfg
View file @ 4bd3dca4
...@@ -33,7 +33,6 @@ npm_config_tarball = ${nodejs-headers:target} ...@@ -33,7 +33,6 @@ npm_config_tarball = ${nodejs-headers:target}
[nodejs-16.19.0] [nodejs-16.19.0]
<= nodejs-base <= nodejs-base
openssl_location = ${openssl:location}
version = v16.19.0 version = v16.19.0
md5sum = e72b698681aff62bf17146ad70dc9425 md5sum = e72b698681aff62bf17146ad70dc9425
patches = patches =
...@@ -52,7 +51,6 @@ md5sum = e7bfbf135ae54d1dcca63bf17be84818 ...@@ -52,7 +51,6 @@ md5sum = e7bfbf135ae54d1dcca63bf17be84818
[nodejs-18.18.0] [nodejs-18.18.0]
<= nodejs-base <= nodejs-base
openssl_location = ${openssl:location}
version = v18.18.0 version = v18.18.0
md5sum = a1ce8df7e6b9df9f4ba3ff1d4e2173d2 md5sum = a1ce8df7e6b9df9f4ba3ff1d4e2173d2
...@@ -64,13 +62,11 @@ md5sum = c5ab3e98977dfd639d830625d79eff52 ...@@ -64,13 +62,11 @@ md5sum = c5ab3e98977dfd639d830625d79eff52
[nodejs-14.16.0] [nodejs-14.16.0]
<= nodejs-base <= nodejs-base
openssl_location = ${openssl:location}
version = v14.16.0 version = v14.16.0
md5sum = 7dc3666f407bf4e12a01ce1be2883d31 md5sum = 7dc3666f407bf4e12a01ce1be2883d31
[nodejs-12.18.3] [nodejs-12.18.3]
<= nodejs-base <= nodejs-base
openssl_location = ${openssl:location}
version = v12.18.3 version = v12.18.3
md5sum = 28bf6a4d98b238403fa58a0805f4a979 md5sum = 28bf6a4d98b238403fa58a0805f4a979
PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
...@@ -80,6 +76,7 @@ configure-command = ./configure ...@@ -80,6 +76,7 @@ configure-command = ./configure
<= nodejs-base <= nodejs-base
version = v8.9.4 version = v8.9.4
md5sum = 4ddc1daff327d7e6f63da57fdfc24f55 md5sum = 4ddc1daff327d7e6f63da57fdfc24f55
openssl-location = ${openssl-1.0:location}
PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
configure-command = ./configure configure-command = ./configure
...@@ -87,6 +84,7 @@ configure-command = ./configure ...@@ -87,6 +84,7 @@ configure-command = ./configure
<= nodejs-base <= nodejs-base
version = v8.12.0 version = v8.12.0
md5sum = 5690333b77964edf81945fc724f6ea85 md5sum = 5690333b77964edf81945fc724f6ea85
openssl-location = ${openssl-1.0:location}
PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
configure-command = ./configure configure-command = ./configure
...@@ -94,7 +92,7 @@ configure-command = ./configure ...@@ -94,7 +92,7 @@ configure-command = ./configure
# Server-side Javascript. # Server-side Javascript.
version = version =
md5sum = md5sum =
openssl_location = ${openssl-1.0:location} openssl-location = ${openssl:location}
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
...@@ -103,16 +101,16 @@ configure-command = python3 configure ...@@ -103,16 +101,16 @@ configure-command = python3 configure
configure-options = configure-options =
--prefix=%(location)s --prefix=%(location)s
--shared-openssl --shared-openssl
--shared-openssl-includes=${:openssl_location}/include --shared-openssl-includes=${:openssl-location}/include
--shared-openssl-libpath=${:openssl_location}/lib --shared-openssl-libpath=${:openssl-location}/lib
PATH = ${python3:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH = ${python3:location}/bin:${pkgconfig:location}/bin:%(PATH)s
environment = environment =
HOME=@@LOCATION@@ HOME=@@LOCATION@@
PATH=${:PATH} PATH=${:PATH}
PKG_CONFIG_PATH=${:openssl_location}/lib/pkgconfig/ PKG_CONFIG_PATH=${:openssl-location}/lib/pkgconfig/
CPPFLAGS=-I${zlib:location}/include CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-Wl,-rpath=${:openssl_location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${:openssl-location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
LD_LIBRARY_PATH=${:openssl_location}/lib LD_LIBRARY_PATH=${:openssl-location}/lib
[nodejs-headers-base] [nodejs-headers-base]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
......
component/openssh/buildout.cfg
View file @ 4bd3dca4
...@@ -16,9 +16,9 @@ parts = ...@@ -16,9 +16,9 @@ parts =
[openssh] [openssh]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
md5sum = 8ce5f390958baeeab635aafd0ef41453 md5sum = 3d29a7394816deeb57186899d7f7662c
location = @@LOCATION@@ location = @@LOCATION@@
url = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-8.8p1.tar.gz url = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.5p1.tar.gz
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
patch-options = -p1 patch-options = -p1
patches = patches =
......
component/p11-kit/buildout.cfg
View file @ 4bd3dca4
...@@ -6,6 +6,7 @@ extends = ...@@ -6,6 +6,7 @@ extends =
../libffi/buildout.cfg ../libffi/buildout.cfg
../libtasn1/buildout.cfg ../libtasn1/buildout.cfg
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../xz-utils/buildout.cfg
[p11-kit] [p11-kit]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
...@@ -18,5 +19,5 @@ configure-options = ...@@ -18,5 +19,5 @@ configure-options =
--disable-doc-html --disable-doc-html
--without-trust-paths --without-trust-paths
environment = environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${libffi:location}/lib/pkgconfig:${libtasn1:location}/lib/pkgconfig PKG_CONFIG_PATH=${libffi:location}/lib/pkgconfig:${libtasn1:location}/lib/pkgconfig
component/popt/buildout.cfg
View file @ 4bd3dca4
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
[popt] [popt]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz url = http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.19.tar.gz
md5sum = 450f2f636e6a3aa527de803d0ae76c5a md5sum = eaa2135fddb6eb03f2c87ee1823e5a78
configure-options = configure-options =
--disable-static --disable-static
component/pygolang/buildout.cfg
View file @ 4bd3dca4
...@@ -30,6 +30,8 @@ exe = ${buildout:bin-directory}/gpython ...@@ -30,6 +30,8 @@ exe = ${buildout:bin-directory}/gpython
# python-interpreter provides python interpreter with all specified eggs. # python-interpreter provides python interpreter with all specified eggs.
# eggs default to pygolang, but can be overwritten or changed in inherited section. # eggs default to pygolang, but can be overwritten or changed in inherited section.
# if eggs are changes, they must still have pygolang. # if eggs are changes, they must still have pygolang.
#
# ${python-interpreter:exe} is where buildout installs the interpreter.
[python-interpreter] [python-interpreter]
recipe = zc.recipe.egg:scripts recipe = zc.recipe.egg:scripts
eggs = ${pygolang:egg} eggs = ${pygolang:egg}
...@@ -47,6 +49,7 @@ initialization = ...@@ -47,6 +49,7 @@ initialization =
# NOTE with scripts=ø interpreter is not handled, so we use `scripts=python` as # NOTE with scripts=ø interpreter is not handled, so we use `scripts=python` as
# a workaround. # a workaround.
scripts = ${:interpreter} scripts = ${:interpreter}
exe = ${buildout:bin-directory}/${:interpreter}
# pyprog provides macro recipe to build python programs. # pyprog provides macro recipe to build python programs.
...@@ -102,7 +105,6 @@ init = ...@@ -102,7 +105,6 @@ init =
<= python-interpreter <= python-interpreter
eggs += %(eggs)s eggs += %(eggs)s
interpreter = $${:_buildout_section_name_} interpreter = $${:_buildout_section_name_}
exe = $${buildout:bin-directory}/$${:interpreter}
""" % locals()) """ % locals())
......
component/readline/buildout.cfg
View file @ 4bd3dca4
...@@ -45,7 +45,6 @@ patches = ...@@ -45,7 +45,6 @@ patches =
configure-options = configure-options =
--enable-multibyte --enable-multibyte
--disable-static --disable-static
--with-curses
environment = environment =
CPPFLAGS=-I${ncurses:location}/include CPPFLAGS=-I${ncurses:location}/include
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
......
component/restic/buildout.cfg
View file @ 4bd3dca4
...@@ -26,4 +26,4 @@ location = ${:output} ...@@ -26,4 +26,4 @@ location = ${:output}
<= go-git-package <= go-git-package
go.importpath = github.com/restic/restic go.importpath = github.com/restic/restic
repository = https://github.com/restic/restic repository = https://github.com/restic/restic
revision = v0.14.0-0-g1bc87e17 revision = v0.16.1-0-gbaca3f630
component/rsyslogd/buildout.cfg
View file @ 4bd3dca4
...@@ -10,8 +10,8 @@ extends = ...@@ -10,8 +10,8 @@ extends =
[rsyslogd] [rsyslogd]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2110.0.tar.gz url = https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2310.0.tar.gz
md5sum = 2d2b9d4a70a6e2fd4a7e806a5782c56b md5sum = e492884a5f64d2a069684fcb21171114
shared = true shared = true
configure-options = configure-options =
--disable-klog --disable-klog
......
component/slapos/obs.cfg
View file @ 4bd3dca4
...@@ -44,23 +44,23 @@ configure-options += ...@@ -44,23 +44,23 @@ configure-options +=
make-options += make-options +=
DESTDIR=${buildout:destdir} DESTDIR=${buildout:destdir}
environment += environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.38.0/
[intltool] [intltool]
environment += environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.38.0/
[autoconf] [autoconf]
environment += environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.38.0/
[automake] [automake]
environment += environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.38.0/
[firewalld] [firewalld]
environment += environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.38.0/
[dbus] [dbus]
...@@ -97,7 +97,7 @@ make-options += ...@@ -97,7 +97,7 @@ make-options +=
INSTALL_PREFIX=${buildout:destdir} INSTALL_PREFIX=${buildout:destdir}
DESTDIR=${buildout:destdir} DESTDIR=${buildout:destdir}
environment += environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.38.0/
[gobject-introspection] [gobject-introspection]
pre-configure = pre-configure =
...@@ -105,7 +105,7 @@ pre-configure = ...@@ -105,7 +105,7 @@ pre-configure =
configure-options += configure-options +=
--enable-shared --enable-shared
environment += environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.38.0/
post-install = 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 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
...@@ -121,14 +121,14 @@ environment += ...@@ -121,14 +121,14 @@ environment +=
[perl-CPAN-package] [perl-CPAN-package]
perl-PERL5LIB=${perl:location}/lib/5.28.1/ perl-PERL5LIB=${perl:location}/lib/5.38.0/
pre-configure = pre-configure =
sed -i "s#'/opt/slapos/parts/perl#'${perl:location}#" ${perl:location}/lib/5.28.1/*-linux-thread-multi/Config.pm sed -i "s#'/opt/slapos/parts/perl#'${perl:location}#" ${perl:location}/lib/5.38.0/*-linux-thread-multi/Config.pm
sed -i "s#'/opt/slapos/parts/site_perl#'${buildout:destdir}/parts/site_perl#" ${perl:location}/lib/5.28.1/*-linux-thread-multi/Config.pm sed -i "s#'/opt/slapos/parts/site_perl#'${buildout:destdir}/parts/site_perl#" ${perl:location}/lib/5.38.0/*-linux-thread-multi/Config.pm
post-install = post-install =
sed -i "s#'${perl:location}#'/opt/slapos/parts/perl#" ${perl:location}/lib/5.28.1/*-linux-thread-multi/Config.pm sed -i "s#'${perl:location}#'/opt/slapos/parts/perl#" ${perl:location}/lib/5.38.0/*-linux-thread-multi/Config.pm
sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.28.1/*-linux-thread-multi/Config.pm sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.38.0/*-linux-thread-multi/Config.pm
[perl] [perl]
configure-command = configure-command =
......
component/sqlite3/buildout.cfg
View file @ 4bd3dca4
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
extends = extends =
../readline/buildout.cfg ../readline/buildout.cfg
../tcl/buildout.cfg ../tcl/buildout.cfg
../xz-utils/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
parts = parts =
sqlite3 sqlite3
...@@ -12,7 +13,6 @@ shared = true ...@@ -12,7 +13,6 @@ shared = true
# Some options need the canonical source code (i.e. not as an amalgamation). # Some options need the canonical source code (i.e. not as an amalgamation).
url = https://deb.debian.org/debian/pool/main/s/sqlite3/sqlite3_3.40.1.orig.tar.xz url = https://deb.debian.org/debian/pool/main/s/sqlite3/sqlite3_3.40.1.orig.tar.xz
md5sum = 79f2507907721b770cbec98195cecece md5sum = 79f2507907721b770cbec98195cecece
pre-configure = sed -i 's/-ltinfo//g;s/-ltermcap//g;s/ termcap//;s/ curses//' configure
configure-options = configure-options =
--disable-static --disable-static
--disable-tcl --disable-tcl
...@@ -23,4 +23,4 @@ configure-options = ...@@ -23,4 +23,4 @@ configure-options =
environment = environment =
CPPFLAGS=-I${readline:location}/include -I${ncurses:location}/include -I${zlib:location}/include -DSQLITE_MAX_VARIABLE_NUMBER=250000 -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 CPPFLAGS=-I${readline:location}/include -I${ncurses:location}/include -I${zlib:location}/include -DSQLITE_MAX_VARIABLE_NUMBER=250000 -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
LDFLAGS=-L@@LOCATION@@ -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-L@@LOCATION@@ -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
PATH=${tcl:location}/bin:%(PATH)s PATH=${tcl:location}/bin:${xz-utils:location}/bin:%(PATH)s
component/theia/buildout.hash.cfg
View file @ 4bd3dca4
...@@ -19,7 +19,7 @@ md5sum = a27e2cb34e4efe2ed0d4698f505554f0 ...@@ -19,7 +19,7 @@ md5sum = a27e2cb34e4efe2ed0d4698f505554f0
[yarn.lock] [yarn.lock]
_update_hash_filename_ = yarn.lock _update_hash_filename_ = yarn.lock
md5sum = bb7444ebfeea21fed1960700aa6becf9 md5sum = ae0f135e9c32967cc7cbc0a708225b60
[ms-python-disable-jedi-buildout.patch] [ms-python-disable-jedi-buildout.patch]
_update_hash_filename_ = ms-python-disable-jedi-buildout.patch _update_hash_filename_ = ms-python-disable-jedi-buildout.patch
......
component/theia/yarn.lock
View file @ 4bd3dca4
This source diff could not be displayed because it is too large. You can view the blob instead.
component/trafficserver/buildout.cfg
View file @ 4bd3dca4
...@@ -24,8 +24,8 @@ min_version = 8 ...@@ -24,8 +24,8 @@ min_version = 8
[trafficserver] [trafficserver]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://dlcdn.apache.org/trafficserver/trafficserver-9.2.2.tar.bz2 url = https://dlcdn.apache.org/trafficserver/trafficserver-9.2.3.tar.bz2
md5sum = 994247ed0f50e6dfcfb8d7200dcad6ea md5sum = 5e37ec924667052d655de2ebab98ad3f
shared = true shared = true
patch-options = -p1 patch-options = -p1
configure-options = configure-options =
......
component/util-linux/buildout.cfg
View file @ 4bd3dca4
...@@ -7,8 +7,8 @@ extends = ...@@ -7,8 +7,8 @@ extends =
[util-linux] [util-linux]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz url = https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.2.tar.xz
md5sum = d659bf7cd417d93dc609872f6334b019 md5sum = 2feb3e7c306f336a3d22a182dfffc942
configure-options = configure-options =
--disable-static --disable-static
--enable-libuuid --enable-libuuid
...@@ -67,4 +67,4 @@ configure-options = ...@@ -67,4 +67,4 @@ configure-options =
--without-audit --without-audit
environment = environment =
PATH=${perl:location}/bin:%(PATH)s PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
component/w3m/buildout.cfg
View file @ 4bd3dca4
...@@ -21,7 +21,6 @@ url = https://salsa.debian.org/debian/w3m/-/archive/${:version}/w3m-${:version}. ...@@ -21,7 +21,6 @@ url = https://salsa.debian.org/debian/w3m/-/archive/${:version}/w3m-${:version}.
configure-options = configure-options =
--with-gc=${garbage-collector:location} --with-gc=${garbage-collector:location}
--with-ssl=${openssl:location} --with-ssl=${openssl:location}
--with-termlib=ncurses
--disable-nls --disable-nls
--disable-image --disable-image
--disable-dict --disable-dict
......
component/xorg/buildout.cfg
View file @ 4bd3dca4
...@@ -379,7 +379,7 @@ configure-options = ...@@ -379,7 +379,7 @@ configure-options =
--with-xkb-config-root=${:xkeyboard-config-location} --with-xkb-config-root=${:xkeyboard-config-location}
environment = environment =
PKG_CONFIG_PATH=${libxkbfile:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xorgproto:location}/share/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${libXau:location}/lib/pkgconfig PKG_CONFIG_PATH=${libxkbfile:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xorgproto:location}/share/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${libXau:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:${pkgconfig:location}/bin:%(PATH)s
LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxkbfile:location}/lib -Wl,-rpath=${libxkbfile:location}/lib LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxkbfile:location}/lib -Wl,-rpath=${libxkbfile:location}/lib
[renderext] [renderext]
...@@ -579,7 +579,7 @@ recipe = slapos.recipe.cmmi ...@@ -579,7 +579,7 @@ recipe = slapos.recipe.cmmi
url = https://www.x.org/releases/individual/app/xdpyinfo-1.3.3.tar.xz url = https://www.x.org/releases/individual/app/xdpyinfo-1.3.3.tar.xz
md5sum = f67116760888f2e06486ee3d179875d2 md5sum = f67116760888f2e06486ee3d179875d2
environment = environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${libX11:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libXtst:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${xorgproto:location}/share/pkgconfig:${libXi:location}/lib/pkgconfig:${libXi:pkg_config_depends} PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${libX11:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libXtst:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${xorgproto:location}/share/pkgconfig:${libXi:location}/lib/pkgconfig:${libXi:pkg_config_depends}
CPPFLAGS=-I${libXt:location}/include CPPFLAGS=-I${libXt:location}/include
LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -Wl,-rpath=${libXi:location}/lib -Wl,-rpath=${libXtst:location}/lib -Wl,-rpath=${libXext:location}/lib -Wl,-rpath=${libXau:location}/lib -Wl,-rpath=${libXdmcp:location}/lib -Wl,-rpath=${libxcb:location}/lib LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -Wl,-rpath=${libXi:location}/lib -Wl,-rpath=${libXtst:location}/lib -Wl,-rpath=${libXext:location}/lib -Wl,-rpath=${libXau:location}/lib -Wl,-rpath=${libXdmcp:location}/lib -Wl,-rpath=${libxcb:location}/lib
...@@ -608,7 +608,7 @@ configure-options = ...@@ -608,7 +608,7 @@ configure-options =
environment = environment =
PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${xorgproto:location}/share/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xorgproto:pkg_config_depends}:${xorgproto:location}/share/pkgconfig:${renderproto:location}/lib/pkgconfig:${presentproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libXfont2:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libxcvt:location}/lib/pkgconfig PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${xorgproto:location}/share/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xorgproto:pkg_config_depends}:${xorgproto:location}/share/pkgconfig:${renderproto:location}/lib/pkgconfig:${presentproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libXfont2:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libxcvt:location}/lib/pkgconfig
CPPFLAGS=-I${bzip2:location}/include -I${libgcrypt:location}/include -I${libgpg-error:location}/include -I${zlib:location}/include CPPFLAGS=-I${bzip2:location}/include -I${libgcrypt:location}/include -I${libgpg-error:location}/include -I${zlib:location}/include
PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libgcrypt:location}/lib -Wl,-rpath=${libgcrypt:location}/lib -L${libgpg-error:location}/lib -Wl,-rpath=${libgpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libgcrypt:location}/lib -Wl,-rpath=${libgcrypt:location}/lib -L${libgpg-error:location}/lib -Wl,-rpath=${libgpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
[libXi] [libXi]
......
component/xz-utils/buildout.cfg
View file @ 4bd3dca4
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
[xz-utils] [xz-utils]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://tukaani.org/xz/xz-5.2.5.tar.bz2 url = https://tukaani.org/xz/xz-5.4.4.tar.bz2
md5sum = 33ab3ef79aa1146b83b778210e7b0a54 md5sum = fbb849a27e266964aefe26bad508144f
configure-options = configure-options =
--disable-static --disable-static
component/zlib/buildout.cfg
View file @ 4bd3dca4
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
[zlib] [zlib]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://zlib.net/fossils/zlib-1.2.12.tar.gz url = https://zlib.net/fossils/zlib-1.3.tar.gz
md5sum = 5fc414a9726be31427b440b434d05f78 md5sum = 60373b133d630f74f4a1f94c1185a53f
environment = environment =
CFLAGS=-fPIC CFLAGS=-fPIC
component/zstd/buildout.cfg
View file @ 4bd3dca4
...@@ -10,8 +10,8 @@ parts = ...@@ -10,8 +10,8 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/facebook/zstd/releases/download/v${:version}/zstd-${:version}.tar.gz url = https://github.com/facebook/zstd/releases/download/v${:version}/zstd-${:version}.tar.gz
version = 1.4.9 version = 1.5.5
md5sum = eb718b8aae0302cabe20f968e500534d md5sum = 63251602329a106220e0a5ad26ba656f
location = @@LOCATION@@ location = @@LOCATION@@
configure-command = : configure-command = :
environment = environment =
......
software/backupserver/buildout.hash.cfg
View file @ 4bd3dca4
...@@ -18,7 +18,7 @@ md5sum = 458870b70c33a1621b68961ae2372ad5 ...@@ -18,7 +18,7 @@ md5sum = 458870b70c33a1621b68961ae2372ad5
[template-nginx-configuration] [template-nginx-configuration]
filename = template-nginx.cfg.in filename = template-nginx.cfg.in
md5sum = fc4f258e3ae56e0c9596484d736ccfed md5sum = 3edea04f8e7c79f3363b7a849ae6c7eb
[template-dcron-service] [template-dcron-service]
filename = template-dcron-service.sh.in filename = template-dcron-service.sh.in
......
software/backupserver/template-nginx.cfg.in
View file @ 4bd3dca4
...@@ -51,9 +51,8 @@ http { ...@@ -51,9 +51,8 @@ http {
gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
server { server {
listen [$${nginx-configuration:ip}]:$${nginx-configuration:port}; listen [$${nginx-configuration:ip}]:$${nginx-configuration:port} ssl;
ssl on;
ssl_certificate $${nginx-configuration:ssl_crt}; ssl_certificate $${nginx-configuration:ssl_crt};
ssl_certificate_key $${nginx-configuration:ssl_key}; ssl_certificate_key $${nginx-configuration:ssl_key};
......
software/beremiz-ide/software.cfg
View file @ 4bd3dca4
...@@ -113,7 +113,7 @@ url = ${:_profile_base_location_}/${:filename} ...@@ -113,7 +113,7 @@ url = ${:_profile_base_location_}/${:filename}
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
output = ${buildout:directory}/instance.cfg output = ${buildout:directory}/instance.cfg
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
python-bin = ${buildout:bin-directory}/${python-interpreter:interpreter} python-bin = ${python-interpreter:exe}
type = beremiz type = beremiz
context = context =
key autoconf_location autoconf:location key autoconf_location autoconf:location
......
software/beremiz-runtime/software.cfg
View file @ 4bd3dca4
...@@ -78,6 +78,7 @@ eggs = click ...@@ -78,6 +78,7 @@ eggs = click
opcua opcua
${beremiz:egg} ${beremiz:egg}
${Twisted:egg} ${Twisted:egg}
sslpsk
[instance-profile] [instance-profile]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
...@@ -127,3 +128,4 @@ opcua = 0.98.13 ...@@ -127,3 +128,4 @@ opcua = 0.98.13
trollius = 2.2.1 trollius = 2.2.1
futures = 3.3.0 futures = 3.3.0
cycler = 0.10.0 cycler = 0.10.0
sslpsk = 1.0.0
software/ors-amarisoft/buildout.hash.cfg
View file @ 4bd3dca4
...@@ -56,11 +56,11 @@ md5sum = 63472d5dc9bd46923d3941b5189e2ccd ...@@ -56,11 +56,11 @@ md5sum = 63472d5dc9bd46923d3941b5189e2ccd
[template-enb] [template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = 6be204217dd3c4ce240184ec31332cd6 md5sum = f61ba5e691bf263c8666e92f9eeef643
[template-gnb] [template-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum = e4d8c66c00dc5c022e9208c10e37490e md5sum = 9575d69d3ea61842750b44ad67e92258
[template-core-network] [template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg _update_hash_filename_ = instance-core-network.jinja2.cfg
...@@ -68,11 +68,11 @@ md5sum = 919340a049d628a86838453354c9efa2 ...@@ -68,11 +68,11 @@ md5sum = 919340a049d628a86838453354c9efa2
[template-ue-lte] [template-ue-lte]
_update_hash_filename_ = instance-ue-lte.jinja2.cfg _update_hash_filename_ = instance-ue-lte.jinja2.cfg
md5sum = 587531b7a43fecbcdc2f1bffac74a363 md5sum = f6d8e97add6d11b0a5436744cb455195
[template-ue-nr] [template-ue-nr]
_update_hash_filename_ = instance-ue-nr.jinja2.cfg _update_hash_filename_ = instance-ue-nr.jinja2.cfg
md5sum = 3d6f3e864b6480a98c2699b11281182a md5sum = e57780260a1588d1dab29431c5e5ed97
[template-obsolete] [template-obsolete]
_update_hash_filename_ = instance-obsolete.jinja2.cfg _update_hash_filename_ = instance-obsolete.jinja2.cfg
......
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @ 4bd3dca4
...@@ -615,6 +615,8 @@ name = ${:_buildout_section_name_} ...@@ -615,6 +615,8 @@ name = ${:_buildout_section_name_}
promise = check_sdr_busy promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }} config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }} config-sdr = {{ sdr }}
config-sdr_dev = 0
config-dma_chan = 0
[check-baseband-latency.py] [check-baseband-latency.py]
<= macro.promise <= macro.promise
...@@ -699,6 +701,7 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }} ...@@ -699,6 +701,7 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
<= macro.promise <= macro.promise
promise = check_rx_saturated promise = check_rx_saturated
config-testing = {{ slapparameter_dict.get("testing", False) }} config-testing = {{ slapparameter_dict.get("testing", False) }}
config-rf-rx-chan-list = {{ list(range(0, int(slapparameter_dict.get('n_antenna_ul', default_n_antenna_ul)))) }}
config-amarisoft-stats-log = ${amarisoft-stats-template:log-output} config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }} config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }} config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
software/ors-amarisoft/instance-gnb.jinja2.cfg
View file @ 4bd3dca4
...@@ -298,6 +298,8 @@ name = ${:_buildout_section_name_} ...@@ -298,6 +298,8 @@ name = ${:_buildout_section_name_}
promise = check_sdr_busy promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }} config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }} config-sdr = {{ sdr }}
config-sdr_dev = 0
config-dma_chan = 0
[check-baseband-latency.py] [check-baseband-latency.py]
<= macro.promise <= macro.promise
...@@ -319,6 +321,7 @@ config-stats-period = {{ slapparameter_dict.get("gnb_stats_fetch_period", 60) }} ...@@ -319,6 +321,7 @@ config-stats-period = {{ slapparameter_dict.get("gnb_stats_fetch_period", 60) }}
<= macro.promise <= macro.promise
promise = check_rx_saturated promise = check_rx_saturated
config-testing = {{ slapparameter_dict.get("testing", False) }} config-testing = {{ slapparameter_dict.get("testing", False) }}
config-rf-rx-chan-list = {{ list(range(0, int(slapparameter_dict.get('n_antenna_ul', default_n_antenna_ul)))) }}
config-amarisoft-stats-log = ${amarisoft-stats-template:log-output} config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
config-stats-period = {{ slapparameter_dict.get("gnb_stats_fetch_period", 60) }} config-stats-period = {{ slapparameter_dict.get("gnb_stats_fetch_period", 60) }}
config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }} config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
software/ors-amarisoft/instance-ue-lte.jinja2.cfg
View file @ 4bd3dca4
...@@ -145,3 +145,5 @@ name = ${:_buildout_section_name_} ...@@ -145,3 +145,5 @@ name = ${:_buildout_section_name_}
promise = check_sdr_busy promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }} config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }} config-sdr = {{ sdr }}
config-sdr_dev = 0
config-dma_chan = 0
software/ors-amarisoft/instance-ue-nr.jinja2.cfg
View file @ 4bd3dca4
...@@ -146,3 +146,5 @@ name = ${:_buildout_section_name_} ...@@ -146,3 +146,5 @@ name = ${:_buildout_section_name_}
promise = check_sdr_busy promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }} config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }} config-sdr = {{ sdr }}
config-sdr_dev = 0
config-dma_chan = 0
software/rapid-cdn/buildout.hash.cfg
View file @ 4bd3dca4
...@@ -50,7 +50,7 @@ md5sum = d56e2cfab274cbbbe5b387f2f6e417df ...@@ -50,7 +50,7 @@ md5sum = d56e2cfab274cbbbe5b387f2f6e417df
[template-backend-haproxy-configuration] [template-backend-haproxy-configuration]
_update_hash_filename_ = templates/backend-haproxy.cfg.in _update_hash_filename_ = templates/backend-haproxy.cfg.in
md5sum = 6457064905f818f21e3733eb4278a580 md5sum = 629f4cc34dd7512eb61f10eac4e62d7a
[template-empty] [template-empty]
_update_hash_filename_ = templates/empty.in _update_hash_filename_ = templates/empty.in
......
software/rapid-cdn/templates/backend-haproxy.cfg.in
View file @ 4bd3dca4
...@@ -128,7 +128,7 @@ backend {{ slave_instance['slave_reference'] }}-{{ scheme }} ...@@ -128,7 +128,7 @@ backend {{ slave_instance['slave_reference'] }}-{{ scheme }}
{{ active_check_option }} {{ active_check_option }}
{%- endfor %} {%- endfor %}
{%- if path %} {%- if path %}
http-request set-path {{ path }}%[path] http-request set-path {{ path }}%[path,regsub('^/$','')]
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
...@@ -175,7 +175,7 @@ backend {{ slave_instance['slave_reference'] }}-{{ scheme }}-failover ...@@ -175,7 +175,7 @@ backend {{ slave_instance['slave_reference'] }}-{{ scheme }}-failover
timeout server {{ slave_instance['request-timeout'] }}s timeout server {{ slave_instance['request-timeout'] }}s
retries {{ slave_instance['backend-connect-retries'] }} retries {{ slave_instance['backend-connect-retries'] }}
{%- if path %} {%- if path %}
http-request set-path {{ path }}%[path] http-request set-path {{ path }}%[path,regsub('^/$','')]
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
......
software/rapid-cdn/test/test.py
View file @ 4bd3dca4
...@@ -1654,6 +1654,12 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -1654,6 +1654,12 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
# authenticating to http backend shall be no-op # authenticating to http backend shall be no-op
'authenticate-to-backend': True, 'authenticate-to-backend': True,
}, },
'url-trailing-slash-absent': {
'url': cls.backend_url + 'index.html',
},
'url-trailing-slash-present': {
'url': cls.backend_url + 'index.html/',
},
'url-netloc-list': { 'url-netloc-list': {
'url': cls.backend_url, 'url': cls.backend_url,
'url-netloc-list': '%(ip)s:%(port_a)s %(ip)s:%(port_b)s' % { 'url-netloc-list': '%(ip)s:%(port_a)s %(ip)s:%(port_b)s' % {
...@@ -2123,9 +2129,9 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2123,9 +2129,9 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
'monitor-base-url': 'https://[%s]:8401' % self.master_ipv6, 'monitor-base-url': 'https://[%s]:8401' % self.master_ipv6,
'backend-client-caucase-url': 'http://[%s]:8990' % self.master_ipv6, 'backend-client-caucase-url': 'http://[%s]:8990' % self.master_ipv6,
'domain': 'example.com', 'domain': 'example.com',
'accepted-slave-amount': '62', 'accepted-slave-amount': '64',
'rejected-slave-amount': '0', 'rejected-slave-amount': '0',
'slave-amount': '62', 'slave-amount': '64',
'rejected-slave-dict': { 'rejected-slave-dict': {
}, },
'warning-slave-dict': { 'warning-slave-dict': {
...@@ -2462,6 +2468,30 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2462,6 +2468,30 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
j['Incoming Headers']['x-forwarded-for'] j['Incoming Headers']['x-forwarded-for']
) )
def test_url_trailing_slash_absent(self):
parameter_dict = self.assertSlaveBase('url-trailing-slash-absent')
self.assertEqual(
fakeHTTPSResult(parameter_dict['domain'], '').json()['Path'],
'/index.html')
self.assertEqual(
fakeHTTPSResult(parameter_dict['domain'], 'path').json()['Path'],
'/index.html/path')
self.assertEqual(
fakeHTTPSResult(parameter_dict['domain'], 'path/').json()['Path'],
'/index.html/path/')
def test_url_trailing_slash_present(self):
parameter_dict = self.assertSlaveBase('url-trailing-slash-present')
self.assertEqual(
fakeHTTPSResult(parameter_dict['domain'], '').json()['Path'],
'/index.html')
self.assertEqual(
fakeHTTPSResult(parameter_dict['domain'], 'path').json()['Path'],
'/index.html/path')
self.assertEqual(
fakeHTTPSResult(parameter_dict['domain'], 'path/').json()['Path'],
'/index.html/path/')
def test_url_netloc_list(self): def test_url_netloc_list(self):
parameter_dict = self.assertSlaveBase('url-netloc-list') parameter_dict = self.assertSlaveBase('url-netloc-list')
result = fakeHTTPSResult(parameter_dict['domain'], 'path') result = fakeHTTPSResult(parameter_dict['domain'], 'path')
......
software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_log.txt
View file @ 4bd3dca4
...@@ -182,6 +182,12 @@ T-2/var/log/httpd/_type-zope_frontend_log ...@@ -182,6 +182,12 @@ T-2/var/log/httpd/_type-zope_frontend_log
T-2/var/log/httpd/_url-netloc-list_access_log T-2/var/log/httpd/_url-netloc-list_access_log
T-2/var/log/httpd/_url-netloc-list_backend_log T-2/var/log/httpd/_url-netloc-list_backend_log
T-2/var/log/httpd/_url-netloc-list_frontend_log T-2/var/log/httpd/_url-netloc-list_frontend_log
T-2/var/log/httpd/_url-trailing-slash-absent_access_log
T-2/var/log/httpd/_url-trailing-slash-absent_backend_log
T-2/var/log/httpd/_url-trailing-slash-absent_frontend_log
T-2/var/log/httpd/_url-trailing-slash-present_access_log
T-2/var/log/httpd/_url-trailing-slash-present_backend_log
T-2/var/log/httpd/_url-trailing-slash-present_frontend_log
T-2/var/log/httpd/_url_https-url_access_log T-2/var/log/httpd/_url_https-url_access_log
T-2/var/log/httpd/_url_https-url_backend_log T-2/var/log/httpd/_url_https-url_backend_log
T-2/var/log/httpd/_url_https-url_frontend_log T-2/var/log/httpd/_url_https-url_frontend_log
......
software/rapid-cdn/test/test_data/test.TestSlave.test00file_list_log.txt
View file @ 4bd3dca4
...@@ -182,6 +182,12 @@ T-2/var/log/httpd/_type-zope_frontend_log ...@@ -182,6 +182,12 @@ T-2/var/log/httpd/_type-zope_frontend_log
T-2/var/log/httpd/_url-netloc-list_access_log T-2/var/log/httpd/_url-netloc-list_access_log
T-2/var/log/httpd/_url-netloc-list_backend_log T-2/var/log/httpd/_url-netloc-list_backend_log
T-2/var/log/httpd/_url-netloc-list_frontend_log T-2/var/log/httpd/_url-netloc-list_frontend_log
T-2/var/log/httpd/_url-trailing-slash-absent_access_log
T-2/var/log/httpd/_url-trailing-slash-absent_backend_log
T-2/var/log/httpd/_url-trailing-slash-absent_frontend_log
T-2/var/log/httpd/_url-trailing-slash-present_access_log
T-2/var/log/httpd/_url-trailing-slash-present_backend_log
T-2/var/log/httpd/_url-trailing-slash-present_frontend_log
T-2/var/log/httpd/_url_https-url_access_log T-2/var/log/httpd/_url_https-url_access_log
T-2/var/log/httpd/_url_https-url_backend_log T-2/var/log/httpd/_url_https-url_backend_log
T-2/var/log/httpd/_url_https-url_frontend_log T-2/var/log/httpd/_url_https-url_frontend_log
......
software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test00file_list_log.txt
View file @ 4bd3dca4
...@@ -182,6 +182,12 @@ T-2/var/log/httpd/_type-zope_frontend_log ...@@ -182,6 +182,12 @@ T-2/var/log/httpd/_type-zope_frontend_log
T-2/var/log/httpd/_url-netloc-list_access_log T-2/var/log/httpd/_url-netloc-list_access_log
T-2/var/log/httpd/_url-netloc-list_backend_log T-2/var/log/httpd/_url-netloc-list_backend_log
T-2/var/log/httpd/_url-netloc-list_frontend_log T-2/var/log/httpd/_url-netloc-list_frontend_log
T-2/var/log/httpd/_url-trailing-slash-absent_access_log
T-2/var/log/httpd/_url-trailing-slash-absent_backend_log
T-2/var/log/httpd/_url-trailing-slash-absent_frontend_log
T-2/var/log/httpd/_url-trailing-slash-present_access_log
T-2/var/log/httpd/_url-trailing-slash-present_backend_log
T-2/var/log/httpd/_url-trailing-slash-present_frontend_log
T-2/var/log/httpd/_url_https-url_access_log T-2/var/log/httpd/_url_https-url_access_log
T-2/var/log/httpd/_url_https-url_backend_log T-2/var/log/httpd/_url_https-url_backend_log
T-2/var/log/httpd/_url_https-url_frontend_log T-2/var/log/httpd/_url_https-url_frontend_log
......
software/theia/buildout.hash.cfg
View file @ 4bd3dca4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance-theia] [instance-theia]
_update_hash_filename_ = instance-theia.cfg.jinja.in _update_hash_filename_ = instance-theia.cfg.jinja.in
md5sum = b31e74f018ae92607f4ff63984b33c7a md5sum = bf611d4551e6c2d4ea5fd22c3ae8ecfd
[instance] [instance]
_update_hash_filename_ = instance.cfg.in _update_hash_filename_ = instance.cfg.in
......
software/theia/instance-theia.cfg.jinja.in
View file @ 4bd3dca4
...@@ -11,7 +11,6 @@ theia-environment-parts = ...@@ -11,7 +11,6 @@ theia-environment-parts =
slapos-repository slapos-repository
runner-link runner-link
settings.json settings.json
python-enable-user-pip
theia-parts = theia-parts =
frontend-instance frontend-instance
...@@ -513,12 +512,6 @@ command = ...@@ -513,12 +512,6 @@ command =
${buildout:bin-directory}/slapos complete > $${directory:bash-completions}/slapos ${buildout:bin-directory}/slapos complete > $${directory:bash-completions}/slapos
${buildout:bin-directory}/slapos complete --shell fish > $${directory:fish-completions}/slapos.fish ${buildout:bin-directory}/slapos complete --shell fish > $${directory:fish-completions}/slapos.fish
[python-enable-user-pip]
# enable pip user installation for python extension
recipe = plone.recipe.command
stop-on-error = true
command =
${python:executable} -m ensurepip --user
# Embedded Instance # Embedded Instance
# ----------------- # -----------------
......
software/theia/software.cfg
View file @ 4bd3dca4
...@@ -138,7 +138,7 @@ needs-these-eggs-scripts-in-path = ...@@ -138,7 +138,7 @@ needs-these-eggs-scripts-in-path =
[python-for-buildout-languageserver] [python-for-buildout-languageserver]
<= python-interpreter <= python-interpreter
interpreter = ${:_buildout_section_name_} interpreter = ${:_buildout_section_name_}
executable = ${buildout:bin-directory}/${:interpreter} executable = ${:exe}
eggs += eggs +=
zc.buildout.languageserver zc.buildout.languageserver
......
stack/erp5-zope2/buildout.cfg
View file @ 4bd3dca4
...@@ -230,7 +230,7 @@ context = ...@@ -230,7 +230,7 @@ context =
key unixodbc_location unixodbc:location key unixodbc_location unixodbc:location
key wget_location wget:location key wget_location wget:location
key extra_path_list eggs:extra-paths key extra_path_list eggs:extra-paths
key python_executable_for_kernel erp5-python-interpreter-jupyter:interpreter_path key python_executable_for_kernel erp5-python-interpreter-jupyter:exe
key erp5_kernel_location erp5-kernel:location key erp5_kernel_location erp5-kernel:location
key erp5_kernel_filename erp5-kernel:filename key erp5_kernel_filename erp5-kernel:filename
key kernel_json_location kernel-json:location key kernel_json_location kernel-json:location
...@@ -493,7 +493,6 @@ extra-paths += ${eggs:extra-paths} ...@@ -493,7 +493,6 @@ extra-paths += ${eggs:extra-paths}
[erp5-python-interpreter-jupyter] [erp5-python-interpreter-jupyter]
<= erp5-python-interpreter <= erp5-python-interpreter
interpreter = pythonwitheggs_jupyter interpreter = pythonwitheggs_jupyter
interpreter_path = ${buildout:directory}/bin/${:interpreter}
eggs += eggs +=
jupyter_client jupyter_client
jupyter_core jupyter_core
......
stack/erp5/buildout.cfg
View file @ 4bd3dca4
...@@ -232,7 +232,7 @@ context = ...@@ -232,7 +232,7 @@ context =
key unixodbc_location unixodbc:location key unixodbc_location unixodbc:location
key wget_location wget:location key wget_location wget:location
key extra_path_list eggs:extra-paths key extra_path_list eggs:extra-paths
key python_executable_for_kernel erp5-python-interpreter-jupyter:interpreter_path key python_executable_for_kernel erp5-python-interpreter-jupyter:exe
key erp5_kernel_location erp5-kernel:location key erp5_kernel_location erp5-kernel:location
key erp5_kernel_filename erp5-kernel:filename key erp5_kernel_filename erp5-kernel:filename
key kernel_json_location kernel-json:location key kernel_json_location kernel-json:location
...@@ -495,7 +495,6 @@ extra-paths += ${eggs:extra-paths} ...@@ -495,7 +495,6 @@ extra-paths += ${eggs:extra-paths}
[erp5-python-interpreter-jupyter] [erp5-python-interpreter-jupyter]
<= erp5-python-interpreter <= erp5-python-interpreter
interpreter = pythonwitheggs_jupyter interpreter = pythonwitheggs_jupyter
interpreter_path = ${buildout:directory}/bin/${:interpreter}
eggs += eggs +=
jupyter_client jupyter_client
jupyter_core jupyter_core
......
stack/erp5/buildout.hash.cfg
View file @ 4bd3dca4
...@@ -50,7 +50,7 @@ md5sum = f928b9dc99f7f970caadfe7dd6f95d34 ...@@ -50,7 +50,7 @@ md5sum = f928b9dc99f7f970caadfe7dd6f95d34
[template-postfix] [template-postfix]
filename = instance-postfix.cfg.in filename = instance-postfix.cfg.in
md5sum = 8f7bfca893a01c390df7a3dc9c2410e1 md5sum = b1cdeb8fe02d47c093658b50afa7d6b9
[template-postfix-master-cf] [template-postfix-master-cf]
filename = postfix_master.cf.in filename = postfix_master.cf.in
......
stack/erp5/instance-postfix.cfg.in
View file @ 4bd3dca4
...@@ -104,7 +104,7 @@ output = ${directory:etc-postfix}/sasl_passwd ...@@ -104,7 +104,7 @@ output = ${directory:etc-postfix}/sasl_passwd
{% if relay -%} {% if relay -%}
inline = {{ "{{ host }} {{ sasl_credential }}" }} inline = {{ "{{ host }} {{ sasl_credential }}" }}
{%- else -%} {%- else -%}
inline = inline = {{ dumps("# empty") }}
{%- endif %} {%- endif %}
context = context =
key host configuration:relayhost key host configuration:relayhost
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7