Merge branch 'master' into patch-2

9 files changed, 28 insertions, 16 deletions

diff --git a/debian/bin/restart.sh b/debian/bin/restart.sh
index 9b64b6d72..34fce0670 100755
--- a/debian/bin/restart.sh
+++ b/debian/bin/restart.sh
@@ -24,13 +24,13 @@ cmd="$( get_service_command )"
 echo "Detected service control platform '$cmd'; using it to restart Jellyfin..."
 case $cmd in
     'systemctl')
-        echo "sleep 2; /usr/bin/sudo $( which systemctl ) restart jellyfin" | at now 
+        echo "sleep 0.5; /usr/bin/sudo $( which systemctl ) start jellyfin" | at now 
         ;;
     'service')
-        echo "sleep 2; /usr/bin/sudo $( which service ) jellyfin restart" | at now 
+        echo "sleep 0.5; /usr/bin/sudo $( which service ) jellyfin start" | at now 
         ;;
     'sysv')
-        echo "sleep 2; /usr/bin/sudo /etc/init.d/jellyfin restart" | at now 
+        echo "sleep 0.5; /usr/bin/sudo /etc/init.d/jellyfin start" | at now 
         ;;
 esac
 exit 0
diff --git a/debian/changelog b/debian/changelog
index 184143fe9..430594cac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jellyfin-server (10.8.0-1) unstable; urgency=medium
+
+  * Forthcoming stable release
+
+ -- Jellyfin Packaging Team <packaging@jellyfin.org>  Fri, 04 Dec 2020 21:55:12 -0500
+
 jellyfin-server (10.7.0-1) unstable; urgency=medium
 
   * Forthcoming stable release
diff --git a/debian/conf/jellyfin b/debian/conf/jellyfin
index 93373aeba..ab8d5d1d4 100644
--- a/debian/conf/jellyfin
+++ b/debian/conf/jellyfin
@@ -36,6 +36,11 @@ JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg"
 # Space to add additional command line options to jellyfin (for help see ~$ jellyfin --help)
 JELLYFIN_ADDITIONAL_OPTS=""
 
+# [OPTIONAL] run Jellyfin with ASP.NET Server Garbage Collection (uses more RAM and less CPU than Workstation GC)
+# 0 = Workstation
+# 1 = Server
+#COMPlus_gcServer=1
+
 #
 # SysV init/Upstart options
 #
diff --git a/debian/control b/debian/control
index 39c2aa055..9675d36ca 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: Jellyfin Team <team@jellyfin.org>
 Build-Depends:  debhelper (>= 9),
-                dotnet-sdk-3.1,
+                dotnet-sdk-5.0,
                 libc6-dev,
                 libcurl4-openssl-dev,
                 libfontconfig1-dev,
@@ -20,7 +20,6 @@ Breaks: jellyfin (<<10.6.0)
 Architecture: any
 Depends: at,
          libsqlite3-0,
-         jellyfin-ffmpeg (>= 4.2.1-2),
          libfontconfig1,
          libfreetype6,
          libssl1.1
diff --git a/debian/jellyfin.service b/debian/jellyfin.service
index 459ac6363..b79cd47c7 100644
--- a/debian/jellyfin.service
+++ b/debian/jellyfin.service
@@ -1,6 +1,6 @@
 [Unit]
 Description = Jellyfin Media Server
-After = network.target
+After = network-online.target
 
 [Service]
 Type = simple
diff --git a/debian/metapackage/jellyfin b/debian/metapackage/jellyfin
index 026fcb821..a9a0ae5b0 100644
--- a/debian/metapackage/jellyfin
+++ b/debian/metapackage/jellyfin
@@ -5,7 +5,7 @@ Homepage: https://jellyfin.org
 Standards-Version: 3.9.2
 
 Package: jellyfin
-Version: 10.7.0
+Version: 10.8.0
 Maintainer: Jellyfin Packaging Team <packaging@jellyfin.org>
 Depends: jellyfin-server, jellyfin-web
 Description: Provides the Jellyfin Free Software Media System
diff --git a/debian/postinst b/debian/postinst
index 860222e05..2f9c4cffb 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -9,6 +9,8 @@ if [[ -f $DEFAULT_FILE ]]; then
   . $DEFAULT_FILE
 fi
 
