[Git][java-team/lucene-solr][master] 6 commits: Declare compliance with Debian Policy 4.5.1.
Markus Koschany
gitlab at salsa.debian.org
Mon Feb 22 16:19:46 GMT 2021
Markus Koschany pushed to branch master at Debian Java Maintainers / lucene-solr
Commits:
46d114ae by Markus Koschany at 2021-02-22T16:49:13+01:00
Declare compliance with Debian Policy 4.5.1.
- - - - -
e0386f96 by Markus Koschany at 2021-02-22T16:49:43+01:00
Switch to debhelper-compat = 13.
- - - - -
6caf9580 by Markus Koschany at 2021-02-22T16:58:17+01:00
Drop solr-tomcat, solr-jetty, solr-common and libsolr-java.
The version of solr in Debian is outdated and newer versions are not viable to
maintain. An alternative version packaged with jdeb or similar tools may be
available via the contrib repository in the future.
Closes: #982001, #581435, #800983, #840827, #842402, #842706, #931845, #956464
- - - - -
d1f8a988 by Markus Koschany at 2021-02-22T17:03:49+01:00
Update changelog
- - - - -
e9e90312 by Markus Koschany at 2021-02-22T17:08:06+01:00
Ignore one more solr artifact
- - - - -
d0eb5f53 by Markus Koschany at 2021-02-22T17:13:42+01:00
Wrap changelog line
- - - - -
27 changed files:
- debian/changelog
- debian/control
- debian/liblucene3-java.poms.in
- − debian/libsolr-java.docs
- debian/rules
- − debian/solr-common.README.Debian
- − debian/solr-common.config
- − debian/solr-common.dirs
- − debian/solr-common.docs
- − debian/solr-common.install
- − debian/solr-common.links
- − debian/solr-common.postinst
- − debian/solr-common.postrm
- − debian/solr-common.templates
- − debian/solr-jetty.install
- − debian/solr-jetty.links
- − debian/solr-jetty.postinst
- − debian/solr-jetty.postrm
- − debian/solr-jetty.xml
- − debian/solr-permissions.conf
- − debian/solr-tomcat.install
- − debian/solr-tomcat.links
- − debian/solr-tomcat.maintscript
- − debian/solr-tomcat.postinst
- − debian/solr-tomcat.postrm
- − debian/solr-tomcat.xml
- − debian/tomcat.policy
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+lucene-solr (3.6.2+dfsg-23) unstable; urgency=medium
+
+ * Declare compliance with Debian Policy 4.5.1.
+ * Switch to debhelper-compat = 13.
+ * Drop solr-tomcat, solr-jetty, solr-common and libsolr-java.
+ The version of solr in Debian is outdated and newer versions are not viable
+ to maintain. An alternative version packaged with jdeb or similar tools may
+ be available via the contrib repository in the future.
+ (Closes: #982001, #581435, #800983, #840827, #842402, #842706, #931845,
+ #956464)
+
+ -- Markus Koschany <apo at debian.org> Mon, 22 Feb 2021 17:02:39 +0100
+
lucene-solr (3.6.2+dfsg-22) unstable; urgency=medium
* Add myself to Uploaders and remove Jakub Adam, James Page and Mat Scales
=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Build-Depends:
ant,
ant-optional,
bnd (>= 2.1.0),
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
default-jdk,
javacc,
jflex,
@@ -44,7 +44,7 @@ Build-Depends:
libxml-commons-resolver1.1-java,
maven-repo-helper (>= 1.5~),
po-debconf
-Standards-Version: 4.4.1
+Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/lucene-solr.git
Vcs-Browser: https://salsa.debian.org/java-team/lucene-solr
Homepage: http://lucene.apache.org
@@ -93,103 +93,3 @@ Description: Full-text search engine library for Java - additional libraries
.
This package contains a number of additional (contributed) libraries.
-Package: libsolr-java
-Architecture: all
-Depends:
- libcommons-codec-java (>= 1.6),
- libcommons-fileupload-java (>= 1.2.1),
- libcommons-httpclient-java (>= 3.1),
- libcommons-io-java (>= 1.4),
- libcommons-lang-java,
- libcommons-logging-java,
- libguava-java,
- libhttpclient-java (>= 4.1.1),
- libhttpmime-java,
- liblucene3-contrib-java,
- liblucene3-java,
- libservlet3.1-java,
- libslf4j-java (>= 1.6.1),
- libwoodstox-java,
- ${misc:Depends}
-Breaks:
- solr-common (<< 3.6.0-1)
-Replaces:
- solr-common (<< 3.6.0-1)
-Suggests:
- junit4,
- libeasymock-java,
- libjetty9-extras-java,
- libjetty9-java (>= 9.4)
-Description: Enterprise search server based on Lucene - Java libraries
- Solr is an open source enterprise search server based on the Lucene
- Java search library, with XML/HTTP and JSON APIs, hit highlighting,
- faceted search, caching, replication, and a web administration
- interface. It runs in a Java servlet container such as Tomcat.
- .
- This package provides the Java libraries required to support execution
- of solr.
-
-Package: solr-common
-Architecture: all
-Depends:
- curl,
- debconf (>= 1.5),
- default-jre-headless | java5-runtime-headless | java6-runtime-headless,
- libjs-jquery,
- libsolr-java (= ${binary:Version}),
- procps,
- ${misc:Depends}
-Recommends:
- solr-tomcat (= ${binary:Version}) | solr-jetty (= ${binary:Version})
-Suggests:
- libmariadb-java
-Description: Enterprise search server based on Lucene3 - common files
- Solr is an open source enterprise search server based on the Lucene
- Java search library, with XML/HTTP and JSON APIs, hit highlighting,
- faceted search, caching, replication, and a web administration
- interface. It runs in a Java servlet container such as Tomcat.
- .
- This package provides the common files for Solr. Install
- solr-tomcat or solr-jetty to use Solr under Tomcat or Jetty.
- .
- This package also contains the dataimporthandler contrib while omitting
- dataimporthandler-extras, clustering, extraction and velocity due to missing
- dependencies.
- .
- libmysql-java is necessary to connect the dataimporthandler to MySQL.
-
-Package: solr-tomcat
-Architecture: all
-Depends:
- solr-common (= ${binary:Version}),
- tomcat9 | tomcat9-user,
- ${misc:Depends}
-Conflicts:
- solr-jetty,
- solr-tomcat6
-Description: Enterprise search server based on Lucene3 - Tomcat integration
- Solr is an open source enterprise search server based on the Lucene
- Java search library, with XML/HTTP and JSON APIs, hit highlighting,
- faceted search, caching, replication, and a web administration
- interface. It runs in a Java servlet container such as Tomcat.
- .
- This package provides the Tomcat integration files for Solr.
-
-Package: solr-jetty
-Architecture: all
-Depends:
- default-jdk | java5-sdk,
- jetty9,
- libjetty9-extra-java,
- solr-common (= ${binary:Version}),
- ${misc:Depends}
-Conflicts:
- solr-tomcat,
- solr-tomcat6
-Description: Enterprise search server based on Lucene3 - Jetty integration
- Solr is an open source enterprise search server based on the Lucene
- Java search library, with XML/HTTP and JSON APIs, hit highlighting,
- faceted search, caching, replication, and a web administration
- interface. It runs in a Java servlet container such as Tomcat.
- .
- This package provides the Jetty integration files for Solr.
=====================================
debian/liblucene3-java.poms.in
=====================================
@@ -20,20 +20,20 @@
# --dest-jar=<path>: the destination for the real jar
#
pom.xml --no-parent --package=liblucene3-java
-solr/pom.xml --package=libsolr-java
+solr/pom.xml --ignore
solr/test-framework/pom.xml --ignore
-solr/solrj/pom.xml --artifact=solr/dist/apache-solr-solrj-__VERSION__.jar --package=libsolr-java --java-lib --usj-name=solr-solrj
+solr/solrj/pom.xml --ignore
solr/webapp/pom.xml --ignore
solr/contrib/pom.xml --ignore
solr/contrib/clustering/pom.xml --ignore
solr/contrib/analysis-extras/pom.xml --ignore
solr/contrib/langid/pom.xml --ignore
-solr/contrib/dataimporthandler/pom.xml --artifact=solr/build/contrib/solr-dataimporthandler/apache-solr-dataimporthandler-__VERSION__.jar --package=libsolr-java --java-lib --usj-name=solr-dataimporthandler
+solr/contrib/dataimporthandler/pom.xml --ignore
solr/contrib/extraction/pom.xml --ignore
solr/contrib/dataimporthandler-extras/pom.xml --ignore
solr/contrib/velocity/pom.xml --ignore
solr/contrib/uima/pom.xml --ignore
-solr/core/pom.xml --artifact=solr/dist/apache-solr-core-__VERSION__.jar --package=libsolr-java --java-lib --usj-name=solr-core
+solr/core/pom.xml --ignore
lucene/pom.xml --package=liblucene3-java
lucene/test-framework/pom.xml --ignore
lucene/contrib/analyzers/smartcn/pom.xml --artifact=lucene/build/contrib/analyzers/smartcn/lucene-smartcn-__VERSION__.jar --package=liblucene3-contrib-java --java-lib --usj-name=lucene3-smartcn
=====================================
debian/libsolr-java.docs deleted
=====================================
@@ -1,2 +0,0 @@
-solr/NOTICE.txt
-solr/README.txt
=====================================
debian/rules
=====================================
@@ -21,10 +21,6 @@ override_dh_auto_build:
ant -buildfile build.xml -Dversion=$(DEB_UPSTREAM_VERSION) get-maven-poms
ant -buildfile lucene/build.xml -propertyfile debian/ant.properties \
-Dversion=$(DEB_UPSTREAM_VERSION) javacc jar-core docs build-contrib
- ant -buildfile solr/contrib/dataimporthandler/build.xml \
- -propertyfile debian/ant.properties -Dversion=$(DEB_UPSTREAM_VERSION) dist
- ant -buildfile solr/build.xml -propertyfile debian/ant.properties \
- -Dversion=$(DEB_UPSTREAM_VERSION) dist-war
#ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
@@ -44,14 +40,6 @@ override_dh_auto_clean:
rm -rf lucene/site/build/site
dh_auto_clean
-override_dh_fixperms:
- chmod 644 debian/solr-common/usr/share/solr/web/WEB-INF/weblogic.xml \
- debian/solr-common/etc/solr/conf/schema.xml \
- debian/solr-common/etc/solr/conf/solrconfig.xml \
- debian/solr-common/usr/share/solr/web/favicon.ico \
- debian/solr-common/usr/share/solr/web/admin/favicon.ico
- dh_fixperms
-
override_dh_auto_install:
sed -e "s|__VERSION__|$(DEB_UPSTREAM_VERSION)|g" \
< debian/liblucene3-java.poms.in > debian/liblucene3-java.poms
@@ -69,8 +57,5 @@ override_mh_install:
override_dh_installchangelogs:
dh_installchangelogs -pliblucene3-java lucene/CHANGES.txt
- dh_installchangelogs -plibsolr-java solr/CHANGES.txt
dh_installchangelogs
-get-orig-source:
- uscan --force-download --rename
=====================================
debian/solr-common.README.Debian deleted
=====================================
@@ -1,83 +0,0 @@
-README for solr
----------------
-
-Solr is an enterprise search server based on the Lucene Java library. The
-Debian packaging of Solr consists of three binary packages:
-
-- libsolr-java contains the Java Jar files that support all other solr
- components.
-- solr-common contains the Solr software itself and general configuration.
-- solr-tomcat installs Solr as a servlet in Tomcat. After installation,
- point your browser to http://localhost:8080/solr/admin
- to see the Solr web administration interface.
-- solr-jetty installs Solr as a servlet in the Jetty application server.
- The Solr admin interface is at http://localhost:8080/solr/admin/
-
-Homepage: http://lucene.apache.org/solr/
-
-Configuration
--------------
-
-The solr-common package comes with an example configuration that is not
-at all suitable for production use! Please learn about solr and write
-your own configuration in /etc/solr.
-
-Certain features of the admin interface are disabled by tomcat security
-policies if this feature is enabled (disabled by default).
-
-Have a look at /etc/solr/tomcat.policy if you want to enable them.
-
-MultiCore
----------
-
-Solr upstream does not really support the separation of the application and
-configuration directory, but knows only a Solr "homedir". We could partly
-handle this by placing a symlink conf to /etc/solr/conf in /usr/share/solr.
-
-However the solr.xml file necessary to configure multicore must be placed
-directly into /usr/share/solr.
-
-So to avoid having a configuration file outside /etc it's recommended to place
-a symlink from /usr/share/solr/solr.xml to /etc/solr/solr.xml.
-
-If you want to use the dataDir parameter in the dynamic core admin interface
-make sure, that no datadir is specified in /etc/solr/conf/solrconfig.xml..
-Otherwise the latter one will always be taken.
-
-Replication
------------
-
-Solr's replication scripts are installed into /usr/share/solr/scripts
-Please note that there is a java based replication solution since Solr
-1.4 and that we still need to find out, whether upstream will continue
-to support the scripts based solution.
-Also have a look at Debian Bug 538229.
-
-Contrib
--------
-
-Upstream provides additional functionality in so called contributions.
-We have so far included only the dataimporthandler without
-dataimporthandler-extras. The other contributions have dependencies not
-yet packaged for Debian.
-
-DataImportHandler
------------------
-
-If you use the handler with mysql, you need to install libmariadb-java and
-add the following to your solrconfig.xml:
-
- <lib path="/usr/share/java/mariadb-java-client.jar" />
-
-The handler writes status information to::
-
- /etc/solr/conf/dataimport.properties
-
-Make sure that the tomcat/jetty user can write to this file. Yes this is ugly,
-but nobody has taught the FHS to java developers yet.
-
-Read more about the DataImportHandler here::
-
- http://wiki.apache.org/solr/DataImportHandler
-
-
=====================================
debian/solr-common.config deleted
=====================================
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
-
=====================================
debian/solr-common.dirs deleted
=====================================
@@ -1,2 +0,0 @@
-/var/lib/solr/data
-/var/log/solr
=====================================
debian/solr-common.docs deleted
=====================================
@@ -1,2 +0,0 @@
-solr/NOTICE.txt
-solr/README.txt
=====================================
debian/solr-common.install deleted
=====================================
@@ -1,7 +0,0 @@
-debian/conf/* /etc/solr/conf
-solr/build/web/* /usr/share/solr/web
-solr/example/solr/conf /etc/solr
-solr/example/solr/solr.xml /etc/solr
-solr/scripts/* /usr/share/solr/bin
-solr/webapp/web/* /usr/share/solr/web
-solr/webapp/web/WEB-INF/web.xml /etc/solr/
=====================================
debian/solr-common.links deleted
=====================================
@@ -1,37 +0,0 @@
-/etc/solr/conf /usr/share/solr/conf
-/etc/solr/solr.xml /usr/share/solr/solr.xml
-/etc/solr/web.xml /usr/share/solr/web/WEB-INF/web.xml
-/usr/share/java/commons-codec.jar /usr/share/solr/web/WEB-INF/lib/commons-codec.jar
-/usr/share/java/commons-fileupload.jar /usr/share/solr/web/WEB-INF/lib/commons-fileupload.jar
-/usr/share/java/commons-httpclient.jar /usr/share/solr/web/WEB-INF/lib/commons-httpclient.jar
-/usr/share/java/commons-io.jar /usr/share/solr/web/WEB-INF/lib/commons-io.jar
-/usr/share/java/commons-lang.jar /usr/share/solr/web/WEB-INF/lib/commons-lang.jar
-/usr/share/java/commons-logging.jar /usr/share/solr/web/WEB-INF/lib/commons-logging.jar
-/usr/share/java/guava.jar /usr/share/solr/web/WEB-INF/lib/guava.jar
-/usr/share/java/httpclient.jar /usr/share/solr/web/WEB-INF/lib/httpclient.jar
-/usr/share/java/httpcore.jar /usr/share/solr/web/WEB-INF/lib/httpcore.jar
-/usr/share/java/httpmime.jar /usr/share/solr/web/WEB-INF/lib/httpmime.jar
-/usr/share/java/jcl-over-slf4j.jar /usr/share/solr/web/WEB-INF/lib/jcl-over-slf4j.jar
-/usr/share/java/log4j-over-slf4j.jar /usr/share/solr/web/WEB-INF/lib/log4j-over-slf4j.jar
-/usr/share/java/lucene3-analyzers.jar /usr/share/solr/web/WEB-INF/lib/lucene3-analyzers.jar
-/usr/share/java/lucene3-core.jar /usr/share/solr/web/WEB-INF/lib/lucene3-core.jar
-/usr/share/java/lucene3-grouping.jar /usr/share/solr/web/WEB-INF/lib/lucene3-grouping.jar
-/usr/share/java/lucene3-highlighter.jar /usr/share/solr/web/WEB-INF/lib/lucene3-highlighter.jar
-/usr/share/java/lucene3-kuromoji.jar /usr/share/solr/web/WEB-INF/lib/lucene3-kuromoji.jar
-/usr/share/java/lucene3-memory.jar /usr/share/solr/web/WEB-INF/lib/lucene3-memory.jar
-/usr/share/java/lucene3-misc.jar /usr/share/solr/web/WEB-INF/lib/lucene3-misc.jar
-/usr/share/java/lucene3-phonetic.jar /usr/share/solr/web/WEB-INF/lib/lucene3-phonetic.jar
-/usr/share/java/lucene3-queries.jar /usr/share/solr/web/WEB-INF/lib/lucene3-queries.jar
-/usr/share/java/lucene3-spatial.jar /usr/share/solr/web/WEB-INF/lib/lucene3-spatial.jar
-/usr/share/java/lucene3-spellchecker.jar /usr/share/solr/web/WEB-INF/lib/lucene3-spellchecker.jar
-/usr/share/java/slf4j-api.jar /usr/share/solr/web/WEB-INF/lib/slf4j-api.jar
-/usr/share/java/slf4j-jdk14.jar /usr/share/solr/web/WEB-INF/lib/slf4j-jdk14.jar
-/usr/share/java/solr-core.jar /usr/share/solr/web/WEB-INF/lib/solr-core.jar
-/usr/share/java/solr-dataimporthandler.jar /usr/share/solr/web/WEB-INF/lib/solr-dataimporthandler.jar
-/usr/share/java/solr-solrj.jar /usr/share/solr/web/WEB-INF/lib/solr-solrj.jar
-/usr/share/java/stax2-api.jar /usr/share/solr/web/WEB-INF/lib/stax2-api.jar
-/usr/share/java/woodstox-core.jar /usr/share/solr/web/WEB-INF/lib/wstx-lgpl.jar
-/usr/share/javascript/jquery/jquery.min.js /usr/share/solr/web/admin/jquery-1.4.3.min.js
-/usr/share/solr/bin /usr/share/solr/scripts
-/var/lib/solr/data /usr/share/solr/data
-/var/log/solr /usr/share/solr/logs
=====================================
debian/solr-common.postinst deleted
=====================================
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
=====================================
debian/solr-common.postrm deleted
=====================================
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "purge" ]; then
- if [ -e /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- db_input high solr/purgeindexfiles || true
- db_go || true
- db_get solr/purgeindexfiles || true
- if [ "$RET" = "true" ]; then
- rm -rf /var/lib/solr
- fi
- else
- rm -rf /var/lib/solr
- fi
-fi
-
-#DEBHELPER#
=====================================
debian/solr-common.templates deleted
=====================================
@@ -1,18 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: solr/purgeindexfiles
-Type: boolean
-Default: false
-_Description: Remove Solr index files?
- The Solr data directory (/var/lib/solr), and the index files it contains, may
- be removed while purging the package.
- .
- You should not choose this option if you intend to re-use Solr's index
- files later.
=====================================
debian/solr-jetty.install deleted
=====================================
@@ -1,2 +0,0 @@
-debian/solr-jetty.xml /etc/solr/
-debian/solr-permissions.conf /etc/systemd/system/jetty9.service.d/
=====================================
debian/solr-jetty.links deleted
=====================================
@@ -1 +0,0 @@
-/etc/solr/solr-jetty.xml /var/lib/jetty9/webapps/solr.xml
=====================================
debian/solr-jetty.postinst deleted
=====================================
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# If proper permissions for the stuff under /var/lib/solr haven't
-# been set, set them now
-case "$1" in
- configure)
-
- if ! dpkg-statoverride --quiet --list /var/lib/solr > /dev/null; then
- dpkg-statoverride --quiet --update --add jetty root 0750 /var/lib/solr
- fi
-
- if ! dpkg-statoverride --quiet --list /var/lib/solr/data > /dev/null ; then
- dpkg-statoverride --quiet --update --add jetty root 0750 /var/lib/solr/data
- fi
-
- if [ -d /var/lib/solr/data/index ]; then
- chown -R jetty:root /var/lib/solr/data
- fi
-
- invoke-rc.d --quiet jetty9 restart || {
- RESULT=$?
- # Ignore if jetty init script does not exist (yet)
- if [ $RESULT != 100 ]; then
- exit $RESULT
- fi
- }
- ;;
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-#DEBHELPER#
=====================================
debian/solr-jetty.postrm deleted
=====================================
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|purge)
- # If permissions for the stuff under /var/lib/solr haven't
- # been removed, remove them now
- if [ -x dpkg-statoverride ]; then
- if dpkg-statoverride --quiet --list /var/lib/solr > /dev/null ; then
- dpkg-statoverride --quiet --remove /var/lib/solr
- fi
-
- if dpkg-statoverride --quiet --list /var/lib/solr/data > /dev/null ; then
- dpkg-statoverride --quiet --remove /var/lib/solr/data
- fi
- fi
-
- if [ -x invoke-rc.d ]; then
- invoke-rc.d jetty9 restart || true
- fi
- ;;
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- # do nothing
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
=====================================
debian/solr-jetty.xml deleted
=====================================
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- Context configuration file for the Solr web application in Jetty -->
-
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
- <Set name="contextPath">/solr</Set>
- <Set name="war">/usr/share/solr/web</Set>
-
- <!-- Set the solr.solr.home system property -->
- <Call name="setProperty" class="java.lang.System">
- <Arg type="String">solr.solr.home</Arg>
- <Arg type="String">/usr/share/solr</Arg>
- </Call>
-
- <!-- Enable symlinks -->
- <!-- This call will not work with Jetty9 in Debian 10. FIXME
- <Call name="addAliasCheck">
- <Arg>
- <New class="org.eclipse.jetty.server.handler.ContextHandler$ApproveSameSuffixAliases"/>
- </Arg>
- </Call>
- -->
-</Configure>
=====================================
debian/solr-permissions.conf deleted
=====================================
@@ -1,2 +0,0 @@
-[Service]
-ReadWritePaths=/var/lib/solr/
=====================================
debian/solr-tomcat.install deleted
=====================================
@@ -1,3 +0,0 @@
-debian/solr-tomcat.xml /etc/solr/
-debian/tomcat.policy /etc/solr/
-debian/solr-permissions.conf /etc/systemd/system/tomcat9.service.d/
=====================================
debian/solr-tomcat.links deleted
=====================================
@@ -1 +0,0 @@
-/etc/solr/solr-tomcat.xml /etc/tomcat9/Catalina/localhost/solr.xml
=====================================
debian/solr-tomcat.maintscript deleted
=====================================
@@ -1,2 +0,0 @@
-rm_conffile /etc/systemd/system/tomcat9.d/solr-permissions.conf 3.6.2+dfsg-20~
-
=====================================
debian/solr-tomcat.postinst deleted
=====================================
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# If proper permissions for the stuff under /var/lib/solr haven't
-# been set, set them now
-
-case "$1" in
- configure)
- # fixup for upgrade from solr-tomcat55, wich makes this tomcat55:root 750
- chown root:root /var/lib/solr
- chmod 755 /var/lib/solr
-
- chown -R tomcat:tomcat /var/lib/solr/data
- chmod -R 770 /var/lib/solr/data
-
- ln -sf /etc/solr/tomcat.policy /etc/tomcat9/policy.d/05solr.policy
-
- systemctl daemon-reload
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-invoke-rc.d --quiet tomcat9 restart || {
- RESULT=$?
- # Ignore if tomcat9 init script does not exist (yet)
- if [ $RESULT != 100 ]; then
- exit $RESULT
- fi
-}
-
-#DEBHELPER#
=====================================
debian/solr-tomcat.postrm deleted
=====================================
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|purge)
- rm -f /etc/tomcat9/policy.d/05solr.policy
- if [ -x invoke-rc.d ]; then
- invoke-rc.d tomcat9 restart || true
- fi
- ;;
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- # do nothing
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-#DEBHELPER#
=====================================
debian/solr-tomcat.xml deleted
=====================================
@@ -1,9 +0,0 @@
-<!--
- Context configuration file for the Solr Web App
--->
-
-<Context path="/solr" docBase="/usr/share/solr/web" privileged="true" crossContext="true">
- <Resources allowLinking="true"/>
-
- <Environment name="solr/home" type="java.lang.String" value="/usr/share/solr" override="true" />
-</Context>
=====================================
debian/tomcat.policy deleted
=====================================
@@ -1,37 +0,0 @@
-grant codeBase "file:/usr/share/solr/-" {
- permission java.lang.RuntimePermission "modifyThread";
- permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.http";
- permission java.util.PropertyPermission "sun.arch.data.model", "read";
- permission java.util.PropertyPermission "java.io.tmpdir", "read";
- permission java.util.PropertyPermission "user.dir", "read";
- permission java.util.PropertyPermission "solr.*", "read";
- permission java.util.PropertyPermission "org.apache.lucene.lockDir", "read,write";
- permission java.util.PropertyPermission "org.apache.lucene.store.FSDirectoryLockFactoryClass", "read";
- permission java.io.FilePermission "/usr/share/java", "read";
- permission java.io.FilePermission "/usr/share/java/-", "read";
- permission java.io.FilePermission "/usr/share/maven-repo/-", "read";
- permission java.io.FilePermission "/var/log/tomcat9/-", "read,write";
- permission java.io.FilePermission "/var/lib/tomcat9/webapps/solr/-", "read";
- permission java.io.FilePermission "/var/lib/tomcat9/temp/-", "read,write";
- permission java.io.FilePermission "/etc/solr/-", "read";
- permission java.io.FilePermission "/usr/share/solr/-", "read";
- permission java.io.FilePermission "/usr/share/solr", "read";
- permission java.io.FilePermission "/var/lib/solr", "read,write,delete";
- permission java.io.FilePermission "/var/lib/solr/-", "read,write,delete";
- permission javax.management.MBeanServerPermission "findMBeanServer";
- permission javax.management.MBeanPermission "org.apache.solr.core.*", "*";
- permission javax.management.MBeanTrustPermission "register";
-
- // dataimporthandler
- permission java.io.FilePermission "/usr/share/solr/conf/dataimport.properties", "read,write,delete";
- // really ugly, but we would need to patch solr to get around this:
- permission java.io.FilePermission "/etc/solr/conf/dataimport.properties", "read,write,delete";
- // needed to access mysql via dataimporthandler
- permission java.net.SocketPermission "127.0.0.1:3306", "connect,resolve" ;
-
- /* needed by admin/get-properties.jsp
- permission java.util.PropertyPermission "*", "read,write"; */
-
- /* for admin/threaddump.jsp
- permission java.lang.management.ManagementPermission "monitor"; */
-};
View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/-/compare/486dde851b525a201521fb69ca907a4d710f130e...d0eb5f536adad94f2cd7c2035b3df1f4ac61e6a0
--
View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/-/compare/486dde851b525a201521fb69ca907a4d710f130e...d0eb5f536adad94f2cd7c2035b3df1f4ac61e6a0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210222/44366e3f/attachment.htm>
More information about the pkg-java-commits
mailing list