From 7636b89500e53864a53949054ad95102e1b87f35 Mon Sep 17 00:00:00 2001
From: Matthias Fechner <mfechner@FreeBSD.org>
Date: Sun, 18 Jun 2023 14:44:04 +0300
Subject: textproc/apache-solr: switch to version 9

For more details look on 20230618 in UPDATING
---
 textproc/apache-solr8/files/patch-bin_solr | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 textproc/apache-solr8/files/patch-bin_solr

(limited to 'textproc/apache-solr8/files/patch-bin_solr')

diff --git a/textproc/apache-solr8/files/patch-bin_solr b/textproc/apache-solr8/files/patch-bin_solr
new file mode 100644
index 000000000000..0ea5bdcbddd3
--- /dev/null
+++ b/textproc/apache-solr8/files/patch-bin_solr
@@ -0,0 +1,31 @@
+--- bin/solr.orig	2020-10-28 09:40:06 UTC
++++ bin/solr
+@@ -2255,13 +2255,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
+@@ -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 | 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
+   fi
+ }
+ 
-- 
cgit v1.2.3