69 lines
3.5 KiB
Diff
69 lines
3.5 KiB
Diff
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
|
|
- self.window.input_combobox_authentication.addItems(['Basic', 'Digest', 'Kerberos', 'Bearer'])
|
|
+ self.window.input_combobox_authentication.addItems(['Basic', 'Digest', 'Bearer'])
|
|
if ECP_AVAILABLE is True:
|
|
self.window.input_combobox_authentication.addItems(['ECP'])
|
|
|
|
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_MACOS:
|
|
- # 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
|
|
-else:
|
|
- # 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
|
|
@@ -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)
|
|
- elif self.authentication == 'kerberos':
|
|
- session.auth = HTTPSKerberos()
|
|
elif self.authentication == 'bearer':
|
|
session.auth = BearerAuth(self.password)
|
|
|
|
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 ',
|