Date: Sat, 27 Feb 2021 06:31:14 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566667 - head/textproc/apache-solr Message-ID: <202102270631.11R6VECu099363@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Sat Feb 27 06:31:13 2021 New Revision: 566667 URL: https://svnweb.freebsd.org/changeset/ports/566667 Log: Bugfix update to 8.8.1. Changelog: https://lucene.apache.org/solr/8_8_1/changes/Changes.html Added: head/textproc/apache-solr/create-plist.php (contents, props changed) Modified: head/textproc/apache-solr/Makefile head/textproc/apache-solr/distinfo head/textproc/apache-solr/pkg-plist Modified: head/textproc/apache-solr/Makefile ============================================================================== --- head/textproc/apache-solr/Makefile Sat Feb 27 06:12:50 2021 (r566666) +++ head/textproc/apache-solr/Makefile Sat Feb 27 06:31:13 2021 (r566667) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= apache-solr -PORTVERSION= 8.8.0 -PORTREVISION= 1 +PORTVERSION= 8.8.1 CATEGORIES= textproc java MASTER_SITES= APACHE/lucene/solr/${PORTVERSION} DISTNAME= solr-${PORTVERSION} @@ -58,7 +57,7 @@ do-install-JTS-on: ${LN} -sf ${JAVALIBDIR}/jts-core.jar ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/server/solr-webapp/webapp/WEB-INF/lib/ # execute this target to generate the pkg-plist -generate-plist: patch +my-generate-plist: patch php create-plist.php ${WRKSRC} >pkg-plist $(MAKE) clean Added: head/textproc/apache-solr/create-plist.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/apache-solr/create-plist.php Sat Feb 27 06:31:13 2021 (r566667) @@ -0,0 +1,72 @@ +<?php + +if(empty($argv[1])) + die("please specify solr-worksrc\n"); + +$strGitLabDir = $argv[1]; + +if(!is_dir($strGitLabDir)) + die("given path is not a dir: $strGitLabDir\n"); + +if(!is_readable($strGitLabDir)) + die("given path is not readable: $strGitLabDir\n"); + +// remove last slash of path if given to easy +// path handling later +if(strrpos($strGitLabDir, '/') == (strlen($strGitLabDir) - 1)) + $strGitLabDir = substr($strGitLabDir, 0, strlen($strGitLabDir) - 1); + +$objDir = new RecursiveDirectoryIterator($strGitLabDir); +$objDir = new RecursiveIteratorIterator($objDir); + +$arrFiles = array(); + +// iterate through complete given work-dir +foreach($objDir AS $objFile) { + + // skip dirs, we only want files + if(!$objFile->isFile()) + continue; + + // skip unwanted files + if(in_array($objFile->getExtension(), + array('orig', 'bak', 'gitkeep', 'gitignore'))) + continue; + + // skip lock file, it shoud be generated when GitLab is started + if('Gemfile.lock' === $objFile->getFilename()) + continue; + + // strip given dir - we just want the aim-dir + $intEndPosOfDir = strpos($objFile->getRealPath(), $strGitLabDir) + strlen($strGitLabDir); + $strFilePath = substr($objFile->getRealPath(), $intEndPosOfDir); + + // list of config files to ignore + $arrConfigFiles = array('/etc/solr.in.sh.sample', + '/var/db/solr/solr.xml.sample'); + + // skip config files + if(in_array($strFilePath, $arrConfigFiles)) + continue; + + $arrFiles[] = "solr$strFilePath"; + +} + +sort($arrFiles); + +// go through the files and print them +foreach($arrFiles AS $strFile) { + + print "$strFile\n"; +} + +// at least print static block of dirs and config files +print "@dir(solr,solr) /var/db/solr +@dir(solr,solr) /var/log/solr +@sample etc/solr.in.sh.sample +@sample(solr,solr) /var/db/solr/solr.xml.sample +%%JTS%%solr/server/solr-webapp/webapp/WEB-INF/lib/jts-core.jar +"; +print "\n"; + Modified: head/textproc/apache-solr/distinfo ============================================================================== --- head/textproc/apache-solr/distinfo Sat Feb 27 06:12:50 2021 (r566666) +++ head/textproc/apache-solr/distinfo Sat Feb 27 06:31:13 2021 (r566667) @@ -1,3 +1,3 @@ -TIMESTAMP = 1611992882 -SHA256 (solr-8.8.0.tgz) = 7318752d1d30fa2ef839eb3d2df0f2bdb2709d304aa4870b02b33b91e945b054 -SIZE (solr-8.8.0.tgz) = 196347787 +TIMESTAMP = 1614406417 +SHA256 (solr-8.8.1.tgz) = 00b573afd3ae0a3dd4ff79668ee3c4193a1fc681aeb031da9a7385fbc01c1f1d +SIZE (solr-8.8.1.tgz) = 196356009 Modified: head/textproc/apache-solr/pkg-plist ============================================================================== --- head/textproc/apache-solr/pkg-plist Sat Feb 27 06:12:50 2021 (r566666) +++ head/textproc/apache-solr/pkg-plist Sat Feb 27 06:31:13 2021 (r566667) @@ -19,11 +19,11 @@ solr/contrib/analysis-extras/lib/morfologik-polish-2.1 solr/contrib/analysis-extras/lib/morfologik-stemming-2.1.5.jar solr/contrib/analysis-extras/lib/morfologik-ukrainian-search-4.9.1.jar solr/contrib/analysis-extras/lib/opennlp-tools-1.9.2.jar -solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-8.8.0.jar -solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-8.8.0.jar -solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-opennlp-8.8.0.jar -solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-8.8.0.jar -solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-8.8.0.jar +solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-8.8.1.jar +solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-8.8.1.jar +solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-opennlp-8.8.1.jar +solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-8.8.1.jar +solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-8.8.1.jar solr/contrib/dataimporthandler-extras/lib/activation-1.1.1.jar solr/contrib/dataimporthandler-extras/lib/gimap-1.5.1.jar solr/contrib/dataimporthandler-extras/lib/javax.mail-1.5.1.jar @@ -100,25 +100,25 @@ solr/contrib/prometheus-exporter/lib/simpleclient-0.2. solr/contrib/prometheus-exporter/lib/simpleclient_common-0.2.0.jar solr/contrib/prometheus-exporter/lib/simpleclient_httpserver-0.2.0.jar solr/contrib/prometheus-exporter/lib/slf4j-api-1.7.24.jar -solr/contrib/prometheus-exporter/lucene-libs/lucene-analyzers-common-8.8.0.jar +solr/contrib/prometheus-exporter/lucene-libs/lucene-analyzers-common-8.8.1.jar solr/contrib/velocity/lib/commons-lang3-3.10.jar solr/contrib/velocity/lib/velocity-engine-core-2.0.jar solr/contrib/velocity/lib/velocity-tools-generic-3.0.jar solr/contrib/velocity/lib/velocity-tools-view-3.0.jar solr/contrib/velocity/lib/velocity-tools-view-jsp-3.0.jar -solr/dist/solr-analysis-extras-8.8.0.jar -solr/dist/solr-analytics-8.8.0.jar -solr/dist/solr-cell-8.8.0.jar -solr/dist/solr-core-8.8.0.jar -solr/dist/solr-dataimporthandler-8.8.0.jar -solr/dist/solr-dataimporthandler-extras-8.8.0.jar -solr/dist/solr-jaegertracer-configurator-8.8.0.jar -solr/dist/solr-langid-8.8.0.jar -solr/dist/solr-ltr-8.8.0.jar -solr/dist/solr-prometheus-exporter-8.8.0.jar -solr/dist/solr-solrj-8.8.0.jar -solr/dist/solr-test-framework-8.8.0.jar -solr/dist/solr-velocity-8.8.0.jar +solr/dist/solr-analysis-extras-8.8.1.jar +solr/dist/solr-analytics-8.8.1.jar +solr/dist/solr-cell-8.8.1.jar +solr/dist/solr-core-8.8.1.jar +solr/dist/solr-dataimporthandler-8.8.1.jar +solr/dist/solr-dataimporthandler-extras-8.8.1.jar +solr/dist/solr-jaegertracer-configurator-8.8.1.jar +solr/dist/solr-langid-8.8.1.jar +solr/dist/solr-ltr-8.8.1.jar +solr/dist/solr-prometheus-exporter-8.8.1.jar +solr/dist/solr-solrj-8.8.1.jar +solr/dist/solr-test-framework-8.8.1.jar +solr/dist/solr-velocity-8.8.1.jar solr/dist/solrj-lib/commons-io-2.8.0.jar solr/dist/solrj-lib/commons-lang-2.6.jar solr/dist/solrj-lib/commons-math3-3.6.1.jar @@ -157,7 +157,7 @@ solr/dist/test-framework/lib/junit-4.13.1.jar solr/dist/test-framework/lib/junit4-ant-2.7.2.jar solr/dist/test-framework/lib/opentracing-mock-0.33.0.jar solr/dist/test-framework/lib/randomizedtesting-runner-2.7.2.jar -solr/dist/test-framework/lucene-libs/lucene-test-framework-8.8.0.jar +solr/dist/test-framework/lucene-libs/lucene-test-framework-8.8.1.jar solr/docs/images/solr.svg solr/docs/index.html solr/example/README.txt @@ -1154,26 +1154,26 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/kerb-core-1 solr/server/solr-webapp/webapp/WEB-INF/lib/kerb-util-1.0.1.jar solr/server/solr-webapp/webapp/WEB-INF/lib/kerby-asn1-1.0.1.jar solr/server/solr-webapp/webapp/WEB-INF/lib/kerby-pkix-1.0.1.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-nori-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-phonetic-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-backward-codecs-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-classification-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-codecs-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-core-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-expressions-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-grouping-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-highlighter-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-join-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-memory-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-misc-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queries-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queryparser-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-sandbox-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-extras-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial3d-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-8.8.0.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-nori-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-phonetic-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-backward-codecs-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-classification-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-codecs-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-core-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-expressions-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-grouping-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-highlighter-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-join-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-memory-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-misc-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queries-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queryparser-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-sandbox-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-extras-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial3d-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-8.8.1.jar solr/server/solr-webapp/webapp/WEB-INF/lib/netty-buffer-4.1.50.Final.jar solr/server/solr-webapp/webapp/WEB-INF/lib/netty-codec-4.1.50.Final.jar solr/server/solr-webapp/webapp/WEB-INF/lib/netty-common-4.1.50.Final.jar @@ -1190,8 +1190,8 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/re2j-1.2.ja solr/server/solr-webapp/webapp/WEB-INF/lib/rrd4j-3.5.jar solr/server/solr-webapp/webapp/WEB-INF/lib/s2-geometry-library-java-1.0.0.jar solr/server/solr-webapp/webapp/WEB-INF/lib/snappy-java-1.1.7.6.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-8.8.0.jar -solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-8.8.0.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-8.8.1.jar +solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-8.8.1.jar solr/server/solr-webapp/webapp/WEB-INF/lib/spatial4j-0.7.jar solr/server/solr-webapp/webapp/WEB-INF/lib/stax2-api-3.1.4.jar solr/server/solr-webapp/webapp/WEB-INF/lib/t-digest-3.1.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102270631.11R6VECu099363>