Update to v5.0.4.

6 files changed, 75 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f841f6b4a449..82b6411122dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,34 @@
 pkgbase = nzbhydra2
 	pkgdesc = Search aggregator for newznab and torznab indexers.
-	pkgver = 4.7.6
+	pkgver = 5.0.4
 	pkgrel = 1
 	url = https://github.com/theotherp/nzbhydra2
 	arch = any
 	license = Apache
 	makedepends = maven
-	makedepends = java-environment=11
+	makedepends = java-environment=17
 	depends = python
-	depends = java-runtime-headless<=17
-	depends = java-runtime-headless>=8
+	depends = java-runtime-headless=17
 	optdepends = jackett: torrent indexer proxy
-	source = nzbhydra2-4.7.6.tar.gz::https://github.com/theotherp/nzbhydra2/archive/refs/tags/v4.7.6.tar.gz
+	source = nzbhydra2-5.0.4.tar.gz::https://github.com/theotherp/nzbhydra2/archive/refs/tags/v5.0.4.tar.gz
 	source = nzbhydra2.service
 	source = nzbhydra2.tmpfiles
 	source = nzbhydra2.sysusers
 	source = nzbhydra2.sh
 	source = wrapper-remove-base-path-checks.patch
 	source = wrapper-remove-update-support.patch
+	source = wrapper-remove-release-type-detection.patch
 	source = disable-update-checks.patch
 	source = skip-unneeded-builds.patch
-	sha256sums = 2c99b92ef1685731116300f2d643c0084fa0f9338fa6b494b0e8dcf7843e5882
+	sha256sums = bf4ce0d0c0e856bd81a31aa8afbbfffda787a6f74ddb85941d9c246dfa1f76b6
 	sha256sums = 2fae64a1c5979d9f7b508f1e15d0f013b7cca1f2bbbdae56f546f4c362146b68
 	sha256sums = a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003
 	sha256sums = 8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a
 	sha256sums = 57b65e56459324a7665d3642a04bb9c3ddff96659511c07f995b6158531a3b58
-	sha256sums = fd6ba3e8b22f3f90c19d9903445b2539837dca1c12df49863b2e8d1085d88b0e
-	sha256sums = f302b8dc8ed95ce18d67305a0460b1e62a4e4586fba0f77d3dd980a77cfba3d4
+	sha256sums = 5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4
+	sha256sums = 35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73
+	sha256sums = defb77e7b19c6abfc8380cd175bc04062a0c52d1042b8e02173133367152c8e2
 	sha256sums = 83b4071b2fe02e9a302fda5b9b0de97e7531b6032cdbcb8148e2f0b1fc566a22
-	sha256sums = 693c834e641b54fd940490e522dba49d3f7a9846554181e2d284acdd81d87c38
+	sha256sums = c9280f81749e34a829f93d7a548b9275a05789593d57a00f90efa959d1f025fd
 
 pkgname = nzbhydra2
diff --git a/PKGBUILD b/PKGBUILD
index 81794a0d4b4b..5395e87b3afd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 # Co-Maintainer: Leon Möller <jkhsjdhjs at totally dot rip>
 
 pkgname="nzbhydra2"
-pkgver=4.7.6
+pkgver=5.0.4
 pkgrel=1
 pkgdesc="Search aggregator for newznab and torznab indexers."
 arch=('any')
 url="https://github.com/theotherp/nzbhydra2"
 license=('Apache')
-depends=('python' 'java-runtime-headless<=17' 'java-runtime-headless>=8')
-makedepends=('maven' 'java-environment=11')
+depends=('python' 'java-runtime-headless=17')
+makedepends=('maven' 'java-environment=17')
 optdepends=('jackett: torrent indexer proxy')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/theotherp/nzbhydra2/archive/refs/tags/v${pkgver}.tar.gz"
         'nzbhydra2.service'
@@ -19,23 +19,26 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/theotherp/nzbhydra2/arc
         'nzbhydra2.sh'
         'wrapper-remove-base-path-checks.patch'
         'wrapper-remove-update-support.patch'
+        'wrapper-remove-release-type-detection.patch'
         'disable-update-checks.patch'
         'skip-unneeded-builds.patch')
 
