Update to v3.0.5.1144.

9 files changed, 89 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4577af907b8d..a973072a7337 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,31 @@
 pkgbase = sonarr
-	pkgdesc = PVR for newsgroup users
-	pkgver = 2.0.0.5344
+	pkgdesc = TV download automation for usenet and torrents.
+	pkgver = 3.0.5.1144
 	pkgrel = 1
-	url = https://sonarr.tv
-	install = sonarr.install
+	url = https://sonarr.tv/
 	arch = any
 	license = GPL3
 	depends = mono
 	depends = libmediainfo
 	depends = sqlite
-	optdepends = sabnzbd: an NZB downloader
-	optdepends = nzbget: an NZB downloader
-	optdepends = transmission-cli: a torrent downloader (CLI and daemon version)
-	optdepends = transmission-gtk: a torrent downloader (GTK+ version)
-	optdepends = transmission-qt: a torrent downloader (Qt version)
-	optdepends = deluge: a torrent downloader
-	source = https://update.sonarr.tv/v2/master/mono/NzbDrone.master.2.0.0.5344.mono.tar.gz
-	source = sonarr.sh
+	optdepends = sabnzbd: usenet downloader
+	optdepends = nzbget: usenet downloader
+	optdepends = transmission-cli: torrent downloader (CLI and daemon)
+	optdepends = transmission-gtk: torrent downloader (GTK+)
+	optdepends = transmission-qt: torrent downloader (Qt)
+	optdepends = deluge: torrent downloader
+	optdepends = rtorrent: torrent downloader
+	optdepends = jackett: torrent indexer proxy
+	source = https://download.sonarr.tv/v3/main/3.0.5.1144/Sonarr.main.3.0.5.1144.linux.tar.gz
 	source = sonarr.service
 	source = sonarr.sysusers
-	sha512sums = 3b68bc44115143ddb570c1a786204bdf59583c4d0dae8e36369e4bd9a4cb6e163e2c0b4c725a30680743d53ffa9aa917b26a51eaf424dc020a2091224372286a
-	sha512sums = 84efa2eebd9afe6b74203aefdc3fdbd4088ecfad17dbe929396f1ffc639743b615a9b75566a0b45d6b7925bd5675368015047c6d65c1421ffe8712728f350695
-	sha512sums = 591c76551f511198afa71b98bd5c1e3a800af4c24f8be3065148a0dccce85dcb2cdbad03e55efb66441f900df3b97043ea6bd1574cc0653808b8ab0e54abd999
-	sha512sums = 35af6024f61003c83e1b35bc5658bd8dbce65cadb6f06e6415de20f4c25ab4c4f107224c27668810f99c4a00bfd24175176c35a4b660243935aef872a39ebce7
+	source = sonarr.tmpfiles
+	source = package_info
+	sha256sums = 77aff6978d4dc80027979c815bd5a79579dd9bb50d39b1b2d14b3bb9e18058aa
+	sha256sums = cafc9dfea7d6f941d7c481d35d83e3228ac35f51ad78a220e2eb1e1bd3652d62
+	sha256sums = cc3c69f719fa64335f4c5b41b2588f1ec56865fb2202f5919d3668b50b8f398e
+	sha256sums = 7bf87304383b7d58ecab59b3686d00a8f1b6fbe4af3a86da35a887e4cebee411
+	sha256sums = 19112dc0051224b4de66f28077c93b6ee06e163b5194e6aecf62dedf66ff45a9
 
 pkgname = sonarr
 
diff --git a/.gitignore b/.gitignore
index 23f2a22da68d..6e570bc49abe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-NzbDrone.master.*.mono.tar.gz
-pkg
-sonarr-*.pkg.tar.xz
-src
+*.xz
+*.gz
+*.log
+/src/
+/pkg/
diff --git a/PKGBUILD b/PKGBUILD
index e7a3fddebc3b..0071fe2d76d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,58 @@
 # Maintainer: Daniel Egeberg <daniel.egeberg@gmail.com>
+# Maintainer: Donald Webster <fryfrog@gmail.com>
 # Contributor: Justin Dray <justin@dray.be>
