cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to solr-8.3.0

Browse Source
This commit is contained in:
sthen 2019-11-03 19:09:46 +00:00
parent 4067d436f1
commit 153ed2619b
5 changed files with 75 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
textproc/solr/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2019/08/01 12:40:52 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2019/11/03 19:09:46 sthen Exp $
COMMENT= full-text search engine based on Lucene
V= 8.2.0
V= 8.3.0
DISTNAME= solr-$V
EXTRACT_SUFX= .tgz

4
textproc/solr/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (solr-8.2.0.tgz) = v6SzmyNuXXFPQjMTi4tct+GZbdwKrWAFLOg8S3vzNEk=
SIZE (solr-8.2.0.tgz) = 181899182
SHA256 (solr-8.3.0.tgz) = GpggkVGGIn6vb8uFHWBpCFORG5KhW04LfwRjJOuNE4c=
SIZE (solr-8.3.0.tgz) = 186097798

6
textproc/solr/patches/patch-bin_solr
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-bin_solr,v 1.6 2019/05/15 08:18:34 sthen Exp $
$OpenBSD: patch-bin_solr,v 1.7 2019/11/03 19:09:46 sthen Exp $
Index: bin/solr
--- bin/solr.orig
@ -12,7 +12,7 @@ Index: bin/solr
fi
if [ -z "$SOLR_STOP_WAIT" ]; then
@@ -2135,14 +2135,12 @@ function start_solr() {
@@ -2160,14 +2160,12 @@ function start_solr() {
echo "RNG might not work properly. To check for the amount of available entropy, use 'cat /proc/sys/kernel/random/entropy_avail'."
echo ""
fi
@ -28,7 +28,7 @@ Index: bin/solr
if [ -z "$running" ]; then
slept=$((loops * 2))
if [ $slept -lt $SOLR_STOP_WAIT ]; then
@@ -2160,13 +2158,6 @@ function start_solr() {
@@ -2185,13 +2183,6 @@ function start_solr() {
fi
done) &
spinner $!

6
textproc/solr/patches/patch-bin_solr_in_sh
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-bin_solr_in_sh,v 1.3 2019/05/15 08:18:34 sthen Exp $
$OpenBSD: patch-bin_solr_in_sh,v 1.4 2019/11/03 19:09:46 sthen Exp $
Index: bin/solr.in.sh
--- bin/solr.in.sh.orig
+++ bin/solr.in.sh
@@ -94,13 +94,16 @@ ENABLE_REMOTE_JMX_OPTS="true"
@@ -94,13 +94,16 @@
#SOLR_OPTS="$SOLR_OPTS -Dsolr.autoCommit.maxTime=60000"
#SOLR_OPTS="$SOLR_OPTS -Dsolr.clustering.enabled=true"
@ -22,7 +22,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
@@ -109,14 +112,14 @@ ENABLE_REMOTE_JMX_OPTS="true"
@@ -109,14 +112,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

91
textproc/solr/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2019/08/01 12:40:52 sthen Exp $
@comment $OpenBSD: PLIST,v 1.12 2019/11/03 19:09:46 sthen Exp $
@newgroup _solr:801
@newuser _solr:801:_solr:daemon:solr user:/nonexistent:/sbin/nologin
@extraunexec rm -rf ${LOCALSTATEDIR}/db/solr/*
@ -50,9 +50,9 @@ share/solr/contrib/clustering/lib/
share/solr/contrib/clustering/lib/attributes-binder-1.3.3.jar
share/solr/contrib/clustering/lib/carrot2-guava-18.0.jar
share/solr/contrib/clustering/lib/carrot2-mini-3.16.0.jar
share/solr/contrib/clustering/lib/jackson-annotations-2.9.8.jar
share/solr/contrib/clustering/lib/jackson-databind-2.9.8.jar
share/solr/contrib/clustering/lib/simple-xml-2.7.1.jar
share/solr/contrib/clustering/lib/jackson-annotations-2.9.9.jar
share/solr/contrib/clustering/lib/jackson-databind-2.9.9.3.jar
share/solr/contrib/clustering/lib/simple-xml-safe-2.7.1.jar
share/solr/contrib/dataimporthandler/
share/solr/contrib/dataimporthandler-extras/
share/solr/contrib/dataimporthandler-extras/lib/
@ -129,9 +129,9 @@ share/solr/contrib/prometheus-exporter/conf/grafana-solr-dashboard.json
share/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml
share/solr/contrib/prometheus-exporter/lib/
share/solr/contrib/prometheus-exporter/lib/argparse4j-0.8.1.jar
share/solr/contrib/prometheus-exporter/lib/jackson-annotations-2.9.8.jar
share/solr/contrib/prometheus-exporter/lib/jackson-core-2.9.8.jar
share/solr/contrib/prometheus-exporter/lib/jackson-databind-2.9.8.jar
share/solr/contrib/prometheus-exporter/lib/jackson-annotations-2.9.9.jar
share/solr/contrib/prometheus-exporter/lib/jackson-core-2.9.9.jar
share/solr/contrib/prometheus-exporter/lib/jackson-databind-2.9.9.3.jar
share/solr/contrib/prometheus-exporter/lib/jackson-jq-0.0.8.jar
share/solr/contrib/prometheus-exporter/lib/log4j-api-2.11.2.jar
share/solr/contrib/prometheus-exporter/lib/log4j-core-2.11.2.jar
@ -181,6 +181,14 @@ share/solr/dist/solrj-lib/jetty-client-9.4.19.v20190610.jar
share/solr/dist/solrj-lib/jetty-http-9.4.19.v20190610.jar
share/solr/dist/solrj-lib/jetty-io-9.4.19.v20190610.jar
share/solr/dist/solrj-lib/jetty-util-9.4.19.v20190610.jar
share/solr/dist/solrj-lib/netty-buffer-4.1.29.Final.jar
share/solr/dist/solrj-lib/netty-codec-4.1.29.Final.jar
share/solr/dist/solrj-lib/netty-common-4.1.29.Final.jar
share/solr/dist/solrj-lib/netty-handler-4.1.29.Final.jar
share/solr/dist/solrj-lib/netty-resolver-4.1.29.Final.jar
share/solr/dist/solrj-lib/netty-transport-4.1.29.Final.jar
share/solr/dist/solrj-lib/netty-transport-native-epoll-4.1.29.Final.jar
share/solr/dist/solrj-lib/netty-transport-native-unix-common-4.1.29.Final.jar
share/solr/dist/solrj-lib/slf4j-api-1.7.24.jar
share/solr/dist/solrj-lib/stax2-api-3.1.4.jar
share/solr/dist/solrj-lib/woodstox-core-asl-4.4.1.jar
@ -558,7 +566,7 @@ share/solr/licenses/apache-mime4j-dom-NOTICE.txt
share/solr/licenses/argparse4j-0.8.1.jar.sha1
share/solr/licenses/argparse4j-LICENSE-MIT.txt
share/solr/licenses/argparse4j-NOTICE.txt
share/solr/licenses/asciidoctor-ant-1.6.0-alpha.5.jar.sha1
share/solr/licenses/asciidoctor-ant-1.6.2.jar.sha1
share/solr/licenses/asciidoctor-ant-LICENSE-ASL.txt
share/solr/licenses/asciidoctor-ant-NOTICE.txt
share/solr/licenses/asm-5.1.jar.sha1
@ -591,7 +599,7 @@ share/solr/licenses/boilerpipe-NOTICE.txt
share/solr/licenses/byte-buddy-1.9.3.jar.sha1
share/solr/licenses/byte-buddy-LICENSE-ASL.txt
share/solr/licenses/byte-buddy-NOTICE.txt
share/solr/licenses/caffeine-2.4.0.jar.sha1
share/solr/licenses/caffeine-2.8.0.jar.sha1
share/solr/licenses/caffeine-LICENSE-ASL.txt
share/solr/licenses/caffeine-NOTICE.txt
share/solr/licenses/calcite-core-1.18.0.jar.sha1
@ -606,9 +614,6 @@ share/solr/licenses/carrot2-guava-NOTICE.txt
share/solr/licenses/carrot2-mini-3.16.0.jar.sha1
share/solr/licenses/carrot2-mini-LICENSE-BSD_LIKE.txt
share/solr/licenses/carrot2-mini-NOTICE.txt
share/solr/licenses/commons-beanutils-1.9.3.jar.sha1
share/solr/licenses/commons-beanutils-LICENSE-ASL.txt
share/solr/licenses/commons-beanutils-NOTICE.txt
share/solr/licenses/commons-cli-1.2.jar.sha1
share/solr/licenses/commons-cli-LICENSE-ASL.txt
share/solr/licenses/commons-cli-NOTICE.txt
@ -762,18 +767,18 @@ share/solr/licenses/jackcess-NOTICE.txt
share/solr/licenses/jackcess-encrypt-2.1.4.jar.sha1
share/solr/licenses/jackcess-encrypt-LICENSE-ASL.txt
share/solr/licenses/jackcess-encrypt-NOTICE.txt
share/solr/licenses/jackson-annotations-2.9.8.jar.sha1
share/solr/licenses/jackson-annotations-2.9.9.jar.sha1
share/solr/licenses/jackson-annotations-LICENSE-ASL.txt
share/solr/licenses/jackson-annotations-NOTICE.txt
share/solr/licenses/jackson-core-2.9.8.jar.sha1
share/solr/licenses/jackson-core-2.9.9.jar.sha1
share/solr/licenses/jackson-core-LICENSE-ASL.txt
share/solr/licenses/jackson-core-NOTICE.txt
share/solr/licenses/jackson-core-asl-LICENSE-ASL.txt
share/solr/licenses/jackson-core-asl-NOTICE.txt
share/solr/licenses/jackson-databind-2.9.8.jar.sha1
share/solr/licenses/jackson-databind-2.9.9.3.jar.sha1
share/solr/licenses/jackson-databind-LICENSE-ASL.txt
share/solr/licenses/jackson-databind-NOTICE.txt
share/solr/licenses/jackson-dataformat-smile-2.9.8.jar.sha1
share/solr/licenses/jackson-dataformat-smile-2.9.9.jar.sha1
share/solr/licenses/jackson-dataformat-smile-LICENSE-ASL.txt
share/solr/licenses/jackson-dataformat-smile-NOTICE.txt
share/solr/licenses/jackson-jq-0.0.8.jar.sha1
@ -959,9 +964,33 @@ share/solr/licenses/morfologik-stemming-NOTICE.txt
share/solr/licenses/morfologik-ukrainian-search-3.9.0.jar.sha1
share/solr/licenses/morfologik-ukrainian-search-LICENSE-ASL.txt
share/solr/licenses/morfologik-ukrainian-search-NOTICE.txt
share/solr/licenses/netty-all-4.0.52.Final.jar.sha1
share/solr/licenses/netty-all-4.1.29.Final.jar.sha1
share/solr/licenses/netty-all-LICENSE-ASL.txt
share/solr/licenses/netty-all-NOTICE.txt
share/solr/licenses/netty-buffer-4.1.29.Final.jar.sha1
share/solr/licenses/netty-buffer-LICENSE-ASL.txt
share/solr/licenses/netty-buffer-NOTICE.txt
share/solr/licenses/netty-codec-4.1.29.Final.jar.sha1
share/solr/licenses/netty-codec-LICENSE-ASL.txt
share/solr/licenses/netty-codec-NOTICE.txt
share/solr/licenses/netty-common-4.1.29.Final.jar.sha1
share/solr/licenses/netty-common-LICENSE-ASL.txt
share/solr/licenses/netty-common-NOTICE.txt
share/solr/licenses/netty-handler-4.1.29.Final.jar.sha1
share/solr/licenses/netty-handler-LICENSE-ASL.txt
share/solr/licenses/netty-handler-NOTICE.txt
share/solr/licenses/netty-resolver-4.1.29.Final.jar.sha1
share/solr/licenses/netty-resolver-LICENSE-ASL.txt
share/solr/licenses/netty-resolver-NOTICE.txt
share/solr/licenses/netty-transport-4.1.29.Final.jar.sha1
share/solr/licenses/netty-transport-LICENSE-ASL.txt
share/solr/licenses/netty-transport-NOTICE.txt
share/solr/licenses/netty-transport-native-epoll-4.1.29.Final.jar.sha1
share/solr/licenses/netty-transport-native-epoll-LICENSE-ASL.txt
share/solr/licenses/netty-transport-native-epoll-NOTICE.txt
share/solr/licenses/netty-transport-native-unix-common-4.1.29.Final.jar.sha1
share/solr/licenses/netty-transport-native-unix-common-LICENSE-ASL.txt
share/solr/licenses/netty-transport-native-unix-common-NOTICE.txt
share/solr/licenses/objenesis-2.6.jar.sha1
share/solr/licenses/objenesis-LICENSE-ASL.txt
share/solr/licenses/objenesis-NOTICE.txt
@ -1032,9 +1061,9 @@ share/solr/licenses/s2-geometry-library-java-LICENSE-ASL.txt
share/solr/licenses/s2-geometry-library-java-NOTICE.txt
share/solr/licenses/servlet-api-LICENSE-CDDL.txt
share/solr/licenses/servlet-api-NOTICE.txt
share/solr/licenses/simple-xml-2.7.1.jar.sha1
share/solr/licenses/simple-xml-LICENSE-ASL.txt
share/solr/licenses/simple-xml-NOTICE.txt
share/solr/licenses/simple-xml-safe-2.7.1.jar.sha1
share/solr/licenses/simple-xml-safe-LICENSE-ASL.txt
share/solr/licenses/simple-xml-safe-NOTICE.txt
share/solr/licenses/simpleclient-0.2.0.jar.sha1
share/solr/licenses/simpleclient-LICENSE-ASL.txt
share/solr/licenses/simpleclient-NOTICE.txt
@ -1184,10 +1213,9 @@ share/solr/server/solr-webapp/webapp/WEB-INF/lib/antlr4-runtime-4.5.1-1.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/asm-5.1.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/asm-commons-5.1.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/avatica-core-1.13.0.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/caffeine-2.4.0.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/caffeine-2.8.0.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/calcite-core-1.18.0.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/calcite-linq4j-1.18.0.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/commons-beanutils-1.9.3.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/commons-cli-1.2.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/commons-codec-1.11.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/commons-collections-3.2.2.jar
@ -1218,10 +1246,10 @@ share/solr/server/solr-webapp/webapp/WEB-INF/lib/http2-http-client-transport-9.4
share/solr/server/solr-webapp/webapp/WEB-INF/lib/httpclient-4.5.6.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/httpcore-4.4.10.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/httpmime-4.5.6.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-annotations-2.9.8.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.9.8.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-databind-2.9.8.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.9.8.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-annotations-2.9.9.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.9.9.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-databind-2.9.9.3.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.9.9.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/janino-3.0.9.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-alpn-client-9.4.19.v20190610.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-alpn-java-client-9.4.19.v20190610.jar
@ -1255,6 +1283,14 @@ share/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-sandbox-${V}.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-extras-${V}.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial3d-${V}.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-${V}.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/netty-buffer-4.1.29.Final.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/netty-codec-4.1.29.Final.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/netty-common-4.1.29.Final.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/netty-handler-4.1.29.Final.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/netty-resolver-4.1.29.Final.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-4.1.29.Final.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-native-epoll-4.1.29.Final.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-native-unix-common-4.1.29.Final.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/opentracing-api-0.33.0.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/opentracing-noop-0.33.0.jar
share/solr/server/solr-webapp/webapp/WEB-INF/lib/opentracing-util-0.33.0.jar
@ -1292,6 +1328,7 @@ share/solr/server/solr-webapp/webapp/css/angular/jquery-ui.structure.min.css
share/solr/server/solr-webapp/webapp/css/angular/logging.css
share/solr/server/solr-webapp/webapp/css/angular/login.css
share/solr/server/solr-webapp/webapp/css/angular/menu.css
share/solr/server/solr-webapp/webapp/css/angular/overview.css
share/solr/server/solr-webapp/webapp/css/angular/plugins.css
share/solr/server/solr-webapp/webapp/css/angular/query.css
share/solr/server/solr-webapp/webapp/css/angular/replication.css
@ -1522,6 +1559,7 @@ share/solr/server/solr-webapp/webapp/js/
share/solr/server/solr-webapp/webapp/js/angular/
share/solr/server/solr-webapp/webapp/js/angular/app.js
share/solr/server/solr-webapp/webapp/js/angular/controllers/
share/solr/server/solr-webapp/webapp/js/angular/controllers/alias-overview.js
share/solr/server/solr-webapp/webapp/js/angular/controllers/analysis.js
share/solr/server/solr-webapp/webapp/js/angular/controllers/cloud.js
share/solr/server/solr-webapp/webapp/js/angular/controllers/cluster-suggestions.js
@ -1568,6 +1606,7 @@ share/solr/server/solr-webapp/webapp/libs/jquery-ui.min.js
share/solr/server/solr-webapp/webapp/libs/jquery.jstree.js
share/solr/server/solr-webapp/webapp/libs/ngtimeago.js
share/solr/server/solr-webapp/webapp/partials/
share/solr/server/solr-webapp/webapp/partials/alias_overview.html
share/solr/server/solr-webapp/webapp/partials/analysis.html
share/solr/server/solr-webapp/webapp/partials/cloud.html
share/solr/server/solr-webapp/webapp/partials/cluster_suggestions.html