Update package and add install script to create user and group

3 files changed, 51 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eec2084564c4..f534f65b1a89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,24 @@
 pkgbase = monetdb
 	pkgdesc = MonetDB: an open source database system
-	pkgver = 11.25.9
+	pkgver = 11.27.11
 	pkgrel = 1
 	url = http://www.monetdb.org/Home
+	install = monetdb.install
 	arch = i686
 	arch = x86_64
 	license = custom
+	makedepends = r
 	makedepends = python
-	makedepends = apache-ant
-	source = http://dev.monetdb.org/downloads/sources/Latest/MonetDB-11.25.9.tar.xz
-	sha256sums = 45bacc0c674060eb1d2ec3dff2a36520d3f42b6c2461d2dd06a19f239a05ab6e
+	makedepends = libatomic_ops
+	makedepends = snappy
+	makedepends = unixodbc
+	depends = r
+	depends = python
+	depends = libatomic_ops
+	depends = snappy
+	depends = unixodbc
+	source = http://dev.monetdb.org/downloads/sources/Latest/MonetDB-11.27.11.tar.xz
+	sha256sums = 473b2ea245d8fe006aabe5b2ea3924ade0283f46cfd2edf6fce6aa786c191d0b
 
 pkgname = monetdb
 
diff --git a/PKGBUILD b/PKGBUILD
index 36ca38c52b2f..bec973e8ebbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,32 @@
 # Contributor: Benjamin van der Burgh <gringo@archlinux.info>
 # Contributor: symen
 # Contributor: Thiago Perrotta <perrotta dot thiago at poli dot ufrj dot br>
+# Contributor: artemklevtsov
+# Contributor: Moritz Bruder <muesli4 at gmail dot com>
 
 pkgname=monetdb
-pkgver=11.25.23
+pkgver=11.27.11
 pkgrel=1
 pkgdesc="MonetDB: an open source database system"
 arch=('i686' 'x86_64')
 url="http://www.monetdb.org/Home"
 license=('custom')
-makedepends=('python' 'apache-ant' 'r')
+makedepends=('r' 'python' 'libatomic_ops' 'snappy' 'unixodbc')
+depends=('r' 'python' 'libatomic_ops' 'snappy' 'unixodbc')
+install=monetdb.install
 source=("http://dev.monetdb.org/downloads/sources/Latest/MonetDB-$pkgver.tar.xz")
-sha256sums=('8f3a39cfcd11dc81746e062795a8e46eb9b1ca9fdf03a3dbd5290826f62d1c07')
+sha256sums=('473b2ea245d8fe006aabe5b2ea3924ade0283f46cfd2edf6fce6aa786c191d0b')
 
 build() {
-  cd "$srcdir/MonetDB-$pkgver"
- ./bootstrap
- ./configure --libdir=/usr/lib --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --disable-assert --disable-testing --enable-optimize --enable-rintegration
- make
+    cd "$srcdir/MonetDB-$pkgver"
+    ./bootstrap
+    ./configure --libdir=/usr/lib --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+        --disable-assert --disable-testing --enable-optimize --enable-rintegration
+    make
 }
 
 package() {
-  cd "$srcdir/MonetDB-$pkgver"
-  make "DESTDIR=$pkgdir" install
-  mkdir -p "$pkgdir/var/log/monetdb"
+    cd "$srcdir/MonetDB-$pkgver"
+    make "DESTDIR=$pkgdir" install
+    mkdir -p "$pkgdir/var/log/monetdb"
 }
diff --git a/monetdb.install b/monetdb.install
new file mode 100644
index 000000000000..10bd2857dc97
--- /dev/null
+++ b/monetdb.install
@@ -0,0 +1,23 @@
+post_install() {
+    if ! getent group monetdb > /dev/null; then
+        groupadd --system monetdb
+    fi
+
+    if ! getent passwd monetdb > /dev/null; then
+        useradd --system -c 'MonetDB user' -g monetdb -d '/var/MonetDB' -s /sbin/nologin monetdb
+        passwd -l monetdb &> /dev/null
+    fi
+
+    mkdir -p /var/monetdb5/dbfarm
+    chown monetdb:monetdb /var/monetdb5 /var/monetdb5/dbfarm
+    chmod ug=rwx,g+s,o= /var/monetdb5 /var/monetdb5/dbfarm
+
+    mkdir -p /var/log/monetdb /var/run/monetdb
+    chown monetdb:monetdb /var/log/monetdb /var/run/monetdb
+    chmod ug=rwx,o= /var/log/monetdb
+    chmod ug=rwx,o=rx /var/run/monetdb
+}
+
+post_upgrade() {
+    post_install
+}