git: b224cb40ad54 - main - textproc/apache-solr: Update version 8.11.2=>9.0.0
Date: Sat, 08 Oct 2022 13:05:57 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b224cb40ad545da1f09dcf0d8bafb8baf0e1b110
commit b224cb40ad545da1f09dcf0d8bafb8baf0e1b110
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-10-08 13:02:28 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
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
}
]