Merge remote-tracking branch 'upstream/master' into master

8 files changed, 122 insertions, 122 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61e65c1772bb..d7062c0390ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = tvheadend-satip-server-git
 	pkgdesc = TV streaming server for Linux
-	pkgver = 4.3.r1857.g221c29b40
-	pkgrel = 2
+	pkgver = 4.3.r1979.g8fc2dfa7e
+	pkgrel = 1
 	url = https://tvheadend.org/
-	install = tvheadend.install
 	arch = i686
 	arch = pentium4
 	arch = x86_64
@@ -20,14 +19,23 @@ pkgbase = tvheadend-satip-server-git
 	depends = uriparser
 	provides = tvheadend
 	conflicts = tvheadend
-	conflicts = hts-tvheadend
-	conflicts = hts-tvheadend-svn
 	conflicts = tvheadend-git
+	options = !strip
+	options = emptydirs
 	backup = etc/conf.d/tvheadend
-	source = tvheadend-git::git+https://github.com/tvheadend/tvheadend.git#branch=master
-	source = dvb-scan-tables::git+https://git.linuxtv.org/dtv-scan-tables.git#branch=master
-	md5sums = SKIP
-	md5sums = SKIP
+	source = tvheadend-git::git+https://github.com/tvheadend/tvheadend.git
+	source = dvb-scan-tables::git+https://git.linuxtv.org/dtv-scan-tables.git
+	source = tvheadend.conf
+	source = dbus.conf
+	source = tvheadend.service
+	source = tmpfile.conf
+	source = user.conf
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = f7f630d60217ae64d529d4573c3dbce3f57f2bb1ddd952b789232cd199155591c373ac8986006b9f4f64dbe64f40e18b00b8b3174d4f0c0f4310573d7ae79117
+	sha512sums = 5439d5bacd256a0d3b78b87d176638250e043ce3786fa4a72af36fcbde044d6b4301a6d45f83ccd9ef3eeaf353e909a6c418581972476a30e31776f6fd7330ef
+	sha512sums = 480b0213ccb7dad409027b3e66eeb97035350ff9e145b91dbe4fed8569bac12dd77756fc01aa2ac6bf0127683ab053152e05ac575dfada3c505613ebfc0160ce
+	sha512sums = 1080c8a2530d1f16ab5304cdd81c9c9da23b281e44a4874f4921905c843d876831214af481f9be91a74291ed4a6a10684dbdfb8f926b51bbb6895b92d493b201
+	sha512sums = 5e0475cfe1f915bd3269ba3e9e0ca6cc7e492988bfd4f1feafcbbd3e8b0276c228f0b08a4116f3213d12c0ea940eff0dc71601a6e6ddcda934964cf51a665539
 
 pkgname = tvheadend-satip-server-git
-
diff --git a/PKGBUILD b/PKGBUILD
index a4ef8c2e5c9d..97fdfb7ff84e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,41 +2,46 @@
 
 pkgname=tvheadend-satip-server-git
 _gitname='tvheadend-git'
-pkgver=4.3.r1857.g221c29b40
-pkgrel=2
+pkgver=4.3.r1979.g8fc2dfa7e
+pkgrel=1
 pkgdesc="TV streaming server for Linux"
 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://tvheadend.org/"
 license=('GPL3')
 depends=(
-    'dbus'
-    'openssl'
-    'pcre2'
-    'uriparser'
+  'dbus'
+  'openssl'
+  'pcre2'
+  'uriparser'
 )
 makedepends=(
-    'git'
-    'python'
+  'git'
+  'python'
 )
+options=('!strip' 'emptydirs')
 provides=('tvheadend')
-conflicts=('tvheadend' 'hts-tvheadend' 'hts-tvheadend-svn' 'tvheadend-git')
-install=tvheadend.install
+conflicts=('tvheadend' 'tvheadend-git')
 backup=('etc/conf.d/tvheadend')
-
 source=(
-    "${_gitname}::git+https://github.com/tvheadend/tvheadend.git#branch=master"
-    'dvb-scan-tables::git+https://git.linuxtv.org/dtv-scan-tables.git#branch=master'
-    'tvheadend.conf'
-    'tvheadend-dbus.conf'
+  "${_gitname}::git+https://github.com/tvheadend/tvheadend.git"
+  'dvb-scan-tables::git+https://git.linuxtv.org/dtv-scan-tables.git'
+  tvheadend.conf
+  dbus.conf
+  tvheadend.service
+  tmpfile.conf
+  user.conf
 )
