diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | PKGBUILD | 29 | ||||
| -rw-r--r-- | sheepit-client.conf | 24 | ||||
| -rw-r--r-- | sheepit-client.install | 4 | ||||
| -rw-r--r-- | sheepit-client.service | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | sheepit-client.sh | 4 | ||||
| -rw-r--r-- | sheepit-client.sysusers | 2 |
7 files changed, 46 insertions, 45 deletions
@@ -1,18 +1,20 @@ pkgbase = sheepit-client-git pkgdesc = Client for the free and distributed render farm - pkgver = 5.1678.3038r381.2a8f324 - pkgrel = 1 + pkgver = 6.2020.0 + pkgrel = 2 url = https://www.sheepit-renderfarm.com/ - install = sheepit-client.install arch = i686 arch = x86_64 license = GPL makedepends = git - makedepends = gradle4 + makedepends = gradle depends = java-runtime depends = freetype2 depends = glew depends = libxrender + depends = libxi + depends = libxxf86vm + depends = libxfixes optdepends = cuda: CUDA GPU rendering (not in service mode) optdepends = blender: Create 3D scenes to render provides = sheepit-client @@ -23,11 +25,11 @@ pkgbase = sheepit-client-git source = sheepit-client.sysusers source = sheepit-client.conf source = sheepit-client.service - md5sums = SKIP - md5sums = a30b3ba1c40b2063ccab54b65a7b8e09 - md5sums = 0c61cd94f631e9480cd1aec5377f57ab - md5sums = 30e9d9e679a8b22d9c5efbf64c14743c - md5sums = e051e06111c73777914dffee61b43afc + sha256sums = SKIP + sha256sums = 7e6b48f67f35556aaef7823d5e84b6841c46003b65b9a8c373d1cd14343068a4 + sha256sums = 2ec4f41f996f149102403a0376da75bf6545a80883c595232aa27eedc2eb9803 + sha256sums = 19924349046bc2801ed8532f37d388d6e0317cb5e46b7c13acb5c3069193177d + sha256sums = 22c9a9461a56e37971a8662308448188164f70caac7e328fc4c7c78a91772af4 pkgname = sheepit-client-git @@ -1,29 +1,30 @@ -# Maintainer: Geoffrey Frogeye <geoffrey+aur@frogeye.fr> +# Maintainer: Geoffrey Frogeye <geoffrey+aur@frogeye.fr> +# Maintainer: John Turner <jturner.usa+aur@gmail.com> pkgname=sheepit-client-git -pkgver=5.1678.3038r381.2a8f324 -pkgrel=1 +pkgver=6.2020.0 +pkgrel=2 pkgdesc="Client for the free and distributed render farm" arch=('i686' 'x86_64') url="https://www.sheepit-renderfarm.com/" license=('GPL') -depends=('java-runtime' 'freetype2' 'glew' 'libxrender') -makedepends=('git' 'gradle4') +depends=('java-runtime' 'freetype2' 'glew' 'libxrender' 'libxfixes' 'libxi' 'libxxf86vm') +makedepends=('git' 'gradle') optdepends=('cuda: CUDA GPU rendering (not in service mode)' 'blender: Create 3D scenes to render') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") -install=sheepit-client.install backup=('etc/conf.d/sheepit-client') source=('git://github.com/laurent-clouet/sheepit-client.git#branch=master' 'sheepit-client.sh' 'sheepit-client.sysusers' 'sheepit-client.conf' 'sheepit-client.service') -md5sums=('SKIP' - 'a30b3ba1c40b2063ccab54b65a7b8e09' - '0c61cd94f631e9480cd1aec5377f57ab' - '30e9d9e679a8b22d9c5efbf64c14743c' - 'e051e06111c73777914dffee61b43afc') + +sha256sums=('SKIP' + '7e6b48f67f35556aaef7823d5e84b6841c46003b65b9a8c373d1cd14343068a4' + '2ec4f41f996f149102403a0376da75bf6545a80883c595232aa27eedc2eb9803' + '19924349046bc2801ed8532f37d388d6e0317cb5e46b7c13acb5c3069193177d' + '22c9a9461a56e37971a8662308448188164f70caac7e328fc4c7c78a91772af4') pkgver() { cd "$srcdir/${pkgname%-git}" @@ -31,12 +32,12 @@ pkgver() { } build() { - cd "$srcdir/${pkgname%-git}" - gradle4 shadowJar + cd "$srcdir/sheepit-client" + gradle shadowJar } package() { - install -Dm644 "${srcdir}/${pkgname%-git}/build/libs/sheepit-client-all.jar" "${pkgdir}/usr/share/java/sheepit-client/sheepit-client.jar" + install -Dm644 "${srcdir}/sheepit-client/build/libs/sheepit-client.jar" "${pkgdir}/usr/share/java/sheepit-client/sheepit-client.jar" install -Dm755 "${srcdir}/sheepit-client.sh" "${pkgdir}/usr/bin/sheepit-client" install -Dm644 "${srcdir}/sheepit-client.sysusers" "${pkgdir}/usr/lib/sysusers.d/sheepit-client.conf" install -Dm644 "${srcdir}/sheepit-client.conf" "${pkgdir}/etc/conf.d/sheepit-client" diff --git a/sheepit-client.conf b/sheepit-client.conf index eb76d1d4098c..bcc3ee8ff985 100644 --- a/sheepit-client.conf +++ b/sheepit-client.conf @@ -4,16 +4,16 @@ # values or run sheepit-client and # paste the content of ~/.sheepit.conf # here. -# It is however recommended to -# set cache-dir to the directory suggested -# here since the default uses /tmp -# and it might fill up quickly. -# The ui setting is overriden by the -# service so there is no need to change it. + +# This option must not +# be changed. +ui=text # Cache/Working directory. Caution, # everything in it not related to the -# render-farm will be removed +# render-farm will be removed. +# Changing the cache directory +# requires editing the service cache-dir=/var/cache/sheepit-client/ # CPU: only use cpu, GPU: only use gpu, @@ -44,16 +44,12 @@ proxy= # Set render process priorit (19 # lowest to -19 highest) -prority=19 +#prority=19 # Maximum time allow for each frame (in # minute) #rendertime=20 # Maximum memory allow to be used by -# renderer (in KB) -#ram=2097152 - -# Tile size -#tile-size=128 - +# renderer (in MB). +#ram=2000M diff --git a/sheepit-client.install b/sheepit-client.install deleted file mode 100644 index 70bf207adafb..000000000000 --- a/sheepit-client.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - systemd-sysusers sheepit-client.conf - [[ -d /var/cache/sheepit-client ]] || install -dm 755 -o sheepit-client -g sheepit-client /var/cache/sheepit-client -} diff --git a/sheepit-client.service b/sheepit-client.service index b9ddb7e11778..c1a0730f7459 100644 --- a/sheepit-client.service +++ b/sheepit-client.service @@ -5,7 +5,13 @@ After=network.target [Service] User=sheepit-client -ExecStart=/usr/bin/sheepit-client -config /etc/conf.d/sheepit-client -ui text +NoNewPrivileges=true +ProtectSystem=strict +ProtectHome=true +PrivateDevices=true +RestrictNamespaces=true +CacheDirectory=sheepit-client/ +ExecStart=/usr/bin/sheepit-client RestartSec=60 Restart=on-failure diff --git a/sheepit-client.sh b/sheepit-client.sh index aaa26cd19ecb..59c85519980a 100755..100644 --- a/sheepit-client.sh +++ b/sheepit-client.sh @@ -1,2 +1,2 @@ -#!/bin/sh -exec /usr/bin/java -jar '/usr/share/java/sheepit-client/sheepit-client.jar' "$@" +#!/bin/bash +exec /bin/java -jar /usr/share/java/sheepit-client/sheepit-client.jar -config /etc/conf.d/sheepit-client diff --git a/sheepit-client.sysusers b/sheepit-client.sysusers index b180e1ee211e..610e0d1f5bdf 100644 --- a/sheepit-client.sysusers +++ b/sheepit-client.sysusers @@ -1 +1 @@ -u sheepit-client - "SheepIt client user" /var/cache/sheepit-client +u sheepit-client - "SheepIt client user" |