From nobody Thu Dec 19 09:56:34 2024 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 4YDQtW0xVnz5gwnC; Thu, 19 Dec 2024 09:56:35 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YDQtV5y08z4CT4; Thu, 19 Dec 2024 09:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734602194; 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=nS5DkSCh85nmHTS1LveNxFDjAnXAQlQ1aheppYFYE5g=; b=nJfC7OC7BvPYOBd6P40h0tIW4ejlUZWkLQMMk32XBJTjtId4WrrplJ4NY620Bb3EWBTQqg Y8Go4iGah3ePeSEzF0nCPuU3PZT39Rm+0jKvfYc2WzjkL8W2CkGn62V60X5pYjP3e8mFeX jm0XTjBph3ugs6WF7ARyLsuDigTuiI+nmV6XP1qFbtiDDDGkkJ5Vn+kS5c60TcnuI+gZ+o /5Qxf2xMIan47RkKdKE7j+R19Qvl3HlGC2NekRbMvXGqBg9o4rWIB04jqA/HeUvgm9IADU tsF82AodjrjIt0EPc4+2xS4SD791Tc8hMap67820MlFM/d5/4P2ogngtVErYQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734602194; 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=nS5DkSCh85nmHTS1LveNxFDjAnXAQlQ1aheppYFYE5g=; b=hhU2oyw6cepFnv0DclICTPix4iMJ0KWvgOgzNWfpnm1T2H4+IA5HzpU4XU5y3R3Cwy8RNr c6cNE/41dwCjoE/+p8CODxA/hetMGckO4jMFP+qnJU/KZlKzQukazNVctUKaUrH6fvwLJo FtPwWVCDCCkyiOqs0+3RnJQqfDQExN5QJMANCjvCyyxYD9FLartzNe4Xra8dN3sXQR2IhY TDklgNWzLUPBon/GhZGbPXZ+XKImjvRmVrRfZRkFJhEbCgYrQo2P7xx9tmvHF2CWPV5N6H 5zbfbxZyMYNvZ0TFii4tzUGxdKsbM5jM9hixOJ6Q/f+p8NuRlUcLlUM78HEsBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734602194; a=rsa-sha256; cv=none; b=UQuw6Ew4Ft/2eB9UYoncnSyzdalgm6GDUukZigagQ1GVnNmoUn/qrdmUKV3+3Tfy+8CyHt tEYpDYDv3dkJNHrowh/drnSpzUfK7CCNPCvv6h1/cszDgxrmuip/UiHuy6/vXUSkJPr/ml 1Nybiw/8Inmk1druKBX3XJmCM4X89kIjbPQmt9yu/HO/uCiUMSyhyB6bwwWAMQuieQQmMp 4EUA6UzUwhnXfGCZ6o9K+etsCcHSHkKPgH2l752/wYLv6ZjNChuRsC42/hYjXM7ZT7shdS vbBzal2fMtC4UdraXtmyLHmUuwWgqA+OkHc5TL/248BaEVJ62BfpadKtenKi5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YDQtV57BRzpMx; Thu, 19 Dec 2024 09:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BJ9uY1T076964; Thu, 19 Dec 2024 09:56:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BJ9uYgg076961; Thu, 19 Dec 2024 09:56:34 GMT (envelope-from git) Date: Thu, 19 Dec 2024 09:56:34 GMT Message-Id: <202412190956.4BJ9uYgg076961@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 5cd096a4dce2 - 2024Q4 - textproc/apache-solr: use sockstat instead of lsof 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 5cd096a4dce2188fc74fcb4026b45aaf073a2707 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=5cd096a4dce2188fc74fcb4026b45aaf073a2707 commit 5cd096a4dce2188fc74fcb4026b45aaf073a2707 Author: Matthias Fechner AuthorDate: 2024-12-13 09:17:37 +0000 Commit: Matthias Fechner CommitDate: 2024-12-19 09:04:46 +0000 textproc/apache-solr: use sockstat instead of lsof While starting solr it is using now sockstat and can detect now if the start was successful. The patch is also provided upstream here: https://github.com/apache/solr/pull/2906 Thanks a lot freebsd@koenigbj.8bx.de to provide with the required sockstat parameters to make this PR possible. PR: 283270 (cherry picked from commit a164dd24d276862af02b1a02f1dfd728ca4de71d) --- textproc/apache-solr/Makefile | 1 + textproc/apache-solr/files/patch-bin_solr | 33 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile index 4193227435e8..41035b83c920 100644 --- a/textproc/apache-solr/Makefile +++ b/textproc/apache-solr/Makefile @@ -1,5 +1,6 @@ PORTNAME= apache-solr PORTVERSION= 9.7.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= textproc java MASTER_SITES= https://archive.apache.org/dist/solr/solr/${PORTVERSION}/ diff --git a/textproc/apache-solr/files/patch-bin_solr b/textproc/apache-solr/files/patch-bin_solr new file mode 100644 index 000000000000..9184b2f8ba45 --- /dev/null +++ b/textproc/apache-solr/files/patch-bin_solr @@ -0,0 +1,33 @@ +--- bin/solr.orig 2024-08-06 17:02:34 UTC ++++ bin/solr +@@ -2027,13 +2027,20 @@ function start_solr() { + fi + + # no lsof on cygwin though ++ check_command="" + if lsof -v 2>&1 | grep -q revision; then ++ check_command="lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN" ++ elif which -s sockstat; then ++ check_command="sockstat -q46lp$SOLR_PORT" ++ fi ++ ++ if [[ "${check_command}" != "" ]]; then + echo -n "Waiting up to $SOLR_START_WAIT seconds to see Solr running on port $SOLR_PORT" + # Launch in a subshell to show the spinner + (loops=0 + while true + do +- running=$(lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN || :) ++ running=$(${check_command} || :) + if [ -z "${running:-}" ]; then + slept=$((loops * 2)) + if [ $slept -lt $SOLR_START_WAIT ]; then +@@ -2052,7 +2059,7 @@ function start_solr() { + done) & + spinner $! + else +- echo -e "NOTE: Please install lsof as this script needs it to determine if Solr is listening on port $SOLR_PORT." ++ echo -e "NOTE: Please install lsof or sockstat as this script needs it to determine if Solr is listening on port $SOLR_PORT." + sleep 10 + SOLR_PID=$(ps auxww | grep start\.jar | awk "/\-Djetty\.port=$SOLR_PORT/"' {print $2}' | sort -r) + echo -e "\nStarted Solr server on port $SOLR_PORT (pid=$SOLR_PID). Happy searching!\n"