-md5sums=('SKIP'
-         'SKIP'
-         '57185c43bcd3512296cb23c849f4b872'
-         '67222bc49a82fab4189083cf993fa659')
+sha512sums=('SKIP'
+            'SKIP'
+            'f7f630d60217ae64d529d4573c3dbce3f57f2bb1ddd952b789232cd199155591c373ac8986006b9f4f64dbe64f40e18b00b8b3174d4f0c0f4310573d7ae79117'
+            '5439d5bacd256a0d3b78b87d176638250e043ce3786fa4a72af36fcbde044d6b4301a6d45f83ccd9ef3eeaf353e909a6c418581972476a30e31776f6fd7330ef'
+            '480b0213ccb7dad409027b3e66eeb97035350ff9e145b91dbe4fed8569bac12dd77756fc01aa2ac6bf0127683ab053152e05ac575dfada3c505613ebfc0160ce'
+            '1080c8a2530d1f16ab5304cdd81c9c9da23b281e44a4874f4921905c843d876831214af481f9be91a74291ed4a6a10684dbdfb8f926b51bbb6895b92d493b201'
+            '5e0475cfe1f915bd3269ba3e9e0ca6cc7e492988bfd4f1feafcbbd3e8b0276c228f0b08a4116f3213d12c0ea940eff0dc71601a6e6ddcda934964cf51a665539')
 
 pkgver() {
-    cd "${srcdir}/${_gitname}"
-    git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "${srcdir}/${_gitname}"
+  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -49,73 +54,60 @@ prepare() {
 }
 
 build() {
-    cd "${srcdir}/${_gitname}"
+  cd "${srcdir}/${_gitname}"
+
+  # Work-around for GCC 10
+  export CFLAGS="${CFLAGS} -fcommon"
+
+  ./configure \
+    --prefix=/usr \
+    --datadir=/var/lib \
+    --mandir=/usr/share/man/man1 \
+    --python=python3 \
+    --disable-avahi \
+    --enable-zlib \
+    --disable-pngquant \
+    --disable-libav \
+    --disable-ffmpeg_static --disable-ffmpeg \
+    --disable-libx264_static --disable-libx264 \
+    --disable-libx265_static --disable-libx265 \
+    --disable-libvpx_static --disable-libvpx \
+    --disable-libogg_static --disable-libogg \
+    --disable-libtheora_static --disable-libtheora \
+    --disable-libvorbis_static --disable-libvorbis \
+    --disable-libfdkaac_static --disable-libfdkaac \
+    --disable-libopus_static --disable-libopus \
+    --disable-hdhomerun_static --disable-hdhomerun_client \
+    --disable-cardclient \
+    --disable-cwc \
+    --disable-cccam \
+    --disable-capmt \
+    --disable-constcw \
+    --disable-satip_client \
+    --disable-iptv \
+    --disable-timeshift \
+    --disable-vaapi \
+    --disable-inotify \
+    --enable-epoll \
+    --disable-pcre \
+    --disable-ccache \
+    --disable-tvhcsa \
+    --enable-dbus_1 \
+    --enable-libsystemd_daemon \
+    --disable-pcloud_cache \
+    --disable-ddci
 
-    ./configure --prefix=/usr --mandir=/usr/share/man/man1 --release \
-        --python=python3 \
-        --enable-pie \
-        --disable-ccdebug \
-        --disable-cardclient \
-        --disable-cwc \
-        --disable-cccam \
-        --disable-capmt \
-        --disable-constcw \
-        --enable-linuxdvb \
-        --enable-satip_server \
-        --disable-satip_client \
-        --disable-hdhomerun_static --disable-hdhomerun_client \
-        --disable-iptv \
-        --enable-tsfile \
-        --enable-dvbscan \
-        --disable-timeshift \
-        --enable-trace \
-        --disable-avahi \
-        --enable-zlib \
-        --disable-ffmpeg_static --disable-libav \
-        --disable-libx264_static --disable-libx264 \
-        --disable-libx265_static --disable-libx265 \
-        --disable-libvpx_static --disable-libvpx \
-        --disable-libtheora_static --disable-libtheora \
-        --disable-libvorbis_static --disable-libvorbis \
-        --disable-libfdkaac_static --disable-libfdkaac \
-        --disable-libopus_static --disable-libopus \
-        --disable-nvenc \
-        --disable-vaapi \
-        --disable-mmal \
-        --disable-omx \
-        --disable-inotify \
-        --enable-epoll \
-        --disable-pcre --enable-pcre2 \
-        --enable-uriparser \
-        --disable-ccache \
-        --disable-tvhcsa \
-        --disable-bundle \
-        --disable-pngquant \
-        --disable-kqueue \
-        --enable-dbus_1 \
-        --disable-android \
-        --disable-gtimer_check \
-        --disalbe-slow_memoryinfo \
-        --enable-libsystemd_daemon \
-        --disable-pcloud_cache \
-        --disable-ddci \
-        --disable-cclang_threadsan \
-        --disable-gperftools
-    make
+  make
 }
 
 package() {
-    cd "${srcdir}/${_gitname}"
-    make DESTDIR="$pkgdir/" install
+  cd "${srcdir}/${_gitname}"
 
-    install -D -m 644 "${srcdir}/${_gitname}/rpm/tvheadend.service" \
-        "$pkgdir/usr/lib/systemd/system/tvheadend.service"
-    sed -i 's|/etc/sysconfig|/etc/conf.d|g' \
-        "$pkgdir/usr/lib/systemd/system/tvheadend.service"
+  make DESTDIR="$pkgdir/" install
 
-    install -D -m 644 "$srcdir/tvheadend.conf" "$pkgdir/etc/conf.d/tvheadend"
-
-    install -D -m 644 "$srcdir/tvheadend-dbus.conf" \
-        "$pkgdir/usr/share/dbus-1/system.d/tvheadend.conf"
+  install -Dm 644 "${srcdir}/tvheadend.conf" "${pkgdir}/etc/conf.d/tvheadend"
+  install -Dm 644 "${srcdir}/dbus.conf" "${pkgdir}/usr/share/dbus-1/system.d/tvheadend.conf"
+  install -Dm 644 "${srcdir}/tvheadend.service" -t "${pkgdir}/usr/lib/systemd/system"
+  install -Dm 644 "${srcdir}/user.conf" "${pkgdir}/usr/lib/sysusers.d/tvheadend.conf"
+  install -Dm 644 "${srcdir}/tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/tvheadend.conf"
 }
-
diff --git a/tvheadend-dbus.conf b/dbus.conf
index 07a5363b921c..fa20f1e669cb 100644
--- a/tvheadend-dbus.conf
+++ b/dbus.conf
@@ -3,12 +3,12 @@
           "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
 
-  <policy user="hts">
+  <policy user="tvheadend">
     <allow own="org.tvheadend.server"/>
     <allow own="org.tvheadend.notify"/>
   </policy>
 
-  <policy group="hts">
+  <policy group="tvheadend">
     <allow send_destination="org.tvheadend.server"/>
     <allow receive_sender="org.tvheadend.server"/>
   </policy>
diff --git a/tmpfile.conf b/tmpfile.conf
new file mode 100644
index 000000000000..447f2fe94fa0
--- /dev/null
+++ b/tmpfile.conf
@@ -0,0 +1,4 @@
+d /etc/tvheadend 0750 tvheadend tvheadend -
+d /var/lib/tvheadend 0755 tvheadend tvheadend -
+Z /var/lib/tvheadend/data - tvheadend tvheadend -
+Z /var/lib/tvheadend/src - tvheadend tvheadend -
\ No newline at end of file
diff --git a/tvheadend.conf b/tvheadend.conf
index ef00be1892de..0fccb036d870 100644
--- a/tvheadend.conf
+++ b/tvheadend.conf
@@ -1,4 +1,3 @@
 # Configuration file for the tvheadend service.
 
-MALLOC_ARENA_MAX=4
-OPTIONS="-u hts -g video -6 --http_port 9981 --htsp_port 0 --dbus"
+OPTIONS="-6 --http_port 9981 --htsp_port 0 --dbus"
diff --git a/tvheadend.install b/tvheadend.install
deleted file mode 100644
index f2446007e519..000000000000
--- a/tvheadend.install
+++ /dev/null
@@ -1,24 +0,0 @@
-HTS_USER=hts
-HTS_UID=1337
-HTS_GROUP=video
-
-post_install() {
-  if ! getent passwd $HTS_USER &> /dev/null; then
-    useradd -u $HTS_UID -g $HTS_GROUP -m -s /bin/false $HTS_USER &> /dev/null
-    passwd -l $HTS_USER &> /dev/null
-    echo "  ==> User '$HTS_USER' created"
-  fi
-
-cat << 'EOM'
-  ==> All configuration is maintained through the web interface:
-  ==>
-  ==> http://localhost:9981/
-  ==>
-  ==> Default login without username/password.
-EOM
-}
-
-post_remove() {
-  userdel $HTS_USER &> /dev/null
-  echo "  ==> User '$HTS_USER' removed"
-}
diff --git a/tvheadend.service b/tvheadend.service
new file mode 100644
index 000000000000..bf7fb9f652c8
--- /dev/null
+++ b/tvheadend.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Tvheadend - a TV streaming server and DVR
+Wants=network.target
+
+[Service]
+Type=notify
+WatchdogSec=1m
+TimeoutStartSec=2m
+TimeoutStopSec=20
+RuntimeDirectory=tvheadend
+PrivateTmp=yes
+EnvironmentFile=/etc/conf.d/tvheadend
+User=tvheadend
+Group=tvheadend
+ExecStart=/usr/bin/tvheadend -c /etc/tvheadend -n $OPTIONS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/user.conf b/user.conf
new file mode 100644
index 000000000000..39108edae836
--- /dev/null
+++ b/user.conf
@@ -0,0 +1,2 @@
+u tvheadend - "TVHeadend user" /var/lib/tvheadend
+m tvheadend video
\ No newline at end of file