+JELLYFIN_USER=${JELLYFIN_USER:-jellyfin}
+
 # Data directories for program data (cache, db), configs, and logs
 PROGRAMDATA=${JELLYFIN_DATA_DIRECTORY-/var/lib/$NAME}
 CONFIGDATA=${JELLYFIN_CONFIG_DIRECTORY-/etc/$NAME}
@@ -18,12 +20,12 @@ CACHEDATA=${JELLYFIN_CACHE_DIRECTORY-/var/cache/$NAME}
 case "$1" in
   configure)
     # create jellyfin group if it does not exist
-    if [[ -z "$(getent group jellyfin)" ]]; then
-      addgroup --quiet --system jellyfin > /dev/null 2>&1
+    if [[ -z "$(getent group ${JELLYFIN_USER})" ]]; then
+      addgroup --quiet --system ${JELLYFIN_USER} > /dev/null 2>&1
     fi
     # create jellyfin user if it does not exist
-    if [[ -z "$(getent passwd jellyfin)"  ]]; then
-      adduser --system --ingroup jellyfin --shell /bin/false jellyfin --no-create-home --home ${PROGRAMDATA} \
+    if [[ -z "$(getent passwd ${JELLYFIN_USER})"  ]]; then
+      adduser --system --ingroup ${JELLYFIN_USER} --shell /bin/false ${JELLYFIN_USER} --no-create-home --home ${PROGRAMDATA} \
         --gecos "Jellyfin default user" > /dev/null 2>&1
     fi
     # ensure $PROGRAMDATA exists
@@ -43,7 +45,7 @@ case "$1" in
       mkdir $CACHEDATA
     fi
     # Ensure permissions are correct on all config directories
-    chown -R jellyfin $PROGRAMDATA $CONFIGDATA $LOGDATA $CACHEDATA
+    chown -R ${JELLYFIN_USER} $PROGRAMDATA $CONFIGDATA $LOGDATA $CACHEDATA
     chgrp adm $PROGRAMDATA $CONFIGDATA $LOGDATA $CACHEDATA
     chmod 0750 $PROGRAMDATA $CONFIGDATA $LOGDATA $CACHEDATA
 
diff --git a/debian/postrm b/debian/postrm
index 1d00a984e..3d56a5f1e 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -25,7 +25,7 @@ case "$1" in
   purge)
     echo PURGE | debconf-communicate $NAME > /dev/null 2>&1 || true
 
-    if [[ -x "/etc/init.d/jellyfin" ]] || [[ -e "/etc/init/jellyfin.connf" ]]; then
+    if [[ -x "/etc/init.d/jellyfin" ]] || [[ -e "/etc/init/jellyfin.conf" ]]; then
       update-rc.d jellyfin remove >/dev/null 2>&1 || true
     fi
 
@@ -54,7 +54,7 @@ case "$1" in
       rm -rf $PROGRAMDATA
     fi
     # Remove binary symlink
-    [[ -f /usr/bin/jellyfin ]] && rm /usr/bin/jellyfin
+    rm -f /usr/bin/jellyfin
     # Remove sudoers config
     [[ -f /etc/sudoers.d/jellyfin-sudoers ]] && rm /etc/sudoers.d/jellyfin-sudoers
     # Remove anything at the default locations; catches situations where the user moved the defaults
diff --git a/debian/rules b/debian/rules
index 2a5d41a69..64e2b48ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,8 +39,8 @@ override_dh_auto_test:
 override_dh_clistrip:
 
 override_dh_auto_build:
-	dotnet publish --configuration $(CONFIG) --output='$(CURDIR)/usr/lib/jellyfin/bin' --self-contained --runtime $(DOTNETRUNTIME) \
-		"-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" Jellyfin.Server
+	dotnet publish -maxcpucount:1 --configuration $(CONFIG) --output='$(CURDIR)/usr/lib/jellyfin/bin' --self-contained --runtime $(DOTNETRUNTIME) \
+		"-p:DebugSymbols=false;DebugType=none" Jellyfin.Server
 
 override_dh_auto_clean:
 	dotnet clean -maxcpucount:1 --configuration $(CONFIG) Jellyfin.Server || true