-sha256sums=('2c99b92ef1685731116300f2d643c0084fa0f9338fa6b494b0e8dcf7843e5882'
+sha256sums=('bf4ce0d0c0e856bd81a31aa8afbbfffda787a6f74ddb85941d9c246dfa1f76b6'
             '2fae64a1c5979d9f7b508f1e15d0f013b7cca1f2bbbdae56f546f4c362146b68'
             'a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003'
             '8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a'
             '57b65e56459324a7665d3642a04bb9c3ddff96659511c07f995b6158531a3b58'
-            'fd6ba3e8b22f3f90c19d9903445b2539837dca1c12df49863b2e8d1085d88b0e'
-            'f302b8dc8ed95ce18d67305a0460b1e62a4e4586fba0f77d3dd980a77cfba3d4'
+            '5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4'
+            '35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73'
+            'defb77e7b19c6abfc8380cd175bc04062a0c52d1042b8e02173133367152c8e2'
             '83b4071b2fe02e9a302fda5b9b0de97e7531b6032cdbcb8148e2f0b1fc566a22'
-            '693c834e641b54fd940490e522dba49d3f7a9846554181e2d284acdd81d87c38')
+            'c9280f81749e34a829f93d7a548b9275a05789593d57a00f90efa959d1f025fd')
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     patch -p1 < "${srcdir}/wrapper-remove-base-path-checks.patch"
     patch -p1 < "${srcdir}/wrapper-remove-update-support.patch"
+    patch -p1 < "${srcdir}/wrapper-remove-release-type-detection.patch"
     patch -p1 < "${srcdir}/disable-update-checks.patch"
     patch -p1 < "${srcdir}/skip-unneeded-builds.patch"
 }
@@ -43,14 +46,14 @@ prepare() {
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
 
-    export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
+    export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
     mvn -Dmaven.test.skip -pl core -am clean package
 }
 
 check() {
     cd "${srcdir}/${pkgname}-${pkgver}"
 
-    export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
+    export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
     mvn -pl core -am test
 }
 
diff --git a/skip-unneeded-builds.patch b/skip-unneeded-builds.patch
index 7a0c02ee4c93..19046827ee9b 100644
--- a/skip-unneeded-builds.patch
+++ b/skip-unneeded-builds.patch
@@ -1,15 +1,14 @@
 diff --git a/other/pom.xml b/other/pom.xml
-index d36645c8..93ba61cc 100644
+index 93e16c3a..87ba7c2f 100644
 --- a/other/pom.xml
 +++ b/other/pom.xml
-@@ -10,10 +10,7 @@
+@@ -10,9 +10,7 @@
      <packaging>pom</packaging>
  
      <modules>
 -        <module>mockserver</module>
          <module>sockslib</module>
 -        <module>github-release-plugin</module>
--        <module>discordbot</module>
      </modules>
  
      <properties>
diff --git a/wrapper-remove-base-path-checks.patch b/wrapper-remove-base-path-checks.patch
index c5f55962979d..6edf526dd8e0 100644
--- a/wrapper-remove-base-path-checks.patch
+++ b/wrapper-remove-base-path-checks.patch
@@ -1,8 +1,8 @@
 diff --git a/other/wrapper/nzbhydra2wrapperPy3.py b/other/wrapper/nzbhydra2wrapperPy3.py
-index 1c691007..9d920faa 100644
+index e64c80d4..a9d8843c 100644
 --- a/other/wrapper/nzbhydra2wrapperPy3.py
 +++ b/other/wrapper/nzbhydra2wrapperPy3.py
-@@ -283,11 +283,6 @@ def startup():
+@@ -304,11 +304,6 @@ def startup():
      global jarFile, process, args, unknownArgs, consoleLines
      basePath = getBasePath()
  
@@ -11,18 +11,20 @@ index 1c691007..9d920faa 100644
 -        logger.critical("Unable to determine base path correctly. Please make sure to run NZBHydra in the folder where its binary is located. Current base path: " + basePath)
 -        sys.exit(-1)
 -
-     debugSwitchFile = os.path.join(args.datafolder, "DEBUG")
-     if os.path.exists(debugSwitchFile):
-         logger.setLevel("DEBUG")
-@@ -297,10 +292,7 @@ def startup():
+     releaseType = determineReleaseType()
+     isWindows = platform.system().lower() == "windows"
+     isWithTrayIcon = os.path.exists("isWindowsTrayMarkerFile")
+@@ -332,12 +327,8 @@ def startup():
+         console_logger.setLevel("DEBUG")
          logger.info("Setting wrapper log level to DEBUG")
  
