Update to 3.5.3 and do some house cleaning

4 files changed, 24 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a54e61ff28d3..349afff6414f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = arangodb
 	pkgdesc = A multi-model NoSQL database, combining key-value, document and graph data models.
-	pkgver = 3.5.2
-	pkgrel = 2
+	pkgver = 3.5.3
+	pkgrel = 1
 	url = https://www.arangodb.com/
 	install = arangodb.install
 	arch = i686
@@ -14,15 +14,15 @@ pkgbase = arangodb
 	depends = systemd
 	depends = curl
 	depends = zlib
-	source = https://download.arangodb.com/Source/ArangoDB-3.5.2.tar.bz2
-	source = https://download.arangodb.com/Source/ArangoDB-3.5.2.tar.bz2.asc
+	source = https://download.arangodb.com/Source/ArangoDB-3.5.3.tar.bz2
+	source = https://download.arangodb.com/Source/ArangoDB-3.5.3.tar.bz2.asc
 	source = arangodb3.service
 	source = arangodb-tmpfile.conf
 	source = arangodb-users.conf
 	validpgpkeys = CD8CB0F1E0AD5B52E93F41E7EA93F5E56E751E9B
-	sha512sums = baa5edbb0e807a94a3fe3a306fee851fb5d555a45d983d2198365c2a999e1bc2e81748dd21526f47c88decd970ac8f8198a35f3da78ebf632694295b708be74d
+	sha512sums = d5f26c6c10e3e2bed04c977761f567e160a6ecbb92bc56ba9e063b61785e8a86630c74a911cf7334b0a55b8878992ea08be6fcffc1eff1369d27c690d159e045
 	sha512sums = SKIP
-	sha512sums = 18bccbc960555c600c86409a89545c1c056dbce9abcd5724cd61c54a734d9c974df0d01b0a49c1859299ffc448c3e576f8c2bcc6134ad3f5062293b11cf85091
+	sha512sums = 5afb8b1b611e81dc5a5e0d74ba4e781d41f0404c24ae327fd55481a23669ef1acc7bf90a1dd1eda8b86476fe1ac3cb287c39e50820d610f041f029ad36ae82ca
 	sha512sums = b1fdf8cc0525d1fc093d02b24b18a1d8361fb2cd8274974269957ef8074a26eb4f2174bdd4abd41154d535df43cd9d553c1b8205cd5945e53674d25dfa3c533f
 	sha512sums = 8a73da7dfb9cc371ce7c72efd53afc04ede26a890cd7542c82c518bf3d7c5be38abfcad66235fc9cf9d63c9955ebcdbca4c1d7056b386b1b59bf61dc1887febd
 
diff --git a/PKGBUILD b/PKGBUILD
index 9e541ec27ab7..99636b7afcb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Mike Williamson <mike at korora dot ca>
 
 pkgname=arangodb
-pkgver=3.5.2
-pkgrel=2
+pkgver=3.5.3
+pkgrel=1
 pkgdesc="A multi-model NoSQL database, combining key-value, document and graph data models."
 arch=("i686" "x86_64")
 url="https://www.arangodb.com/"
@@ -17,9 +17,9 @@ source=("https://download.arangodb.com/Source/ArangoDB-$pkgver.tar.bz2"
 "arangodb-tmpfile.conf"
 "arangodb-users.conf")
 validpgpkeys=("CD8CB0F1E0AD5B52E93F41E7EA93F5E56E751E9B") # Frank Celler (ArangoDB Debian Repository) <info@arangodb.com>
