Update to 3.11.2 and implement galaux's changes

2 files changed, 17 insertions, 46 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 67f89d33b49b..cc3cfc0043cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,19 @@
-# Maintainer: Carsten Feuls <archlinux@carstenfeuls.de>
+# Maintainer: Oden S. <hello@odensc.me>
+# Contributor: Carsten Feuls <archlinux@carstenfeuls.de>
 # Contributor: Guillaume ALAUX <guillaume at alaux dot net>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Konstantin Nikiforov <helllamer@gmail.com> 
+# Contributor: Konstantin Nikiforov <helllamer@gmail.com>
 # Contributor: Alper Kanat <alperkanat@raptiye.org>
 # Contributor: adam2fours <adam@2fours.com>
 
-# check() function is used to verify GPG signature. check() imports 3 keys into your GPG keyring at first build.
-# See http://scarybeastsecurity.blogspot.com/2011/07/alert-vsftpd-download-backdoored.html for reason of this step.
-# If you have problems with gpg, you can remove check() function, and all will be ok.
+# `makepkg` will refuse to build this package unless you either:
+# - manually add upstream signing key to your GPG keyring with:
+#   `gpg --recv-keys <UPSTREAM_KEY(S)>`
+# - set your GPG config to automatically retrieve missing keys by adding
+#   `keyserver-options auto-key-retrieve` to your `~/.gnupg/gpg.conf`
 
 pkgname=cassandra
-pkgver=3.11.1
+pkgver=3.11.2
 pkgrel=1
 pkgdesc='Apache Cassandra NoSQL database'
 arch=('any')
@@ -28,16 +31,15 @@ backup=(etc/cassandra/cassandra-env.sh
         etc/cassandra/logback.xml
         etc/cassandra/logback-tools.xml)
 install=cassandra.install
-_url_tgz="http://www.apache.org/dist/${pkgname}/${pkgver}/apache-${pkgname}-${pkgver}-bin.tar.gz"
-source=("${_url_tgz}"
+source=(https://www.apache.org/dist/${pkgname}/${pkgver}/apache-${pkgname}-${pkgver}-bin.tar.gz{,.asc}
         '01_fix_cassandra_home_path.patch'
-        'cassandra.install'
         'cassandra.service'
         'cassandra-tmpfile.conf'
         'cassandra-user.conf')
-sha256sums=('6feed696759e2f3219e0ebde13f4c9080cac0744a77eb3cb43af136ab527f0ed'
+validpgpkeys=('A26E528B271F19B9E5D8E19EA278B781FE4B2BDA') # Michael Shuler <michael@pbandjelly.org>
+sha256sums=('e922770ad95d5288d42442c3cfa1475938597b38418b7be5c4234a9de388c720'
+            'SKIP'
             'bbb5dcc19cac4e19c506210da901280c3063a6a241480bf12bc874e6a5c02657'
-            '971d6d0f21963b2d9443039431e5225191771454728c6eda4aab9175ee478ce4'
             'abc9d54399c84eacf5922811b5480846ea1c88a73c5d214ea1db3d20c7c0422a'
             '7ea0024331734b9755b6fa2ed1881f9bc608b551990b96f14e80406cb6b05eb8'
             '7a87a4369ca2c13558fa8733f6abdcf548c63dda8a16790b5bcc20bae597ee91')
@@ -48,21 +50,6 @@ build() {
   patch -p0 < ${srcdir}/01_fix_cassandra_home_path.patch
 }
 
-## to check gpg signature
-check() {
-  msg "Checking GPG signature..."
-  msg2 "(To disable gpg-check: build with '--nocheck')"
-
-  _url_keys='https://www.apache.org/dist/cassandra/KEYS'
-  msg "Importing GPG keys from ${_url_keys} ..."
-  wget --quiet -O - ${_url_keys} | gpg --import -
-
-  # no need to add signature to package dependences
-  echo "${_url_tgz}.asc"
-  wget --quiet -O - "${_url_tgz}.asc" | gpg --verify - "apache-${pkgname}-${pkgver}-bin.tar.gz"
-  msg2 "Detached GPG signature is valid."
-}
-
 package() {
   cd ${srcdir}/apache-cassandra-${pkgver}
 
@@ -73,22 +60,22 @@ package() {
 
   mkdir -p ${pkgdir}/usr/share/cassandra/bin/
   for f in bin/*; do
-    if [[ ! "${f}" == *.bat && -x ${f} ]]; then
+    if [[ ! "${f}" == *.bat && ! "${f}" == *.ps1 && -x ${f} ]]; then
       cp -a ${f} ${pkgdir}/usr/share/cassandra/bin/
       ln -s /usr/share/cassandra/${f} ${pkgdir}/usr/${f}
     fi
   done
+  unlink ${pkgdir}/usr/bin/cqlsh.py
   cp -a bin/cassandra.in.sh ${pkgdir}/usr/share/cassandra/
 
   cp -a lib/* ${pkgdir}/usr/share/java/cassandra/
   ln -s ../java/cassandra ${pkgdir}/usr/share/cassandra/lib
 
   cp -a conf/* ${pkgdir}/etc/cassandra/
+  rm  ${pkgdir}/etc/cassandra/*.ps1
   ln -s /etc/cassandra ${pkgdir}/usr/share/cassandra/conf
 
   install -Dm644 ${srcdir}/cassandra.service ${pkgdir}/usr/lib/systemd/system/cassandra.service
   install -Dm644 ${srcdir}/cassandra-tmpfile.conf ${pkgdir}/usr/lib/tmpfiles.d/cassandra.conf
   install -Dm644 ${srcdir}/cassandra-user.conf ${pkgdir}/usr/lib/sysusers.d/cassandra.conf
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/cassandra.install b/cassandra.install
index f4f4b222a226..e42da194c8a9 100644
--- a/cassandra.install
+++ b/cassandra.install
@@ -1,24 +1,8 @@
 post_install() {
-  systemd-sysusers cassandra.conf
-  systemd-tmpfiles --create cassandra.conf
-
   ln -snf /var/lib/cassandra /usr/share/cassandra/data
   ln -snf /var/log/cassandra /usr/share/cassandra/logs
 }
 
 post_upgrade() {
   post_install
-}
-
-pre_remove() {
-  systemctl stop cassandra
-}
-
-post_remove() {
-  if getent passwd cassandra >/dev/null 2>&1; then
-    userdel cassandra
-  fi
-  if getent group cassandra >/dev/null 2>&1; then
-    groupdel cassandra
-  fi
-}
+}
\ No newline at end of file