Date: Wed, 16 May 2018 20:19:04 +0000 (UTC) From: Kirill Ponomarev <krion@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470149 - in head/databases/clickhouse: . files Message-ID: <201805162019.w4GKJ4Sf003171@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: krion Date: Wed May 16 20:19:04 2018 New Revision: 470149 URL: https://svnweb.freebsd.org/changeset/ports/470149 Log: Update to 1.1.54381 [1] Adapt ${name}_limits to the new resource limiting mechanics for services PR: 228292 [1], 227223 [2] Submitted by: maintainer [1], 0mp@ [2] Modified: head/databases/clickhouse/Makefile head/databases/clickhouse/distinfo head/databases/clickhouse/files/clickhouse.in head/databases/clickhouse/pkg-plist Modified: head/databases/clickhouse/Makefile ============================================================================== --- head/databases/clickhouse/Makefile Wed May 16 20:12:25 2018 (r470148) +++ head/databases/clickhouse/Makefile Wed May 16 20:19:04 2018 (r470149) @@ -2,14 +2,13 @@ # $FreeBSD$ PORTNAME= clickhouse -PORTVERSION= 1.1.54362 +PORTVERSION= 1.1.54381 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -stable -PORTREVISION= 3 CATEGORIES= databases MAINTAINER= proler@gmail.com -COMMENT= ClickHouse is an column-oriented database management system +COMMENT= ClickHouse is a column-oriented database management system LICENSE= APACHE20 @@ -59,6 +58,14 @@ GROUPS= clickhouse SOVERSION= ${PORTVERSION} PLIST_SUB= SOVERSION=${SOVERSION} + +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +.else +SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " +.endif .include <bsd.port.pre.mk> Modified: head/databases/clickhouse/distinfo ============================================================================== --- head/databases/clickhouse/distinfo Wed May 16 20:12:25 2018 (r470148) +++ head/databases/clickhouse/distinfo Wed May 16 20:19:04 2018 (r470149) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520953357 -SHA256 (yandex-ClickHouse-v1.1.54362-stable_GH0.tar.gz) = b3e98ca9fbc9eb81e757efeb6a2ce93945a8c1bf20848566ce8925884e736705 -SIZE (yandex-ClickHouse-v1.1.54362-stable_GH0.tar.gz) = 5776863 +TIMESTAMP = 1526386533 +SHA256 (yandex-ClickHouse-v1.1.54381-stable_GH0.tar.gz) = f001216dfeaf515a0556854767a66049142885f4203e82c959a3964c7a309452 +SIZE (yandex-ClickHouse-v1.1.54381-stable_GH0.tar.gz) = 5833766 Modified: head/databases/clickhouse/files/clickhouse.in ============================================================================== --- head/databases/clickhouse/files/clickhouse.in Wed May 16 20:12:25 2018 (r470148) +++ head/databases/clickhouse/files/clickhouse.in Wed May 16 20:19:04 2018 (r470149) @@ -10,9 +10,9 @@ # # clickhouse_enable (bool): Set to "NO" by default # Set it to "YES" to enable clickhouse server -# clickhouse_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U clickhouse` -# just before clickhouse starts. +%%LEGACY_LIMITS%%# clickhouse_limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U clickhouse` +%%LEGACY_LIMITS%%# just before clickhouse starts. # clickhouse_config (str): Path to config file (required). # (default: %%PREFIX%%/etc/clickhouse-server/config.xml) # clickhouse_rundir (str): Path to directory holding a pidfile. @@ -34,7 +34,7 @@ rcvar=clickhouse_enable load_rc_config ${name} : ${clickhouse_enable="NO"} -: ${clickhouse_limits="NO"} +%%LEGACY_LIMITS%%: ${clickhouse_limits="NO"} : ${clickhouse_config="%%PREFIX%%/etc/clickhouse-server/config.xml"} : ${clickhouse_rundir="/var/run/clickhouse"} : ${clickhouse_user="clickhouse"} @@ -51,11 +51,12 @@ required_files=${clickhouse_config} start_precmd=clickhouse_prestart clickhouse_prestart () { - if checkyesno clickhouse_limits; then - eval `/usr/bin/limits -e -U ${clickhouse_user}` 2>/dev/null - else - return 0 - fi +%%LEGACY_LIMITS%% if checkyesno clickhouse_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${clickhouse_user}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 } run_rc_command "$1" Modified: head/databases/clickhouse/pkg-plist ============================================================================== --- head/databases/clickhouse/pkg-plist Wed May 16 20:12:25 2018 (r470148) +++ head/databases/clickhouse/pkg-plist Wed May 16 20:19:04 2018 (r470149) @@ -8,6 +8,7 @@ bin/clickhouse-format bin/clickhouse-lld bin/clickhouse-local bin/clickhouse-performance-test +bin/clickhouse-report bin/clickhouse-server bin/clickhouse-test bin/clickhouse-test-server @@ -94,6 +95,7 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/performance/string_comparisions/results.json %%DATADIR%%-test/performance/test_hits/test_hits.xml %%DATADIR%%-test/performance/test_hits/test_hits_agg_functions_min_max_any.xml +%%DATADIR%%-test/performance/url/url_hits.xml %%DATADIR%%-test/queries/0_stateless/00001_select_1.reference %%DATADIR%%-test/queries/0_stateless/00001_select_1.sql %%DATADIR%%-test/queries/0_stateless/00002_system_numbers.reference @@ -466,8 +468,8 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00165_transform_non_const_default.sql %%DATADIR%%-test/queries/0_stateless/00166_functions_of_aggregation_states.reference %%DATADIR%%-test/queries/0_stateless/00166_functions_of_aggregation_states.sql -%%DATADIR%%-test/queries/0_stateless/00167_shard_settings_inside_query.reference -%%DATADIR%%-test/queries/0_stateless/00167_shard_settings_inside_query.sql +%%DATADIR%%-test/queries/0_stateless/00167_settings_inside_query.reference +%%DATADIR%%-test/queries/0_stateless/00167_settings_inside_query.sql %%DATADIR%%-test/queries/0_stateless/00168_buffer_defaults.reference %%DATADIR%%-test/queries/0_stateless/00168_buffer_defaults.sql %%DATADIR%%-test/queries/0_stateless/00169_join_constant_keys.reference @@ -1157,8 +1159,9 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00504_insert_miss_columns.sh %%DATADIR%%-test/queries/0_stateless/00504_mergetree_arrays_rw.reference %%DATADIR%%-test/queries/0_stateless/00504_mergetree_arrays_rw.sql -%%DATADIR%%-test/queries/0_stateless/00505_tcp_ssl.reference -%%DATADIR%%-test/queries/0_stateless/00505_tcp_ssl.sh +%%DATADIR%%-test/queries/0_stateless/00505_distributed_secure.data +%%DATADIR%%-test/queries/0_stateless/00505_secure.reference +%%DATADIR%%-test/queries/0_stateless/00505_secure.sh %%DATADIR%%-test/queries/0_stateless/00506_shard_global_in_union.reference %%DATADIR%%-test/queries/0_stateless/00506_shard_global_in_union.sql %%DATADIR%%-test/queries/0_stateless/00506_union_distributed.reference @@ -1253,6 +1256,10 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00534_long_functions_bad_arguments6.sh %%DATADIR%%-test/queries/0_stateless/00534_long_functions_bad_arguments7.reference %%DATADIR%%-test/queries/0_stateless/00534_long_functions_bad_arguments7.sh +%%DATADIR%%-test/queries/0_stateless/00534_long_functions_bad_arguments8.reference +%%DATADIR%%-test/queries/0_stateless/00534_long_functions_bad_arguments8.sh +%%DATADIR%%-test/queries/0_stateless/00534_long_functions_bad_arguments9.reference +%%DATADIR%%-test/queries/0_stateless/00534_long_functions_bad_arguments9.sh %%DATADIR%%-test/queries/0_stateless/00535_parse_float_scientific.reference %%DATADIR%%-test/queries/0_stateless/00535_parse_float_scientific.sql %%DATADIR%%-test/queries/0_stateless/00536_int_exp.reference @@ -1429,6 +1436,8 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00598_create_as_select_http.sh %%DATADIR%%-test/queries/0_stateless/00599_create_view_with_subquery.reference %%DATADIR%%-test/queries/0_stateless/00599_create_view_with_subquery.sql +%%DATADIR%%-test/queries/0_stateless/00600_create_temporary_table_if_not_exists.reference +%%DATADIR%%-test/queries/0_stateless/00600_create_temporary_table_if_not_exists.sql %%DATADIR%%-test/queries/0_stateless/00600_replace_running_query.reference %%DATADIR%%-test/queries/0_stateless/00600_replace_running_query.sh %%DATADIR%%-test/queries/0_stateless/00601_kill_running_query.reference @@ -1437,6 +1446,60 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00602_throw_if.sh %%DATADIR%%-test/queries/0_stateless/00603_system_parts_nonexistent_database.reference %%DATADIR%%-test/queries/0_stateless/00603_system_parts_nonexistent_database.sql +%%DATADIR%%-test/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.reference +%%DATADIR%%-test/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql +%%DATADIR%%-test/queries/0_stateless/00604_show_create_database.reference +%%DATADIR%%-test/queries/0_stateless/00604_show_create_database.sql +%%DATADIR%%-test/queries/0_stateless/00605_intersections_aggregate_functions.reference +%%DATADIR%%-test/queries/0_stateless/00605_intersections_aggregate_functions.sql +%%DATADIR%%-test/queries/0_stateless/00606_quantiles_and_nans.reference +%%DATADIR%%-test/queries/0_stateless/00606_quantiles_and_nans.sql +%%DATADIR%%-test/queries/0_stateless/00607_index_in_in.reference +%%DATADIR%%-test/queries/0_stateless/00607_index_in_in.sql +%%DATADIR%%-test/queries/0_stateless/00608_uniq_array.reference +%%DATADIR%%-test/queries/0_stateless/00608_uniq_array.sql +%%DATADIR%%-test/queries/0_stateless/00609_distributed_with_case_when_then.reference +%%DATADIR%%-test/queries/0_stateless/00609_distributed_with_case_when_then.sql +%%DATADIR%%-test/queries/0_stateless/00609_mv_index_in_in.reference +%%DATADIR%%-test/queries/0_stateless/00609_mv_index_in_in.sql +%%DATADIR%%-test/queries/0_stateless/00609_prewhere_and_default.reference +%%DATADIR%%-test/queries/0_stateless/00609_prewhere_and_default.sql +%%DATADIR%%-test/queries/0_stateless/00610_materialized_view_forward_alter_partition_statements.reference +%%DATADIR%%-test/queries/0_stateless/00610_materialized_view_forward_alter_partition_statements.sql +%%DATADIR%%-test/queries/0_stateless/00611_zookeeper_different_checksums_formats.reference +%%DATADIR%%-test/queries/0_stateless/00611_zookeeper_different_checksums_formats.sql +%%DATADIR%%-test/queries/0_stateless/00612_http_max_query_size.reference +%%DATADIR%%-test/queries/0_stateless/00612_http_max_query_size.sh +%%DATADIR%%-test/queries/0_stateless/00612_pk_in_tuple.reference +%%DATADIR%%-test/queries/0_stateless/00612_pk_in_tuple.sql +%%DATADIR%%-test/queries/0_stateless/00612_union_query_with_subquery.reference +%%DATADIR%%-test/queries/0_stateless/00612_union_query_with_subquery.sql +%%DATADIR%%-test/queries/0_stateless/00613_shard_distributed_max_execution_time.reference +%%DATADIR%%-test/queries/0_stateless/00613_shard_distributed_max_execution_time.sql +%%DATADIR%%-test/queries/0_stateless/00614_array_nullable.reference +%%DATADIR%%-test/queries/0_stateless/00614_array_nullable.sql +%%DATADIR%%-test/queries/0_stateless/00615_nullable_alter_optimize.reference +%%DATADIR%%-test/queries/0_stateless/00615_nullable_alter_optimize.sql +%%DATADIR%%-test/queries/0_stateless/00616_final_single_part.reference +%%DATADIR%%-test/queries/0_stateless/00616_final_single_part.sql +%%DATADIR%%-test/queries/0_stateless/00617_array_in.reference +%%DATADIR%%-test/queries/0_stateless/00617_array_in.sql +%%DATADIR%%-test/queries/0_stateless/00618_nullable_in.reference +%%DATADIR%%-test/queries/0_stateless/00618_nullable_in.sql +%%DATADIR%%-test/queries/0_stateless/00619_extract.reference +%%DATADIR%%-test/queries/0_stateless/00619_extract.sql +%%DATADIR%%-test/queries/0_stateless/00619_union_highlite.reference +%%DATADIR%%-test/queries/0_stateless/00619_union_highlite.sql +%%DATADIR%%-test/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.reference +%%DATADIR%%-test/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql +%%DATADIR%%-test/queries/0_stateless/00621_regression_for_in_operator.reference +%%DATADIR%%-test/queries/0_stateless/00621_regression_for_in_operator.sql +%%DATADIR%%-test/queries/0_stateless/00622_select_in_parens.reference +%%DATADIR%%-test/queries/0_stateless/00622_select_in_parens.sql +%%DATADIR%%-test/queries/0_stateless/00623_in_partition_key.reference +%%DATADIR%%-test/queries/0_stateless/00623_in_partition_key.sql +%%DATADIR%%-test/queries/0_stateless/00624_length_utf8.reference +%%DATADIR%%-test/queries/0_stateless/00624_length_utf8.sql %%DATADIR%%-test/queries/0_stateless/99999_prepare.reference %%DATADIR%%-test/queries/0_stateless/99999_prepare.sql %%DATADIR%%-test/queries/shell_config.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805162019.w4GKJ4Sf003171>