-sha512sums=('baa5edbb0e807a94a3fe3a306fee851fb5d555a45d983d2198365c2a999e1bc2e81748dd21526f47c88decd970ac8f8198a35f3da78ebf632694295b708be74d'
+sha512sums=('d5f26c6c10e3e2bed04c977761f567e160a6ecbb92bc56ba9e063b61785e8a86630c74a911cf7334b0a55b8878992ea08be6fcffc1eff1369d27c690d159e045'
             'SKIP'
-            '18bccbc960555c600c86409a89545c1c056dbce9abcd5724cd61c54a734d9c974df0d01b0a49c1859299ffc448c3e576f8c2bcc6134ad3f5062293b11cf85091'
+            '5afb8b1b611e81dc5a5e0d74ba4e781d41f0404c24ae327fd55481a23669ef1acc7bf90a1dd1eda8b86476fe1ac3cb287c39e50820d610f041f029ad36ae82ca'
             'b1fdf8cc0525d1fc093d02b24b18a1d8361fb2cd8274974269957ef8074a26eb4f2174bdd4abd41154d535df43cd9d553c1b8205cd5945e53674d25dfa3c533f'
             '8a73da7dfb9cc371ce7c72efd53afc04ede26a890cd7542c82c518bf3d7c5be38abfcad66235fc9cf9d63c9955ebcdbca4c1d7056b386b1b59bf61dc1887febd')
 
@@ -45,22 +45,21 @@ package() {
   msg2 "Preparing ArangoDB."
   mkdir -p $pkgdir/usr/bin
   cp -R $srcdir/ArangoDB-$pkgver/build/etc $pkgdir
-  cp -R $srcdir/ArangoDB-$pkgver/build/var $pkgdir
-  cp -R $srcdir/ArangoDB-$pkgver/build/bin/* $pkgdir/usr/bin/
+  cp $srcdir/ArangoDB-$pkgver/build/bin/arango* $pkgdir/usr/bin/
+  cp $srcdir/ArangoDB-$pkgver/build/bin/foxx* $pkgdir/usr/bin/
   mkdir -p $pkgdir/usr/share/arangodb3/js
   mkdir -p $pkgdir/usr/share/man
-  mkdir -p $pkgdir/var/lib/arangodb3
-  mkdir -p $pkgdir/var/lib/arangodb3-apps
-  mkdir -p $pkgdir/var/log/arangodb3
   cp -R $srcdir/ArangoDB-$pkgver/js/* $pkgdir/usr/share/arangodb3/js
   cp -R $srcdir/ArangoDB-$pkgver/build/Documentation/man/* $pkgdir/usr/share/man
 
-  install -D -m644 arangodb-users.conf "$pkgdir"/usr/lib/sysusers.d/arangodb.conf
+  install -dm755 -o arangodb -g arangodb $pkgdir/var/lib/arangodb3
+  install -dm755 -o arangodb -g arangodb $pkgdir/var/lib/arangodb3-apps
+
+  install -D -m644 $srcdir/ArangoDB-$pkgver/build/bin/icudtl.dat "$pkgdir"/usr/share/arangodb3/icudtl.dat
   install -D -m644 arangodb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/arangodb.conf
   install -D -m644 $srcdir/ArangoDB-"$pkgver"/Installation/logrotate.d/arangod.systemd "$pkgdir"/etc/logrotate.d/arangodb3
   install -D -m644 $srcdir/ArangoDB-$pkgver/LICENSE "${pkgdir}/usr/share/licenses/arangodb3/LICENSE"
 
   msg2 "Preparing systemd service."
-  mkdir -p $pkgdir/usr/lib/systemd/system
-  cp $srcdir/arangodb3.service $pkgdir/usr/lib/systemd/system/
+  install -Dm644 $srcdir/arangodb3.service $pkgdir/usr/lib/systemd/system/arangodb3.service
 }
diff --git a/arangodb.install b/arangodb.install
index 0b9e2fa5939a..3492cc3a2ab5 100644
--- a/arangodb.install
+++ b/arangodb.install
@@ -1,9 +1,5 @@
 post_install() {
 
-  chown -R arangodb:arangodb "/var/lib/arangodb3" &> /dev/null
-  chown -R arangodb:arangodb "/var/lib/arangodb3-apps" &> /dev/null
-  chown -R arangodb:arangodb "/var/log/arangodb3" &> /dev/null
-
   cat <<-EOF
 
   Welcome to ArangoDB.
diff --git a/arangodb3.service b/arangodb3.service
index 2c064f7cd318..c2f782251727 100644
--- a/arangodb3.service
+++ b/arangodb3.service
@@ -16,14 +16,18 @@ Description=ArangoDB
 After=sysinit.target sockets.target timers.target paths.target slices.target network.target syslog.target
 
 [Service]
-PrivateTmp=yes
 Type=simple
 User=arangodb
 Group=arangodb
+ReadWritePaths=/var/log/arangodb3 /var/tmp/arangodb3 /var/lib/arangodb3
+LogsDirectory=arangodb3
+LogsDirectoryMode=0770
 Restart=on-failure
-PIDFile=/run/arangodb3/arangod.pid
+RuntimeDirectory=arangodb3
+RuntimeDirectoryMode=0755
+PIDFile=arangodb3/arangod.pid
 ExecStartPre=/usr/bin/arangod --pid-file /run/arangodb3/arangod.pid --server.rest-server false --database.auto-upgrade true
-ExecStart=/usr/bin/arangod -c /etc/arangodb3/arangod.conf --pid-file /run/arangodb3/arangod.pid --temp.path /var/tmp/arangod3
+ExecStart=/usr/bin/arangod -c /etc/arangodb3/arangod.conf --pid-file /run/arangodb3/arangod.pid --temp.path /var/tmp/arangodb3
 
 
 [Install]