Revert "textproc/apache-solr: Update version 8.11.2=>9.0.0"

This reverts commit b224cb40ad.
This upgrade break solr installation as additional work may be
required to get the new version with existing collections
working.
This commit is contained in:
Matthias Fechner 2022-10-16 09:01:12 +02:00
parent 2b1e7456fb
commit 7abbbd4175
4 changed files with 24 additions and 26 deletions

View file

@ -1,8 +1,9 @@
PORTNAME= apache-solr
PORTVERSION= 9.0.0
PORTVERSION= 8.11.2
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= textproc java
MASTER_SITES= https://archive.apache.org/dist/solr/solr/${PORTVERSION}/
MASTER_SITES= https://archive.apache.org/dist/lucene/solr/${PORTVERSION}/
DISTNAME= solr-${PORTVERSION}
MAINTAINER= mfechner@FreeBSD.org
@ -14,22 +15,19 @@ 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
USE_RC_SUBR= solr
NO_ARCH= yes
NO_BUILD= yes
NO_ARCH= yes
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
SUB_FILES= pkg-message
USE_RC_SUBR= solr
USERS= solr
GROUPS= ${USERS}
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
CPE_PRODUCT= solr
CPE_VENDOR= apache
OPTIONS_DEFINE= JTS
OPTIONS_SUB= yes

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1665150331
SHA256 (solr-9.0.0.tgz) = fd1ddf07e2a25fffee2f398926de7889275bdd2520e97b50402c12125d39581e
SIZE (solr-9.0.0.tgz) = 223857836
TIMESTAMP = 1655708783
SHA256 (solr-8.11.2.tgz) = 54d6ebd392942f0798a60d50a910e26794b2c344ee97c2d9b50e678a7066d3a6
SIZE (solr-8.11.2.tgz) = 218171227

View file

@ -1,6 +1,6 @@
--- bin/solr.orig 2022-04-25 20:37:26 UTC
--- bin/solr.orig 2020-10-28 09:40:06 UTC
+++ bin/solr
@@ -2269,13 +2269,12 @@ function start_solr() {
@@ -2255,13 +2255,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
@@ -2293,13 +2292,6 @@ function start_solr() {
@@ -2279,13 +2278,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`
- SOLR_PID=`ps auxww | grep start\.jar | grep -w "\-Djetty\.port=$SOLR_PORT" | grep -v grep | awk '{print $2}' | sort -r`
- echo -e "\nStarted Solr server on port $SOLR_PORT (pid=$SOLR_PID). Happy searching!\n"
- return;
- fi

View file

@ -14,6 +14,11 @@ 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.
@ -32,14 +37,9 @@ 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/9_0/solr-upgrade-notes.html
https://solr.apache.org/guide/8_9/solr-upgrade-notes.html
EOM
}
]