-pkgname="sonarr"
-pkgver="2.0.0.5344"
+# Helpful URL: http://services.sonarr.tv/v1/releases
+
+pkgname='sonarr'
+pkgver=3.0.5.1144
 pkgrel=1
-pkgdesc="PVR for newsgroup users"
+pkgdesc='TV download automation for usenet and torrents.'
 arch=(any)
-url="https://sonarr.tv"
+url='https://sonarr.tv/'
 license=('GPL3')
-depends=('mono' 'libmediainfo' 'sqlite')
-optdepends=('sabnzbd: an NZB downloader'
-            'nzbget: an NZB downloader'
-            'transmission-cli: a torrent downloader (CLI and daemon version)'
-            'transmission-gtk: a torrent downloader (GTK+ version)'
-            'transmission-qt: a torrent downloader (Qt version)'
-            'deluge: a torrent downloader')
-install='sonarr.install'
-source=("https://update.sonarr.tv/v2/master/mono/NzbDrone.master.${pkgver}.mono.tar.gz"
-        "sonarr.sh"
-        "sonarr.service"
-        "sonarr.sysusers")
-noextract=()
-sha512sums=('3b68bc44115143ddb570c1a786204bdf59583c4d0dae8e36369e4bd9a4cb6e163e2c0b4c725a30680743d53ffa9aa917b26a51eaf424dc020a2091224372286a'
-            '84efa2eebd9afe6b74203aefdc3fdbd4088ecfad17dbe929396f1ffc639743b615a9b75566a0b45d6b7925bd5675368015047c6d65c1421ffe8712728f350695'
-            '591c76551f511198afa71b98bd5c1e3a800af4c24f8be3065148a0dccce85dcb2cdbad03e55efb66441f900df3b97043ea6bd1574cc0653808b8ab0e54abd999'
-            '35af6024f61003c83e1b35bc5658bd8dbce65cadb6f06e6415de20f4c25ab4c4f107224c27668810f99c4a00bfd24175176c35a4b660243935aef872a39ebce7')
 
