diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2021-09-11 16:57:58 +0200 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-09-30 23:23:30 +0200 |
| commit | 620968a43a5f9bb3fa98ab20f257a4c0d864caa7 (patch) | |
| tree | 09bef799707f4b6e715b912429bd3b73c1addf4c /databases/clickhouse | |
| parent | security/vuxml: add www/chromium < 94.0.4606.71 (diff) | |
cleanup: drop support for EOL FreeBSD 11.X
Search criteria used:
- 11.4
- OSREL*
- OSVER*
- *_FreeBSD_11
Input from:
- adridg: devel/qca-legacy
- jbeich: _WITH_DPRINTF, _WITH_GETLINE, GNU bfd workarounds
- sunpoet: security/p5-*OpenSSL*
Reviewed by: doceng, kde, multimedia, perl, python, ruby, rust
Differential Revision: https://reviews.freebsd.org/D32008
Test Plan: make index
Diffstat (limited to 'databases/clickhouse')
| -rw-r--r-- | databases/clickhouse/Makefile | 8 | ||||
| -rw-r--r-- | databases/clickhouse/files/clickhouse.in | 11 |
2 files changed, 1 insertions, 18 deletions
diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile index b6e3fa36090a..0e224cac89b1 100644 --- a/databases/clickhouse/Makefile +++ b/databases/clickhouse/Makefile @@ -209,14 +209,6 @@ CC= clang CXX= clang++ .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " \ - MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" \ - MODERN_LIMITS="@comment " -.endif - SOVERSION= ${PORTVERSION} .include <bsd.port.pre.mk> diff --git a/databases/clickhouse/files/clickhouse.in b/databases/clickhouse/files/clickhouse.in index a3ff2098e49b..f058335c875d 100644 --- a/databases/clickhouse/files/clickhouse.in +++ b/databases/clickhouse/files/clickhouse.in @@ -8,9 +8,6 @@ # # clickhouse_enable (bool): Set to "NO" by default # Set it to "YES" to enable clickhouse server -%%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. @@ -32,7 +29,6 @@ rcvar=clickhouse_enable load_rc_config ${name} : ${clickhouse_enable="NO"} -%%LEGACY_LIMITS%%: ${clickhouse_limits="NO"} : ${clickhouse_config="%%PREFIX%%/etc/clickhouse-server/config.xml"} : ${clickhouse_rundir="/var/run/clickhouse"} : ${clickhouse_user="clickhouse"} @@ -54,12 +50,7 @@ clickhouse_prestart () { install -d -o ${clickhouse_user} -g ${clickhouse_group} ${_dir} done -%%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 + return 0 } run_rc_command "$1" |