From 5f2cd11199875fb6c4698b89d235703cda86021f Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 4 Dec 2020 21:55:32 -0500
Subject: Bump version to 10.8.0 for next release

---
 debian/changelog            | 6 ++++++
 debian/metapackage/jellyfin | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'debian')

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/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
-- 
cgit v1.2.3


From 01491796a285a621c6aebe4f886ee74413e5fbee Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Sun, 11 Apr 2021 12:57:28 +0200
Subject: Enable Workstation GC mode

---
 Jellyfin.Server/Jellyfin.Server.csproj | 1 +
 debian/conf/jellyfin                   | 5 +++++
 fedora/jellyfin.env                    | 4 ++++
 3 files changed, 10 insertions(+)

(limited to 'debian')

diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index e7f83aff1..98d990344 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -9,6 +9,7 @@
     <AssemblyName>jellyfin</AssemblyName>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
+    <ServerGarbageCollection>false</ServerGarbageCollection>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/debian/conf/jellyfin b/debian/conf/jellyfin
index 7cbfa88ee..9ebaf2bd8 100644
--- a/debian/conf/jellyfin
+++ b/debian/conf/jellyfin
@@ -33,6 +33,11 @@ JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg"
 # [OPTIONAL] run Jellyfin without the web app
 #JELLYFIN_NOWEBAPP_OPT="--nowebclient"
 
+# [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/fedora/jellyfin.env b/fedora/jellyfin.env
index bf64acd3f..56b7a3558 100644
--- a/fedora/jellyfin.env
+++ b/fedora/jellyfin.env
@@ -35,3 +35,7 @@ JELLYFIN_RESTART_OPT="--restartpath=/usr/libexec/jellyfin/restart.sh"
 # [OPTIONAL] run Jellyfin without the web app
 #JELLYFIN_NOWEBAPP_OPT="--noautorunwebapp"
 
+# [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
-- 
cgit v1.2.3


From 8eee32c8c2835382c2f7c7d959dd034a50f86e02 Mon Sep 17 00:00:00 2001
From: Tobias Krönke <tobias.kroenke@truffls.com>
Date: Thu, 6 May 2021 18:56:13 +0200
Subject: Respect configured JELLYFIN_USER in Debian's postinst

In my setup I configured a different user. But updates keep "stealing" file permissions for my `$PROGRAMDATA $CONFIGDATA $LOGDATA $CACHEDATA` directories.
---
 debian/postinst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'debian')

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
 
-- 
cgit v1.2.3