From 67705bc487952b73ee3e837491f43815a9507b99 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Mon, 3 Feb 2025 14:17:10 +0000
Subject: [PATCH] update to solr-9.8.0

---
 textproc/solr/Makefile                     |  3 +--
 textproc/solr/distinfo                     |  4 ++--
 textproc/solr/patches/patch-bin_solr       | 10 +++++-----
 textproc/solr/patches/patch-bin_solr_in_sh |  8 ++++----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/textproc/solr/Makefile b/textproc/solr/Makefile
index f97fcef00d3..8512dd5985d 100644
--- a/textproc/solr/Makefile
+++ b/textproc/solr/Makefile
@@ -1,9 +1,8 @@
 COMMENT=	full-text search engine based on Lucene
 
-V=		9.2.0
+V=		9.8.0
 DISTNAME=	solr-$V
 EXTRACT_SUFX=	.tgz
-REVISION=	0
 
 PKG_ARCH=	*
 
diff --git a/textproc/solr/distinfo b/textproc/solr/distinfo
index 6f262c74956..5680f348f49 100644
--- a/textproc/solr/distinfo
+++ b/textproc/solr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (solr-9.2.0.tgz) = ixNKE6PnWY9oVlsB51WkfiSzeogUHNL0ifwoEslvIa8=
-SIZE (solr-9.2.0.tgz) = 278193419
+SHA256 (solr-9.8.0.tgz) = mUjc95jBlrg0xMu0INHqWZVHlDFmnSZsM9RlSLZ+aeE=
+SIZE (solr-9.8.0.tgz) = 386095370
diff --git a/textproc/solr/patches/patch-bin_solr b/textproc/solr/patches/patch-bin_solr
index 6a9c5702688..a892636bf5a 100644
--- a/textproc/solr/patches/patch-bin_solr
+++ b/textproc/solr/patches/patch-bin_solr
@@ -9,7 +9,7 @@ Index: bin/solr
                 /usr/share/solr/solr.in.sh \
                 /usr/local/share/solr/solr.in.sh \
                 /etc/default/solr.in.sh \
-@@ -140,8 +141,8 @@ elif [ -n "${JAVA_HOME:-}" ]; then
+@@ -147,8 +148,8 @@ elif [ -n "${JAVA_HOME:-}" ]; then
      exit 1
    fi
  else
@@ -20,18 +20,18 @@ Index: bin/solr
  fi
  
  : "${SOLR_STOP_WAIT:=180}"
-@@ -718,7 +719,7 @@ function solr_pid_by_port() {
+@@ -493,7 +494,7 @@ function solr_pid_by_port() {
  # extract the value of the -Djetty.port parameter from a running Solr process
  function jetty_port() {
    SOLR_PID="$1"
--  SOLR_PROC=$(ps -o command='' -p "$SOLR_PID" | grep start\.jar | grep jetty\.port)
+-  SOLR_PROC=$(ps -fww -p "$SOLR_PID" | grep start\.jar | grep jetty\.port)
 +  SOLR_PROC=$(ps -ww -o command='' -p "$SOLR_PID" | grep start\.jar | grep jetty\.port)
    IFS=' ' read -a proc_args <<< "$SOLR_PROC"
    for arg in "${proc_args[@]}"
      do
-@@ -2318,13 +2319,13 @@ function start_solr() {
- 	echo ""
+@@ -1455,13 +1456,13 @@ function start_solr() {
      fi
+ 
      # no lsof on cygwin though
 -    if lsof -v 2>&1 | grep -q revision; then
 +    if true; then
diff --git a/textproc/solr/patches/patch-bin_solr_in_sh b/textproc/solr/patches/patch-bin_solr_in_sh
index 5a7dcefc4d1..a8f0a87234b 100644
--- a/textproc/solr/patches/patch-bin_solr_in_sh
+++ b/textproc/solr/patches/patch-bin_solr_in_sh
@@ -1,9 +1,9 @@
 Index: bin/solr.in.sh
 --- bin/solr.in.sh.orig
 +++ bin/solr.in.sh
-@@ -101,13 +101,16 @@
- #SOLR_OPTS="$SOLR_OPTS -Dsolr.autoCommit.maxTime=60000"
- #SOLR_OPTS="$SOLR_OPTS -Dsolr.clustering.enabled=true"
+@@ -110,13 +110,16 @@
+ # A naming convention is that SOLR_FOO_BAR maps to solr.foo.bar
+ #SOLR_CLUSTERING_ENABLED=true
  
 +# Bind only to localhost by default:
 +SOLR_OPTS="$SOLR_OPTS -Djetty.host=localhost"
@@ -20,7 +20,7 @@ Index: bin/solr.in.sh
  
  # Path to a directory that Solr will use as root for data folders for each core.
  # If not set, defaults to <instance_dir>/data. Overridable per core through 'dataDir' core property
-@@ -116,14 +119,14 @@
+@@ -125,14 +128,14 @@
  # Solr provides a default Log4J configuration xml file in server/resources
  # however, you may want to customize the log settings and file appender location
  # so you can point the script to use a different log4j2.xml file