[arch-commits] Commit in emby-server/trunk (3 files)

[Maxime Gauduin]

    Date: Wednesday, April 1, 2020 @ 10:31:32
  Author: alucryd
Revision: 608668

switch to DynamicUser: emby-server 4.4.0.40-4

Added:
  emby-server/trunk/emby-server.install
Modified:
  emby-server/trunk/PKGBUILD
  emby-server/trunk/emby-server.service

---------------------+
 PKGBUILD            |   18 ++++++++----------
 emby-server.install |    9 +++++++++
 emby-server.service |   20 +++++++++++++++-----
 3 files changed, 32 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-01 10:31:18 UTC (rev 608667)
+++ PKGBUILD	2020-04-01 10:31:32 UTC (rev 608668)
@@ -4,9 +4,9 @@
 pkgname=emby-server
 pkgver=4.4.0.40
 _ffmpeg_ver=2020_02_24
-pkgrel=3
+pkgrel=4
 pkgdesc='Bring together your videos, music, photos, and live television'
-arch=(any)
+arch=(x86_64)
 url=https://emby.media
 license=(custom)
 depends=(
@@ -45,7 +45,10 @@
   ffnvcodec-headers8.1
   nasm
 )
-optdepends=('intel-media-sdk: Intel QuickSync support')
+optdepends=(
+  'intel-media-sdk: Intel QuickSync support (requires Emby Premiere)'
+  'nvidia-utils: Nvidia NVDEC/NVENC support (requires Emby Premiere)'
+)
 source=(
   https://github.com/MediaBrowser/Emby.Releases/releases/download/${pkgver}/embyserver-netcore_${pkgver}.zip
   https://mediabrowser.github.io/embytools/ffmpeg-${_ffmpeg_ver}.tar.gz
@@ -53,21 +56,18 @@
   emby-server
   emby-server.conf
   emby-server.service
-  emby-server.sysusers
-  emby-server.tmpfiles
   license.docx
   Permission_to_distribute.mbox
 )
 noextract=(license.docx)
 backup=(etc/conf.d/emby-server)
+install=emby-server.install
 sha256sums=('740e7328d517b1ffbb91d2c0f37884cdf67398af532848b005294d66fc540b9a'
             '6d115633eeb1d48a80f07f53c2e8c43093bd56a4a3d7d8b3d6207c4f473a61e0'
             '50ed2c4b4a8bc62baf92ac6192c8fe21a00dd77b0079d5a971958f412bc2bf9e'
             'ee6ed36a13fcd8fd0b2b818eac742cc2cc2513d7f8f6cd867fa8d1c45ef3dd22'
             'd1a805284d8a1329f6f6e736423be747d8951c5a9600fbb79c13a6f9be7149c0'
-            'efdaabd3002fee13a6831e90fd700dea4d7c6c954ede00da6f28c1eada33ad8c'
-            'f7fa33949757ffc587ecf82496dc35ebc8c8e5c98b882b31dc40a24263d3921a'
-            'a13a844a1bdc679356698e3fd7f3946d07bdfe021ed857d944ead011ad338056'
+            '54bf6a38fcea32fae8468e217a0b1a66a50f5f1a5674fce35fefb6c3881bb827'
             'a6d7ea65dcb06392479a85e1a10a7aeb872d803da6f784f6935fcd4ee63008c6'
             '716cc88f47b829937884e765add9fe54ed27f0f4d1cec1a18045feb138fb66c9')
 
@@ -124,8 +124,6 @@
   install -Dm 755 ffmpeg-${_ffmpeg_ver}_public/ffmpeg "${pkgdir}"/usr/bin/ffmpeg-emby
   install -Dm 755 ffmpeg-${_ffmpeg_ver}_public/ffprobe "${pkgdir}"/usr/bin/ffprobe-emby
   install -Dm 644 emby-server.service -t "${pkgdir}"/usr/lib/systemd/system/
-  install -Dm 644 emby-server.sysusers "${pkgdir}"/usr/lib/sysusers.d/emby-server.conf
-  install -Dm 644 emby-server.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/emby-server.conf
   install -Dm 644 emby-server.conf "${pkgdir}"/etc/conf.d/emby-server
   install -Dm 644 license.docx -t "${pkgdir}"/usr/share/licenses/emby-server/
 }

Added: emby-server.install
===================================================================
--- emby-server.install	                        (rev 0)
+++ emby-server.install	2020-04-01 10:31:32 UTC (rev 608668)
@@ -0,0 +1,9 @@
+post_upgrade() {
+  if [ $(vercmp $2 4.4.0.40-4) -lt 0 ]; then
+    cat << EOF
+The systemd service now uses DynamicUser to manage the emby user.
+You may safely userdel the old emby user.
+EOF
+  fi
+}
+

Modified: emby-server.service
===================================================================
--- emby-server.service	2020-04-01 10:31:18 UTC (rev 608667)
+++ emby-server.service	2020-04-01 10:31:32 UTC (rev 608668)
@@ -1,16 +1,26 @@
 [Unit]
 Description=Emby brings together your videos, music, photos, and live television.
+After=network.target
 
 [Service]
+User=emby
+Group=emby
+SupplementaryGroups=render
+SupplementaryGroups=video
+DynamicUser=true
+StateDirectory=emby
+ReadWritePaths=/dev/dri
+
 EnvironmentFile=/etc/conf.d/emby-server
-WorkingDirectory=/usr/lib/emby-server
 ExecStart=/usr/bin/emby-server
 RestartForceExitStatus=3
-User=emby
-Group=emby
 
-[Unit]
-After=network.target
+AmbientCapabilities=
+CapabilityBoundingSet=
+LockPersonality=true
+ProtectControlGroups=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
 
 [Install]
 WantedBy=multi-user.target