From nobody Fri Mar 13 16:12:29 2026 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXTz16NKBz6VMWl for ; Fri, 13 Mar 2026 16:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXTz159BVz46g5 for ; Fri, 13 Mar 2026 16:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773418349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0O7uC++/ZEVZW4vNS3eiObnnZea/qx+PevyWVs0I6WQ=; b=XDHfKrjHmtPmayvgJ9j3yVESUkbwUXQ0oyTxn9akbrAI3pPGPYzTcRWvrIPJwrZaT+lYSc BsMowJVoWlLdP3ICJ8STpZijykbmYMN6GouiTksIX285Cyv+YiL2Akn9QIfQUOdh1g85rJ svSBPEQiHHQLA00ZbP7cusXresdCWPj3eE9kxqt7tb9JfRrPE+PMFVOMLJ1oC5Up5M1FHp BnniConG+aRbRtpiW2btIhqH6Ph8c7CC5Jp4SXcFtSLKYS8gm6fNryFh5NaQErYjf/LdyN jczwyR/+FzEWism8giqJ9/C6p6s90KDrJzq0UMKhqmRuwnk5o+LpJxTAoibDZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773418349; a=rsa-sha256; cv=none; b=DZQQoriM2vdhEV44A6kAuM8NTqKRO105FaMoQ91gI1w1JEOAbmF1t3Tk8X1JimGE78ocf1 uyOj6/Le/2XngSVqw9OD3zKEE3/QW7nGEBFoRp/ZC/ujgVUa9dUjtvSMFRWchSa2tqGvqM fexLsEp3P3HIjoiF0dKgw9GU6QLJtNkbb9X8LWuVvIxN6nF54ueys4UOpPROAAXXjjhOMR ahvjIwdkFzgQk+HEnz/57Y9nkMmAAj8pVdGtm9mfPbK+vj8hI2z6+bSm2g20CkXTvQVzHI KrkakPeKopUDodgfHK7VOZ5CQtcfYhXbT7+WjYnqp6BMz0twahlMSGwxDsKljQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773418349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0O7uC++/ZEVZW4vNS3eiObnnZea/qx+PevyWVs0I6WQ=; b=INJzoS1gf6479h++tIVcRVdpmKNhXzAf5ZuLXWY98gBcmIZ8quYl6UOfs2uuK61dba/cYg QL/f3sWyV9ZQWueGj/M0rpbsmTDavohKOWtvWKZDFjVo49kqMSQbo+lO+M0ZIKcSZ2UQqi RzsC84qzkw/Ykiyb4VBPhxK7t+fHFzCAreI3rpoA/9sM6yVkpaU3RDZ8+rx8ttDcOOHkDH LrPMaAQMXPdV6VmJBLvi8Kc9mr/at0wu5MuhKNNXK2GgKn448IJ2GPq4m39YADgfkjeZ5R 6qpRvN1v3if+NuveuQeJjS9BUDKxBzdFgRhqQuxXtphqbCJwnmResrTwKbKESA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXTz14bwPzgKG for ; Fri, 13 Mar 2026 16:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1914b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 16:12:29 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: fa14dfb08696 - main - textproc/elasticsearch7: Fix runtime with non-default USERS/GROUPS List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa14dfb0869642be99a46161a09455a20aeddf00 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 16:12:29 +0000 Message-Id: <69b4376d.1914b.ab5b4ec@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa14dfb0869642be99a46161a09455a20aeddf00 commit fa14dfb0869642be99a46161a09455a20aeddf00 Author: Vladimir Druzenko AuthorDate: 2026-03-13 16:04:05 +0000 Commit: Vladimir Druzenko CommitDate: 2026-03-13 16:10:49 +0000 textproc/elasticsearch7: Fix runtime with non-default USERS/GROUPS Also: - Respect ETCDIR substitution in rc.d script. - Replace RM of bundled JDK, jna.jar and modules/x-pack/x-pack-ml files with EXTRACT_AFTER_ARGS=--exclude. - Replace ${JAVASHAREDIR} with ${LOCALBASE}/share/java - JAVASHAREDIR=PREFIX/share/java, but devel/jna installed in LOCALBASE. Approved by: blanket (fix runtime) MFH: 2026Q1 --- textproc/elasticsearch7/Makefile | 18 ++++++++++++------ textproc/elasticsearch7/files/elasticsearch.in | 12 ++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/textproc/elasticsearch7/Makefile b/textproc/elasticsearch7/Makefile index 897904e7d900..e93069aa4bd7 100644 --- a/textproc/elasticsearch7/Makefile +++ b/textproc/elasticsearch7/Makefile @@ -1,5 +1,6 @@ PORTNAME= elasticsearch DISTVERSION= 7.17.29 +PORTREVISION= 1 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \ LOCAL/vvd/elastic @@ -36,12 +37,19 @@ SHEBANG_FILES= bin/elasticsearch bin/elasticsearch-certgen \ CONFLICTS= ${PORTNAME}8 ${PORTNAME}9* +# ML plugin not supported on FreeBSD +EXTRACT_AFTER_ARGS= --exclude jdk.app \ + --exclude lib/jna-5.10.0.jar \ + --exclude modules/x-pack/x-pack-ml \ + --no-same-owner --no-same-permissions + NO_ARCH= yes NO_BUILD= yes PORTSCOUT= limit:^7 SUB_FILES= pkg-message -SUB_LIST= ETCDIR=${ETCDIR} \ - JAVA_HOME=${JAVA_HOME} +SUB_LIST= JAVA_HOME=${JAVA_HOME} \ + SEARCHUSER=${SEARCHUSER} \ + SEARCHGROUP=${SEARCHGROUP} WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} @@ -71,9 +79,6 @@ BINS= elasticsearch elasticsearch-certgen elasticsearch-certutil \ x-pack-security-env x-pack-watcher-env post-patch: - ${RM} ${WRKSRC}/lib/jna-*.jar -# ML plugin not supported on FreeBSD - ${RM} -rf ${WRKSRC}/modules/x-pack/x-pack-ml ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/bin/elasticsearch-env do-install: @@ -88,7 +93,8 @@ do-install: (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar") (cd ${WRKSRC}/modules && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules/) ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/config - ${LN} -s ${JAVASHAREDIR}/classes/jna.jar ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/jna-0.0.0.jar + ${LN} -s ${LOCALBASE}/share/java/classes/jna.jar \ + ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/jna-0.0.0.jar do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/textproc/elasticsearch7/files/elasticsearch.in b/textproc/elasticsearch7/files/elasticsearch.in index 002a2335bf0b..d4414f39d6d0 100644 --- a/textproc/elasticsearch7/files/elasticsearch.in +++ b/textproc/elasticsearch7/files/elasticsearch.in @@ -9,11 +9,11 @@ # # elasticsearch_enable="YES" # -# elasticsearch_user (username): Set to elasticsearch by default. +# elasticsearch_user (username): Set to %%SEARCHUSER%% by default. # Set it to required username. -# elasticsearch_group (group): Set to elasticsearch by default. +# elasticsearch_group (group): Set to %%SEARCHGROUP%% by default. # Set it to required group. -# elasticsearch_config (path): Set to %%PREFIX%%/etc/elasticsearch/elasticsearch.yml by default. +# elasticsearch_config (path): Set to %%ETCDIR%%/elasticsearch.yml by default. # Set it to the config file location. # elasticsearch_java_home (path): Set to %%JAVA_HOME%% by default. # Set it to the root of the JDK to use. @@ -26,9 +26,9 @@ rcvar=elasticsearch_enable load_rc_config ${name} : ${elasticsearch_enable:=NO} -: ${elasticsearch_user=elasticsearch} -: ${elasticsearch_group=elasticsearch} -: ${elasticsearch_config=%%PREFIX%%/etc/elasticsearch} +: ${elasticsearch_user=%%SEARCHUSER%%} +: ${elasticsearch_group=%%SEARCHGROUP%%} +: ${elasticsearch_config=%%ETCDIR%%} : ${elasticsearch_login_class=root} : ${elasticsearch_java_home="%%JAVA_HOME%%"}