Commit da630113 authored by Łukasz Nowak's avatar Łukasz Nowak

Update Release Candidate

parents e54dbf20 81c14ca3
root = true
[*.{cfg,in,md,json}]
end_of_line = lf
charset = utf-8
insert_final_newline = true
[**.json]
indent_style = space
indent_size = 2
# business templates metadata
[**/bt/**]
insert_final_newline = false
...@@ -201,4 +201,4 @@ Listen {{ ip }}:{{ port }} ...@@ -201,4 +201,4 @@ Listen {{ ip }}:{{ port }}
RewriteRule ^/{{path}}(.*) {{ backend }}/VirtualHostBase/https/{{ ip }}:{{ port }}/VirtualHostRoot/_vh_{{ path }}$1 [L,P] RewriteRule ^/{{path}}(.*) {{ backend }}/VirtualHostBase/https/{{ ip }}:{{ port }}/VirtualHostRoot/_vh_{{ path }}$1 [L,P]
{% endfor -%} {% endfor -%}
</VirtualHost> </VirtualHost>
{% endfor -%} {% endfor -%}
\ No newline at end of file
...@@ -39,9 +39,9 @@ configure-options = ...@@ -39,9 +39,9 @@ configure-options =
[apache] [apache]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
version = 2.4.43 version = 2.4.46
url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
md5sum = 791c986b1e70fe61eb44060aacc89a64 md5sum = 7d661ea5e736dac5e2761d9f49fe8361
configure-options = --disable-static configure-options = --disable-static
--enable-authn-alias --enable-authn-alias
--enable-bucketeer --enable-bucketeer
......
...@@ -14,5 +14,4 @@ ...@@ -14,5 +14,4 @@
# not need these here). # not need these here).
[template-apache-backend-conf] [template-apache-backend-conf]
filename = apache-backend.conf.in filename = apache-backend.conf.in
md5sum = ace264843228af84d025797f520ce70f md5sum = 6f51eaa9930e7a7ef959de7c510c7c2f
...@@ -10,4 +10,4 @@ url = https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz ...@@ -10,4 +10,4 @@ url = https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz
md5sum = 0f234cc21ac6cebfe373da6afa70bb1d md5sum = 0f234cc21ac6cebfe373da6afa70bb1d
configure-command = : configure-command = :
make-options = make-options =
PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
\ No newline at end of file
...@@ -3,6 +3,7 @@ extends = ...@@ -3,6 +3,7 @@ extends =
../autoconf/buildout.cfg ../autoconf/buildout.cfg
../automake/buildout.cfg ../automake/buildout.cfg
../m4/buildout.cfg ../m4/buildout.cfg
../patch/buildout.cfg
../perl/buildout.cfg ../perl/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
parts = parts =
...@@ -15,7 +16,7 @@ url = http://ftp.gnu.org/gnu/bison/bison-3.3.2.tar.xz ...@@ -15,7 +16,7 @@ url = http://ftp.gnu.org/gnu/bison/bison-3.3.2.tar.xz
md5sum = c9b552dee234b2f6b66e56b27e5234c9 md5sum = c9b552dee234b2f6b66e56b27e5234c9
environment = environment =
M4=${m4:location}/bin/m4 M4=${m4:location}/bin/m4
PATH=${autoconf:location}/bin:${automake:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${autoconf:location}/bin:${automake:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
patch-options = -p1 patch-options = -p1
patches = patches =
${:_profile_base_location_}/01_inhibit_example_generation#ee2df22601a56d738939fa760f9dc19b ${:_profile_base_location_}/01_inhibit_example_generation#ee2df22601a56d738939fa760f9dc19b
...@@ -71,4 +71,3 @@ install = ...@@ -71,4 +71,3 @@ install =
extract_dir = self.extract(self.download(*options[guessPlatform()].split())) extract_dir = self.extract(self.download(*options[guessPlatform()].split()))
os.mkdir(location) os.mkdir(location)
shutil.copy(os.path.join(extract_dir, 'chromedriver'), location) shutil.copy(os.path.join(extract_dir, 'chromedriver'), location)
...@@ -28,5 +28,3 @@ entry-points = ...@@ -28,5 +28,3 @@ entry-points =
scripts = scripts =
paster=cloudooo_paster paster=cloudooo_paster
runCloudoooUnitTest runCloudoooUnitTest
...@@ -29,4 +29,4 @@ stop-on-error = true ...@@ -29,4 +29,4 @@ stop-on-error = true
update-command = ${:command} update-command = ${:command}
command = ${coreutils-output:test} -x ${:crond} -a -x ${:crontab} -a ! -u ${:crontab} command = ${coreutils-output:test} -x ${:crond} -a -x ${:crontab} -a ! -u ${:crontab}
crond = ${dcron:location}/sbin/crond crond = ${dcron:location}/sbin/crond
crontab = ${dcron:location}/bin/crontab crontab = ${dcron:location}/bin/crontab
\ No newline at end of file
...@@ -16,4 +16,4 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -16,4 +16,4 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
dtach-bin = dtach dtach-bin = dtach
command = command =
mkdir -p ${:location}/bin mkdir -p ${:location}/bin
cp -rp ${dtach-build:compile-directory}/dtach-${dtach-build:version}/${:dtach-bin} ${:location}/bin cp -rp ${dtach-build:compile-directory}/dtach-${dtach-build:version}/${:dtach-bin} ${:location}/bin
\ No newline at end of file
...@@ -23,4 +23,4 @@ post-install = cp f2c ${:location} ...@@ -23,4 +23,4 @@ post-install = cp f2c ${:location}
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
environment = environment =
CPPFLAGS=-I${libf2c:location}/include CPPFLAGS=-I${libf2c:location}/include
LDFLAGS=-L${libf2c:location}/lib LDFLAGS=-L${libf2c:location}/lib
\ No newline at end of file
...@@ -119,4 +119,4 @@ environment = ...@@ -119,4 +119,4 @@ environment =
PKG_CONFIG_PATH=${:pkg_config_depends} PKG_CONFIG_PATH=${:pkg_config_depends}
CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libtheora:location}/include -I${opencore-amr:location}/include -I${lame:location}/include CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libtheora:location}/include -I${opencore-amr:location}/include -I${lame:location}/include
LDFLAGS=-Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -Wl,-rpath=${zlib:location}/lib
PATH=${pkgconfig:location}/bin:${yasm:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:${yasm:location}/bin:%(PATH)s
\ No newline at end of file
[template-fonts-conf] [template-fonts-conf]
filename = fonts.conf.in filename = fonts.conf.in
md5sum = 6967e553630d107fc0a59b14de8b0251 md5sum = 6967e553630d107fc0a59b14de8b0251
...@@ -32,4 +32,3 @@ eggs = ...@@ -32,4 +32,3 @@ eggs =
futures futures
PIL PIL
gateone gateone
...@@ -22,3 +22,4 @@ strip-top-level-dir = true ...@@ -22,3 +22,4 @@ strip-top-level-dir = true
[versions] [versions]
geoip2 = 2.9.0 geoip2 = 2.9.0
maxminddb = 1.5.4
...@@ -15,4 +15,4 @@ configure-options = ...@@ -15,4 +15,4 @@ configure-options =
# restrict building to libraries only, we don't care about binaries # restrict building to libraries only, we don't care about binaries
# and specially docs which would require more dependencies (e.g. xmlto): # and specially docs which would require more dependencies (e.g. xmlto):
make-options = make-options =
SUBDIRS=lib SUBDIRS=lib
\ No newline at end of file
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
extends = extends =
../gettext/buildout.cfg ../gettext/buildout.cfg
../libffi/buildout.cfg ../libffi/buildout.cfg
../patch/buildout.cfg
../pcre/buildout.cfg ../pcre/buildout.cfg
../perl/buildout.cfg ../perl/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
...@@ -25,13 +26,14 @@ configure-options = ...@@ -25,13 +26,14 @@ configure-options =
--disable-xattr --disable-xattr
--disable-man --disable-man
environment = environment =
PATH=${gettext:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
LIBFFI_CFLAGS=-I${libffi:location}/include LIBFFI_CFLAGS=-I${libffi:location}/include
LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
PCRE_CFLAGS=-I${pcre:location}/include PCRE_CFLAGS=-I${pcre:location}/include
PCRE_LIBS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -lpcre PCRE_LIBS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -lpcre
post-install = rm %(location)s/bin/gtester-report
[x86-cygwin-glib] [x86-cygwin-glib]
patches = patches =
......
...@@ -5,4 +5,4 @@ url = https://git.savannah.gnu.org/gitweb/?p=config.git;a=snapshot;h=5e531d39185 ...@@ -5,4 +5,4 @@ url = https://git.savannah.gnu.org/gitweb/?p=config.git;a=snapshot;h=5e531d39185
md5sum = ffe323c69b6f21aa28e900f76febd3d6 md5sum = ffe323c69b6f21aa28e900f76febd3d6
configure-command = : configure-command = :
make-targets = make-targets =
make-binary = cp -r . @@LOCATION@@ make-binary = cp -r . @@LOCATION@@
\ No newline at end of file
...@@ -15,8 +15,8 @@ extends = ...@@ -15,8 +15,8 @@ extends =
[groonga] [groonga]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://packages.groonga.org/source/groonga/groonga-9.1.2.tar.gz url = https://packages.groonga.org/source/groonga/groonga-10.0.5.tar.gz
md5sum = 5266c49b758dde744854cb8cfe025812 md5sum = 12f5c7b522afd72d0be2caa1e5f254da
groonga-plugin-dir = @@LOCATION@@/lib/groonga/plugins/ groonga-plugin-dir = @@LOCATION@@/lib/groonga/plugins/
# temporary patch to respect more tokens in natural language mode. # temporary patch to respect more tokens in natural language mode.
patches = patches =
......
...@@ -55,4 +55,3 @@ environment = ...@@ -55,4 +55,3 @@ environment =
# not taken from pkg-config result... # not taken from pkg-config result...
CPPFLAGS=-I${cairo:location}/include -I${inputproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${renderext:location}/include -I${libXext:location}/include -I${libX11:location}/include -I${libXinerama:location}/include -I${gdk-pixbuf:location}/include -I${libXrandr:location}/include -I${xfixes:location}/include -I${libXcomposite:location}/include -I${xdamage:location}/include -I${fixesproto:location}/include CPPFLAGS=-I${cairo:location}/include -I${inputproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${renderext:location}/include -I${libXext:location}/include -I${libX11:location}/include -I${libXinerama:location}/include -I${gdk-pixbuf:location}/include -I${libXrandr:location}/include -I${xfixes:location}/include -I${libXcomposite:location}/include -I${xdamage:location}/include -I${fixesproto:location}/include
LDFLAGS=-L${libX11:location}/lib -L${libXi:location}/lib -L${libXext:location}/lib -L${libXrender:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXinerama:location}/lib -Wl,-rpath=${libXinerama:location}/lib -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${libXrandr:location}/lib -Wl,-rpath=${libXrandr:location}/lib -L${xfixes:location}/lib -Wl,-rpath=${xfixes:location}/lib -L${libXcomposite:location}/lib -Wl,-rpath=${libXcomposite:location}/lib -L${xdamage:location}/lib -Wl,-rpath=${xdamage:location}/lib LDFLAGS=-L${libX11:location}/lib -L${libXi:location}/lib -L${libXext:location}/lib -L${libXrender:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXinerama:location}/lib -Wl,-rpath=${libXinerama:location}/lib -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${libXrandr:location}/lib -Wl,-rpath=${libXrandr:location}/lib -L${xfixes:location}/lib -Wl,-rpath=${xfixes:location}/lib -L${libXcomposite:location}/lib -Wl,-rpath=${libXcomposite:location}/lib -L${xdamage:location}/lib -Wl,-rpath=${xdamage:location}/lib
[buildout]
extends =
../cmake/buildout.cfg
../openssl/buildout.cfg
../zlib/buildout.cfg
../bison/buildout.cfg
../ruby/buildout.cfg
parts =
h2o
[h2o]
recipe = slapos.recipe.cmmi
shared = True
url = https://github.com/h2o/h2o/archive/v2.2.6.tar.gz
md5sum = 075283f92347fcb7b2f87dcc5251b922
configure-command = ${cmake:location}/bin/cmake .
configure-options =
-DCMAKE_INSTALL_PREFIX=@@LOCATION@@
-DWITH_MRUBY=on
-DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}"
-DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}"
-DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH}
CMAKE_CFLAGS=-I${openssl:location}/include -I${zlib:location}/include
CMAKE_LIBRARY_PATH=${openssl:location}/lib:${zlib:location}/lib
environment =
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig ${zlib:location}/lib/pkgconfig ${ruby:location}/lib/pkgconfig ${bison:location}/lib/pkgconfig
CMAKE_INCLUDE_PATH=${openssl:location}/include:${zlib:location}/include
CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
PATH=${ruby:location}/bin:${bison:location}/bin:%(PATH)s
...@@ -13,8 +13,8 @@ parts = haproxy ...@@ -13,8 +13,8 @@ parts = haproxy
[haproxy] [haproxy]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.15.tar.gz url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.17.tar.gz
md5sum = 59f892991476f08e2d16ac460c502f61 md5sum = 786a967c73cc1455c938d42fbe333bfe
configure-command = true configure-command = true
# for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET, # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
# otherwise use "generic". # otherwise use "generic".
......
...@@ -102,5 +102,3 @@ input = inline: ...@@ -102,5 +102,3 @@ input = inline:
#!/bin/sh #!/bin/sh
export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile
exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@" exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@"
...@@ -13,4 +13,4 @@ md5sum = 1f9f9155682fe8946a97c08896109508 ...@@ -13,4 +13,4 @@ md5sum = 1f9f9155682fe8946a97c08896109508
environment = environment =
PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:%(PATH)s
configure-options = configure-options =
--prefix="${buildout:parts-directory}/${:_buildout_section_name_}" --prefix="${buildout:parts-directory}/${:_buildout_section_name_}"
\ No newline at end of file
...@@ -20,4 +20,4 @@ configure-options = ...@@ -20,4 +20,4 @@ configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_} --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
make-options = -j1 make-options = -j1
environment = environment =
PATH=${bison:location}/bin:%(PATH)s PATH=${bison:location}/bin:%(PATH)s
\ No newline at end of file
[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.7.10.tar.gz
md5sum = 57dc267e2949cdecb651a929f9206572
location = @@LOCATION@@
configure-options =
--with-python=no
--with-python3=no
# we set -lpthread to workaround https://github.com/stevegrubb/libcap-ng/issues/9
environment =
LDFLAGS=-lpthread
...@@ -25,4 +25,4 @@ post-install = ...@@ -25,4 +25,4 @@ post-install =
[ -d lib64 ] && ln -s lib64 lib [ -d lib64 ] && ln -s lib64 lib
[libcap] [libcap]
<= libcap2 <= libcap2
\ No newline at end of file
...@@ -6,4 +6,3 @@ parts = ...@@ -6,4 +6,3 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://hyperrealm.github.io/libconfig/dist/libconfig-1.7.2.tar.gz url = https://hyperrealm.github.io/libconfig/dist/libconfig-1.7.2.tar.gz
md5sum = 6bd98ee3a6e6b9126c82c916d7a9e690 md5sum = 6bd98ee3a6e6b9126c82c916d7a9e690
...@@ -26,5 +26,3 @@ configure-options = ...@@ -26,5 +26,3 @@ configure-options =
--without-libinnodb-prefix --without-libinnodb-prefix
--without-libsasl-prefix --without-libsasl-prefix
--without-libsasl2-prefix --without-libsasl2-prefix
...@@ -9,4 +9,4 @@ recipe = slapos.recipe.cmmi ...@@ -9,4 +9,4 @@ recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz url = http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz
md5sum = 5fe00cda18ca5daeb43762b80c38e06e md5sum = 5fe00cda18ca5daeb43762b80c38e06e
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess config/ pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess config/
\ No newline at end of file
...@@ -6,4 +6,3 @@ parts = ...@@ -6,4 +6,3 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://freefr.dl.sourceforge.net/project/lksctp/lksctp-tools/lksctp-tools-1.0.17.tar.gz url = https://freefr.dl.sourceforge.net/project/lksctp/lksctp-tools/lksctp-tools-1.0.17.tar.gz
md5sum = 68e9b8fa4d4e331029b247b72d46d7a5 md5sum = 68e9b8fa4d4e331029b247b72d46d7a5
...@@ -20,4 +20,3 @@ make-options = ...@@ -20,4 +20,3 @@ make-options =
environment = environment =
PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s
[buildout] [buildout]
extends = extends =
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
../patch/buildout.cfg
parts = parts =
m4 m4
...@@ -10,7 +11,7 @@ shared = true ...@@ -10,7 +11,7 @@ shared = true
url = http://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz url = http://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz
md5sum = 730bb15d96fffe47e148d1e09235af82 md5sum = 730bb15d96fffe47e148d1e09235af82
environment = environment =
PATH=${xz-utils:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:${patch:location}/bin:%(PATH)s
patch-options = -p1 patch-options = -p1
patches = patches =
${:_profile_base_location_}/01-fix-ftbfs-with-glibc-2.28.patch#058a786425e507f911649205b61ffcac ${:_profile_base_location_}/01-fix-ftbfs-with-glibc-2.28.patch#058a786425e507f911649205b61ffcac
...@@ -30,14 +30,13 @@ parts = ...@@ -30,14 +30,13 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
version = 10.4.13 version = 10.4.14
md5sum = 89e832d6d89dc9bd4c98657a954e0f2c md5sum = 9801120ae8acb33904ab4a3366a7714f
location = @@LOCATION@@ location = @@LOCATION@@
pre-configure = pre-configure =
set '\bSET(PLUGIN_AUTH_PAM YES)' cmake/build_configurations/mysql_release.cmake set '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
grep -q "$@" grep -q "$@"
sed -i "/$1/d" "$2" sed -i "/$1/d" "$2"
mv cmake/Findzstd.cmake cmake/FindZSTD.cmake
configure-command = ${cmake:location}/bin/cmake configure-command = ${cmake:location}/bin/cmake
configure-options = configure-options =
-DCMAKE_INSTALL_PREFIX=${:location} -DCMAKE_INSTALL_PREFIX=${:location}
...@@ -97,8 +96,8 @@ post-install = ...@@ -97,8 +96,8 @@ post-install =
# as plugin-dir ( https://mariadb.com/kb/en/server-system-variables/#plugin_dir ) # as plugin-dir ( https://mariadb.com/kb/en/server-system-variables/#plugin_dir )
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://packages.groonga.org/source/mroonga/mroonga-9.12.tar.gz url = https://packages.groonga.org/source/mroonga/mroonga-10.05.tar.gz
md5sum = d0af673f1bad3b9ccf33870bb2344a25 md5sum = a690811be5cc0593acc12ecf4ac9c40f
pre-configure = pre-configure =
rm -rf fake_mariadb_source rm -rf fake_mariadb_source
mkdir -p fake_mariadb_source mkdir -p fake_mariadb_source
......
...@@ -4,6 +4,7 @@ extends = ...@@ -4,6 +4,7 @@ extends =
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../libpng/buildout.cfg ../libpng/buildout.cfg
../freetype/buildout.cfg ../freetype/buildout.cfg
./buildout.hash.cfg
parts = parts =
matplotlib matplotlib
...@@ -11,10 +12,9 @@ parts = ...@@ -11,10 +12,9 @@ parts =
[matplotlibrc] [matplotlibrc]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
template = ${:_profile_base_location_}/matplotlibrc.in template = ${:_profile_base_location_}/${:filename}
rendered = ${matplotlibrc:location}/matplotlibrc rendered = ${matplotlibrc:location}/matplotlibrc
mode = 0644 mode = 0644
md5sum = 849f48f08bea21dd10d3825867cb1561
backend = agg backend = agg
context = context =
key backend matplotlibrc:backend key backend matplotlibrc:backend
......
[matplotlibrc]
filename = matplotlibrc.in
md5sum = 47a737b8f4db0b329e2b3fd70e5a325c
backend : {{ backend }} backend : {{ backend }}
\ No newline at end of file
...@@ -136,4 +136,3 @@ component = vbucketmigrator ...@@ -136,4 +136,3 @@ component = vbucketmigrator
component-configure-options = component-configure-options =
--without-sasl --without-sasl
--with-isasl --with-isasl
...@@ -5,4 +5,4 @@ parts = netcat ...@@ -5,4 +5,4 @@ parts = netcat
[netcat] [netcat]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://sourceforge.net/projects/netcat/files/netcat/0.7.1/netcat-0.7.1.tar.gz url = http://sourceforge.net/projects/netcat/files/netcat/0.7.1/netcat-0.7.1.tar.gz
md5sum = 088def25efe04dcdd1f8369d8926ab34 md5sum = 088def25efe04dcdd1f8369d8926ab34
\ No newline at end of file
...@@ -38,4 +38,4 @@ stop-on-error = true ...@@ -38,4 +38,4 @@ stop-on-error = true
update-command = ${:command} update-command = ${:command}
command = ${coreutils-output:test} -x ${:ssh} -a -x ${:keygen} command = ${coreutils-output:test} -x ${:ssh} -a -x ${:keygen}
ssh = ${openssh:location}/bin/ssh ssh = ${openssh:location}/bin/ssh
keygen = ${openssh:location}/bin/ssh-keygen keygen = ${openssh:location}/bin/ssh-keygen
\ No newline at end of file
[buildout]
extends =
../perl/buildout.cfg
parts =
perl-Image-ExifTool
[perl-Image-ExifTool]
<= perl-CPAN-package
module = Image/Image-ExifTool
version = 12.00
md5sum = 8c3f99a9a8d110ba340ee3f7063c940e
...@@ -127,4 +127,3 @@ template = inline: ...@@ -127,4 +127,3 @@ template = inline:
mode = 0755 mode = 0755
rendered = ${buildout:bin-directory}/${:_buildout_section_name_} rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
perl-bin = ${:rendered} perl-bin = ${:rendered}
...@@ -11,4 +11,4 @@ configure-options = ...@@ -11,4 +11,4 @@ configure-options =
--disable-static --disable-static
[x86-cygwin-popt] [x86-cygwin-popt]
patches = ${:_profile_base_location_}/cygwin-popt-1.16-src.patch patches = ${:_profile_base_location_}/cygwin-popt-1.16-src.patch
\ No newline at end of file
...@@ -18,4 +18,4 @@ shared = true ...@@ -18,4 +18,4 @@ shared = true
url = https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-cpp-3.4.0.tar.gz url = https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-cpp-3.4.0.tar.gz
md5sum = 6d59dad503bea5ad420fd09ddad84481 md5sum = 6d59dad503bea5ad420fd09ddad84481
environment = environment =
LDFLAGS=-Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${zlib:location}/lib
\ No newline at end of file
...@@ -4,6 +4,7 @@ extends = ...@@ -4,6 +4,7 @@ extends =
../gnutls/buildout.cfg ../gnutls/buildout.cfg
../libaio/buildout.cfg ../libaio/buildout.cfg
../libcap/buildout.cfg ../libcap/buildout.cfg
../libcap-ng/buildout.cfg
../libpng/buildout.cfg ../libpng/buildout.cfg
../libuuid/buildout.cfg ../libuuid/buildout.cfg
../ncurses/buildout.cfg ../ncurses/buildout.cfg
...@@ -32,8 +33,8 @@ configure-options = ...@@ -32,8 +33,8 @@ configure-options =
--enable-vnc --enable-vnc
--enable-vnc-png --enable-vnc-png
--disable-vnc-jpeg --disable-vnc-jpeg
--extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${ncurses:location}/include -I${zlib:location}/include -I${libpng:location}/include -I${libaio:location}/include -I${attr:location}/include -I${libcap:location}/include" --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${ncurses:location}/include -I${zlib:location}/include -I${libpng:location}/include -I${libaio:location}/include -I${attr:location}/include -I${libcap:location}/include -I${libcap-ng:location}/include "
--extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libgpg-error:location}/lib -L${libgpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls -L${attr:location}/lib -Wl,-rpath=${attr:location}/lib -L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib" --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libgpg-error:location}/lib -L${libgpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls -L${attr:location}/lib -Wl,-rpath=${attr:location}/lib -L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib -L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib"
--disable-werror --disable-werror
--disable-xfsctl --disable-xfsctl
environment = environment =
...@@ -63,16 +64,16 @@ md5sum = df0ce86d0b1d81e232ad08eef58754ed ...@@ -63,16 +64,16 @@ md5sum = df0ce86d0b1d81e232ad08eef58754ed
[debian-amd64-stretch-netinst.iso] [debian-amd64-stretch-netinst.iso]
<= debian-amd64-netinst-base <= debian-amd64-netinst-base
version = 9.12.0 version = 9.13.0
md5sum = 50e7919f4276787f3a4631544edceae3 md5sum = 6097fdb9cbab47c96471274b9044e983
[debian-amd64-netinst.iso] [debian-amd64-netinst.iso]
# Download the installer of Debian 10 (Buster) # Download the installer of Debian 10 (Buster)
# XXX: This is not the latest version because # XXX: This is not the latest version because
# Debian does not provide a stable URL for it. # Debian does not provide a stable URL for it.
<= debian-amd64-netinst-base <= debian-amd64-netinst-base
version = 10.3.0 version = 10.4.0
md5sum = 5956434be4b81e6376151b64ef9b1596 md5sum = e2ddc8268e4c164c32b4ba25be52c9af
[debian-amd64-testing-netinst.iso] [debian-amd64-testing-netinst.iso]
<= debian-amd64-netinst-base <= debian-amd64-netinst-base
......
...@@ -14,4 +14,3 @@ recipe = zc.recipe.egg ...@@ -14,4 +14,3 @@ recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
slapos.cookbook slapos.cookbook
...@@ -30,4 +30,4 @@ command = set -e ...@@ -30,4 +30,4 @@ command = set -e
go.importpath = github.com/signal18/replication-manager go.importpath = github.com/signal18/replication-manager
repository = https://github.com/signal18/replication-manager repository = https://github.com/signal18/replication-manager
branch = 2.1 branch = 2.1
revision = 9167a82c81af8f7be41cf51bc9be8a37dc3d8c03 revision = 9167a82c81af8f7be41cf51bc9be8a37dc3d8c03
\ No newline at end of file
...@@ -29,4 +29,4 @@ location = ${:output} ...@@ -29,4 +29,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.9.6 revision = v0.9.6
\ No newline at end of file
...@@ -27,4 +27,4 @@ configure-command = ...@@ -27,4 +27,4 @@ configure-command =
environment = environment =
PATH=${autoconf:location}/bin:${automake:location}/bin:${git:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s PATH=${autoconf:location}/bin:${automake:location}/bin:${git:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
CFLAGS = -I${zlib:location}/include CFLAGS = -I${zlib:location}/include
LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
\ No newline at end of file
...@@ -13,10 +13,6 @@ extensions = ...@@ -13,10 +13,6 @@ extensions =
extends-cache = extends-cache extends-cache = extends-cache
download-cache = download-cache download-cache = download-cache
[gcc]
# force usage of gcc from slapos
max_version = 0
# Uguu, upstream buildout.cfg must be patched as it works the other way # Uguu, upstream buildout.cfg must be patched as it works the other way
# around from a packager point of view at least, thus at the end static # around from a packager point of view at least, thus at the end static
# path, such as Python HOME directory, are wrong... # path, such as Python HOME directory, are wrong...
......
...@@ -11,4 +11,4 @@ url = http://www.dest-unreach.org/socat/download/socat-${:version}.tar.gz ...@@ -11,4 +11,4 @@ url = http://www.dest-unreach.org/socat/download/socat-${:version}.tar.gz
version = 1.7.3.2 version = 1.7.3.2
md5sum = aec3154f7854580cfab0c2d81e910519 md5sum = aec3154f7854580cfab0c2d81e910519
environment = environment =
LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
\ No newline at end of file
...@@ -8,8 +8,8 @@ parts = ...@@ -8,8 +8,8 @@ parts =
[sqlite3] [sqlite3]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://sqlite.org/2019/sqlite-autoconf-3300100.tar.gz url = https://sqlite.org/2020/sqlite-autoconf-3320300.tar.gz
md5sum = 51252dc6bc9094ba11ab151ba650ff3c md5sum = 2e3911a3c15e85c2f2d040154bbe5ce3
configure-options = configure-options =
--disable-static --disable-static
--enable-readline --enable-readline
......
...@@ -42,5 +42,3 @@ environment = ...@@ -42,5 +42,3 @@ environment =
CPPFLAGS=${:CMAKE_CFLAGS} CPPFLAGS=${:CMAKE_CFLAGS}
LDFLAGS=-L${bzip2:location}/lib -L${mbedtls:location}/lib -L${lksctp-tools:location}/lib -L${libconfig:location}/lib -L${boost-lib:location}/lib -L${fftw3:location}/lib LDFLAGS=-L${bzip2:location}/lib -L${mbedtls:location}/lib -L${lksctp-tools:location}/lib -L${libconfig:location}/lib -L${boost-lib:location}/lib -L${fftw3:location}/lib
PATH=${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
...@@ -25,4 +25,4 @@ environment = ...@@ -25,4 +25,4 @@ environment =
PATH=${m4:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:%(PATH)s PATH=${m4:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:%(PATH)s
CPPFLAGS=-I${gettext:location}/include -I${mariadb:location}/include CPPFLAGS=-I${gettext:location}/include -I${mariadb:location}/include
LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${mariadb:location}/lib -Wl,-rpath=${mariadb:location}/lib LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${mariadb:location}/lib -Wl,-rpath=${mariadb:location}/lib
ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${gettext:location}/share/aclocal:${libtool:location}/share/aclocal ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${gettext:location}/share/aclocal:${libtool:location}/share/aclocal
\ No newline at end of file
...@@ -50,4 +50,3 @@ recipe = slapos.recipe.build:download ...@@ -50,4 +50,3 @@ recipe = slapos.recipe.build:download
destination = ${tesseract-traineddata:location}/tessdata/osd.traineddata destination = ${tesseract-traineddata:location}/tessdata/osd.traineddata
url = https://github.com/tesseract-ocr/tessdata/raw/590567f20dc044f6948a8e2c61afc714c360ad0e/osd.traineddata url = https://github.com/tesseract-ocr/tessdata/raw/590567f20dc044f6948a8e2c61afc714c360ad0e/osd.traineddata
md5sum = 7611737524efd1ce2dde67eff629bbcf md5sum = 7611737524efd1ce2dde67eff629bbcf
...@@ -31,4 +31,4 @@ recipe = plone.recipe.command ...@@ -31,4 +31,4 @@ recipe = plone.recipe.command
stop-on-error = true stop-on-error = true
update-command = ${:command} update-command = ${:command}
command = ${coreutils-output:test} -x ${:catalina} command = ${coreutils-output:test} -x ${:catalina}
catalina = ${tomcat7:location}/bin/catalina.sh catalina = ${tomcat7:location}/bin/catalina.sh
\ No newline at end of file
[buildout] [buildout]
extends = extends =
../perl/buildout.cfg ../perl/buildout.cfg
../libcap-ng/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
[util-linux] [util-linux]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true
url = https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-2.31.1.tar.xz url = https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-2.31.1.tar.xz
md5sum = 7733b583dcb51518944d42aa62ef19ea md5sum = 7733b583dcb51518944d42aa62ef19ea
configure-options = configure-options =
...@@ -31,7 +33,7 @@ configure-options = ...@@ -31,7 +33,7 @@ configure-options =
--disable-setterm --disable-setterm
--enable-libsmartcols --enable-libsmartcols
--disable-switch_root --disable-switch_root
--disable-tinfo --without-tinfo
--disable-tls --disable-tls
--disable-ul --disable-ul
--disable-unshare --disable-unshare
...@@ -43,5 +45,8 @@ configure-options = ...@@ -43,5 +45,8 @@ configure-options =
--without-slang --without-slang
--without-selinux --without-selinux
--without-audit --without-audit
--with-cap-ng=${libcap-ng:location}
environment = environment =
PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib
CFLAGS=-I${libcap-ng:location}/include
...@@ -11,4 +11,4 @@ url = http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz ...@@ -11,4 +11,4 @@ url = http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz
md5sum = faf33a3945edbe4c848627750856cbeb md5sum = faf33a3945edbe4c848627750856cbeb
environment = environment =
CPPFLAGS = -I${zlib:location}/include -I${libuuid:location}/include CPPFLAGS = -I${zlib:location}/include -I${libuuid:location}/include
LDFLAGS = -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libuuid:location}/lib -Wl,-R${libuuid:location}/lib LDFLAGS = -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libuuid:location}/lib -Wl,-R${libuuid:location}/lib
\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"python2 ./format-json", "python2 ./format-json",
"git add" "git add"
], ],
"{components,software,stack}/**": [ "{component,software,stack}/**": [
"python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"python2\", \"./update-hash\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'", "python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"python2\", \"./update-hash\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'",
"python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"git\", \"add\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'" "python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"git\", \"add\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'"
] ]
......
...@@ -32,4 +32,4 @@ resthost=%(listen_ip)s ...@@ -32,4 +32,4 @@ resthost=%(listen_ip)s
#operator=accords #operator=accords
# Password (default: co-system) # Password (default: co-system)
#password=co-system #password=co-system
\ No newline at end of file
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
tls="0" tls="0"
current="0" current="0"
/> />
</os_configs> </os_configs>
\ No newline at end of file
...@@ -15,4 +15,3 @@ if expected != "" and value != expected: ...@@ -15,4 +15,3 @@ if expected != "" and value != expected:
if not_expected != "" and value == not_expected: if not_expected != "" and value == not_expected:
print "FAIL: %%s == %%s" %% (value, not_expected) print "FAIL: %%s == %%s" %% (value, not_expected)
sys.exit(127) sys.exit(127)
...@@ -121,4 +121,4 @@ TypesConfig "%(mime_types)s" ...@@ -121,4 +121,4 @@ TypesConfig "%(mime_types)s"
AddType application/x-compress .Z AddType application/x-compress .Z
AddType application/x-gzip .gz .tgz AddType application/x-gzip .gz .tgz
AddType application/x-httpd-php .php .phtml .php5 .php4 AddType application/x-httpd-php .php .phtml .php5 .php4
AddType application/x-httpd-php-source .phps AddType application/x-httpd-php-source .phps
\ No newline at end of file
...@@ -16,4 +16,4 @@ file_uploads = On ...@@ -16,4 +16,4 @@ file_uploads = On
upload_max_filesize = 8M upload_max_filesize = 8M
post_max_size = 8M post_max_size = 8M
magic_quotes_gpc=Off magic_quotes_gpc=Off
output_buffering=Off output_buffering=Off
\ No newline at end of file
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
echo $$ > %(pid_file)s echo $$ > %(pid_file)s
exec %(command)s \ exec %(command)s \
%(parameter)s %(parameter)s
\ No newline at end of file
...@@ -2,4 +2,3 @@ ...@@ -2,4 +2,3 @@
path %(path)s path %(path)s
# pack-gc false # pack-gc false
</filestorage> </filestorage>
...@@ -50,4 +50,3 @@ pycurl = 7.43.0 ...@@ -50,4 +50,3 @@ pycurl = 7.43.0
slapos.recipe.download = 1.0 slapos.recipe.download = 1.0
slapos.recipe.template = 4.4 slapos.recipe.template = 4.4
smmap = 0.9.0 smmap = 0.9.0
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[instance] [instance]
filename = instance.cfg filename = instance.cfg
md5sum = 4c7936accb3658871b635158198b7905 md5sum = 1fbb72e4305ded9614ee80c0ee17b672
[instance-apache] [instance-apache]
filename = instance-apachephp.cfg filename = instance-apachephp.cfg
...@@ -30,4 +30,4 @@ md5sum = c5695762361b801c284ee23a150cd1f1 ...@@ -30,4 +30,4 @@ md5sum = c5695762361b801c284ee23a150cd1f1
[template-httpd-conf-hash] [template-httpd-conf-hash]
filename = templates/apache.conf.in filename = templates/apache.conf.in
md5sum = 6788381fadd8ca96f892d33df3163da0 md5sum = 4fc3f853abf702aeb6653942d4fb85d8
...@@ -9,4 +9,4 @@ offline = true ...@@ -9,4 +9,4 @@ offline = true
[switch_softwaretype] [switch_softwaretype]
recipe = slapos.cookbook:softwaretype recipe = slapos.cookbook:softwaretype
default = ${instance-apache:output} default = ${instance-apache:output}
mariadb = ${instance-mariadb:output} mariadb = ${instance-mariadb:output}
\ No newline at end of file
...@@ -105,4 +105,4 @@ LoadModule rewrite_module modules/mod_rewrite.so ...@@ -105,4 +105,4 @@ LoadModule rewrite_module modules/mod_rewrite.so
LoadModule headers_module modules/mod_headers.so LoadModule headers_module modules/mod_headers.so
LoadModule dir_module modules/mod_dir.so LoadModule dir_module modules/mod_dir.so
LoadModule php5_module modules/libphp5.so LoadModule php5_module modules/libphp5.so
LoadModule alias_module modules/mod_alias.so LoadModule alias_module modules/mod_alias.so
\ No newline at end of file
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = f686f765e55d1dce2e55a400f0714b3e md5sum = 4adae801babadd9aed6112c1ff209076
[template-apache-frontend] [template-apache-frontend]
filename = instance-apache-frontend.cfg filename = instance-apache-frontend.cfg
...@@ -34,7 +34,7 @@ md5sum = b3d5a3573fa381fec954ad5cbf1575a0 ...@@ -34,7 +34,7 @@ md5sum = b3d5a3573fa381fec954ad5cbf1575a0
[template-replicate-publish-slave-information] [template-replicate-publish-slave-information]
filename = templates/replicate-publish-slave-information.cfg.in filename = templates/replicate-publish-slave-information.cfg.in
md5sum = 665e83d660c9b779249b2179d7ce4b4e md5sum = 7c0025a35dc62eb3cbfd07a6b04d659e
[template-apache-frontend-configuration] [template-apache-frontend-configuration]
filename = templates/apache.conf.in filename = templates/apache.conf.in
...@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b ...@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
[template-default-virtualhost] [template-default-virtualhost]
filename = templates/000.conf.in filename = templates/000.conf.in
md5sum = d98a01182f38868612948c87d5231428 md5sum = 5fcc11ea7f3eae38b0135b94dfc42dd5
[template-default-slave-virtualhost] [template-default-slave-virtualhost]
filename = templates/default-virtualhost.conf.in filename = templates/default-virtualhost.conf.in
...@@ -58,7 +58,7 @@ md5sum = 7890469ecc5e7f46be5b2c3074a09b52 ...@@ -58,7 +58,7 @@ md5sum = 7890469ecc5e7f46be5b2c3074a09b52
[template-cached-slave-virtualhost] [template-cached-slave-virtualhost]
filename = templates/cached-virtualhost.conf.in filename = templates/cached-virtualhost.conf.in
md5sum = 1a1a53d9ac4a1591c017d86850a94796 md5sum = f97dfcfae80527e242f285c9ebf11b27
[template-log-access] [template-log-access]
filename = templates/template-log-access.conf.in filename = templates/template-log-access.conf.in
...@@ -66,11 +66,11 @@ md5sum = a20683faba37b5b9c035783e811dd88d ...@@ -66,11 +66,11 @@ md5sum = a20683faba37b5b9c035783e811dd88d
[template-empty] [template-empty]
filename = templates/empty.in filename = templates/empty.in
md5sum = c2314c3a9c3412a38d14b312d3df83c1 md5sum = 7155b18edfe128825b8d1f48071454a6
[template-wrapper] [template-wrapper]
filename = templates/wrapper.in filename = templates/wrapper.in
md5sum = 8cde04bfd0c0e9bd56744b988275cfd8 md5sum = 975177dedf677d24e14cede5d13187ce
[template-trafficserver-records-config] [template-trafficserver-records-config]
filename = templates/trafficserver/records.config.jinja2 filename = templates/trafficserver/records.config.jinja2
...@@ -94,7 +94,7 @@ md5sum = 82d74a7f2aceb2b4a7acc6259291b7f2 ...@@ -94,7 +94,7 @@ md5sum = 82d74a7f2aceb2b4a7acc6259291b7f2
[template-apache-lazy-script-call] [template-apache-lazy-script-call]
filename = templates/apache-lazy-script-call.sh.in filename = templates/apache-lazy-script-call.sh.in
md5sum = ebe5d3d19923eb812a40019cb11276d8 md5sum = 44e235d0451932f1232f9d9e0ecc59f9
[template-apache-graceful-script] [template-apache-graceful-script]
filename = templates/apache-graceful-script.sh.in filename = templates/apache-graceful-script.sh.in
......
...@@ -47,4 +47,3 @@ extra-context = ...@@ -47,4 +47,3 @@ extra-context =
# Must match the key id in [switch-softwaretype] which uses this section. # Must match the key id in [switch-softwaretype] which uses this section.
raw software_type RootSoftwareInstance-default-custom-personal-replicate raw software_type RootSoftwareInstance-default-custom-personal-replicate
raw template_monitor ${monitor2-template:rendered} raw template_monitor ${monitor2-template:rendered}
...@@ -14,4 +14,3 @@ smmap = 0.9.0 ...@@ -14,4 +14,3 @@ smmap = 0.9.0
numpy = 1.16.4 numpy = 1.16.4
websockify = 0.8.0 websockify = 0.8.0
...@@ -19,4 +19,4 @@ ...@@ -19,4 +19,4 @@
ServerName www.example.org ServerName www.example.org
ErrorDocument 404 /notfound.html ErrorDocument 404 /notfound.html
</VirtualHost> </VirtualHost>
\ No newline at end of file
...@@ -19,4 +19,3 @@ else ...@@ -19,4 +19,3 @@ else
{{ lazy_command }} {{ lazy_command }}
fi fi
fi fi
...@@ -48,4 +48,3 @@ ...@@ -48,4 +48,3 @@
RewriteRule ^/(.*)$ {{ slave_parameter.get('https_backend_url', '') }}/$1 [L,P] RewriteRule ^/(.*)$ {{ slave_parameter.get('https_backend_url', '') }}/$1 [L,P]
</VirtualHost> </VirtualHost>
{{ content }} {{ content }}
\ No newline at end of file
...@@ -48,4 +48,4 @@ parts = ...@@ -48,4 +48,4 @@ parts =
eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
offline = true offline = true
\ No newline at end of file
#!${dash-output:dash} #!${dash-output:dash}
{{ content }} {{ content }}
\ No newline at end of file
...@@ -18,7 +18,7 @@ md5sum = 5c94d952305552dcbeaeaeb27dd28f3b ...@@ -18,7 +18,7 @@ md5sum = 5c94d952305552dcbeaeaeb27dd28f3b
[template-nginx-configuration] [template-nginx-configuration]
filename = template-nginx.cfg.in filename = template-nginx.cfg.in
md5sum = a7012aac9b47ddd4e3aa3197aee1ffac md5sum = fc4f258e3ae56e0c9596484d736ccfed
[template-dcron-service] [template-dcron-service]
filename = template-dcron-service.sh.in filename = template-dcron-service.sh.in
...@@ -34,7 +34,7 @@ md5sum = 5cbd64f04da0601ba4286516a6161f5e ...@@ -34,7 +34,7 @@ md5sum = 5cbd64f04da0601ba4286516a6161f5e
[template-crontab] [template-crontab]
filename = template-crontab.in filename = template-crontab.in
md5sum = 072be0fd04896880c931d44d8eabde37 md5sum = f1f82101258de19068262b7213fc478b
[status2rss] [status2rss]
filename = status2rss.py filename = status2rss.py
......
# min(0-59) hours(0-23) day(1-31) month(1-12) dow(0-7) command # min(0-59) hours(0-23) day(1-31) month(1-12) dow(0-7) command
MAILTO=admins@erp5.org MAILTO=admins@erp5.org
...@@ -81,4 +81,3 @@ server { ...@@ -81,4 +81,3 @@ server {
} }
} }
...@@ -3,6 +3,11 @@ Changes ...@@ -3,6 +3,11 @@ Changes
Here are listed the most important changes, which might affect upgrades. Here are listed the most important changes, which might affect upgrades.
1.0.160 (2020-08-25)
--------------------
* haproxy updated from 2.0.15 to 2.0.17 in order to fix issue while accessing inaccessible backends
1.0.159 (2020-07-30) 1.0.159 (2020-07-30)
-------------------- --------------------
......
...@@ -129,9 +129,9 @@ Example sessions is:: ...@@ -129,9 +129,9 @@ Example sessions is::
curl -g -X GET --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" master-key-generate-auth-url curl -g -X GET --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" master-key-generate-auth-url
> authtoken > authtoken
cat certificate.pem key.pem ca-bundle.pem > master.pem cat certificate.pem ca.pem key.pem > bundle.pem
curl -g -X PUT --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" --data-binary @master.pem master-key-upload-url+authtoken curl -g -X PUT --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" --data-binary @bundle.pem master-key-upload-url+authtoken
This replaces old request parameters: This replaces old request parameters:
...@@ -157,9 +157,9 @@ Example sessions is:: ...@@ -157,9 +157,9 @@ Example sessions is::
curl -g -X GET --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" key-generate-auth-url curl -g -X GET --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" key-generate-auth-url
> authtoken > authtoken
cat certificate.pem key.pem ca-bundle.pem > master.pem cat certificate.pem ca.pem key.pem > bundle.pem
curl -g -X PUT --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" --data-binary @master.pem key-upload-url+authtoken curl -g -X PUT --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" --data-binary @bundle.pem key-upload-url+authtoken
This replaces old request parameters: This replaces old request parameters:
......
...@@ -18,7 +18,7 @@ md5sum = dae3bf6daf851b5610a1a6bd83057b29 ...@@ -18,7 +18,7 @@ md5sum = dae3bf6daf851b5610a1a6bd83057b29
[template-common] [template-common]
filename = instance-common.cfg.in filename = instance-common.cfg.in
md5sum = c801b7f9f11f0965677c22e6bbe9281b md5sum = 5784bea3bd608913769ff9a8afcccb68
[template-apache-frontend] [template-apache-frontend]
filename = instance-apache-frontend.cfg.in filename = instance-apache-frontend.cfg.in
...@@ -62,11 +62,11 @@ md5sum = f8068179333ce19e95df561c70073857 ...@@ -62,11 +62,11 @@ md5sum = f8068179333ce19e95df561c70073857
[template-empty] [template-empty]
_update_hash_filename_ = templates/empty.in _update_hash_filename_ = templates/empty.in
md5sum = c2314c3a9c3412a38d14b312d3df83c1 md5sum = 7155b18edfe128825b8d1f48071454a6
[template-wrapper] [template-wrapper]
_update_hash_filename_ = templates/wrapper.in _update_hash_filename_ = templates/wrapper.in
md5sum = 8cde04bfd0c0e9bd56744b988275cfd8 md5sum = 975177dedf677d24e14cede5d13187ce
[template-trafficserver-records-config] [template-trafficserver-records-config]
_update_hash_filename_ = templates/trafficserver/records.config.jinja2 _update_hash_filename_ = templates/trafficserver/records.config.jinja2
...@@ -86,7 +86,7 @@ md5sum = 217a6c801b8330b0b825f7b8b4c77184 ...@@ -86,7 +86,7 @@ md5sum = 217a6c801b8330b0b825f7b8b4c77184
[template-caddy-lazy-script-call] [template-caddy-lazy-script-call]
_update_hash_filename_ = templates/apache-lazy-script-call.sh.in _update_hash_filename_ = templates/apache-lazy-script-call.sh.in
md5sum = b9f73f6323f9fceea054c46c854d2862 md5sum = 77d60840591de67b64ab3572e46273a0
[template-graceful-script] [template-graceful-script]
_update_hash_filename_ = templates/graceful-script.sh.in _update_hash_filename_ = templates/graceful-script.sh.in
......
...@@ -10,4 +10,4 @@ partition_id = ${slap-connection:partition-id} ...@@ -10,4 +10,4 @@ partition_id = ${slap-connection:partition-id}
server_url = ${slap-connection:server-url} server_url = ${slap-connection:server-url}
software_release_url = ${slap-connection:software-release-url} software_release_url = ${slap-connection:software-release-url}
key_file = ${slap-connection:key-file} key_file = ${slap-connection:key-file}
cert_file = ${slap-connection:cert-file} cert_file = ${slap-connection:cert-file}
\ No newline at end of file
...@@ -21,4 +21,3 @@ else ...@@ -21,4 +21,3 @@ else
rm -f $PIDFILE rm -f $PIDFILE
fi fi
fi fi
{{ content }} {{ content }}
\ No newline at end of file
#!${dash-output:dash} #!${dash-output:dash}
{{ content }} {{ content }}
\ No newline at end of file
[template]
filename = instance.cfg
md5sum = bed788dee6daf05349c4577e7a7f1299
[instance-davstorage]
filename = instance-davstorage.cfg
md5sum = 081f97f9e575af7a4b7f9afc7c80dd4a
...@@ -9,6 +9,7 @@ extends = ...@@ -9,6 +9,7 @@ extends =
../../component/logrotate/buildout.cfg ../../component/logrotate/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/gzip/buildout.cfg ../../component/gzip/buildout.cfg
./buildout.hash.cfg
parts = parts =
apache-php apache-php
...@@ -35,14 +36,12 @@ strip-top-level-dir = true ...@@ -35,14 +36,12 @@ strip-top-level-dir = true
[template] [template]
# Default template for the instance. # Default template for the instance.
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/${:filename}
md5sum = bed788dee6daf05349c4577e7a7f1299
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
[instance-davstorage] [instance-davstorage]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-davstorage.cfg url = ${:_profile_base_location_}/${:filename}
md5sum = b83b0351a0f46aac35d52e681270ff03
output = ${buildout:directory}/template-davstorage.cfg output = ${buildout:directory}/template-davstorage.cfg
mode = 0644 mode = 0644
...@@ -187,4 +187,4 @@ return = domain ...@@ -187,4 +187,4 @@ return = domain
#path = $${basedirectory:promises}/frontend-ajaxupload #path = $${basedirectory:promises}/frontend-ajaxupload
#url = $${request-frontend-ajaxupload:connection-site_url} #url = $${request-frontend-ajaxupload:connection-site_url}
#dash_path = ${dash:location}/bin/dash #dash_path = ${dash:location}/bin/dash
#curl_path = ${curl:location}/bin/curl #curl_path = ${curl:location}/bin/curl
\ No newline at end of file
[instance] [instance]
filename = instance.cfg filename = instance.cfg
md5sum = 94e1cd21bbdf7cabb5834223859407e0 md5sum = 646e50cfa93681e8bd85767621c7a39d
\ No newline at end of file
...@@ -75,4 +75,3 @@ log = $${:var}/log ...@@ -75,4 +75,3 @@ log = $${:var}/log
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publishurl recipe = slapos.cookbook:publishurl
url = $${dream_platform_parameter:url} url = $${dream_platform_parameter:url}
[buildout] [buildout]
extends = extends =
../../stack/erp5/buildout.cfg ../../stack/erp5/buildout.cfg
...@@ -48,6 +48,8 @@ setup(name=name, ...@@ -48,6 +48,8 @@ setup(name=name,
'psutil', 'psutil',
'requests', 'requests',
'mysqlclient', 'mysqlclient',
'cryptography',
'pyOpenSSL',
], ],
zip_safe=True, zip_safe=True,
test_suite='test', test_suite='test',
......
...@@ -116,7 +116,7 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase): ...@@ -116,7 +116,7 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase):
pass pass
time.sleep(1) time.sleep(1)
else: else:
raise RuntimeError, 'caucased failed to start.' raise RuntimeError('caucased failed to start.')
cau_args = [ cau_args = [
caucase_path, caucase_path,
...@@ -145,7 +145,6 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase): ...@@ -145,7 +145,6 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase):
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
) )
result = caucase_process.communicate() result = caucase_process.communicate()
print result
csr_id = result[0].split()[0] csr_id = result[0].split()[0]
subprocess.check_call( subprocess.check_call(
...@@ -196,7 +195,7 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase): ...@@ -196,7 +195,7 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase):
else: else:
time.sleep(1) time.sleep(1)
else: else:
raise RuntimeError, 'getting service certificate failed.' raise RuntimeError('getting service certificate failed.')
# start a caucased and server certificate. # start a caucased and server certificate.
cls.backend_caucase_dir = tempfile.mkdtemp() cls.backend_caucase_dir = tempfile.mkdtemp()
...@@ -223,7 +222,7 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase): ...@@ -223,7 +222,7 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase):
pass pass
time.sleep(1) time.sleep(1)
else: else:
raise RuntimeError, 'caucased failed to start.' raise RuntimeError('caucased failed to start.')
super(TestFrontendXForwardedFor, cls).setUpClass() super(TestFrontendXForwardedFor, cls).setUpClass()
......
...@@ -22,4 +22,4 @@ recipe = slapos.recipe.template:jinja2 ...@@ -22,4 +22,4 @@ recipe = slapos.recipe.template:jinja2
template = inline:#!/bin/sh template = inline:#!/bin/sh
echo "Hello : $(date)" >> $${directory:log}/log.log echo "Hello : $(date)" >> $${directory:log}/log.log
rendered = $${directory:script}/log-writer rendered = $${directory:script}/log-writer
mode = 700 mode = 700
\ No newline at end of file
[template]
_update_hash_filename_ = instance.cfg
md5sum = 7ab2a242df988bf5c10bf8002acac3bd
[instance-etherpad-lite]
_update_hash_filename_ = instance-etherpad-lite.cfg
md5sum = 7ead62829a85f5922bb9ed0fc8dfb0df
[template-conf]
_update_hash_filename_ = templates/settings.json.in
md5sum = 19ab39e6b3256c82fd54ce074488b136
[template-run-script]
_update_hash_filename_ = templates/run.sh.in
md5sum = eac870b5f30e735e109a48913af2fae3
[template-deps-script]
_update_hash_filename_ = templates/installDeps.sh.in
md5sum = 53d0d53d419bd9ee592d3e1a1c84c758
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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