-package() {
-    cd "$srcdir"
+depends=(
+  'mono'
+  'libmediainfo'
+  'sqlite'
+)
 
-    install -d -m 755 "${pkgdir}/var/lib/sonarr"
+optdepends=(
+  'sabnzbd: usenet downloader'
+  'nzbget: usenet downloader'
+  'transmission-cli: torrent downloader (CLI and daemon)'
+  'transmission-gtk: torrent downloader (GTK+)'
+  'transmission-qt: torrent downloader (Qt)'
+  'deluge: torrent downloader'
+  'rtorrent: torrent downloader'
+  'jackett: torrent indexer proxy'
+)
 
-    msg2 "Install Sonarr in /usr/lib"
-    install -d -m 755 "${pkgdir}/usr/lib/sonarr"
-    cp -dpr --no-preserve=ownership "${srcdir}/NzbDrone/"* "${pkgdir}/usr/lib/sonarr"
+source=(
+  "https://download.sonarr.tv/v3/main/${pkgver}/Sonarr.main.${pkgver}.linux.tar.gz"
+  'sonarr.service'
+  'sonarr.sysusers'
+  'sonarr.tmpfiles'
+  'package_info'
+)
 
-    msg2 "Install executable into /usr/bin"
-    install -D -m755 "${srcdir}/sonarr.sh" "${pkgdir}/usr/bin/sonarr"
+noextract=()
+sha256sums=('77aff6978d4dc80027979c815bd5a79579dd9bb50d39b1b2d14b3bb9e18058aa'
+            'cafc9dfea7d6f941d7c481d35d83e3228ac35f51ad78a220e2eb1e1bd3652d62'
+            'cc3c69f719fa64335f4c5b41b2588f1ec56865fb2202f5919d3668b50b8f398e'
+            '7bf87304383b7d58ecab59b3686d00a8f1b6fbe4af3a86da35a887e4cebee411'
+            '19112dc0051224b4de66f28077c93b6ee06e163b5194e6aecf62dedf66ff45a9')
+
+package() {
+  rm -rf "${srcdir}/Sonarr/Sonarr.Update"
+  install -d -m 755 "${pkgdir}/usr/lib/sonarr/bin"
+  cp -dpr --no-preserve=ownership "${srcdir}/Sonarr/"* "${pkgdir}/usr/lib/sonarr/bin"
 
-    msg2 "Install sonarr.service"
-    install -D -m 644 "${srcdir}/sonarr.service" "${pkgdir}/usr/lib/systemd/system/sonarr.service"
+  # Disable built in updater.
+  install -D -m 644 "${srcdir}/package_info" "${pkgdir}/usr/lib/sonarr"
+  echo "PackageVersion=${pkgver}-${pkgrel}" >> "${pkgdir}/usr/lib/sonarr/package_info"
 
-    install -Dm644 "$srcdir/sonarr.sysusers" "$pkgdir/usr/lib/sysusers.d/sonarr.conf"
+  install -D -m 644 "${srcdir}/sonarr.sysusers" "${pkgdir}/usr/lib/sysusers.d/sonarr.conf"
+  install -D -m 644 "${srcdir}/sonarr.service" "${pkgdir}/usr/lib/systemd/system/sonarr.service"
+  install -D -m 644 "${srcdir}/sonarr.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/sonarr.conf"
 }
diff --git a/package_info b/package_info
new file mode 100644
index 000000000000..4059dd68d991
--- /dev/null
+++ b/package_info
@@ -0,0 +1,5 @@
+# PackageVersion is added by PKGBUILD
+PackageAuthor=[sonarr](https://aur.archlinux.org/packages/sonarr/)
+UpdateMethod=External
+UpdateMethodMessage=flag [sonarr](https://aur.archlinux.org/packages/sonarr/) [out-of-date](https://aur.archlinux.org/pkgbase/sonarr/flag/), use an [aur helper](https://wiki.archlinux.org/index.php/AUR_helpers) or the [manual method](https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages) to update.
+Branch=main
diff --git a/sonarr.install b/sonarr.install
deleted file mode 100644
index f4170d223ad0..000000000000
--- a/sonarr.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    systemd-sysusers sonarr.conf
-
-    mkdir -p /var/lib/sonarr
-    if [[ ! -f /var/lib/sonarr/config.xml ]]; then
-        chown -R sonarr: /var/lib/sonarr
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
diff --git a/sonarr.service b/sonarr.service
index a4a66df47bca..1d8a71465414 100644
--- a/sonarr.service
+++ b/sonarr.service
@@ -1,15 +1,17 @@
+# Be sure to use `systemctl edit sonarr` to modify this service with an override.conf because
+# direct changes will be overwritten by package updates.
+
 [Unit]
 Description=Sonarr Service
-After=network.target
+Wants=network-online.target
+After=network-online.target
 
 [Service]
+Type=simple
 User=sonarr
 Group=sonarr
-ExecStart=/usr/bin/sonarr -nobrowser -data=/var/lib/sonarr
-Type=simple
-TimeoutStopSec=20
-KillMode=process
-Restart=always
+ExecStart=/usr/bin/mono --debug /usr/lib/sonarr/bin/Sonarr.exe -nobrowser -data=/var/lib/sonarr
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sonarr.sh b/sonarr.sh
deleted file mode 100755
index 1b1e91d58f79..000000000000
--- a/sonarr.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec mono /usr/lib/sonarr/NzbDrone.exe "$@"
diff --git a/sonarr.sysusers b/sonarr.sysusers
index 213fe8c49731..bd3a457f32b7 100644
--- a/sonarr.sysusers
+++ b/sonarr.sysusers
@@ -1 +1,2 @@
-u sonarr - "Sonarr daemon" /var/lib/sonarr
+u sonarr - - /var/lib/sonarr
+g sonarr -
diff --git a/sonarr.tmpfiles b/sonarr.tmpfiles
new file mode 100644
index 000000000000..ae236ca35d46
--- /dev/null
+++ b/sonarr.tmpfiles
@@ -0,0 +1,4 @@
+# Override this file with a modified version in /etc/tmpfiles.d/
+d /var/lib/sonarr 0755 sonarr sonarr
+Z /var/lib/sonarr - sonarr sonarr
+L /var/log/sonarr - - - - /var/lib/sonarr/logs/