summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFranco Masotti2017-02-07 18:52:29 +0100
committerFranco Masotti2017-02-07 18:52:29 +0100
commit77733473cd0bb441a96baea257e187bde6dd5d9a (patch)
treea08e37bc8141e3b7339f814672d457613105b654
parent84a15fab5d347b8cb36f9294e51cd6f1fc3e47fa (diff)
downloadaur-77733473cd0bb441a96baea257e187bde6dd5d9a.tar.gz
Minor fixes.
-rw-r--r--.SRCINFO6
-rw-r--r--.install4
-rw-r--r--PKGBUILD8
-rw-r--r--rserve-sandbox-docker.service2
4 files changed, 12 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d419c472daa4..8c55a469ea51 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
pkgbase = rserve-sandbox-docker
pkgdesc = Docker spec for running Rserve in a sandbox
- pkgver = r24.8499ca9
- pkgrel = 4
+ pkgver = r31.d7e1235
+ pkgrel = 1
url = https://github.com/frnmst/rserve-sandbox
install = .install
arch = x86_64
license = BSD
makedepends = git
makedepends = sed
+ depends = sed
depends = r
depends = docker
+ conflicts = rserve-sandbox-docker-bin
source = git+https://github.com/frnmst/rserve-sandbox#branch=distro-package
md5sums = SKIP
diff --git a/.install b/.install
index d6914b0e2742..052bb1af8d8a 100644
--- a/.install
+++ b/.install
@@ -1,7 +1,7 @@
post_install() {
# Add rserve user and group.
- getent group rserve &>/dev/null || groupadd -r rserve >/dev/null
- getent passwd rserve &>/dev/null || useradd -m -d /home/rserve \
+ getent group rserve &>/dev/null || groupadd -g 32749 -r rserve >/dev/null
+ getent passwd rserve &>/dev/null || useradd -u 32749 -m -d /home/rserve \
-s /bin/false -r -g rserve rserve >/dev/null
# Exec the chmod just like in the Makefile.
chmod 750 /home/rserve
diff --git a/PKGBUILD b/PKGBUILD
index bb7c79415ca4..d72736228ac2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,18 @@
# Maintainer: Franco Masotti <franco dot masotti at student dot unife dot it>
# Contributor: Franco Masotti <franco dot masotti at student dot unife dot it>
pkgname=rserve-sandbox-docker
-pkgver=r24.8499ca9
-pkgrel=4
+pkgver=r31.d7e1235
+pkgrel=1
pkgdesc="Docker spec for running Rserve in a sandbox"
arch=('x86_64')
url="https://github.com/frnmst/rserve-sandbox"
license=('BSD')
-depends=('r'
+depends=('sed'
+ 'r'
'docker')
makedepends=('git'
'sed')
+conflicts=('rserve-sandbox-docker-bin')
install=.install
source=('git+https://github.com/frnmst/rserve-sandbox#branch=distro-package')
md5sums=('SKIP')
diff --git a/rserve-sandbox-docker.service b/rserve-sandbox-docker.service
index c0c1ae65da36..fbb595466e2a 100644
--- a/rserve-sandbox-docker.service
+++ b/rserve-sandbox-docker.service
@@ -24,7 +24,7 @@
[Unit]
Description=Docker spec for running Rserve in a sandbox
-Documentation=https://github.com/JanWielemaker/rserve-sandbox https://github.com/JanWielemaker/rserve_client
+Documentation=https://github.com/frnmst/rserve-sandbox https://github.com/JanWielemaker/rserve_client
Requires=docker.service
After=docker.service