Attachment 246457 Details for Bug 274418 – Update news/nzbhydra2 to 5.3.3 and ensure lib/ only contains the current .jar file

[patch] Update news/nzbhydra2 to 5.3.3 and ensure lib/ only contains the current .jar file

nzbhydra2_5.3.3_update.patch (text/plain), 2.63 KB, created by kreeblah on 2023-11-21 09:08:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kreeblah

Created: 2023-11-21 09:08:08 UTC

Size: 2.63 KB

patch

obsolete

>From ed0decc4dbc57e7f93bb96905697e3fde49e0f50 Mon Sep 17 00:00:00 2001
>From: Kreeblah <kreeblah@gmail.com>
>Date: Tue, 21 Nov 2023 00:58:43 -0800
>Subject: [PATCH] news/nzbhydra2: Update to 5.3.3 and clean out lib/ on start
>
>---
> news/nzbhydra2/Makefile           | 12 ++++--------
> news/nzbhydra2/distinfo           |  6 +++---
> news/nzbhydra2/files/nzbhydra2.in |  2 ++
> 3 files changed, 9 insertions(+), 11 deletions(-)
>
>diff --git a/news/nzbhydra2/Makefile b/news/nzbhydra2/Makefile
>index 8380785573f8..40c0467e755f 100644
>--- a/news/nzbhydra2/Makefile
>+++ b/news/nzbhydra2/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	nzbhydra2
>-DISTVERSION=	4.7.4
>-DISTVERSIONSUFFIX=	-linux
>+DISTVERSION=	5.3.3
>+DISTVERSIONSUFFIX=	-generic
> CATEGORIES=	news java
> MASTER_SITES=	https://github.com/theotherp/${PORTNAME}/releases/download/v${DISTVERSION}/
> 
>@@ -22,7 +22,8 @@ NO_WRKSUBDIR=	yes
> 
> SUB_FILES=	nzbhydra2
> SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
>-		JAVA=${JAVA}
>+		JAVA=${JAVA} \
>+		DISTVERSION=${DISTVERSION}
> 
> JAVA_VERSION=	17+
> JAVA_VENDOR=	openjdk
>@@ -32,7 +33,6 @@ USERS=		nzbhydra2
> GROUPS=		nzbhydra2
> 
> PLIST_FILES=	${DATADIR}/lib/core-${DISTVERSION}-exec.jar \
>-		${DATADIR}/nzbhydra2 \
> 		${DATADIR}/nzbhydra2wrapperPy3.py \
> 		${DATADIR}/changelog.md \
> 		${DATADIR}/readme.md \
>@@ -42,10 +42,6 @@ post-extract:
> 	# Cleanup unnecessary files
> 	@${RM} -r ${WRKSRC}/systemd ${WRKSRC}/sysv ${WRKSRC}/rc.d ${WRKSRC}/upstart ${WRKSRC}/nzbhydra2wrapper.py
> 
>-pre-install:
>-	# temp fix for https://github.com/theotherp/nzbhydra2/issues/812
>-	${RM} -r ${WRKSRC}/data
>-
> do-install:
> 	@${MKDIR} ${STAGEDIR}/${DATADIR}
> 	${INSTALL} -d -m 755 ${STAGEDIR}/${DATADIR}
>diff --git a/news/nzbhydra2/distinfo b/news/nzbhydra2/distinfo
>index 14f3161ecf8a..88eb11269223 100644
>--- a/news/nzbhydra2/distinfo
>+++ b/news/nzbhydra2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1671278127
>-SHA256 (nzbhydra2-4.7.4-linux.zip) = 70ca65452f1e80f010a61bd5a760961efcab04e06cd0599403b174af753d8a84
>-SIZE (nzbhydra2-4.7.4-linux.zip) = 83396533
>+TIMESTAMP = 1700556557
>+SHA256 (nzbhydra2-5.3.3-generic.zip) = 61e656a066ed01dd4214c52609c051c7f2e1451a9f7080510f731863ac461a92
>+SIZE (nzbhydra2-5.3.3-generic.zip) = 195956868
>diff --git a/news/nzbhydra2/files/nzbhydra2.in b/news/nzbhydra2/files/nzbhydra2.in
>index 490cceb158c0..c20452637d24 100644
>--- a/news/nzbhydra2/files/nzbhydra2.in
>+++ b/news/nzbhydra2/files/nzbhydra2.in
>@@ -45,6 +45,8 @@ nzbhydra2_precmd()
> 	export XDG_CONFIG_HOME=${nzbhydra2_data_dir}
> 	export NZBHYDRA_DISABLE_UPDATE=1
> 
>+	find "%%PREFIX%%/share/nzbhydra2/lib/" ! -name "core-%%DISTVERSION%%-exec.jar" -delete
>+
> 	if [ -f ${pidfile} ]; then
> 		rm -f ${pidfile}
> 		echo "Removing stale pidfile."
>-- 
>2.42.1
>

Flags:

marcel: maintainer-approval+

Actions: View | Diff

Attachments on bug 274418: 245572 | 246457