From nobody Sat Oct 8 13:05:57 2022 X-Original-To: dev-commits-ports-main@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 4Ml55d47lkz4fLH8; Sat, 8 Oct 2022 13:05:57 +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 4Ml55d3YqCz3c3J; Sat, 8 Oct 2022 13:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665234357; 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=4VJnkqID872ooT5g8Qef+qbq7EwNCf+geF+lRZVNWr0=; b=Aonuns+yDW3aP/YgUntZjPrM6Er2QT97R1tGYn4DAEq3qSckuYIlarn5aBpfwM1qWu++tV N8qVnxK23obSyhs0R1CCY1Dyn9b4vxQNvKxTH+zRf+L1pECQkUho8GWr2uh6naQ6Bo+GNO XXghzlkBiogoumoNdDD7EjYdjbRNY7Ag0R0GVE2ZgK0b3OwGX0ZSPmE7pRUSe1AHJLKojm Z+Hj6xyufcq6KUDed0S5lUnif3LNt7/f8Mta1uYN8MboSfLNONFbz9uFX9a3LOCkgXBcq+ ynwbyWXpREU61M730c0uztkCpT9I81/Tfq+Gzv/2akavLgTL8Skij3qto/dgpA== 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 4Ml55d2X5JzxDr; Sat, 8 Oct 2022 13:05:57 +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 298D5vnc063939; Sat, 8 Oct 2022 13:05:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 298D5vqB063938; Sat, 8 Oct 2022 13:05:57 GMT (envelope-from git) Date: Sat, 8 Oct 2022 13:05:57 GMT Message-Id: <202210081305.298D5vqB063938@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: b224cb40ad54 - main - textproc/apache-solr: Update version 8.11.2=>9.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b224cb40ad545da1f09dcf0d8bafb8baf0e1b110 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665234357; 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=4VJnkqID872ooT5g8Qef+qbq7EwNCf+geF+lRZVNWr0=; b=KVcfO0QGHCVLISduY5nwRxVL89aO58l2+JcJLLhckm1kaVk1mJssrcxBdKRrtJG/Ced3Vc fqTfqNK9hEdZwb0ctkYELE4TfaOmraFof8Rni/NHmRc2TN7IP44Cp4ATOp6JeVrJH274TG cLadyF0yQO3NpwzEP3kzTUSy39Eaz/fzoJS/hEE/IBiGVIiQGGbkLx1l2phoQjJZFBnygr OumkhvO9BkPxxDxE9oEZdNO3VfIDlospntnw1Uq40AR73jk4BF/ciadSfHy1doV8VGv/Zp AlpoN7ikyRwwiFritLnV3LR9uBdLoQHgzNiSPkLYCB7o/mHaUzujD4RuM08gPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665234357; a=rsa-sha256; cv=none; b=Oz6TLIzKkMOPb0ozV24EZ+ZM0m1Nm9LahXQljcO8qsU9cdMD7qb6yUSAr7IZDfzggcHGth 1rIIFG9MW4xlXKEvk9KQutBJA8Xm4cayRi9n8JCBY9++aE2qFrx5nvSfOSHLijOEw2Ova4 g7pZxmLq8ip3DYq5yEZ6lYxYduMOhAA1/ZRoWV3Ywh5wQDBm/7NtLbcjitAReUJi8fwWNw NFEtA2F3yfh4C4JedRcKDIJqq75N2+dqthzV/5hekDhH2o+cs/TpuOD/SfClwQ3+lUOjHe RD7cvBr7QZdzXut94NWtDJ8Dfa/2VyQiUrAghmb/LheRdbFgBb4hNMXY3N6ckA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=b224cb40ad545da1f09dcf0d8bafb8baf0e1b110 commit b224cb40ad545da1f09dcf0d8bafb8baf0e1b110 Author: Muhammad Moinur Rahman AuthorDate: 2022-10-08 13:02:28 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-10-08 13:05:43 +0000 textproc/apache-solr: Update version 8.11.2=>9.0.0 - Pet portclippy IMPORTANT NOTE: Data Import Handler has been removed from this version. Please use the third party community plugin from: https://github.com/rohitbemax/dataimporthandler Approved by: mfechner (By implicit mail in developers@) Sponsored by: Bounce Experts --- textproc/apache-solr/Makefile | 17 ++++++++++------- textproc/apache-solr/distinfo | 6 +++--- textproc/apache-solr/files/patch-bin_solr | 14 +++++++------- textproc/apache-solr/files/pkg-message.in | 12 ++++++------ 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile index 546bee228e89..027cc18dabd4 100644 --- a/textproc/apache-solr/Makefile +++ b/textproc/apache-solr/Makefile @@ -1,8 +1,8 @@ PORTNAME= apache-solr -PORTVERSION= 8.11.2 +PORTVERSION= 9.0.0 PORTREVISION= 0 CATEGORIES= textproc java -MASTER_SITES= https://archive.apache.org/dist/lucene/solr/${PORTVERSION}/ +MASTER_SITES= https://archive.apache.org/dist/solr/solr/${PORTVERSION}/ DISTNAME= solr-${PORTVERSION} MAINTAINER= mfechner@FreeBSD.org @@ -14,19 +14,22 @@ LICENSE= APACHE20 RUN_DEPENDS= bash:shells/bash USES= cpe tar:tgz +CPE_VENDOR= apache +CPE_PRODUCT= solr USE_JAVA= yes JAVA_VERSION= 11+ JAVA_RUN= yes -NO_BUILD= yes +USE_RC_SUBR= solr + NO_ARCH= yes -PLIST_SUB+= PORTVERSION="${PORTVERSION}" +NO_BUILD= yes + SUB_FILES= pkg-message -USE_RC_SUBR= solr + USERS= solr GROUPS= ${USERS} -CPE_PRODUCT= solr -CPE_VENDOR= apache +PLIST_SUB+= PORTVERSION="${PORTVERSION}" OPTIONS_DEFINE= JTS OPTIONS_SUB= yes diff --git a/textproc/apache-solr/distinfo b/textproc/apache-solr/distinfo index e72f763a3c70..76634295a4da 100644 --- a/textproc/apache-solr/distinfo +++ b/textproc/apache-solr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655708783 -SHA256 (solr-8.11.2.tgz) = 54d6ebd392942f0798a60d50a910e26794b2c344ee97c2d9b50e678a7066d3a6 -SIZE (solr-8.11.2.tgz) = 218171227 +TIMESTAMP = 1665150331 +SHA256 (solr-9.0.0.tgz) = fd1ddf07e2a25fffee2f398926de7889275bdd2520e97b50402c12125d39581e +SIZE (solr-9.0.0.tgz) = 223857836 diff --git a/textproc/apache-solr/files/patch-bin_solr b/textproc/apache-solr/files/patch-bin_solr index 0ea5bdcbddd3..1c15691df53e 100644 --- a/textproc/apache-solr/files/patch-bin_solr +++ b/textproc/apache-solr/files/patch-bin_solr @@ -1,6 +1,6 @@ ---- bin/solr.orig 2020-10-28 09:40:06 UTC +--- bin/solr.orig 2022-04-25 20:37:26 UTC +++ bin/solr -@@ -2255,13 +2255,12 @@ function start_solr() { +@@ -2269,13 +2269,12 @@ function start_solr() { echo "" fi # no lsof on cygwin though @@ -10,19 +10,19 @@ (loops=0 while true do -- running=$(lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN) +- 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 [ -z "${running:-}" ]; then + slept=$((loops * 2)) if [ $slept -lt $SOLR_START_WAIT ]; then -@@ -2279,13 +2278,6 @@ function start_solr() { +@@ -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 | grep -w "\-Djetty\.port=$SOLR_PORT" | grep -v grep | awk '{print $2}' | sort -r` +- 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 diff --git a/textproc/apache-solr/files/pkg-message.in b/textproc/apache-solr/files/pkg-message.in index 9a5826983431..4ff8a03f0ec2 100644 --- a/textproc/apache-solr/files/pkg-message.in +++ b/textproc/apache-solr/files/pkg-message.in @@ -14,11 +14,6 @@ http://lucene.apache.org/solr/resources.html#documentation The port is configured to listen only on localhost, port 8983. -To have a working initial config, use: - -cp -R %%LOCALBASE%%/solr/example/example-DIH/solr/solr /var/db/solr/ -chown -R solr /var/db/solr/solr - To rotate solr log files include /var/log/solr/ to your log rotation configuration. @@ -37,9 +32,14 @@ If you would like to change logging, copy: cp %%LOCALBASE%%/solr/server/resources/log4j2.xml /var/db/solr/ Change it and make sure it is loaded in %%LOCALBASE%%/etc/solr.in.sh. +Data Import Handler (DIH) has been removed from the base solr and is +available as independent module which can be installed with solr +package manager. The current repo is available at: +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/8_9/solr-upgrade-notes.html +https://solr.apache.org/guide/9_0/solr-upgrade-notes.html EOM } ]