sabnzbd: update to 4.2.1.

[Olaf Seibert <rhialto%falu.nl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sat Jan 13 19:06:33 2024 +0100
Changeset:	8a1bb9ffdf1117c5045149fe2a6bb14f1dbfe715

Modified Files:
	py-sabctools/Makefile
	py-sabctools/PLIST
	py-sabctools/distinfo
	sabnzbd/Makefile
	sabnzbd/PLIST
	sabnzbd/distinfo
Removed Files:
	sabnzbd/TODO

Log Message:
sabnzbd: update to 4.2.1.

py-sabctools: update to 8.1.0.

CVE-2023-34237 was already fixed in 4.0.2.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8a1bb9ffdf1117c5045149fe2a6bb14f1dbfe715

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-sabctools/Makefile |  7 +++++--
 py-sabctools/PLIST    |  9 +++++----
 py-sabctools/distinfo |  6 +++---
 sabnzbd/Makefile      | 16 ++++++++++------
 sabnzbd/PLIST         |  6 ++++--
 sabnzbd/TODO          |  2 --
 sabnzbd/distinfo      |  6 +++---
 7 files changed, 30 insertions(+), 22 deletions(-)

diffs:
diff --git a/py-sabctools/Makefile b/py-sabctools/Makefile
index 70fa7903c0..6789e52202 100644
--- a/py-sabctools/Makefile
+++ b/py-sabctools/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=		sabctools-${DISTVERSION}
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-DISTVERSION=		7.0.2
+DISTVERSION=		8.1.0
 CATEGORIES=		news
 MASTER_SITES=		${MASTER_SITE_GITHUB:=sabnzbd/}
 GITHUB_PROJECT=		sabctools
@@ -15,8 +15,11 @@ LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND modified-bsd AND mit
 
 USE_LANGUAGES+=	c c++
 
+TOOL_DEPENDS+=  ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+=  ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 #.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-sabctools/PLIST b/py-sabctools/PLIST
index c8a19b34f2..931eabe9da 100644
--- a/py-sabctools/PLIST
+++ b/py-sabctools/PLIST
@@ -1,8 +1,9 @@
 @comment $NetBSD$
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE.md
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/sabctools/__init__.py
 ${PYSITELIB}/sabctools/__init__.pyc
 ${PYSITELIB}/sabctools/__init__.pyo
diff --git a/py-sabctools/distinfo b/py-sabctools/distinfo
index f9b49e6115..3a533cc32b 100644
--- a/py-sabctools/distinfo
+++ b/py-sabctools/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (sabctools-7.0.2.tar.gz) = 4fd36ac9f6bca10c11cf143601c574ac7d16006838abedd047024b4070c33d6b
-SHA512 (sabctools-7.0.2.tar.gz) = 05968a29afb7a041549bae9e9a4303160820da4cd10ea33ab4475fe48fd0b4cf46023c6254715161265f3e1bdf2b66ae7e62007789fbc288aa229d3a218a3df8
-Size (sabctools-7.0.2.tar.gz) = 8539819 bytes
+BLAKE2s (sabctools-8.1.0.tar.gz) = 35b6568f427c8afea18e2bf1be1de3dad83f1a7e3a18a6e63d92df19038028f0
+SHA512 (sabctools-8.1.0.tar.gz) = 862c39f2e386622b528f120a431f214e1e2e92b7c5a751e47d0768f40ce06ad2736d867f7ac2e1810d676e980312bbfedd29951cbadeddefe75246cdcf53fcc6
+Size (sabctools-8.1.0.tar.gz) = 8963885 bytes
 SHA1 (patch-setup.py) = e04119159c5765d6ecebd272ffd335aeab988e08
diff --git a/sabnzbd/Makefile b/sabnzbd/Makefile
index c26db8dd68..9f95da60eb 100644
--- a/sabnzbd/Makefile
+++ b/sabnzbd/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	sabnzbd-${DISTVERSION}
-DISTVERSION=	4.0.3
+DISTVERSION=	4.2.1
 CATEGORIES=	news
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sabnzbd/}
 GITHUB_PROJECT=	sabnzbd
@@ -13,15 +13,19 @@ HOMEPAGE=	https://sabnzbd.org/
 COMMENT=	Web-interface based binary newsgrabber in python, with nzb support
 LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND modified-bsd AND mit
 
-DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah3
-DEPENDS+=	${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
-DEPENDS+=	${PYPKGPREFIX}-sabctools>=7.0.2:../../wip/py-sabctools
 DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
-DEPENDS+=	${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj
-DEPENDS+=	${PYPKGPREFIX}-portend-[0-9]*:../../net/py-portend
+DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah3
 DEPENDS+=	${PYPKGPREFIX}-cherrypy>=18.2:../../www/py-cherrypy
+DEPENDS+=	${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj
+DEPENDS+=	${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-guessit>=3.1.1:../../textproc/py-guessit
+DEPENDS+=	${PYPKGPREFIX}-jaraco.classes>=3.3.0:../../devel/py-jaraco.classes
+DEPENDS+=	${PYPKGPREFIX}-portend-[0-9]*:../../net/py-portend
 DEPENDS+=	${PYPKGPREFIX}-puremagic>=1.11:../../sysutils/py-puremagic
+DEPENDS+=	${PYPKGPREFIX}-sabctools>=8.1.0:../../wip/py-sabctools
+# Optional:
+#DEPENDS+=	${PYPKGPREFIX}-dbus>=1.3.2:../../sysutils/py-dbus
+# 
 DEPENDS+=	par2-[0-9]*:../../archivers/par2
 DEPENDS+=	unrar-[0-9]*:../../archivers/unrar
 DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
diff --git a/sabnzbd/PLIST b/sabnzbd/PLIST
index daf488901d..e17b439872 100644
--- a/sabnzbd/PLIST
+++ b/sabnzbd/PLIST
@@ -19,7 +19,9 @@ ${PYSITELIB}/sabnzbd/emailer.py
 ${PYSITELIB}/sabnzbd/encoding.py
 ${PYSITELIB}/sabnzbd/filesystem.py
 ${PYSITELIB}/sabnzbd/getipaddress.py
+${PYSITELIB}/sabnzbd/happyeyeballs.py
 ${PYSITELIB}/sabnzbd/interface.py
+${PYSITELIB}/sabnzbd/internetspeed.py
 ${PYSITELIB}/sabnzbd/lang.py
 ${PYSITELIB}/sabnzbd/misc.py
 ${PYSITELIB}/sabnzbd/newsunpack.py
@@ -47,8 +49,6 @@ ${PYSITELIB}/sabnzbd/utils/checkdir.py
 ${PYSITELIB}/sabnzbd/utils/diskspeed.py
 ${PYSITELIB}/sabnzbd/utils/file_extension.py
 ${PYSITELIB}/sabnzbd/utils/getperformance.py
-${PYSITELIB}/sabnzbd/utils/happyeyeballs.py
-${PYSITELIB}/sabnzbd/utils/internetspeed.py
 ${PYSITELIB}/sabnzbd/utils/kronos.py
 ${PYSITELIB}/sabnzbd/utils/pathbrowser.py
 ${PYSITELIB}/sabnzbd/utils/pybonjour.py
@@ -96,6 +96,8 @@ share/sabnzbd/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-h
 share/sabnzbd/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-halflings-regular.svg
 share/sabnzbd/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-halflings-regular.ttf
 share/sabnzbd/interfaces/Config/templates/staticcfg/bootstrap/js/bootstrap.min.js
+share/sabnzbd/interfaces/Config/templates/staticcfg/css/Auto.css
+share/sabnzbd/interfaces/Config/templates/staticcfg/css/Night.css
 share/sabnzbd/interfaces/Config/templates/staticcfg/css/chartist.min.css
 share/sabnzbd/interfaces/Config/templates/staticcfg/css/login.css
 share/sabnzbd/interfaces/Config/templates/staticcfg/css/style.css
diff --git a/sabnzbd/TODO b/sabnzbd/TODO
deleted file mode 100644
index 9869b1d301..0000000000
--- a/sabnzbd/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-This package has known vulnerabilities, please investigate and fix if possible:
-  CVE-2023-34237
diff --git a/sabnzbd/distinfo b/sabnzbd/distinfo
index 2140beb1ea..137981ba39 100644
--- a/sabnzbd/distinfo
+++ b/sabnzbd/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.1 2013/10/01 20:25:20 wongk Exp $
 
-BLAKE2s (sabnzbd-4.0.3.tar.gz) = f570814b8d6c4c520bfbd3034feda8c43f48b70b602410ea80e806e7c9a2d26d
-SHA512 (sabnzbd-4.0.3.tar.gz) = 98081cae17c69efdb8639e8594339663994c7550bea12915411a026c45b5996b53f3fcd358f27080fc074a1268e579f4adeb88b964a44d6b0c82e1d16f500e1b
-Size (sabnzbd-4.0.3.tar.gz) = 9415766 bytes
+BLAKE2s (sabnzbd-4.2.1.tar.gz) = b0f061dd2d088a919c28a720d293a1f9355b96e0599a3fd089ae9799585e9969
+SHA512 (sabnzbd-4.2.1.tar.gz) = c920c4c3af2b4a93c3a9ecacf8966f2d0aee0081bc8b8fc5281b887fbeedcc7bb39b899b961def8dc61ef0ca52ca0e11b042f27dd0f7b82d2d1802e64b00c9a3
+Size (sabnzbd-4.2.1.tar.gz) = 10941865 bytes
 SHA1 (patch-SABnzbd.py) = 33019b1b87cc81cea38f3b0c68a27ca37807aaa4
 SHA1 (patch-sabnzbd_cfg.py) = 49a262d8d9c27c741077ea8c2676c425dd63ee6a