From nobody Fri Mar 13 02:35:12 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 4fX7r04Thfz6VBq7 for ; Fri, 13 Mar 2026 02:35:12 +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 4fX7r03s1qz3PrW for ; Fri, 13 Mar 2026 02:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773369312; 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=199RK3Pra0jWus5XoZr1OcAh5GwfK+Kb1R6Ra0NEIgY=; b=TqUC94GvmwEplz3sNFnDcr/If/teW/rmz0aXtLQ8X1l11gQjV/ObO5Fv2YwoXLMs5usDLF b4NuxOwVL5p+MZC9jMmuW4rBjJzsBkyCFYFVPTdzWxqJ528OpHWYKaRMYKWHEKpkvRsjQx wniGEBFJGcS7CaH0ahISCB6a2Z5oCeZzNgPHaHTJ65prjk1lc/tRS2lxobRVuQf9V4IFC/ RnTo0gz4jAW7t90ADkIGFY1R2oYdO4nYiL5d9Fu6Ns7uXB2MdmBZY8/f7aFBNEFOZ/Zt2w Ftmqd+mKAeD1qj7EEDjk9KEBjcWsMUABYvPtmYElCm706/LNXAluS7xwsLDNeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773369312; a=rsa-sha256; cv=none; b=f8GWQsC3GXtYWI5DWywekZnOczWLKKc1yqydnL86uCKXk1FPA8jywa7QhabzW0UccMPnjC Fcwh4jj8bfQieHhvhha1dpNUEUCgIzAbr3p5P5Hqa/p6e3IazNcT4Wlit0Nt1KzKnFO1fv rJ9wj8LkkgVZCpwJP9fRujO6OPkJ2bxvZd7//iGzVbdDml8/nKMwu70aANxIUz9qv7tL/o rO306btNCUX3fh28s/ltsevULKppuXA/IZPmr0DIUrapmIRfIJdiKPlx77CnONWEazzL4Q UbZD4Wi0G2WE44maz7RLzudyO/ey6rX6UfrFZK5lYiDUzfjngwVgXqpx5Bcs1A== 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=1773369312; 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=199RK3Pra0jWus5XoZr1OcAh5GwfK+Kb1R6Ra0NEIgY=; b=FWSSv2KWZEdJDLgVCNu9oEay0sRHvsBjVPB2nFbbUyPuV3QDn21U5GgrpPSwSCOw8/F/E1 XQZ2df/x3tHNgoY6gX6LNAgcDJsE0jOYH29LxIRff+hG2687Rj6qziKBVIBEE8AAGTsHsD p4iE+p3+bZHuTPy2ROjpMWKBS7C18t0Ngb9L0Y673q3E7ix7OAI1VF2y8QtM5vlBIMHsbH yEEul7mW2u1KPIFRthZb9kgPccWHj6L52RKkVOXrtYUdLsY/cYuH99fuxm4BNoP3yBE3qg 0i3l4UTHyDHJy6d9kMGJgMUu/dCHakyY6cX3QY+q4c8eI3SHkRE8b9KWE/pzBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fX7r03BWSz1BmY for ; Fri, 13 Mar 2026 02:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a2ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 02:35:12 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 0b690433aea6 - 2026Q1 - textproc/elasticsearch7: Fix build 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/2026Q1 X-Git-Reftype: branch X-Git-Commit: 0b690433aea60eef332f49853e017e567a239666 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 02:35:12 +0000 Message-Id: <69b377e0.3a2ec.50ba6bb6@gitrepo.freebsd.org> The branch 2026Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b690433aea60eef332f49853e017e567a239666 commit 0b690433aea60eef332f49853e017e567a239666 Author: Vladimir Druzenko AuthorDate: 2026-03-13 02:32:52 +0000 Commit: Vladimir Druzenko CommitDate: 2026-03-13 02:35:02 +0000 textproc/elasticsearch7: Fix build with non-default USERS/GROUPS Also use ${ETCDIR} instead of ${PREFIX}/etc/elasticsearch. Approved by: blanket (fix build) MFH: 2026Q1 (cherry picked from commit 33d68c58fb5855aab6fe665b7f380aa42a2c6672) --- textproc/elasticsearch7/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/textproc/elasticsearch7/Makefile b/textproc/elasticsearch7/Makefile index 0128d84994b4..897904e7d900 100644 --- a/textproc/elasticsearch7/Makefile +++ b/textproc/elasticsearch7/Makefile @@ -77,7 +77,7 @@ post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/bin/elasticsearch-env do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch \ + ${MKDIR} ${STAGEDIR}${ETCDIR} \ ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin \ ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins \ ${STAGEDIR}${PREFIX}/libexec/elasticsearch @@ -104,6 +104,6 @@ post-install: ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir lib/elasticsearch/plugins" >> ${TMPPLIST} ${ECHO} "@dir libexec/elasticsearch" >> ${TMPPLIST} - ${ECHO} "@dir(elasticsearch,elasticsearch,0755) ${ETCDIR}" >> ${TMPPLIST} + ${ECHO} "@dir(${SEARCHUSER},${SEARCHGROUP},0755) ${ETCDIR}" >> ${TMPPLIST} .include