Bump version for 10.4.3

Simplify regex to avoid catastrophic backtracking

(cherry picked from commit 6f283d80dc)
Signed-off-by: Joshua Boniface <joshua@boniface.me>

Dockerfile

@@ -2,7 +2,7 @@ ARG DOTNET_VERSION=2.2
 ARG FFMPEG_VERSION=latest
 
 FROM node:alpine as web-builder
-ARG JELLYFIN_WEB_VERSION=v10.4.2
+ARG JELLYFIN_WEB_VERSION=v10.4.3
 RUN apk add curl \
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \

Dockerfile.arm

@@ -4,7 +4,7 @@ ARG DOTNET_VERSION=3.0
 
 
 FROM node:alpine as web-builder
-ARG JELLYFIN_WEB_VERSION=v10.4.2
+ARG JELLYFIN_WEB_VERSION=v10.4.3
 RUN apk add curl \
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \

Dockerfile.arm64

@@ -4,7 +4,7 @@ ARG DOTNET_VERSION=3.0
 
 
 FROM node:alpine as web-builder
-ARG JELLYFIN_WEB_VERSION=v10.4.2
+ARG JELLYFIN_WEB_VERSION=v10.4.3
 RUN apk add curl \
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \

Emby.Dlna/Api/DlnaServerService.cs

@@ -214,11 +214,13 @@ namespace Emby.Dlna.Api
             string baseUrl = _configurationManager.Configuration.BaseUrl;
 
             // backwards compatibility
-            if (baseUrl.Length == 0
-                && (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase)))
+            if (baseUrl.Length == 0)
             {
-                index++;
+                if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase)
+                    || string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase))
+                {
+                    index++;
+                }
             }
             else if (string.Equals(first, baseUrl.Remove(0, 1)))
             {
@@ -234,7 +236,7 @@ namespace Emby.Dlna.Api
             return pathInfo[index];
         }
 
-        private List<string> Parse(string pathUri)
+        private static string[] Parse(string pathUri)
         {
             var actionParts = pathUri.Split(new[] { "://" }, StringSplitOptions.None);
 
@@ -248,7 +250,7 @@ namespace Emby.Dlna.Api
 
             var args = pathInfo.Split('/');
 
-            return args.Skip(1).ToList();
+            return args.Skip(1).ToArray();
         }
 
         public object Get(GetIcon request)

Emby.Naming/Common/NamingOptions.cs

@@ -314,7 +314,7 @@ namespace Emby.Naming.Common
                 // This isn't a Kodi naming rule, but the expression below causes false positives,
                 // so we make sure this one gets tested first.
                 // "Foo Bar 889"
-                new EpisodeExpression(@".*[\\\/](?![Ee]pisode)(?<seriesname>(\w+\s*?)*)\s(?<epnumber>\d{1,3})(-(?<endingepnumber>\d{2,3}))*[^\\\/]*$")
+                new EpisodeExpression(@".*[\\\/](?![Ee]pisode)(?<seriesname>[\w\s]+?)\s(?<epnumber>\d{1,3})(-(?<endingepnumber>\d{2,3}))*[^\\\/]*$")
                 {
                     IsNamed = true
                 },
@@ -337,7 +337,7 @@ namespace Emby.Naming.Common
                 // *** End Kodi Standard Naming
 
                 // [bar] Foo - 1 [baz]
-                new EpisodeExpression(@".*?(\[.*?\])+.*?(?<seriesname>(\w+\s*?)+?)[-\s_]+(?<epnumber>\d+).*$")
+                new EpisodeExpression(@".*?(\[.*?\])+.*?(?<seriesname>[\w\s]+?)[-\s_]+(?<epnumber>\d+).*$")
                 {
                     IsNamed = true
                 },

Jellyfin.Server/Resources/Configuration/logging.json

@@ -17,6 +17,9 @@
                             "Args": {
                                 "path": "%JELLYFIN_LOG_DIR%//log_.log",
                                 "rollingInterval": "Day",
+                                "retainedFileCountLimit": 3,
+                                "rollOnFileSizeLimit": true,
+                                "fileSizeLimitBytes": 100000000,
                                 "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] {Message}{NewLine}{Exception}"
                             }
                         }

SharedVersion.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.4.2")]
-[assembly: AssemblyFileVersion("10.4.2")]
+[assembly: AssemblyVersion("10.4.3")]
+[assembly: AssemblyFileVersion("10.4.3")]

build.yaml

@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin"
-version: "10.4.2"
+version: "10.4.3"
 packages:
   - debian-package-x64
   - debian-package-armhf

deployment/debian-package-x64/pkg-src/changelog

@@ -1,3 +1,9 @@
+jellyfin (10.4.3-1) unstable; urgency=medium
+
+  * New upstream version 10.4.3; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.4.3
+
+ -- Jellyfin Packaging Team <packaging@jellyfin.org>  Fri, 06 Dec 2019 15:16:18 -0500
+
 jellyfin (10.4.2-1) unstable; urgency=medium
 
   * New upstream version 10.4.2; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.4.2

deployment/fedora-package-x64/pkg-src/jellyfin.spec

@@ -7,7 +7,7 @@
 %endif
 
 Name:           jellyfin
-Version:        10.4.2
+Version:        10.4.3
 Release:        1%{?dist}
 Summary:        The Free Software Media Browser
 License:        GPLv2
@@ -159,6 +159,8 @@ fi
 %systemd_postun_with_restart jellyfin.service
 
 %changelog
+* Fri Dec 06 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
+- New upstream version 10.4.3; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.4.3
 * Sun Nov 24 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
 - New upstream version 10.4.2; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.4.2
 * Sun Nov 03 2019 Jellyfin Packaging Team <packaging@jellyfin.org>