diff options
| author | jkhsjdhjs | 2023-01-21 17:33:01 +0100 |
|---|---|---|
| committer | jkhsjdhjs | 2023-01-21 17:33:01 +0100 |
| commit | fb2de29a8abde932bcfccc9d837bf370fb283ee3 (patch) | |
| tree | beb50c41cd996552e8103271365da4133ce2ad78 | |
| parent | 38f8d75957bab49fd1a45696cc430e11c38ab393 (diff) | |
| download | aur-fb2de29a8abde932bcfccc9d837bf370fb283ee3.tar.gz | |
Update to v5.0.4.
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | wrapper-remove-base-path-checks.patch | 28 | ||||
| -rw-r--r-- | wrapper-remove-release-type-detection.patch | 24 | ||||
| -rw-r--r-- | wrapper-remove-update-support.patch | 14 |
5 files changed, 69 insertions, 29 deletions
@@ -1,29 +1,30 @@ pkgbase = nzbhydra2-bin 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 depends = python - depends = java-runtime-headless<=17 - depends = java-runtime-headless>=8 + depends = java-runtime-headless=17 optdepends = jackett: torrent indexer proxy provides = nzbhydra2 conflicts = nzbhydra2 - source = https://github.com/theotherp/nzbhydra2/releases/download/v4.7.6/nzbhydra2-4.7.6-linux.zip + source = https://github.com/theotherp/nzbhydra2/releases/download/v5.0.4/nzbhydra2-5.0.4-generic.zip 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 - sha256sums = 14a0f457e5f28abb8b0852b2b4980be8d24896ee073f3efaf46b4ad6c105313e + source = wrapper-remove-release-type-detection.patch + sha256sums = f8637de38f06b7d32d95a3dddf2fa9ae4257df77970b8ba3ddd550dbc215130f sha256sums = 2fae64a1c5979d9f7b508f1e15d0f013b7cca1f2bbbdae56f546f4c362146b68 sha256sums = a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003 sha256sums = 8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a sha256sums = 57b65e56459324a7665d3642a04bb9c3ddff96659511c07f995b6158531a3b58 - sha256sums = fd6ba3e8b22f3f90c19d9903445b2539837dca1c12df49863b2e8d1085d88b0e - sha256sums = f302b8dc8ed95ce18d67305a0460b1e62a4e4586fba0f77d3dd980a77cfba3d4 + sha256sums = 5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4 + sha256sums = 35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73 + sha256sums = defb77e7b19c6abfc8380cd175bc04062a0c52d1042b8e02173133367152c8e2 pkgname = nzbhydra2-bin @@ -3,7 +3,7 @@ # Co-Maintainer: Leon Möller <jkhsjdhjs at totally dot rip> pkgname="nzbhydra2-bin" -pkgver=4.7.6 +pkgver=5.0.4 pkgrel=1 pkgdesc="Search aggregator for newznab and torznab indexers." arch=('any') @@ -11,27 +11,30 @@ url="https://github.com/theotherp/nzbhydra2" license=('Apache') provides=('nzbhydra2') conflicts=('nzbhydra2') -depends=('python' 'java-runtime-headless<=17' 'java-runtime-headless>=8') +depends=('python' 'java-runtime-headless=17') optdepends=('jackett: torrent indexer proxy') -source=("https://github.com/theotherp/nzbhydra2/releases/download/v${pkgver}/${pkgname%-bin}-${pkgver}-linux.zip" +source=("https://github.com/theotherp/nzbhydra2/releases/download/v${pkgver}/${pkgname%-bin}-${pkgver}-generic.zip" 'nzbhydra2.service' 'nzbhydra2.tmpfiles' 'nzbhydra2.sysusers' 'nzbhydra2.sh' 'wrapper-remove-base-path-checks.patch' - 'wrapper-remove-update-support.patch') + 'wrapper-remove-update-support.patch' + 'wrapper-remove-release-type-detection.patch') -sha256sums=('14a0f457e5f28abb8b0852b2b4980be8d24896ee073f3efaf46b4ad6c105313e' +sha256sums=('f8637de38f06b7d32d95a3dddf2fa9ae4257df77970b8ba3ddd550dbc215130f' '2fae64a1c5979d9f7b508f1e15d0f013b7cca1f2bbbdae56f546f4c362146b68' 'a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003' '8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a' '57b65e56459324a7665d3642a04bb9c3ddff96659511c07f995b6158531a3b58' - 'fd6ba3e8b22f3f90c19d9903445b2539837dca1c12df49863b2e8d1085d88b0e' - 'f302b8dc8ed95ce18d67305a0460b1e62a4e4586fba0f77d3dd980a77cfba3d4') + '5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4' + '35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73' + 'defb77e7b19c6abfc8380cd175bc04062a0c52d1042b8e02173133367152c8e2') prepare() { patch "${srcdir}/nzbhydra2wrapperPy3.py" < "${srcdir}/wrapper-remove-base-path-checks.patch" patch "${srcdir}/nzbhydra2wrapperPy3.py" < "${srcdir}/wrapper-remove-update-support.patch" + patch "${srcdir}/nzbhydra2wrapperPy3.py" < "${srcdir}/wrapper-remove-release-type-detection.patch" } package() { 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") |