Update to v4.7.2.

3 files changed, 7 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a6169c9d48b..32192fec106c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nzbhydra2
 	pkgdesc = Search aggregator for newznab and torznab indexers.
-	pkgver = 4.6.1
-	pkgrel = 3
+	pkgver = 4.7.2
+	pkgrel = 1
 	url = https://github.com/theotherp/nzbhydra2
 	arch = any
 	license = Apache
@@ -13,22 +13,20 @@ pkgbase = nzbhydra2
 	depends = java-runtime-headless<=17
 	depends = java-runtime-headless>=8
 	optdepends = jackett: torrent indexer proxy
-	source = nzbhydra2-4.6.1.tar.gz::https://github.com/theotherp/nzbhydra2/archive/refs/tags/v4.6.1.tar.gz
+	source = nzbhydra2-4.7.2.tar.gz::https://github.com/theotherp/nzbhydra2/archive/refs/tags/v4.7.2.tar.gz
 	source = nzbhydra2.service
 	source = nzbhydra2.tmpfiles
 	source = nzbhydra2.sysusers
 	source = nzbhydra2.sh
-	source = wrapper-Fix-dropping-every-second-line-of-stdout-807.patch
 	source = wrapper-remove-base-path-checks.patch
 	source = wrapper-remove-update-support.patch
 	source = disable-update-checks.patch
 	source = skip-unneeded-builds.patch
-	sha256sums = 41a68b58630a9e535bc164700603ef088213bdb0a97fe68441c149e7e1d03074
+	sha256sums = 1dd0d2fe30e12097103586a812c9b3ba42fb6d110615699790358407f011ffe7
 	sha256sums = 2fae64a1c5979d9f7b508f1e15d0f013b7cca1f2bbbdae56f546f4c362146b68
 	sha256sums = a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003
 	sha256sums = 8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a
 	sha256sums = f7946e4928fe26e6bbfe1388eb0071b846dd28b54b801b2ade992c204a69f5e3
-	sha256sums = d59bb189f178170c523550a032af7bc5f4c90518b3bca8a631403d6725bd6528
 	sha256sums = fd6ba3e8b22f3f90c19d9903445b2539837dca1c12df49863b2e8d1085d88b0e
 	sha256sums = f302b8dc8ed95ce18d67305a0460b1e62a4e4586fba0f77d3dd980a77cfba3d4
 	sha256sums = 83b4071b2fe02e9a302fda5b9b0de97e7531b6032cdbcb8148e2f0b1fc566a22
diff --git a/PKGBUILD b/PKGBUILD
index a9a8cb7eed23..48674b09746b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Co-Maintainer: Leon Möller <jkhsjdhjs at totally dot rip>
 
 pkgname="nzbhydra2"
-pkgver=4.6.1
-pkgrel=3
+pkgver=4.7.2
+pkgrel=1
 pkgdesc="Search aggregator for newznab and torznab indexers."
 arch=('any')
 url="https://github.com/theotherp/nzbhydra2"
@@ -17,18 +17,16 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/theotherp/nzbhydra2/arc
         'nzbhydra2.tmpfiles'
         'nzbhydra2.sysusers'
         'nzbhydra2.sh'
-        'wrapper-Fix-dropping-every-second-line-of-stdout-807.patch'
         'wrapper-remove-base-path-checks.patch'
         'wrapper-remove-update-support.patch'
         'disable-update-checks.patch'
         'skip-unneeded-builds.patch')
 
-sha256sums=('41a68b58630a9e535bc164700603ef088213bdb0a97fe68441c149e7e1d03074'
+sha256sums=('1dd0d2fe30e12097103586a812c9b3ba42fb6d110615699790358407f011ffe7'
             '2fae64a1c5979d9f7b508f1e15d0f013b7cca1f2bbbdae56f546f4c362146b68'
             'a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003'
             '8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a'
             'f7946e4928fe26e6bbfe1388eb0071b846dd28b54b801b2ade992c204a69f5e3'
-            'd59bb189f178170c523550a032af7bc5f4c90518b3bca8a631403d6725bd6528'
             'fd6ba3e8b22f3f90c19d9903445b2539837dca1c12df49863b2e8d1085d88b0e'
             'f302b8dc8ed95ce18d67305a0460b1e62a4e4586fba0f77d3dd980a77cfba3d4'
             '83b4071b2fe02e9a302fda5b9b0de97e7531b6032cdbcb8148e2f0b1fc566a22'
@@ -40,8 +38,6 @@ prepare() {
     patch -p1 < "${srcdir}/wrapper-remove-update-support.patch"
     patch -p1 < "${srcdir}/disable-update-checks.patch"
     patch -p1 < "${srcdir}/skip-unneeded-builds.patch"
-    # TODO: remove on next release
-    patch -p1 < "${srcdir}/wrapper-Fix-dropping-every-second-line-of-stdout-807.patch"
 }
 
 build() {
diff --git a/wrapper-Fix-dropping-every-second-line-of-stdout-807.patch b/wrapper-Fix-dropping-every-second-line-of-stdout-807.patch
deleted file mode 100644
index c86ec96cf59b..000000000000
--- a/wrapper-Fix-dropping-every-second-line-of-stdout-807.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5f1e047a406a2b2ce32af89b0a44a401c30160ac Mon Sep 17 00:00:00 2001
-From: jkhsjdhjs <jkhsjdhjs@users.noreply.github.com>
-Date: Tue, 1 Nov 2022 21:45:13 +0100
-Subject: [PATCH] wrapper: Fix dropping every second line of stdout (#807)
-
-Since readline() was called twice on stdout, every second
-line of nzbhydra's output was previously dropped.
----
- other/wrapper/nzbhydra2wrapperPy3.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/other/wrapper/nzbhydra2wrapperPy3.py b/other/wrapper/nzbhydra2wrapperPy3.py
-index c44f3f77..1c691007 100644
---- a/other/wrapper/nzbhydra2wrapperPy3.py
-+++ b/other/wrapper/nzbhydra2wrapperPy3.py
-@@ -424,7 +424,7 @@ def startup():
-         while True:
-             # Handle error first in case startup of main process returned only an error (on stderror)
-             nextline = process.stdout.readline()
--            nextlineString = process.stdout.readline().decode("utf-8")
-+            nextlineString = nextline.decode("utf-8")
-             if nextlineString == '' and process.poll() is not None:
-                 break
-             if nextlineString != "":
--- 
-2.38.1
-