11:34 p.m.
commit 8aa7bf04b823343382a1ed030e708aa19224724a
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Wed Dec 28 17:34:06 2022 -0600
Reintroduce firewalld package (RHBZ#6542)
jellyfin-firewalld.xml | 9 +++++++++
jellyfin-offline.sh | 4 ++--
jellyfin.spec | 33 ++++++++++++++++++++++++++++++---
sources | 2 +-
4 files changed, 42 insertions(+), 6 deletions(-)
---
diff --git a/jellyfin-firewalld.xml b/jellyfin-firewalld.xml
new file mode 100644
index 0000000..538c5d6
--- /dev/null
+++ b/jellyfin-firewalld.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+ <short>Jellyfin</short>
+ <description>The Free Software Media System.</description>
+ <port protocol="tcp" port="8096"/>
+ <port protocol="tcp" port="8920"/>
+ <port protocol="udp" port="1900"/>
+ <port protocol="udp" port="7359"/>
+</service>
diff --git a/jellyfin-offline.sh b/jellyfin-offline.sh
index 685eb1d..b7829f2 100755
--- a/jellyfin-offline.sh
+++ b/jellyfin-offline.sh
@@ -1,8 +1,8 @@
#!/bin/sh
JELLYFIN_VERSION=10.8.8
-DOTNET_VERSION=6.0.11
-DOTNET_HOST_VERSION=6.0.11
+DOTNET_VERSION=6.0.12
+DOTNET_HOST_VERSION=6.0.12
# Retrieve neccessary .NET NuGet packages for offline building
tar xf jellyfin-${JELLYFIN_VERSION}.tar.gz
diff --git a/jellyfin.spec b/jellyfin.spec
index 4baf4cb..aff3241 100644
--- a/jellyfin.spec
+++ b/jellyfin.spec
@@ -3,7 +3,7 @@
Name: jellyfin
Version: 10.8.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Free Software Media System
License: GPL-2.0-only
URL: https://jellyfin.org
@@ -22,7 +22,8 @@ Source12: %{name}.env
Source13: %{name}.sudoers
Source14: restart.sh
Source15: %{name}.override.conf
-Source16: %{name}-server-lowports.conf
+Source16: %{name}-firewalld.xml
+Source17: %{name}-server-lowports.conf
# dotnet does not offer a runtime on ppc
ExcludeArch: %{power64} ppc64le %{arm}
@@ -38,6 +39,7 @@ Requires: %{name}-server = %{version}-%{release}
Requires: %{name}-web = %{version}-%{release}
# /etc/sudoers.d/
Requires: sudo
+Requires: (%{name}-firewalld = %{version}-%{release} if firewalld)
%description
@@ -45,6 +47,17 @@ Jellyfin is a free software media system that puts you in control of
managing
and streaming your media.
+%package firewalld
+Summary: FirewallD metadata files for Jellyfin
+Requires: firewalld-filesystem
+Requires(post): firewalld-filesystem
+BuildArch: noarch
+
+
+%description firewalld
+This package contains FirewallD files for Jellyfin.
+
+
%package server
# RPMfusion free
Summary: The Free Software Media System Server backend
@@ -133,6 +146,7 @@ install -p -m 644 -D
Jellyfin.Server/Resources/Configuration/logging.json %{buil
install -p -m 644 -D %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/jellyfin
# system config
+install -p -m 644 -D %{SOURCE16}
%{buildroot}%{_prefix}/lib/firewalld/services/jellyfin.xml
install -p -m 640 -D %{SOURCE13} %{buildroot}%{_sysconfdir}/sudoers.d/jellyfin-sudoers
install -p -m 644 -D %{SOURCE15}
%{buildroot}%{_sysconfdir}/systemd/system/jellyfin.service.d/override.conf
install -p -m 644 -D %{SOURCE11} %{buildroot}%{_unitdir}/jellyfin.service
@@ -144,7 +158,7 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/jellyfin
mkdir -p %{buildroot}%{_localstatedir}/log/jellyfin
# jellyfin-server-lowports subpackage
-install -p -m 644 -D %{SOURCE16}
%{buildroot}%{_unitdir}/jellyfin.service.d/jellyfin-server-lowports.conf
+install -p -m 644 -D %{SOURCE17}
%{buildroot}%{_unitdir}/jellyfin.service.d/jellyfin-server-lowports.conf
cd ../%{name}-web-%{version}
# move web licenses prior to installation
@@ -170,6 +184,11 @@ done
# empty as this is just a meta-package
+%files firewalld
+%license LICENSE
+%{_prefix}/lib/firewalld/services/jellyfin.xml
+
+
%files server
%license LICENSE
# Jellyfin files
@@ -206,6 +225,10 @@ done
%{_datadir}/jellyfin-web
+%post firewalld
+%firewalld_reload
+
+
%pre server
getent group jellyfin >/dev/null || groupadd -r jellyfin
getent passwd jellyfin >/dev/null || \
@@ -239,6 +262,10 @@ exit 0
%changelog
+* Wed Dec 28 2022 Michael Cronenworth <mike(a)cchtml.com> - 10.8.8-2
+- Reintroduce firewalld package (RHBZ#6542)
+- Rebuild for dotnet-6.0.12
+
* Wed Nov 30 2022 Michael Cronenworth <mike(a)cchtml.com> - 10.8.8-1
- Update to 10.8.8
diff --git a/sources b/sources
index 21f208c..fb94da5 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
SHA512 (jellyfin-10.8.8.tar.gz) =
1866a8e6a730d2d2211a907aa9087c8bc7069ef53010ba652f1dbbe2c6c638a29259531e31ccf5bee797651999ec0963b2ff3588e791f3b523e43bf4a3556070
SHA512 (jellyfin-web-10.8.8.tar.gz) =
88a829248f1d2506509a3610cc67575899df4fcb371fdd766b4a91f2005f387055ac716047293882cc494e2894f4121049c9525f468a33c99a12ff5d0c87fb19
SHA512 (jellyfin-npm.tar.xz) =
d1911c3374b6a9875176c1d9a07a7f1f7c0d22b3db19c7755bb292b79dfe1e0e39b8a0ca85be9cd3b6da62a79c75fcddcb0eb0da6bba66625ca350c1c5be634a
-SHA512 (jellyfin-nupkgs2.tar.xz) =
c6127b2cdf422da1a2cb4de6bdc68fe877ab10418af8fc574194d5e9a3ac025fb997432a7a1eedcc9438afeab6f8f737159f62ace3d79e50f6c835d2677e47d3
+SHA512 (jellyfin-nupkgs2.tar.xz) =
2d44f757373017babd5b46e6e1cdcbde30ac7910ca6cdf4a1f8c8b5ca7113961db138fd43d68713f77c670dc03d31dd00d15dfe77ac62f2763ec05a3b7cd96c0
SHA512 (jellyfin-nupkgs.tar.xz) =
9ccc71454e68ff302bcbaee44f36c3ab6b7fc91fb8bc3874fc3dc075e82b96f881b75c0038596078662d100ce47a08fdd4eae929c31b90c801819c8822b70e39