Update to 6.5.1

4 files changed, 23 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0a88e8893fe..817cc4e6141b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Mar 27 15:40:10 UTC 2017
+# Tue May 30 20:10:48 UTC 2017
 pkgbase = solr
 	pkgdesc = Popular, blazing fast open source enterprise search platform from the Apache Lucene project
-	pkgver = 6.4.2
-	pkgrel = 2
+	pkgver = 6.5.1
+	pkgrel = 1
 	url = http://lucene.apache.org/solr/
 	install = solr.install
 	arch = any
@@ -18,10 +18,14 @@ 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.4.2/solr-6.4.2.tgz
+	source = http://archive.apache.org/dist/lucene/solr/6.5.1/solr-6.5.1.tgz
+	source = http://archive.apache.org/dist/lucene/solr/6.5.1/solr-6.5.1.tgz.asc
 	source = solr.service
-	sha256sums = 354e1affd9cad7d6e86cde8c03aaeb604876f0764129621d8e231cdb35b31c55
+	source = solr.conf
+	sha256sums = 7c6a7d4474d5e847a8ddd0a4717d33bf5db07adf17c3d36ad1532c72885bd5d3
+	sha256sums = SKIP
 	sha256sums = e4ca86de2ef9425913280deeeec42d6e8ff310b08ea55d9156193ceef3c847bd
+	sha256sums = a336c1a16742b100b3d28fe49722366477bb805e262f36b83cc2fdd9e85d5bf9
 
 pkgname = solr
 
diff --git a/PKGBUILD b/PKGBUILD
index 1febc07aac90..38b0381b61a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,28 @@
 # Contributor: David Danier <david.danier@team23.de>
 
 pkgname=solr
-pkgver=6.4.2
-pkgrel=2
+pkgver=6.5.1
+pkgrel=1
 pkgdesc="Popular, blazing fast open source enterprise search platform from the Apache Lucene project"
 arch=('any')
 license=('Apache')
 url="http://lucene.apache.org/solr/"
 depends=('java-runtime-headless>=8')
 makedepends=('unzip')
-source=("http://archive.apache.org/dist/lucene/$pkgname/$pkgver/solr-$pkgver.tgz"
-        "solr.service")
+source=("http://archive.apache.org/dist/lucene/$pkgname/$pkgver/solr-$pkgver.tgz"{,.asc}
+        "solr.service"
+        "solr.conf")
 backup=(opt/solr/server/etc/jetty{,-http,-https,-ssl}.xml
         opt/solr/server/etc/webdefault.xml
         opt/solr/server/solr/solr.xml
         opt/solr/server/solr/zoo.cfg)
 install="$pkgname.install"
 options=(!strip)
-sha256sums=('354e1affd9cad7d6e86cde8c03aaeb604876f0764129621d8e231cdb35b31c55'
-            'e4ca86de2ef9425913280deeeec42d6e8ff310b08ea55d9156193ceef3c847bd')
+validpgpkeys=('052C5B48A480B9CEA9E218A5F98C13CFA5A135D8') # "Jim Ferenczi (CODE SIGNING KEY) <jimczi@apache.org>"
+sha256sums=('7c6a7d4474d5e847a8ddd0a4717d33bf5db07adf17c3d36ad1532c72885bd5d3'
+            'SKIP'
+            'e4ca86de2ef9425913280deeeec42d6e8ff310b08ea55d9156193ceef3c847bd'
+            'a336c1a16742b100b3d28fe49722366477bb805e262f36b83cc2fdd9e85d5bf9')
 build() {
   cd "$srcdir/$pkgname-$pkgver"/bin
   rm *.cmd
@@ -34,4 +38,5 @@ package() {
   cp -R * "$pkgdir"/opt/solr
   chown -R 114:114 "$pkgdir"/opt/solr
   install -Dm644 "$srcdir/solr.service" "$pkgdir/usr/lib/systemd/system/solr.service"
+  install -Dm644 "$srcdir/solr.conf" "$pkgdir/usr/lib/sysusers.d/solr.conf"
 }
diff --git a/solr.conf b/solr.conf
new file mode 100644
index 000000000000..0a2bd5d22dfe
--- /dev/null
+++ b/solr.conf
@@ -0,0 +1,3 @@
+# Apache Solr
+g solr 114 - -
+u solr 114 "Apache Solr user" /opt/solr
diff --git a/solr.install b/solr.install
index ae416d79cbf2..66bd25e3c904 100644
--- a/solr.install
+++ b/solr.install
@@ -10,37 +10,8 @@ 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() {
-  _addgroup solr -g 114
-  _adduser solr -c 'Apache Solr user' -u 114 -g solr -d '/opt/solr' -s /bin/bash
-
-  # update shadow files if needed
-  if (( need_group_update )); then
-    grpconv >/dev/null
-  fi
-
-  if (( need_passwd_update )); then
-    pwconv >/dev/null
-  fi
-}
-
 post_install() {
   print_core_message
-  install_solr_user
 }
 
 post_upgrade() {