From 9ec3b112f3696bc6c36c335b3388b36acd610a0c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:53 -0400
Subject: [PATCH] nagstamon: update to 3.4.1

---
 .../nagstamon/patches/disable-kerberos.patch  | 39 ++++++++++++-------
 srcpkgs/nagstamon/template                    | 17 ++++----
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/nagstamon/patches/disable-kerberos.patch b/srcpkgs/nagstamon/patches/disable-kerberos.patch
index 3711c18e12a..deacba86517 100644
--- a/srcpkgs/nagstamon/patches/disable-kerberos.patch
+++ b/srcpkgs/nagstamon/patches/disable-kerberos.patch
@@ -1,6 +1,7 @@
---- Nagstamon/QUI/__init__.py.orig	2018-09-12 16:40:47.350735530 +0200
-+++ Nagstamon/QUI/__init__.py	2018-09-12 16:47:18.330913802 +0200
-@@ -5279,7 +5279,7 @@
+diff -ur Nagstamon.orig/Nagstamon/QUI/__init__.py Nagstamon/Nagstamon/QUI/__init__.py
+--- Nagstamon/QUI/__init__.py	2020-01-24 10:12:12.000000000 -0500
++++ Nagstamon/QUI/__init__.py	2020-10-08 00:20:39.437758862 -0400
+@@ -5770,7 +5770,7 @@
          self.ui.button_choose_custom_cert_ca_file.clicked.connect(self.choose_custom_cert_ca_file)
  
          # fill authentication combobox
@@ -9,28 +10,38 @@
  
          # detect change of server type which leads to certain options shown or hidden
          self.ui.input_combobox_type.activated.connect(self.toggle_type)
---- Nagstamon/Servers/Generic.py,orug	2018-09-12 16:40:47.353735516 +0200
-+++ Nagstamon/Servers/Generic.py	2018-09-12 16:47:52.962752440 +0200
-@@ -45,7 +45,6 @@
- from collections import OrderedDict
+diff -ur Nagstamon.orig/Nagstamon/Servers/Generic.py Nagstamon/Nagstamon/Servers/Generic.py
+--- Nagstamon/Servers/Generic.py	2020-01-24 10:12:12.000000000 -0500
++++ Nagstamon/Servers/Generic.py	2020-10-08 00:21:28.460699656 -0400
+@@ -53,15 +53,6 @@
+                               RESOURCES)
  
- import requests
--import requests_kerberos
  
+-# requests_gssapi is newer but not available everywhere
+-try:
+-    # extra imports needed to get it compiled on macOS
+-    import numbers
+-    import gssapi.raw.cython_converters
+-    from requests_gssapi import HTTPSPNEGOAuth as HTTPSKerberos
+-except ImportError:
+-    from requests_kerberos import HTTPKerberosAuth as HTTPSKerberos
+-
  # disable annoying SubjectAltNameWarning warnings
  try:
-@@ -231,8 +230,6 @@
+     from requests.packages.urllib3.exceptions import SubjectAltNameWarning
+@@ -260,8 +251,6 @@
                  self.session.auth = requests.auth.HTTPBasicAuth(self.username, self.password)
              elif self.authentication == 'digest':
                  self.session.auth = requests.auth.HTTPDigestAuth(self.username, self.password)
 -            elif self.authentication == 'kerberos':
--                self.session.auth = requests_kerberos.HTTPKerberosAuth()
+-                self.session.auth = HTTPSKerberos()
  
              # default to check TLS validity
              if self.ignore_cert:
---- setup.py.orig	2018-09-12 16:40:47.363735470 +0200
-+++ setup.py	2018-09-12 16:48:02.146709650 +0200
-@@ -85,7 +85,6 @@
+diff -ur Nagstamon.orig/setup.py Nagstamon/setup.py
+--- setup.py	2020-10-08 00:18:37.532906083 -0400
++++ setup.py	2020-10-08 00:21:43.580681397 -0400
+@@ -89,7 +89,6 @@
          'python3-psutil '
          'python3-qt5 '
          'python3-requests '
diff --git a/srcpkgs/nagstamon/template b/srcpkgs/nagstamon/template
index 0eb5bc75d27..bf07c6d1bce 100644
--- a/srcpkgs/nagstamon/template
+++ b/srcpkgs/nagstamon/template
@@ -1,12 +1,11 @@
 # Template file for 'nagstamon'
 pkgname=nagstamon
-version=3.2.1
-revision=2
-archs=noarch
+version=3.4.1
+revision=1
 wrksrc=Nagstamon
 build_style=python3-module
 pycompile_module="Nagstamon"
-hostmakedepends="python3-setuptools python3-keyring"
+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"
 short_desc="Nagios status monitor for the desktop"
@@ -14,12 +13,14 @@ maintainer="Laszlo Dvornik <laulicus@zoho.com>"
 license="GPL-2.0-or-later"
 homepage="https://nagstamon.ifw-dresden.de"
 distfiles="https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"
-checksum=a834460e78dc01f62171a83c4a11d890702264ed662863dff39edaf14ae98880
+checksum=2d26cf4d64a6e27fe55f1c5e5f042af511bcb09876ae16a456aee5800a98adea
 
-post_extract() {
-	# Gone in python 3.8, but these where the python 3.6 values.  ;)
-	vsed -i -e 's/platform.dist()/("","","")/g' setup.py
+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