From 2abd4c0c9c17429e5733d67ef3302a804130959a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20M=2E=20P=C3=B6pperl?= Date: Mon, 23 Jan 2023 20:02:41 +0100 Subject: [PATCH] Remove restart.sh dependencies from packaging --- debian/conf/jellyfin-sudoers | 33 --------------------------------- debian/control | 5 ++--- debian/install | 1 - fedora/jellyfin.spec | 17 +++++++---------- fedora/jellyfin.sudoers | 14 -------------- 5 files changed, 9 insertions(+), 61 deletions(-) delete mode 100644 debian/conf/jellyfin-sudoers delete mode 100644 fedora/jellyfin.sudoers diff --git a/debian/conf/jellyfin-sudoers b/debian/conf/jellyfin-sudoers deleted file mode 100644 index 795fd17e83..0000000000 --- a/debian/conf/jellyfin-sudoers +++ /dev/null @@ -1,33 +0,0 @@ -#Allow jellyfin group to start, stop and restart itself -Cmnd_Alias RESTARTSERVER_SYSV = /sbin/service jellyfin restart, /usr/sbin/service jellyfin restart -Cmnd_Alias STARTSERVER_SYSV = /sbin/service jellyfin start, /usr/sbin/service jellyfin start -Cmnd_Alias STOPSERVER_SYSV = /sbin/service jellyfin stop, /usr/sbin/service jellyfin stop -Cmnd_Alias RESTARTSERVER_SYSTEMD = /usr/bin/systemd-run systemctl restart jellyfin -Cmnd_Alias STARTSERVER_SYSTEMD = /usr/bin/systemd-run systemctl start jellyfin -Cmnd_Alias STOPSERVER_SYSTEMD = /usr/bin/systemd-run systemctl stop jellyfin -Cmnd_Alias RESTARTSERVER_INITD = /etc/init.d/jellyfin restart -Cmnd_Alias STARTSERVER_INITD = /etc/init.d/jellyfin start -Cmnd_Alias STOPSERVER_INITD = /etc/init.d/jellyfin stop - - -jellyfin ALL=(ALL) NOPASSWD: RESTARTSERVER_SYSV -jellyfin ALL=(ALL) NOPASSWD: STARTSERVER_SYSV -jellyfin ALL=(ALL) NOPASSWD: STOPSERVER_SYSV -jellyfin ALL=(ALL) NOPASSWD: RESTARTSERVER_SYSTEMD -jellyfin ALL=(ALL) NOPASSWD: STARTSERVER_SYSTEMD -jellyfin ALL=(ALL) NOPASSWD: STOPSERVER_SYSTEMD -jellyfin ALL=(ALL) NOPASSWD: RESTARTSERVER_INITD -jellyfin ALL=(ALL) NOPASSWD: STARTSERVER_INITD -jellyfin ALL=(ALL) NOPASSWD: STOPSERVER_INITD - -Defaults!RESTARTSERVER_SYSV !requiretty -Defaults!STARTSERVER_SYSV !requiretty -Defaults!STOPSERVER_SYSV !requiretty -Defaults!RESTARTSERVER_SYSTEMD !requiretty -Defaults!STARTSERVER_SYSTEMD !requiretty -Defaults!STOPSERVER_SYSTEMD !requiretty -Defaults!RESTARTSERVER_INITD !requiretty -Defaults!STARTSERVER_INITD !requiretty -Defaults!STOPSERVER_INITD !requiretty - -Defaults:jellyfin !requiretty diff --git a/debian/control b/debian/control index 08c0dcda62..0b9dd570e4 100644 --- a/debian/control +++ b/debian/control @@ -18,11 +18,10 @@ Package: jellyfin-server Replaces: jellyfin (<<10.6.0) Breaks: jellyfin (<<10.6.0) Architecture: any -Depends: at, - libsqlite3-0, +Depends: libsqlite3-0, libfontconfig1, libfreetype6, libssl1.1 | libssl3 -Recommends: jellyfin-web, sudo +Recommends: jellyfin-web Description: Jellyfin is the Free Software Media System. This package provides the Jellyfin server backend and API. diff --git a/debian/install b/debian/install index 593b13a7b3..0b48dd7a25 100644 --- a/debian/install +++ b/debian/install @@ -2,4 +2,3 @@ usr/lib/jellyfin usr/lib/ debian/conf/jellyfin etc/default/ debian/conf/logging.json etc/jellyfin/ debian/conf/jellyfin.service.conf etc/systemd/system/jellyfin.service.d/ -debian/conf/jellyfin-sudoers etc/sudoers.d/ diff --git a/fedora/jellyfin.spec b/fedora/jellyfin.spec index 2456877890..a759b29b13 100644 --- a/fedora/jellyfin.spec +++ b/fedora/jellyfin.spec @@ -16,10 +16,9 @@ URL: https://jellyfin.org Source0: jellyfin-server-%{version}.tar.gz Source11: jellyfin.service Source12: jellyfin.env -Source13: jellyfin.sudoers -Source14: jellyfin.override.conf -Source15: jellyfin-firewalld.xml -Source16: jellyfin-server-lowports.conf +Source13: jellyfin.override.conf +Source14: jellyfin-firewalld.xml +Source15: jellyfin-server-lowports.conf %{?systemd_requires} BuildRequires: systemd @@ -43,7 +42,7 @@ Jellyfin is a free software media system that puts you in control of managing an Summary: The Free Software Media System Server backend Requires(pre): shadow-utils Requires: ffmpeg -Requires: libcurl, fontconfig, freetype, openssl, glibc, libicu, at, sudo +Requires: libcurl, fontconfig, freetype, openssl, glibc, libicu %description server The Jellyfin media server backend. @@ -81,9 +80,8 @@ ln -srf %{_libdir}/jellyfin/jellyfin %{buildroot}%{_bindir}/jellyfin %{__install} -D %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/jellyfin # system config -%{__install} -D %{SOURCE15} %{buildroot}%{_prefix}/lib/firewalld/services/jellyfin.xml -%{__install} -D %{SOURCE13} %{buildroot}%{_sysconfdir}/sudoers.d/jellyfin-sudoers -%{__install} -D %{SOURCE14} %{buildroot}%{_sysconfdir}/systemd/system/jellyfin.service.d/override.conf +%{__install} -D %{SOURCE14} %{buildroot}%{_prefix}/lib/firewalld/services/jellyfin.xml +%{__install} -D %{SOURCE13} %{buildroot}%{_sysconfdir}/systemd/system/jellyfin.service.d/override.conf %{__install} -D %{SOURCE11} %{buildroot}%{_unitdir}/jellyfin.service # empty directories @@ -93,7 +91,7 @@ ln -srf %{_libdir}/jellyfin/jellyfin %{buildroot}%{_bindir}/jellyfin %{__mkdir} -p %{buildroot}%{_var}/log/jellyfin # jellyfin-server-lowports subpackage -%{__install} -D -m 0644 %{SOURCE16} %{buildroot}%{_unitdir}/jellyfin.service.d/jellyfin-server-lowports.conf +%{__install} -D -m 0644 %{SOURCE15} %{buildroot}%{_unitdir}/jellyfin.service.d/jellyfin-server-lowports.conf %files @@ -116,7 +114,6 @@ ln -srf %{_libdir}/jellyfin/jellyfin %{buildroot}%{_bindir}/jellyfin # system config %{_prefix}/lib/firewalld/services/jellyfin.xml %{_unitdir}/jellyfin.service -%config(noreplace) %attr(600,root,root) %{_sysconfdir}/sudoers.d/jellyfin-sudoers %config(noreplace) %{_sysconfdir}/systemd/system/jellyfin.service.d/override.conf # empty directories diff --git a/fedora/jellyfin.sudoers b/fedora/jellyfin.sudoers deleted file mode 100644 index 01c7f4e11f..0000000000 --- a/fedora/jellyfin.sudoers +++ /dev/null @@ -1,14 +0,0 @@ -# Allow jellyfin group to start, stop and restart itself -Cmnd_Alias RESTARTSERVER_SYSTEMD = /usr/bin/systemd-run systemctl restart jellyfin -Cmnd_Alias STARTSERVER_SYSTEMD = /usr/bin/systemd-run systemctl start jellyfin -Cmnd_Alias STOPSERVER_SYSTEMD = /usr/bin/systemd-run systemctl stop jellyfin - -jellyfin ALL=(ALL) NOPASSWD: RESTARTSERVER_SYSTEMD -jellyfin ALL=(ALL) NOPASSWD: STARTSERVER_SYSTEMD -jellyfin ALL=(ALL) NOPASSWD: STOPSERVER_SYSTEMD - -Defaults!RESTARTSERVER_SYSTEMD !requiretty -Defaults!STARTSERVER_SYSTEMD !requiretty -Defaults!STOPSERVER_SYSTEMD !requiretty - -Defaults:jellyfin !requiretty