From 3a31aa093cfff4f617e6beaff777a6752db50ddf Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 23 Sep 2023 21:03:43 -0400 Subject: [PATCH] nagstamon: update to 3.12.0. --- .../nagstamon/patches/disable-kerberos.patch | 59 ++++++++++++------- srcpkgs/nagstamon/patches/os-release.patch | 14 +++++ srcpkgs/nagstamon/patches/version.patch | 24 -------- srcpkgs/nagstamon/template | 9 ++- 4 files changed, 55 insertions(+), 51 deletions(-) create mode 100644 srcpkgs/nagstamon/patches/os-release.patch delete mode 100644 srcpkgs/nagstamon/patches/version.patch diff --git a/srcpkgs/nagstamon/patches/disable-kerberos.patch b/srcpkgs/nagstamon/patches/disable-kerberos.patch index 5897ca59cc7..1de6131277a 100644 --- a/srcpkgs/nagstamon/patches/disable-kerberos.patch +++ b/srcpkgs/nagstamon/patches/disable-kerberos.patch @@ -1,6 +1,7 @@ ---- a/Nagstamon/QUI/__init__.py 2022-11-04 07:04:14.000000000 +0100 -+++ - 2023-02-16 15:17:33.465042825 +0100 -@@ -5701,7 +5701,7 @@ +diff -ur nagstamon-3.12.0.orig/Nagstamon/QUI/__init__.py nagstamon-3.12.0/Nagstamon/QUI/__init__.py +--- nagstamon-3.12.0.orig/Nagstamon/QUI/__init__.py 2023-09-29 15:12:51.789086546 -0400 ++++ nagstamon-3.12.0/Nagstamon/QUI/__init__.py 2023-09-29 15:13:18.415245901 -0400 +@@ -5822,7 +5822,7 @@ self.window.button_choose_custom_cert_ca_file.clicked.connect(self.choose_custom_cert_ca_file) # fill authentication combobox @@ -9,13 +10,14 @@ if ECP_AVAILABLE is True: self.window.input_combobox_authentication.addItems(['ECP']) ---- a/Nagstamon/Servers/Generic.py 2022-11-04 07:04:14.000000000 +0100 -+++ - 2023-02-16 15:18:28.346371050 +0100 -@@ -59,20 +59,6 @@ - OS_DARWIN, +diff -ur nagstamon-3.12.0.orig/Nagstamon/Servers/Generic.py nagstamon-3.12.0/Nagstamon/Servers/Generic.py +--- nagstamon-3.12.0.orig/Nagstamon/Servers/Generic.py 2023-09-29 15:12:51.790086552 -0400 ++++ nagstamon-3.12.0/Nagstamon/Servers/Generic.py 2023-09-29 15:13:58.372485063 -0400 +@@ -60,24 +60,6 @@ + OS_MACOS, RESOURCES) --if OS == OS_DARWIN: +-if OS == OS_MACOS: - # requests_gssapi is newer but not available everywhere - try: - # extra imports needed to get it compiled on macOS @@ -25,14 +27,18 @@ - 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 +- # requests_gssapi is newer but not available everywhere +- try: +- # requests_gssapi needs installation of KfW - Kerberos for Windows +- # requests_kerberoes doesn't +- from requests_kerberos import HTTPKerberosAuth as HTTPSKerberos +- except ImportError: +- from requests_gssapi import HTTPSPNEGOAuth as HTTPSKerberos - # disable annoying SubjectAltNameWarning warnings try: from requests.packages.urllib3.exceptions import SubjectAltNameWarning -@@ -303,8 +289,6 @@ +@@ -314,8 +296,6 @@ session.auth = requests.auth.HTTPDigestAuth(self.username, self.password) elif self.authentication == 'ecp' and ECP_AVAILABLE: session.auth = HTTPECPAuth(self.idp_ecp_endpoint, username=self.username, password=self.password) @@ -41,13 +47,22 @@ elif self.authentication == 'bearer': session.auth = BearerAuth(self.password) ---- a/setup.py 2022-11-04 07:04:14.000000000 +0100 -+++ - 2023-02-16 15:18:47.726901893 +0100 -@@ -98,7 +98,6 @@ - 'python3-pysocks ' - 'python3-qt5 ' - 'python3-requests ' -- 'python3-requests-kerberos ' - 'python3-SecretStorage ' - 'qt5-qtmultimedia ' - 'qt5-qtsvg ', +diff -ur nagstamon-3.12.0.orig/setup.py nagstamon-3.12.0/setup.py +--- nagstamon-3.12.0.orig/setup.py 2023-09-29 15:12:51.807086653 -0400 ++++ nagstamon-3.12.0/setup.py 2023-09-29 15:14:14.587582098 -0400 +@@ -99,7 +99,6 @@ + 'python3-pysocks ' + 'python3-qt5 ' + 'python3-requests ' +- 'python3-requests-kerberos ' + 'python3-SecretStorage ' + 'qt5-qtmultimedia ' + 'qt5-qtsvg ', +@@ -115,7 +114,6 @@ + 'python3-pysocks ' + 'python3-pyqt6 ' + 'python3-requests ' +- 'python3-requests-kerberos ' + 'python3-SecretStorage ' + 'qt6-qtmultimedia ' + 'qt6-qtsvg ', diff --git a/srcpkgs/nagstamon/patches/os-release.patch b/srcpkgs/nagstamon/patches/os-release.patch new file mode 100644 index 00000000000..0e6b8db4bb0 --- /dev/null +++ b/srcpkgs/nagstamon/patches/os-release.patch @@ -0,0 +1,14 @@ +--- a/Nagstamon/Helpers.py ++++ b/Nagstamon/Helpers.py +@@ -453,8 +453,9 @@ + os_release_dict = {} + for line in os_release_file.read_text().splitlines(): + if not line.startswith('#'): +- key, value = line.split('=', 1) +- os_release_dict[key] = value.strip('"').strip("'") ++ try: key, value = line.split('=', 1) ++ except ValueError: continue ++ else: os_release_dict[key] = value.strip('"').strip("'") + # Since CentOS Linux got retired by Red Hat, there are various RHEL derivatives/clones; flow is: + # CentOS Stream -> Red Hat Enterprise Linux -> (AlmaLinux, EuroLinux, Oracle Linux, Rocky Linux) + # Goal of this hack is to rule them all as Red Hat Enterprise Linux, the baseline distribution. diff --git a/srcpkgs/nagstamon/patches/version.patch b/srcpkgs/nagstamon/patches/version.patch deleted file mode 100644 index be2ef320217..00000000000 --- a/srcpkgs/nagstamon/patches/version.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 diff --git a/srcpkgs/nagstamon/template b/srcpkgs/nagstamon/template index 53e6142284c..cf01ade2777 100644 --- a/srcpkgs/nagstamon/template +++ b/srcpkgs/nagstamon/template @@ -1,20 +1,19 @@ # Template file for 'nagstamon' pkgname=nagstamon -version=3.10.1 +version=3.12.0 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-pyqt6-multimedia python3-pyqt6-svg python3-requests python3-dateutil" +checkdepends="python3-pytest pylint $depends" short_desc="Nagios status monitor for the desktop" maintainer="Laszlo Dvornik " license="GPL-2.0-or-later" homepage="https://nagstamon.de" distfiles="https://github.com/HenriWahl/Nagstamon/archive/v${version}.tar.gz" -checksum=2de11f91bf5f9de96d9a1232360129349aa5b4483a668125b38ce3837346742f -# Tarball includes no tests -make_check=no +checksum=3b62713d110bf1b3286627eb61e3305e10320b9ddf1c951f5e717177aa0a3b81 post_install() { chmod 644 ${DESTDIR}/usr/share/pixmaps/nagstamon.svg