update PKGBUILD for new deps

2 files changed, 46 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc24fd68dc88..dc3ac6028a59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cms-germany-git
 	pkgdesc = CMS, or Contest Management System, is a distributed system for running and (to some extent) organizing a programming contest. This is a fork used for the German IOI team selection process.
-	pkgver = r3315.be50c3ce
-	pkgrel = 1
+	pkgver = r3802.4d519c16
+	pkgrel = 2
 	url = https://github.com/ioi-germany/cms
 	install = cms-germany-git.install
 	arch = i686
@@ -9,40 +9,40 @@ pkgbase = cms-germany-git
 	license = AGPL3
 	makedepends = asciidoc
 	makedepends = python2-setuptools
-	depends = postgresql
-	depends = postgresql-client
 	depends = python2
-	depends = python2-setuptools
 	depends = python2-tornado
 	depends = python2-psycopg2
 	depends = python2-sqlalchemy
-	depends = python2-psutil
 	depends = python2-netifaces
 	depends = python2-crypto
 	depends = python2-pytz
+	depends = python2-psutil
 	depends = python2-six
-	depends = iso-codes
-	depends = shared-mime-info
-	depends = python2-beautifulsoup3
-	depends = python2-mechanize
-	depends = python2-mock
 	depends = python2-requests
-	depends = python2-werkzeug
 	depends = python2-gevent
-	depends = python2-coverage
+	depends = python2-werkzeug
+	depends = patool-py2
+	depends = python2-bcrypt
+	depends = python2-chardet
+	depends = python2-ipaddress
+	depends = python2-yaml
+	depends = postgresql
+	depends = postgresql-client
 	depends = libcgroup
-	depends = texlive-core
+	depends = iso-codes
+	depends = shared-mime-info
+	depends = python2-pathlib
 	depends = asymptote
-	depends = ghostscript
-	depends = python2-yaml
-	depends = patool-py2
-	depends = jdk8-openjdk
-	depends = zip
+	depends = texlive-core
 	depends = texlive-fontsextra
 	depends = texlive-latexextra
 	depends = texlive-pstricks
+	depends = libcap
+	optdepends = python2-pycups: printing support
+	optdepends = python2-pypdf: printing support
+	optdepends = a2ps: printing support
 	optdepends = fpc: support for Pascal submissions
-	optdepends = python2: taskoverview
+	optdepends = jdk8-openjdk: support for Java submissions
 	provides = cms-germany
 	provides = isolate-germany
 	conflicts = cms
diff --git a/PKGBUILD b/PKGBUILD
index f6fe4daf3da8..844eaec6f1f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=cms-germany-git
 pkgver=r3802.4d519c16
-pkgrel=1
+pkgrel=2
 pkgdesc="CMS, or Contest Management System, is a distributed system for running and (to some extent) organizing a programming contest. This is a fork used for the German IOI team selection process."
 arch=('i686' 'x86_64')
 url="https://github.com/ioi-germany/cms"
@@ -34,6 +34,7 @@ depends=(
     'texlive-fontsextra'
     'texlive-latexextra'
     'texlive-pstricks'
+    'libcap'
 )
 optdepends=(
     'python2-pycups: printing support'
@@ -52,29 +53,39 @@ conflicts=('cms' 'isolate')
 install=$pkgname.install
 
 source=(
-  'git://github.com/ioi-germany/cms.git'
-  'git://github.com/ioi-germany/isolate.git'
+    'git://github.com/ioi-germany/cms.git'
+    'git://github.com/ioi-germany/isolate.git'
 )
 sha256sums=(
-  'SKIP' 'SKIP'
+    'SKIP' 'SKIP'
 )
 
 pkgver() {
-  cd cms
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd cms
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-package() {
-  cd cms
+build() {
+    cd isolate
+    make PREFIX="/usr" VARPREFIX="/var" CONFIGDIR="/etc" isolate isolate.1
+
+    cd ../cms
 
-  git config submodule.isolate.url "$srcdir/isolate"
-  git submodule update
+    git config submodule.isolate.url "$srcdir/isolate"
+    git submodule update
+}
+
+package() {
+    cd isolate
+    make PREFIX="$pkgdir/usr" VARPREFIX="$pkgdir/var" CONFIGDIR="$pkgdir/etc" install install-doc
 
-  #mkdir -p "$pkgdir/"lib/python2.7/site-packages/
-  #export PYTHONPATH="$pkgdir"/lib/python2.7/site-packages/
+    # Patch the configuration file so that it uses a standard directory
+    sed -i "s|/var/local/lib/isolate|/var/lib/isolate|" $pkgdir/etc/isolate
 
-  python2 setup.py install --root="$pkgdir" --optimize=1
+    # The isolate binary has the setuid bit set (to run as root without sudo)
+    # however we should let only the owner and the group be able to run it:
+    chmod o-x $pkgdir/usr/bin/isolate
 
-  #mv "$pkgdir"/lib "$pkgdir"/usr/
-  #mv "$pkgdir"/bin "$pkgdir"/usr/
+    cd ../cms
+    python2 setup.py install --root="$pkgdir" --optimize=1
 }