-     isWindows = platform.system().lower() == "windows"
 -    libFolder = os.path.join(basePath, "lib")
--    if not os.path.exists(libFolder):
--        logger.critical("Error: Lib folder %s not found. An update might've failed or the installation folder is corrupt", libFolder)
--        sys.exit(-1)
 +    libFolder = basePath
- 
-     jarFiles = [os.path.join(libFolder, f) for f in os.listdir(libFolder) if os.path.isfile(os.path.join(libFolder, f)) and f.endswith(".jar")]
-     if len(jarFiles) == 0:
+     if releaseType == ReleaseType.GENERIC:
+-        if not os.path.exists(libFolder):
+-            logger.critical("Error: Lib folder %s not found. An update might've failed or the installation folder is corrupt", libFolder)
+-            sys.exit(-1)
+-
+         jarFiles = [os.path.join(libFolder, f) for f in os.listdir(libFolder) if os.path.isfile(os.path.join(libFolder, f)) and f.endswith(".jar")]
+         if len(jarFiles) == 0:
+             logger.critical("Error: No JAR files found in folder %s. An update might've failed or the installation folder is corrupt", libFolder)
diff --git a/wrapper-remove-release-type-detection.patch b/wrapper-remove-release-type-detection.patch
new file mode 100644
index 000000000000..ef07e3de34bb
--- /dev/null
+++ b/wrapper-remove-release-type-detection.patch
@@ -0,0 +1,24 @@
+diff --git a/other/wrapper/nzbhydra2wrapperPy3.py b/other/wrapper/nzbhydra2wrapperPy3.py
+index e64c80d4..bd9e57ba 100644
+--- a/other/wrapper/nzbhydra2wrapperPy3.py
++++ b/other/wrapper/nzbhydra2wrapperPy3.py
+@@ -491,18 +491,7 @@ def startup():
+ 
+ 
+ def determineReleaseType():
+-    if os.path.exists("lib"):
+-        releaseType = ReleaseType.GENERIC
+-        if os.path.exists("core") or os.path.exists("core.exe"):
+-            logger.warning("lib folder and core(.exe) found. Either delete the executable to use the generic release type (using java and ignoring the executable) or delete the lib folder to use the executable and not require java")
+-    elif os.path.exists("core") or os.path.exists("core.exe"):
+-        releaseType = ReleaseType.NATIVE
+-    else:
+-        logger.critical(
+-            "Unable to determine the release type. Neither lib folder nor core(.exe) found")
+-        sys.exit(-1)
+-    logger.info("Determined release type: " + releaseType)
+-    return releaseType
++    return ReleaseType.GENERIC
+ 
+ 
+ def escape_parameter(is_windows, parameter):
diff --git a/wrapper-remove-update-support.patch b/wrapper-remove-update-support.patch
index b6b2ad1c9e9f..a4f655d4088a 100644
--- a/wrapper-remove-update-support.patch
+++ b/wrapper-remove-update-support.patch
@@ -1,8 +1,18 @@
 diff --git a/other/wrapper/nzbhydra2wrapperPy3.py b/other/wrapper/nzbhydra2wrapperPy3.py
-index 1c691007..de862159 100644
+index e64c80d4..50678569 100644
 --- a/other/wrapper/nzbhydra2wrapperPy3.py
 +++ b/other/wrapper/nzbhydra2wrapperPy3.py
-@@ -617,7 +617,7 @@ if __name__ == '__main__':
+@@ -640,8 +640,7 @@ def main(arguments):
+     global internalApiKey
+     internalApiKey = args.internalApiKey
+     if args.update:
+-        logger.info("Executing update")
+-        update()
++        logger.error("Updating is not supported.")
+         sys.exit(0)
+     if "--version" in unknownArgs or "--help" in unknownArgs:
+         # no fancy shit, just start the file
+@@ -693,7 +692,7 @@ def main(arguments):
  
              if controlCode == 11:
                  logger.info("NZBHydra main process has terminated for updating")