From nobody Sat May 6 20:26:40 2023 X-Original-To: dev-commits-ports-branches@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 4QDJxF101xz494yT; Sat, 6 May 2023 20:26:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QDJxF0MlYz3tg4; Sat, 6 May 2023 20:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683404801; 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=bjTH0n3wttSoIWSe8jTkrvIS3gK9bkHGzT09HpB9iVA=; b=cM/RmhK3AYDT8JPgVmwB0G20SRcJt/OUAGdmnuFstXtZT2TDHVVv+zYiJ+gNTSSTvRc84h VJ5CnPpNBFkR6jNGzOPMBXkUZ+qyKEiPmuH0q6rpMBVJK26kZQLQXDK4efpRPkyZ8E8YhT DQIoRh2CelV624WYy+DWHjfGuImZC//dPLma1vcdQgbLsUzN3Hw/jMejyZOwALn8MR33nA l9Dq+9UXPYoFMVCpxOF8M//d99SeQtEHmlvPaJ+mQCTknfSJ7NWXrm5uIzWnz1Tn9GSN6O t5sMQOrq4/ty3rNZsgkwBRwgJM3zRyC9QYt44mmjjK88Mtt3mCQzAKOP150aeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683404801; 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=bjTH0n3wttSoIWSe8jTkrvIS3gK9bkHGzT09HpB9iVA=; b=HluCuutVDGP2RCBWwQCitKmYaIxCa32m0PRwPwAfRGkzK0J+HEvjVjpaVMBq3c22ZuYfhi JZ3csX9MgMCxxQdEY/Xtac3OwR2bbupycQYpQF8TZM7vL+XZooSJWra1LmxMs0vohE43Wk BYeS/7gA8aO3x6vgY9i8fawmegqrfW9OV8LaGu/jRZMj1DAF77/unR3fcNw8URUr69DuV8 5UUnrymZUXaLww2WGC1Mrx4JocyMss4JcCo9Wo/NloIy0Xn0rt2O6TCOccqZUDWyDGO/l4 YcxK0KHhCrebuN59WPXI3SymzLhvxXzmq/I/U+5Oib52VbCqjJLQ6tKpPYEJjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683404801; a=rsa-sha256; cv=none; b=ERoM6RCKxEpvxrXV+7I3cH21pjyyFrNXrQp13xnqYDgvvxDd0vMjVsURhqe1jrEA6j+NLd Va+V9q3Hyd8lrlasL1330PD9Jh4g/PUMZY2Fy01bGJ8l98ZaTPmtYQ5u+HEq7BUmrziesS 4JkcgHhk11xr9XHMlW0uyafKDFnrY7mxnD+GCuADrau6iflLzmIu7GLYY6/udutnfmj1sJ XCCjlQW/4KiM7TGZUV1jXYFZ7Il3MNjOHo1B+h4fqirc3RZe1TKC/WyZmQhHSI2q2kSd6A BbH3JLuGn6VCARE6CpK0JKdS38WTYOKP6pMJBu9Igg74lj+8n1X4X7CxRb5nBw== 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 4QDJxD6X5Wzqlh; Sat, 6 May 2023 20:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 346KQeBT080568; Sat, 6 May 2023 20:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 346KQewC080567; Sat, 6 May 2023 20:26:40 GMT (envelope-from git) Date: Sat, 6 May 2023 20:26:40 GMT Message-Id: <202305062026.346KQewC080567@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: e53d3e2c6afa - 2023Q2 - textproc/apache-solr9: update from 9.1.1 -> 9.2.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: e53d3e2c6afa07a9b03380f15cca477c8d444494 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e53d3e2c6afa07a9b03380f15cca477c8d444494 commit e53d3e2c6afa07a9b03380f15cca477c8d444494 Author: Matthias Fechner AuthorDate: 2023-04-23 08:26:41 +0000 Commit: Matthias Fechner CommitDate: 2023-05-06 20:18:12 +0000 textproc/apache-solr9: update from 9.1.1 -> 9.2.0 Changelog: https://solr.apache.org/news.html#apache-solrtm-920-available (cherry picked from commit 79d02242b24f2b6f43ef46af3cf86350f2508bbc) --- textproc/apache-solr9/Makefile | 3 +-- textproc/apache-solr9/distinfo | 6 +++--- textproc/apache-solr9/files/patch-bin_solr | 31 ------------------------------ textproc/apache-solr9/files/pkg-message.in | 4 ++++ 4 files changed, 8 insertions(+), 36 deletions(-) diff --git a/textproc/apache-solr9/Makefile b/textproc/apache-solr9/Makefile index fb41a287b8b8..23be209eeba8 100644 --- a/textproc/apache-solr9/Makefile +++ b/textproc/apache-solr9/Makefile @@ -1,5 +1,5 @@ PORTNAME= apache-solr -PORTVERSION= 9.1.1 +PORTVERSION= 9.2.0 PORTREVISION= 0 CATEGORIES= textproc java MASTER_SITES= https://archive.apache.org/dist/solr/solr/${PORTVERSION}/ @@ -41,7 +41,6 @@ JTS_RUN_DEPENDS= jts>0:math/jts do-install: ${FIND} ${WRKSRC} -name '*.orig' -delete cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${CPE_PRODUCT} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/oom_solr.sh ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin ${INSTALL_SCRIPT} ${WRKSRC}/bin/post ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin ${INSTALL_SCRIPT} ${WRKSRC}/bin/postlogs ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin ${INSTALL_SCRIPT} ${WRKSRC}/bin/solr ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin diff --git a/textproc/apache-solr9/distinfo b/textproc/apache-solr9/distinfo index 157bdf0ee4a8..1072d03ea14c 100644 --- a/textproc/apache-solr9/distinfo +++ b/textproc/apache-solr9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676718132 -SHA256 (solr-9.1.1.tgz) = 3d66aadb0afa69360da05a9124e7724539c7d5e41adecb7a736921baf6b97575 -SIZE (solr-9.1.1.tgz) = 229955064 +TIMESTAMP = 1682234904 +SHA256 (solr-9.2.0.tgz) = 8b134a13a3e7598f68565b01e755a47e24b37a88141cd2f489fc2812c96f21af +SIZE (solr-9.2.0.tgz) = 278193419 diff --git a/textproc/apache-solr9/files/patch-bin_solr b/textproc/apache-solr9/files/patch-bin_solr deleted file mode 100644 index 1c15691df53e..000000000000 --- a/textproc/apache-solr9/files/patch-bin_solr +++ /dev/null @@ -1,31 +0,0 @@ ---- bin/solr.orig 2022-04-25 20:37:26 UTC -+++ bin/solr -@@ -2269,13 +2269,12 @@ function start_solr() { - echo "" - fi - # no lsof on cygwin though -- if lsof -v 2>&1 | grep -q revision; 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=$(sockstat -ls -P tcp -p $SOLR_PORT | grep LISTEN) - if [ -z "${running:-}" ]; then - slept=$((loops * 2)) - if [ $slept -lt $SOLR_START_WAIT ]; then -@@ -2293,13 +2292,6 @@ function start_solr() { - fi - done) & - spinner $! -- else -- echo -e "NOTE: Please install lsof 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" -- return; -- fi - fi - } - diff --git a/textproc/apache-solr9/files/pkg-message.in b/textproc/apache-solr9/files/pkg-message.in index 4ff8a03f0ec2..bfbc748d17b9 100644 --- a/textproc/apache-solr9/files/pkg-message.in +++ b/textproc/apache-solr9/files/pkg-message.in @@ -40,6 +40,10 @@ https://github.com/rohitbemax/dataimporthandler Make also sure to always check the manual if you need to modify your configs or schemas: https://solr.apache.org/guide/9_0/solr-upgrade-notes.html + +Maybe you want also to check some examples: +https://dovecot.org/pipermail/dovecot/2022-May/124701.html +https://dovecot.org/pipermail/dovecot/2022-May/124711.html EOM } ]