Commit 97065662 authored by Rafael Monnerat's avatar Rafael Monnerat

Update Release Candidate

parents 502c7505 486e3892
...@@ -5,10 +5,10 @@ parts = ...@@ -5,10 +5,10 @@ parts =
[bzip2] [bzip2]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://fossies.org/linux/misc/bzip2-1.0.6.tar.gz url = https://fossies.org/linux/misc/bzip2-1.0.8.tar.gz
md5sum = 00b516f4704d4a7cb50a1d97e6e8e15b md5sum = 67e051268d0c475ea773822f7500d0e5
configure-command = true configure-command = true
make-options = make-options =
PREFIX=@@LOCATION@@ PREFIX=@@LOCATION@@
CFLAGS="-fpic -fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64" CFLAGS="-fpic -fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64"
post-make-hook = ${:_profile_base_location_}/bzip2-hooks.py#066c8355b7d726f30176ea5b6a35e1a2:post_make_hook post-make-hook = ${:_profile_base_location_}/bzip2-hooks.py#785148a77f1a8456d914aa02ddf9d410:post_make_hook
...@@ -4,7 +4,7 @@ def post_make_hook(options, buildout): ...@@ -4,7 +4,7 @@ def post_make_hook(options, buildout):
make_options_list = [q for q in options.get('make-options', '').split('\n') if q] make_options_list = [q for q in options.get('make-options', '').split('\n') if q]
if os.system('make %s -f Makefile-libbz2_so' % ' '.join(make_options_list)) != 0: if os.system('make %s -f Makefile-libbz2_so' % ' '.join(make_options_list)) != 0:
raise ValueError('Generation of dynamic library failed') raise ValueError('Generation of dynamic library failed')
original = 'libbz2.so.1.0.6' original = 'libbz2.so.1.0.8'
link_list = ['libbz2.so.1.0', 'libbz2.so.1', 'libbz2.so'] link_list = ['libbz2.so.1.0', 'libbz2.so.1', 'libbz2.so']
destination = os.path.join(options['location'], 'lib') destination = os.path.join(options['location'], 'lib')
for filename in [original] + link_list: for filename in [original] + link_list:
......
...@@ -17,8 +17,8 @@ depends = ...@@ -17,8 +17,8 @@ depends =
[caddy] [caddy]
# revision and repository can be used to control which caddy version is used # revision and repository can be used to control which caddy version is used
revision = v1.0.0 revision = v1.0.1
repository = github.com/mholt/caddy/caddy repository = github.com/caddyserver/caddy/caddy
recipe = plone.recipe.command recipe = plone.recipe.command
update-command = ${:command} update-command = ${:command}
......
...@@ -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 = http://ftp.gnu.org/gnu/coreutils/coreutils-8.30.tar.xz url = https://ftp.gnu.org/gnu/coreutils/coreutils-8.31.tar.xz
md5sum = ab06d68949758971fe744db66b572816 md5sum = 0009a224d8e288e8ec406ef0161f9293
environment = environment =
PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
LDFLAGS=-Wl,--as-needed -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib LDFLAGS=-Wl,--as-needed -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib
......
...@@ -64,8 +64,8 @@ environment-extra = ...@@ -64,8 +64,8 @@ environment-extra =
[golang1.12] [golang1.12]
<= golang-common <= golang-common
url = https://dl.google.com/go/go1.12.6.src.tar.gz url = https://dl.google.com/go/go1.12.7.src.tar.gz
md5sum = 48a4141fc718dd742d106431294f08bf md5sum = 49d7a658cbd825f1cfe903d050bad29f
# go1.11 needs go1.4 to bootstrap # go1.11 needs go1.4 to bootstrap
environment-extra = environment-extra =
......
...@@ -13,18 +13,12 @@ parts = nginx-output ...@@ -13,18 +13,12 @@ parts = nginx-output
[nginx-common] [nginx-common]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://nginx.org/download/nginx-1.10.1.tar.gz url = https://nginx.org/download/nginx-1.17.1.tar.gz
md5sum = 088292d9caf6059ef328aa7dda332e44 md5sum = 51021f3e8204a5fc809f5e695a4508db
patch-options = -p0
patch-binary = ${patch:location}/bin/patch
patches =
http://nginx.org/download/patch.2017.ranges.txt#40bf9f37c881cb3b10cfefd84ca92f6a
${:_profile_base_location_}/fix-gcc7-implicit-fallthrough-errors.patch
[nginx] [nginx]
<= nginx-common <= nginx-common
configure-options= configure-options=
--with-ipv6
--with-http_ssl_module --with-http_ssl_module
--with-http_v2_module --with-http_v2_module
--with-http_gzip_static_module --with-http_gzip_static_module
......
commit 8449f750e62cd229026e9df3bd023ec7e073a7d4
Author: Maxim Dounin <mdounin@mdounin.ru>
Date: Thu Apr 27 16:57:18 2017 +0300
Added missing "fall through" comments (ticket #1259).
Found by gcc7 (-Wimplicit-fallthrough).
diff --git src/core/ngx_murmurhash.c src/core/ngx_murmurhash.c
index c31e0e03..5ade658d 100644
--- src/core/ngx_murmurhash.c
+++ src/core/ngx_murmurhash.c
@@ -35,8 +35,10 @@ ngx_murmur_hash2(u_char *data, size_t len)
switch (len) {
case 3:
h ^= data[2] << 16;
+ /* fall through */
case 2:
h ^= data[1] << 8;
+ /* fall through */
case 1:
h ^= data[0];
h *= 0x5bd1e995;
diff --git src/http/ngx_http_parse.c src/http/ngx_http_parse.c
index 36220fdc..e8e51563 100644
--- src/http/ngx_http_parse.c
+++ src/http/ngx_http_parse.c
@@ -1396,6 +1396,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
goto done;
case '+':
r->plus_in_uri = 1;
+ /* fall through */
default:
state = sw_usual;
*u++ = ch;
@@ -1437,6 +1438,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
goto done;
case '+':
r->plus_in_uri = 1;
+ /* fall through */
default:
state = sw_usual;
*u++ = ch;
@@ -1484,6 +1486,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
goto done;
case '+':
r->plus_in_uri = 1;
+ /* fall through */
default:
state = sw_usual;
*u++ = ch;
diff --git src/os/unix/ngx_process.c src/os/unix/ngx_process.c
index dd50b5ca..993c032a 100644
--- src/os/unix/ngx_process.c
+++ src/os/unix/ngx_process.c
@@ -413,6 +413,7 @@ ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext)
break;
}
ngx_debug_quit = 1;
+ /* fall through */
case ngx_signal_value(NGX_SHUTDOWN_SIGNAL):
ngx_quit = 1;
action = ", shutting down";
...@@ -7,4 +7,3 @@ T-2/var/run/graceful_configuration_state_signature ...@@ -7,4 +7,3 @@ T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid T-2/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/validate_configuration_state_signature
\ No newline at end of file
...@@ -99,7 +99,7 @@ context = ...@@ -99,7 +99,7 @@ context =
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = {{ software_dir }}/scripts/cros_full_build.in template = {{ software_dir }}/scripts/cros_full_build.in
rendered = ${directory:run}/cros_full_build rendered = ${directory:run}/cros_full_build
md5sum = 2a64b5cc0314ec2221a949928956f5c0 md5sum = f10eb8863b2575e117aae070be171d76
mode = 0700 mode = 0700
context = context =
key bash_path bin:bash key bash_path bin:bash
......
...@@ -316,7 +316,7 @@ for board in ${BOARDS} ; do ...@@ -316,7 +316,7 @@ for board in ${BOARDS} ; do
NAYU_IMAGE_LOCATION=/tmp/${board}.nayuos.img NAYU_IMAGE_LOCATION=/tmp/${board}.nayuos.img
# rebuild packages with boot pictures # rebuild packages with boot pictures
cros_sdk --nouse-image-- ./build_packages --board=${board} >> "${BUILD_LOG}" cros_sdk --nouse-image -- ./build_packages --board=${board} >> "${BUILD_LOG}"
# NayuOS images # NayuOS images
date >> "${BUILD_LOG}" date >> "${BUILD_LOG}"
......
...@@ -26,7 +26,7 @@ md5sum = d95e8500bdc72d1f40b97cc414656e7e ...@@ -26,7 +26,7 @@ md5sum = d95e8500bdc72d1f40b97cc414656e7e
[template-mariadb] [template-mariadb]
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = b2fea225fbeadcbf004eb2e2e3a68156 md5sum = 14ae385a0fc5c0b4e03466eb786a451a
[template-kumofs] [template-kumofs]
filename = instance-kumofs.cfg.in filename = instance-kumofs.cfg.in
...@@ -42,7 +42,7 @@ md5sum = d32417746fcf671d4e86a70379815039 ...@@ -42,7 +42,7 @@ md5sum = d32417746fcf671d4e86a70379815039
[template-my-cnf] [template-my-cnf]
filename = my.cnf.in filename = my.cnf.in
md5sum = af2113bbdeaf32096c4013fa73b45ced md5sum = 7a882ff275f723fdf30869cb7f1b90d3
[template-mariadb-initial-setup] [template-mariadb-initial-setup]
filename = mariadb_initial_setup.sql.in filename = mariadb_initial_setup.sql.in
......
...@@ -136,6 +136,7 @@ long-query-time = {{ dumps(slapparameter_dict.get('long-query-time', 1)) }} ...@@ -136,6 +136,7 @@ long-query-time = {{ dumps(slapparameter_dict.get('long-query-time', 1)) }}
innodb-buffer-pool-size = {{ dumps(slapparameter_dict.get('innodb-buffer-pool-size', 0)) }} innodb-buffer-pool-size = {{ dumps(slapparameter_dict.get('innodb-buffer-pool-size', 0)) }}
innodb-buffer-pool-instances = {{ dumps(slapparameter_dict.get('innodb-buffer-pool-instances', 0)) }} innodb-buffer-pool-instances = {{ dumps(slapparameter_dict.get('innodb-buffer-pool-instances', 0)) }}
innodb-log-file-size = {{ dumps(slapparameter_dict.get('innodb-log-file-size', 0)) }} innodb-log-file-size = {{ dumps(slapparameter_dict.get('innodb-log-file-size', 0)) }}
innodb-file-per-table = {{ dumps(slapparameter_dict.get('innodb-file-per-table', 0)) }}
innodb-log-buffer-size = {{ dumps(slapparameter_dict.get('innodb-log-buffer-size', 0)) }} innodb-log-buffer-size = {{ dumps(slapparameter_dict.get('innodb-log-buffer-size', 0)) }}
relaxed-writes = {{ dumps(slapparameter_dict.get('relaxed-writes', False)) }} relaxed-writes = {{ dumps(slapparameter_dict.get('relaxed-writes', False)) }}
{% if incremental_backup_retention_days > -1 -%} {% if incremental_backup_retention_days > -1 -%}
......
...@@ -27,7 +27,7 @@ slow_query_log_file = {{ parameter_dict['slow-query-log'] }} ...@@ -27,7 +27,7 @@ slow_query_log_file = {{ parameter_dict['slow-query-log'] }}
long_query_time = {{ parameter_dict['long-query-time'] }} long_query_time = {{ parameter_dict['long-query-time'] }}
max_allowed_packet = 128M max_allowed_packet = 128M
query_cache_size = 32M query_cache_size = 32M
innodb_file_per_table = 0 innodb_file_per_table = {{ parameter_dict['innodb-file-per-table'] }}
plugin_load = ha_mroonga plugin_load = ha_mroonga
...@@ -66,8 +66,8 @@ server_id = {{ parameter_dict['server-id'] }} ...@@ -66,8 +66,8 @@ server_id = {{ parameter_dict['server-id'] }}
{{x}}sync_frm = 0 {{x}}sync_frm = 0
# Force utf8 usage # Force utf8 usage
collation_server = utf8_unicode_ci character_set_server = utf8mb4
character_set_server = utf8 collation_server = utf8mb4_general_ci
skip_character_set_client_handshake skip_character_set_client_handshake
{% if 'ssl-key' in parameter_dict -%} {% if 'ssl-key' in parameter_dict -%}
......
...@@ -135,7 +135,7 @@ pytz = 2016.10 ...@@ -135,7 +135,7 @@ pytz = 2016.10
requests = 2.13.0 requests = 2.13.0
six = 1.11.0 six = 1.11.0
slapos.cookbook = 1.0.92 slapos.cookbook = 1.0.92
slapos.core = 1.4.23 slapos.core = 1.4.24
slapos.extension.strip = 0.4 slapos.extension.strip = 0.4
slapos.extension.shared = 1.0 slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.17 slapos.libnetworkcache = 0.17
...@@ -152,7 +152,7 @@ CacheControl = 0.12.5 ...@@ -152,7 +152,7 @@ CacheControl = 0.12.5
msgpack = 0.6.1 msgpack = 0.6.1
# Required by: # Required by:
# slapos.core==1.4.23 # slapos.core==1.4.24
Flask = 0.12 Flask = 0.12
# Required by: # Required by:
...@@ -224,7 +224,7 @@ jsonschema = 3.0.0a3 ...@@ -224,7 +224,7 @@ jsonschema = 3.0.0a3
lockfile = 0.12.2 lockfile = 0.12.2
# Required by: # Required by:
# slapos.core==1.4.23 # slapos.core==1.4.24
# XXX 'slapos node format' raises an exception with netifaces 0.10.5. # XXX 'slapos node format' raises an exception with netifaces 0.10.5.
netifaces = 0.10.4 netifaces = 0.10.4
...@@ -257,7 +257,7 @@ python-dateutil = 2.7.3 ...@@ -257,7 +257,7 @@ python-dateutil = 2.7.3
rpdb = 0.1.5 rpdb = 0.1.5
# Required by: # Required by:
# slapos.core==1.4.23 # slapos.core==1.4.24
supervisor = 3.3.3 supervisor = 3.3.3
# Required by: # Required by:
...@@ -265,11 +265,11 @@ supervisor = 3.3.3 ...@@ -265,11 +265,11 @@ supervisor = 3.3.3
tzlocal = 1.5.1 tzlocal = 1.5.1
# Required by: # Required by:
# slapos.core==1.4.23 # slapos.core==1.4.24
uritemplate = 3.0.0 uritemplate = 3.0.0
# Required by: # Required by:
# slapos.core==1.4.23 # slapos.core==1.4.24
zope.interface = 4.3.3 zope.interface = 4.3.3
[networkcache] [networkcache]
......
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