nagstamon: update to 3.10.1.

srcpkgs/nagstamon/patches/disable-kerberos.patch

@@ -1,22 +1,21 @@
-diff -ur Nagstamon.orig/Nagstamon/QUI/__init__.py Nagstamon/Nagstamon/QUI/__init__.py
+--- a/Nagstamon/QUI/__init__.py	2022-11-04 07:04:14.000000000 +0100
---- a/Nagstamon/QUI/__init__.py	2020-01-24 10:12:12.000000000 -0500
++++ -	2023-02-16 15:17:33.465042825 +0100
-+++ b/Nagstamon/QUI/__init__.py	2020-10-08 00:20:39.437758862 -0400
+@@ -5701,7 +5701,7 @@
-@@ -5770,7 +5770,7 @@
+         self.window.button_choose_custom_cert_ca_file.clicked.connect(self.choose_custom_cert_ca_file)
-         self.ui.button_choose_custom_cert_ca_file.clicked.connect(self.choose_custom_cert_ca_file)
  
          # fill authentication combobox
--        self.ui.input_combobox_authentication.addItems(['Basic', 'Digest', 'Kerberos'])
+-        self.window.input_combobox_authentication.addItems(['Basic', 'Digest', 'Kerberos', 'Bearer'])
-+        self.ui.input_combobox_authentication.addItems(['Basic', 'Digest'])
++        self.window.input_combobox_authentication.addItems(['Basic', 'Digest', 'Bearer'])
+         if ECP_AVAILABLE is True:
+             self.window.input_combobox_authentication.addItems(['ECP'])
  
-         # detect change of server type which leads to certain options shown or hidden
+--- a/Nagstamon/Servers/Generic.py	2022-11-04 07:04:14.000000000 +0100
-         self.ui.input_combobox_type.activated.connect(self.toggle_type)
++++ -	2023-02-16 15:18:28.346371050 +0100
-diff -ur Nagstamon.orig/Nagstamon/Servers/Generic.py Nagstamon/Nagstamon/Servers/Generic.py
+@@ -59,20 +59,6 @@
---- a/Nagstamon/Servers/Generic.py	2020-01-24 10:12:12.000000000 -0500
+                               OS_DARWIN,
-+++ b/Nagstamon/Servers/Generic.py	2020-10-08 00:21:28.460699656 -0400
-@@ -53,15 +53,6 @@
                                RESOURCES)
  
- 
+-if OS == OS_DARWIN:
 -    # requests_gssapi is newer but not available everywhere
 -    try:
 -        # extra imports needed to get it compiled on macOS
@@ -25,24 +24,27 @@ diff -ur Nagstamon.orig/Nagstamon/Servers/Generic.py Nagstamon/Nagstamon/Servers
 -        from requests_gssapi import HTTPSPNEGOAuth as HTTPSKerberos
 -    except ImportError:
 -        from requests_kerberos import HTTPKerberosAuth as HTTPSKerberos
+-else:
+-    # requests_gssapi needs installation of KfW - Kerberos for Windows
+-    # requests_kerberoes doesn't
+-    from requests_kerberos import HTTPKerberosAuth as HTTPSKerberos
 -
  # disable annoying SubjectAltNameWarning warnings
  try:
      from requests.packages.urllib3.exceptions import SubjectAltNameWarning
-@@ -260,8 +251,6 @@
+@@ -303,8 +289,6 @@
-                 self.session.auth = requests.auth.HTTPBasicAuth(self.username, self.password)
+             session.auth = requests.auth.HTTPDigestAuth(self.username, self.password)
-             elif self.authentication == 'digest':
+         elif self.authentication == 'ecp' and ECP_AVAILABLE:
-                 self.session.auth = requests.auth.HTTPDigestAuth(self.username, self.password)
+             session.auth = HTTPECPAuth(self.idp_ecp_endpoint, username=self.username, password=self.password)
 -        elif self.authentication == 'kerberos':
--                self.session.auth = HTTPSKerberos()
+-            session.auth = HTTPSKerberos()
+         elif self.authentication == 'bearer':
+             session.auth = BearerAuth(self.password)
  
-             # default to check TLS validity
+--- a/setup.py	2022-11-04 07:04:14.000000000 +0100
-             if self.ignore_cert:
++++ -	2023-02-16 15:18:47.726901893 +0100
-diff -ur Nagstamon.orig/setup.py Nagstamon/setup.py
+@@ -98,7 +98,6 @@
---- a/setup.py	2020-10-08 00:18:37.532906083 -0400
+                                   'python3-pysocks '
-+++ b/setup.py	2020-10-08 00:21:43.580681397 -0400
-@@ -89,7 +89,6 @@
-         'python3-psutil '
                                    'python3-qt5 '
                                    'python3-requests '
 -                                  'python3-requests-kerberos '

srcpkgs/nagstamon/patches/version.patch

@@ -0,0 +1,24 @@
+From a1a3516309bd45ec1783321d262b0e2f17a2fc4a Mon Sep 17 00:00:00 2001
+From: Henri Wahl <2835065+HenriWahl@users.noreply.github.com>
+Date: Sun, 12 Feb 2023 22:43:43 +0100
+Subject: [PATCH] version without OS
+
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 5ff72dda..271072e3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -45,8 +45,8 @@
+     else:
+         DIST, DIST_VERSION, DIST_NAME = platform.dist()
+     NAME = NAME.lower()
+-VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION
+-
++#VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION
++VERSION = AppInfo.VERSION.replace('-', '.')
+ NAGSTAMON_SCRIPT = 'nagstamon.py'
+ 
+ from setuptools import setup

srcpkgs/nagstamon/template

@@ -1,26 +1,21 @@
 # Template file for 'nagstamon'
 pkgname=nagstamon
-version=3.6.0
+version=3.10.1
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-keyring python3-psutil"
 depends="python3-BeautifulSoup4 python3-dbus python3-keyring python3-lxml
- python3-psutil python3-PyQt5-multimedia python3-PyQt5-svg python3-requests"
+ python3-psutil python3-PyQt5-multimedia python3-PyQt5-svg python3-requests
+ python3-dateutil"
 short_desc="Nagios status monitor for the desktop"
 maintainer="Laszlo Dvornik <laulicus@zoho.com>"
 license="GPL-2.0-or-later"
 homepage="https://nagstamon.de"
 distfiles="https://github.com/HenriWahl/Nagstamon/archive/v${version}.tar.gz"
-checksum=5ec74c50367ba75af417e04c8192b6f598a1db9e55e2db52a8dc540ac707d904
+checksum=2de11f91bf5f9de96d9a1232360129349aa5b4483a668125b38ce3837346742f
 # Tarball includes no tests
 make_check=no
 
-post_patch() {
-	# This relies on /etc/os-release, which doesn't exist without
-	# runit-void and doesn't provide the version expected
-	vsed -i setup.py -e 's/get_distro()/"void", "", "void"/'
-}
-
 post_install() {
 	chmod 644 ${DESTDIR}/usr/share/pixmaps/nagstamon.svg
 	mv -v ${DESTDIR}/usr/bin/nagstamon.py ${DESTDIR}/usr/bin/nagstamon