CVS commit: pkgsrc/databases/apache-solr

["Jean-Yves Migeon" <jym%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jym
Date:           Thu Jun 11 15:41:23 UTC 2020

Modified Files:
        pkgsrc/databases/apache-solr: Makefile PLIST distinfo
Added Files:
        pkgsrc/databases/apache-solr/files: log4j.properties

Log Message:
Update solr to 8.5.2.

While here hook a working log4j properties file to silence startup with
all the "Missing classes" errors

Changelog:

Bug Fixes   (2)

    SOLR-14411: Fix Admin UI collection/core drop-downs placeholder text. Comple
tes work started in SOLR-14359
    (janhoy)
    SOLR-14471: Fix bug in shards.preference behavior, base replica selection st
rategy not applied to the last group of equivalent replicas.
    (Michael Gibney via Tomas Fernandez Lobbe)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/apache-solr/Makefile \
    pkgsrc/databases/apache-solr/PLIST pkgsrc/databases/apache-solr/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/apache-solr/files/log4j.properties

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/apache-solr/Makefile
diff -u pkgsrc/databases/apache-solr/Makefile:1.1 pkgsrc/databases/apache-solr/Makefile:1.2
--- pkgsrc/databases/apache-solr/Makefile:1.1   Tue Jun  9 22:20:01 2020
+++ pkgsrc/databases/apache-solr/Makefile       Thu Jun 11 15:41:23 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2020/06/09 22:20:01 jym Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/11 15:41:23 jym Exp $
 
 DISTNAME=      solr-${SOLR_VER}
 PKGNAME=       apache-solr-${SOLR_VER}
-SOLR_VER=      8.5.1
+SOLR_VER=      8.5.2
 CATEGORIES=    databases textproc
 MASTER_SITES=  ${MASTER_SITE_APACHE:=lucene/solr/${SOLR_VER}/}
 EXTRACT_SUFX=  .tgz
@@ -38,6 +38,7 @@ SOLR_EXAMPLE?=        ${EGDIR}/example
 BUILD_DEFS+=   SOLR_USER SOLR_GROUP SOLR_HOME SOLR_PORT
 BUILD_DEFS+=   SOLR_LOGDIR SOLR_PIDDIR VARBASE
 
+CONF_FILES+=   ${EGDIR}/log4j.properties ${PKG_SYSCONFDIR}/log4j.properties
 CONF_FILES+=   ${EGDIR}/solr.in.sh ${PKG_SYSCONFDIR}/solr.in.sh
 CONF_FILES+=   ${EGDIR}/solr.xml   ${PKG_SYSCONFDIR}/solr.xml
 
@@ -60,7 +61,7 @@ PKG_GROUPS_VARS+=     SOLR_GROUP
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths=     solr.in.sh bin/solr
+SUBST_FILES.paths=     solr.in.sh log4j.properties bin/solr
 SUBST_VARS.paths+=     PKG_SYSCONFDIR PREFIX SOLR_HOME SOLR_PORT
 SUBST_VARS.paths+=     SOLR_EXAMPLE SOLR_LOGDIR SOLR_PIDDIR
 
@@ -77,6 +78,7 @@ INSTALLATION_DIRS=    bin ${DOCDIR} ${EGDIR
 
 pre-patch:
        ${CP} ${FILESDIR}/solr.in.sh ${WRKSRC}/solr.in.sh
+       ${CP} ${FILESDIR}/log4j.properties ${WRKSRC}/log4j.properties
 
 do-install:
 .for f in ${DOCS}
@@ -87,6 +89,8 @@ do-install:
        cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${SOLR_DIR}/${d}
 .endfor
        ${INSTALL_DATA} ${WRKSRC}/solr.in.sh ${DESTDIR}${EGDIR}/solr.in.sh
+       ${INSTALL_DATA} ${WRKSRC}/log4j.properties \
+           ${DESTDIR}${EGDIR}/log4j.properties
        ${INSTALL_DATA} ${WRKSRC}/server/solr/solr.xml \
                ${DESTDIR}${EGDIR}/solr.xml
        ${INSTALL_DATA_DIR} ${DESTDIR}${SOLR_EXAMPLE}
Index: pkgsrc/databases/apache-solr/PLIST
diff -u pkgsrc/databases/apache-solr/PLIST:1.1 pkgsrc/databases/apache-solr/PLIST:1.2
--- pkgsrc/databases/apache-solr/PLIST:1.1      Tue Jun  9 22:20:01 2020
+++ pkgsrc/databases/apache-solr/PLIST  Thu Jun 11 15:41:23 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/06/09 22:20:01 jym Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/06/11 15:41:23 jym Exp $
 bin/solr
 share/doc/solr/CHANGES.txt
 share/doc/solr/LICENSE.txt
@@ -302,6 +302,7 @@ share/examples/solr/example/films/films-
 share/examples/solr/example/films/films.csv
 share/examples/solr/example/films/films.json
 share/examples/solr/example/films/films.xml
+share/examples/solr/log4j.properties
 share/examples/solr/solr.in.sh
 share/examples/solr/solr.xml
 solr/bin/solr
Index: pkgsrc/databases/apache-solr/distinfo
diff -u pkgsrc/databases/apache-solr/distinfo:1.1 pkgsrc/databases/apache-solr/distinfo:1.2
--- pkgsrc/databases/apache-solr/distinfo:1.1   Tue Jun  9 22:20:01 2020
+++ pkgsrc/databases/apache-solr/distinfo       Thu Jun 11 15:41:23 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2020/06/09 22:20:01 jym Exp $
+$NetBSD: distinfo,v 1.2 2020/06/11 15:41:23 jym Exp $
 
-SHA1 (solr-8.5.1.tgz) = bcd244de32e6bcc1ca9dfa9b8f3adc26fb39e511
-RMD160 (solr-8.5.1.tgz) = ff62dcdbddfa350eca39ee85785c244108b76b33
-SHA512 (solr-8.5.1.tgz) = b372f44baeafa12ec9c06239080e04c75328c37c92e5d27e6f819b139a69eacbbb879d73f032b20db66d33ee33efb41283648727a169ce4edf67095b780a5d0c
-Size (solr-8.5.1.tgz) = 190483244 bytes
+SHA1 (solr-8.5.2.tgz) = 431bda09733dface5a6b8e5f8c25e843f9dcf05b
+RMD160 (solr-8.5.2.tgz) = cd4e7e551316e95522bf3f387913893abdc6444d
+SHA512 (solr-8.5.2.tgz) = 02b9b90468f399701dba26695c9af6cd205f47916a06e26838613fe238594e9902de6ef3b42ec8257d195e37589adf8427d9b7962557731e91949fbef06bb544
+Size (solr-8.5.2.tgz) = 190485345 bytes
 SHA1 (patch-solr-bin) = 2f6a915ebf57b33ae8bc4e4f1c7109ed0f058b29

Added files:

Index: pkgsrc/databases/apache-solr/files/log4j.properties
diff -u /dev/null pkgsrc/databases/apache-solr/files/log4j.properties:1.1
--- /dev/null   Thu Jun 11 15:41:23 2020
+++ pkgsrc/databases/apache-solr/files/log4j.properties Thu Jun 11 15:41:23 2020
@@ -0,0 +1,12 @@
+# Logging level
+log4j.rootLogger=WARN, file
+
+# Size rotation with log cleanup
+log4j.appender.file.MaxFileSize=10MB
+log4j.appender.file.MaxBackupIndex=3
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+
+# File to log to and log format
+log4j.appender.file.File=@SOLR_LOGDIR@/solr.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n