summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Richards2017-03-24 14:17:04 -0400
committerTom Richards2017-03-24 14:17:04 -0400
commit7ec0d78fd4ec4973b46d08f21d7364b2bba225bf (patch)
tree3bed75f7ce5b3e80931ee74b4a610d4368ca5038
parent32f69248bd01511e4a24f136e1264ff8b51329fe (diff)
downloadaur-7ec0d78fd4ec4973b46d08f21d7364b2bba225bf.tar.gz
Update to 6.4.2
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
-rw-r--r--solr.install28
3 files changed, 29 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 27ed2a41f501..47173d4b2793 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Dec 8 20:17:00 UTC 2016
+# Fri Mar 24 18:16:48 UTC 2017
pkgbase = solr
pkgdesc = Popular, blazing fast open source enterprise search platform from the Apache Lucene project
- pkgver = 6.3.0
+ pkgver = 6.4.2
pkgrel = 1
url = http://lucene.apache.org/solr/
install = solr.install
@@ -18,9 +18,9 @@ pkgbase = solr
backup = opt/solr/server/etc/webdefault.xml
backup = opt/solr/server/solr/solr.xml
backup = opt/solr/server/solr/zoo.cfg
- source = http://archive.apache.org/dist/lucene/solr/6.3.0/solr-6.3.0.tgz
+ source = http://archive.apache.org/dist/lucene/solr/6.4.2/solr-6.4.2.tgz
source = solr.service
- sha256sums = 07692257575fe54ddb8a8f64e96d3d352f2f533aa91b5752be1869d2acf2f544
+ sha256sums = 354e1affd9cad7d6e86cde8c03aaeb604876f0764129621d8e231cdb35b31c55
sha256sums = e4ca86de2ef9425913280deeeec42d6e8ff310b08ea55d9156193ceef3c847bd
pkgname = solr
diff --git a/PKGBUILD b/PKGBUILD
index 82847ced2a0d..5f98247c207f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: David Danier <david.danier@team23.de>
pkgname=solr
-pkgver=6.3.0
+pkgver=6.4.2
pkgrel=1
pkgdesc="Popular, blazing fast open source enterprise search platform from the Apache Lucene project"
arch=('any')
@@ -19,7 +19,7 @@ backup=(opt/solr/server/etc/jetty{,-http,-https,-ssl}.xml
opt/solr/server/solr/zoo.cfg)
install="$pkgname.install"
options=(!strip)
-sha256sums=('07692257575fe54ddb8a8f64e96d3d352f2f533aa91b5752be1869d2acf2f544'
+sha256sums=('354e1affd9cad7d6e86cde8c03aaeb604876f0764129621d8e231cdb35b31c55'
'e4ca86de2ef9425913280deeeec42d6e8ff310b08ea55d9156193ceef3c847bd')
build() {
cd "$srcdir/$pkgname-$pkgver"/bin
diff --git a/solr.install b/solr.install
index 0fd55c6580c2..bc772bad7913 100644
--- a/solr.install
+++ b/solr.install
@@ -10,13 +10,31 @@ Then, create new Solr core(s) from the command line:
EOT
}
+# args: <group> [options]
+_addgroup() {
+ if ! getent group "$1" >/dev/null && groupadd "$@" >/dev/null; then
+ need_group_update=1
+ fi
+}
+
+# args: <group> [options]
+_adduser() {
+ if ! getent passwd "$1" >/dev/null && useradd "$@" >/dev/null; then
+ need_passwd_update=1
+ fi
+}
+
install_solr_user() {
- if ! getent group solr >/dev/null; then
- groupadd -g 114 solr
+ _adduser solr -c 'Apache Solr user' -u 114 -g solr -d '/opt/solr' -s /bin/bash
+ _addgroup solr -g 114
+
+ # update shadow files if needed
+ if (( need_group_update )); then
+ grpconv >/dev/null
fi
- if ! getent passwd solr >/dev/null; then
- useradd -c 'Apache Solr user' -u 114 -g solr -d '/opt/solr' -s /bin/bash solr
- passwd -l solr >/dev/null
+
+ if (( need_passwd_update )); then
+ pwconv >/dev/null
fi
}