snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

nagstamon: update to 3.4.1

This commit is contained in:
Andrew J. Hesford 2020-10-07 09:49:53 -04:00
parent 9105591919
commit 9ec3b112f3
2 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
srcpkgs/nagstamon/patches/disable-kerberos.patch
View File

@ -1,6 +1,7 @@
--- Nagstamon/QUI/__init__.py.orig 2018-09-12 16:40:47.350735530 +0200 diff -ur Nagstamon.orig/Nagstamon/QUI/__init__.py Nagstamon/Nagstamon/QUI/__init__.py
+++ Nagstamon/QUI/__init__.py 2018-09-12 16:47:18.330913802 +0200 --- Nagstamon/QUI/__init__.py 2020-01-24 10:12:12.000000000 -0500
@@ -5279,7 +5279,7 @@ +++ 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) self.ui.button_choose_custom_cert_ca_file.clicked.connect(self.choose_custom_cert_ca_file)
# fill authentication combobox # fill authentication combobox
@ -9,28 +10,38 @@
# detect change of server type which leads to certain options shown or hidden # detect change of server type which leads to certain options shown or hidden
self.ui.input_combobox_type.activated.connect(self.toggle_type) self.ui.input_combobox_type.activated.connect(self.toggle_type)
--- Nagstamon/Servers/Generic.py,orug 2018-09-12 16:40:47.353735516 +0200 diff -ur Nagstamon.orig/Nagstamon/Servers/Generic.py Nagstamon/Nagstamon/Servers/Generic.py
+++ Nagstamon/Servers/Generic.py 2018-09-12 16:47:52.962752440 +0200 --- Nagstamon/Servers/Generic.py 2020-01-24 10:12:12.000000000 -0500
@@ -45,7 +45,6 @@ +++ Nagstamon/Servers/Generic.py 2020-10-08 00:21:28.460699656 -0400
from collections import OrderedDict @@ -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 # disable annoying SubjectAltNameWarning warnings
try: 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) self.session.auth = requests.auth.HTTPBasicAuth(self.username, self.password)
elif self.authentication == 'digest': elif self.authentication == 'digest':
self.session.auth = requests.auth.HTTPDigestAuth(self.username, self.password) self.session.auth = requests.auth.HTTPDigestAuth(self.username, self.password)
- elif self.authentication == 'kerberos': - elif self.authentication == 'kerberos':
- self.session.auth = requests_kerberos.HTTPKerberosAuth() - self.session.auth = HTTPSKerberos()
# default to check TLS validity # default to check TLS validity
if self.ignore_cert: if self.ignore_cert:
--- setup.py.orig 2018-09-12 16:40:47.363735470 +0200 diff -ur Nagstamon.orig/setup.py Nagstamon/setup.py
+++ setup.py 2018-09-12 16:48:02.146709650 +0200 --- setup.py 2020-10-08 00:18:37.532906083 -0400
@@ -85,7 +85,6 @@ +++ setup.py 2020-10-08 00:21:43.580681397 -0400
@@ -89,7 +89,6 @@
'python3-psutil ' 'python3-psutil '
'python3-qt5 ' 'python3-qt5 '
'python3-requests ' 'python3-requests '

17
srcpkgs/nagstamon/template
View File

@ -1,12 +1,11 @@
# Template file for 'nagstamon' # Template file for 'nagstamon'
pkgname=nagstamon pkgname=nagstamon
version=3.2.1 version=3.4.1
revision=2 revision=1
archs=noarch
wrksrc=Nagstamon wrksrc=Nagstamon
build_style=python3-module build_style=python3-module
pycompile_module="Nagstamon" pycompile_module="Nagstamon"
hostmakedepends="python3-setuptools python3-keyring" hostmakedepends="python3-setuptools python3-keyring python3-psutil"
depends="python3-BeautifulSoup4 python3-dbus python3-keyring python3-lxml 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"
short_desc="Nagios status monitor for the desktop" short_desc="Nagios status monitor for the desktop"
@ -14,12 +13,14 @@ maintainer="Laszlo Dvornik <laulicus@zoho.com>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://nagstamon.ifw-dresden.de" homepage="https://nagstamon.ifw-dresden.de"
distfiles="https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz" distfiles="https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"
checksum=a834460e78dc01f62171a83c4a11d890702264ed662863dff39edaf14ae98880 checksum=2d26cf4d64a6e27fe55f1c5e5f042af511bcb09876ae16a456aee5800a98adea
post_extract() { post_patch() {
# Gone in python 3.8, but these where the python 3.6 values. ;) # This relies on /etc/os-release, which doesn't exist without
vsed -i -e 's/platform.dist()/("","","")/g' setup.py # runit-void and doesn't provide the version expected
vsed -i setup.py -e 's/get_distro()/"void", "", "void"/'
} }
post_install() { post_install() {
chmod 644 ${DESTDIR}/usr/share/pixmaps/nagstamon.svg chmod 644 ${DESTDIR}/usr/share/pixmaps/nagstamon.svg
mv -v ${DESTDIR}/usr/bin/nagstamon.py ${DESTDIR}/usr/bin/nagstamon mv -v ${DESTDIR}/usr/bin/nagstamon.py ${DESTDIR}/usr/bin/nagstamon