From nobody Sun Oct 16 07:13:11 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mqrtv2hVpz4fZ0W; Sun, 16 Oct 2022 07:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mqrtv2GT7z41YD; Sun, 16 Oct 2022 07:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665904391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lshqH+eZdNCSMVijcZRFFEjyfsSziNb9QNonDwXnqnQ=; b=UL2R9GGYl+LyXOe9kgS2YJxG+z3LVHScJXbNdZberFn81jccb/PUJxdFiOLwzc4hca1m/2 Mm2F0V2XedZRYlIYLBtVyP78cq0EfIvXpqIr8RWsmxYIVyC1va3G7uGdEOyNydLP8W03D2 RZiBSazlVhhGfksyJ0vVHbfpm61nE9b89Yr2XNc+jaEi1PU/1KsVJrS+M+QwXxphezt0hg aKL+YL05a0PKXCFqgTvk/4zLJPfWx87F/TR3D91+TyWNlSus8mqDOG3LUjGYMkhV0RMdF9 J2Pt376QQmAoUliHEXvQZoiBujoZYqjmuEiW/+u+XgYVdjRnOd+qh/Vk/BTIjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mqrtv1JyGzNbJ; Sun, 16 Oct 2022 07:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29G7DBPV081412; Sun, 16 Oct 2022 07:13:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29G7DBDC081411; Sun, 16 Oct 2022 07:13:11 GMT (envelope-from git) Date: Sun, 16 Oct 2022 07:13:11 GMT Message-Id: <202210160713.29G7DBDC081411@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 7abbbd41759a - main - Revert "textproc/apache-solr: Update version 8.11.2=>9.0.0" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7abbbd41759ae4e7e424a9204228f90feb7a62e9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665904391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lshqH+eZdNCSMVijcZRFFEjyfsSziNb9QNonDwXnqnQ=; b=jTmfdVKVT9+BSGpde2jNUKL3bQXKZizz1nmjQOsvoHTcw6D1dputA9M+pYE0SmhQzcOcxI zPwHm57sQpgKOPp6uswYAJKMclgownEvXhYkgtzCxeLrSHVFVodLfwnMAVLroUnmoiOHpC FoqE6yMcYv7h49vUy3tSM7TfPmnVYF395H9dEnsTNMzG6X1Fgv3/S9g+g71FrbiEdT6Dnr vUi7x5906+7+3MC2ds+f2BTElHhMYyxE4+k/eNAnCWGt0tYcmPM3OtHb8Jhe+1znQkhxl+ sRgtDd12P2gZiwvbhPUnjPmAF9g6pyYfKM1HQwV24DwuLSISA/hIdWTTnB1GEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665904391; a=rsa-sha256; cv=none; b=Cn7hII7kzD7qO3Ac1FfjskWyp3uuDZWm+8R3S91k5937HCgE5+JjAve+v6fnh2GRrz9WYb rsq1TT9fmDemvb1spLiAHamvmmo4fJp1Y5imZamevCcKeAKtiaclZWOWlWMj4Pox+ycHv3 6VYyom7eaVM2NseI2HMxasUszmVfM98WPOw/y+ktn224VqTHFq2TcX5ykcjWrw8uSLac/t bVxqq+BDJPf7U7lc3KDiKuC+Pp6u39Mg2MHz9/m5g4sax0zWZ4YLy4pAolI5TdBE6D2vhn ipaWJY58HI6WAwgy295AwQ8u7dNdogNgC5qXx8YKnznEHfBFXxj7W9b5GAuABQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7abbbd41759ae4e7e424a9204228f90feb7a62e9 commit 7abbbd41759ae4e7e424a9204228f90feb7a62e9 Author: Matthias Fechner AuthorDate: 2022-10-16 07:01:12 +0000 Commit: Matthias Fechner CommitDate: 2022-10-16 07:12:42 +0000 Revert "textproc/apache-solr: Update version 8.11.2=>9.0.0" This reverts commit b224cb40ad545da1f09dcf0d8bafb8baf0e1b110. This upgrade break solr installation as additional work may be required to get the new version with existing collections working. --- textproc/apache-solr/Makefile | 18 ++++++++---------- textproc/apache-solr/distinfo | 6 +++--- textproc/apache-solr/files/patch-bin_solr | 14 +++++++------- textproc/apache-solr/files/pkg-message.in | 12 ++++++------ 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile index 027cc18dabd4..8e864555dd08 100644 --- a/textproc/apache-solr/Makefile +++ b/textproc/apache-solr/Makefile @@ -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 diff --git a/textproc/apache-solr/distinfo b/textproc/apache-solr/distinfo index 76634295a4da..e72f763a3c70 100644 --- a/textproc/apache-solr/distinfo +++ b/textproc/apache-solr/distinfo @@ -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 diff --git a/textproc/apache-solr/files/patch-bin_solr b/textproc/apache-solr/files/patch-bin_solr index 1c15691df53e..0ea5bdcbddd3 100644 --- a/textproc/apache-solr/files/patch-bin_solr +++ b/textproc/apache-solr/files/patch-bin_solr @@ -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 diff --git a/textproc/apache-solr/files/pkg-message.in b/textproc/apache-solr/files/pkg-message.in index 4ff8a03f0ec2..9a5826983431 100644 --- a/textproc/apache-solr/files/pkg-message.in +++ b/textproc/apache-solr/files/pkg-message.in @@ -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 } ]