Update to 6.6.0

Add Ishan's pgp key
Clean up .install
Rename sysusers source file

5 files changed, 16 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 817cc4e6141b..8cc7e4b30a1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue May 30 20:10:48 UTC 2017
+# Wed Jun  7 14:00:27 UTC 2017
 pkgbase = solr
 	pkgdesc = Popular, blazing fast open source enterprise search platform from the Apache Lucene project
-	pkgver = 6.5.1
+	pkgver = 6.6.0
 	pkgrel = 1
 	url = http://lucene.apache.org/solr/
 	install = solr.install
@@ -18,11 +18,11 @@ 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.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 = http://archive.apache.org/dist/lucene/solr/6.6.0/solr-6.6.0.tgz
+	source = http://archive.apache.org/dist/lucene/solr/6.6.0/solr-6.6.0.tgz.asc
 	source = solr.service
-	source = solr.conf
-	sha256sums = 7c6a7d4474d5e847a8ddd0a4717d33bf5db07adf17c3d36ad1532c72885bd5d3
+	source = solr.sysusers
+	sha256sums = 6b1d1ed0b74aef320633b40a38a790477e00d75b56b9cdc578533235315ffa1e
 	sha256sums = SKIP
 	sha256sums = e4ca86de2ef9425913280deeeec42d6e8ff310b08ea55d9156193ceef3c847bd
 	sha256sums = a336c1a16742b100b3d28fe49722366477bb805e262f36b83cc2fdd9e85d5bf9
diff --git a/.gitignore b/.gitignore
index 768374af202c..30dc304e7993 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 !PKGBUILD
 !solr.install
 !solr.service
+!solr.sysusers
diff --git a/PKGBUILD b/PKGBUILD
index 38b0381b61a7..89f2043b7cb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: David Danier <david.danier@team23.de>
 
 pkgname=solr
-pkgver=6.5.1
+pkgver=6.6.0
 pkgrel=1
 pkgdesc="Popular, blazing fast open source enterprise search platform from the Apache Lucene project"
 arch=('any')
@@ -13,15 +13,16 @@ depends=('java-runtime-headless>=8')
 makedepends=('unzip')
 source=("http://archive.apache.org/dist/lucene/$pkgname/$pkgver/solr-$pkgver.tgz"{,.asc}
         "solr.service"
-        "solr.conf")
+        "solr.sysusers")
 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)
-validpgpkeys=('052C5B48A480B9CEA9E218A5F98C13CFA5A135D8') # "Jim Ferenczi (CODE SIGNING KEY) <jimczi@apache.org>"
-sha256sums=('7c6a7d4474d5e847a8ddd0a4717d33bf5db07adf17c3d36ad1532c72885bd5d3'
+validpgpkeys=('052C5B48A480B9CEA9E218A5F98C13CFA5A135D8'  # "Jim Ferenczi (CODE SIGNING KEY) <jimczi@apache.org>"
+              '2085660D9C1FCCACC4A479A3BF160FF14992A24C') # "Ishan Chattopadhyaya <ishan@apache.org>"
+sha256sums=('6b1d1ed0b74aef320633b40a38a790477e00d75b56b9cdc578533235315ffa1e'
             'SKIP'
             'e4ca86de2ef9425913280deeeec42d6e8ff310b08ea55d9156193ceef3c847bd'
             'a336c1a16742b100b3d28fe49722366477bb805e262f36b83cc2fdd9e85d5bf9')
@@ -38,5 +39,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"
+  install -Dm644 "$srcdir/solr.sysusers" "$pkgdir/usr/lib/sysusers.d/solr.conf"
 }
diff --git a/solr.install b/solr.install
index 66bd25e3c904..ad3158f7e688 100644
--- a/solr.install
+++ b/solr.install
@@ -1,5 +1,6 @@
-print_core_message() {
+post_install() {
   cat <<EOT
+
 Start the solr service first!
   $ sudo systemctl restart solr
 
@@ -7,13 +8,6 @@ Then, create new Solr core(s) from the command line:
   $ sudo -u solr -s /bin/bash
   $ cd
   $ bin/solr create_core -c new_core
-EOT
-}
 
-post_install() {
-  print_core_message
-}
-
-post_upgrade() {
-  post_install $1
+EOT
 }
diff --git a/solr.conf b/solr.sysusers
index 0a2bd5d22dfe..0a2bd5d22dfe 100644
--- a/solr.conf
+++ b/solr.sysusers