commit:     2ebcc4c065037a790df488d1a7874d9b8f9701b9
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 21:57:41 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 22:00:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebcc4c0

media-tv/tvheadend: Bump snapshot to 20240618, fix systemd service

UNIX socket permission is needed for xmltv integration.

The PID file is not created or used because the systemd service is
"simple" with tvheadend running in the foreground.

Closes: https://bugs.gentoo.org/690120
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-tv/tvheadend/Manifest                                         | 2 +-
 media-tv/tvheadend/files/tvheadend.service                          | 5 ++---
 ...vheadend-4.3_p20240322.ebuild => tvheadend-4.3_p20240618.ebuild} | 6 ++----
 media-tv/tvheadend/tvheadend-9999.ebuild                            | 1 -
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index a435496b5a38..4be00c4079ab 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1 +1 @@
-DIST tvheadend-4.3_p20240322.tar.gz 22572932 BLAKE2B 
b3c09c170a13765194885854ca162a2a55e8b10fca2f6c24eb7b03b9670adb0c88f082986ac974a174abc52db3c49704735b371de28050d12d4aad6cb4a8dfc0
 SHA512 
068e8f6c1d3b3da9af8babd25705c754b2d72173751d65086663a64a45c332c1e1b478f65b86665a531a1f3b9b2168df23f93583b82d96c08e80c475406986da
+DIST tvheadend-4.3_p20240618.tar.gz 22578849 BLAKE2B 
49941eef965bdc5483116ba591ec92d1a2bd903df3a4fe610cfb77e5d1b90eb6328a2aff344bd1be0ed2b1a4299e3f3d7fd566035a649482f4b0f67f54b5218b
 SHA512 
1fc2b5f7323ef5b919999fbb9c6ca86a12ff45c0fce10c86dc063070b62a9899b7320356153bd86cbd9b988a634a74b65737789006ff0b5928486f08a1869b46

diff --git a/media-tv/tvheadend/files/tvheadend.service 
b/media-tv/tvheadend/files/tvheadend.service
index 11d3fe7a814f..778786b7c1b7 100644
--- a/media-tv/tvheadend/files/tvheadend.service
+++ b/media-tv/tvheadend/files/tvheadend.service
@@ -7,9 +7,8 @@ Type=simple
 User=tvheadend
 Group=video
 RuntimeDirectory=tvheadend
-PIDFile=/run/tvheadend/tvheadend.pid
 EnvironmentFile=/etc/conf.d/tvheadend
-ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c 
${TVHEADEND_CONFIG} $TVHEADEND_OPTIONS
+ExecStart=/usr/bin/tvheadend -c ${TVHEADEND_CONFIG} $TVHEADEND_OPTIONS
 TimeoutStartSec=1m
 TimeoutStopSec=20s
 Restart=always
@@ -17,7 +16,7 @@ RestartSec=5s
 DevicePolicy=closed
 DeviceAllow=char-DVB rw
 DeviceAllow=char-drm rw
-RestrictAddressFamilies=AF_INET AF_INET6
+RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
 ProtectSystem=yes
 ProtectHome=yes
 NoNewPrivileges=yes

diff --git a/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild 
b/media-tv/tvheadend/tvheadend-4.3_p20240618.ebuild
similarity index 98%
rename from media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild
rename to media-tv/tvheadend/tvheadend-4.3_p20240618.ebuild
index 3839b754d85b..e9fefcd6df55 100644
--- a/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.3_p20240618.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-COMMIT="c63115464d8f6556fb4cac93ce8740afea1b00d5"
+COMMIT="e855f62e6697cf756ad2eed2ed03b8d06ba2019b"
 PYTHON_COMPAT=( python3_{10..12} )
 
 inherit linux-info python-single-r1 systemd toolchain-funcs
@@ -11,7 +11,7 @@ inherit linux-info python-single-r1 systemd toolchain-funcs
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/";
 SRC_URI="https://github.com/tvheadend/tvheadend/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-
+S="${WORKDIR}/${PN}-${COMMIT}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
@@ -64,8 +64,6 @@ RDEPEND+="
        xmltv? ( media-tv/xmltv )
 "
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 # Some patches from:
 # https://github.com/rpmfusion/tvheadend
 

diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild 
b/media-tv/tvheadend/tvheadend-9999.ebuild
index 21d9095d7d84..aa832d625e41 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -10,7 +10,6 @@ inherit git-r3 linux-info python-single-r1 systemd 
toolchain-funcs
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/";
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git";
-
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv 
opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"

Reply via email to