Update to nagstamon-0.9.11.
This commit is contained in:
ajacoutot
parent
8c86ceb26e
commit
f0eb485ea9
@ -1,11 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.13 2013/07/08 09:10:37 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.14 2013/09/11 10:21:36 ajacoutot Exp $
|
||||
|
||||
COMMENT= nagios status monitor for the Desktop
|
||||
|
||||
MODPY_EGG_VERSION= 0.9.9
|
||||
DISTNAME= nagstamon_${MODPY_EGG_VERSION}
|
||||
PKGNAME= ${DISTNAME:S/_/-/}
|
||||
REVISION= 2
|
||||
MODPY_EGG_VERSION= 0.9.11
|
||||
DISTNAME= Nagstamon-${MODPY_EGG_VERSION}
|
||||
PKGNAME= ${DISTNAME:L}
|
||||
|
||||
CATEGORIES= x11 net
|
||||
|
||||
@ -28,8 +27,6 @@ RUN_DEPENDS= textproc/py-lxml \
|
||||
|
||||
NO_TEST= Yes
|
||||
|
||||
WRKDIST = ${WRKDIR}/Nagstamon
|
||||
|
||||
MODPY_ADJ_FILES=nagstamon.py \
|
||||
Nagstamon/Server/Multisite.py
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (nagstamon_0.9.9.tar.gz) = l78tVpS5hEMSEjY4Z5ql7DUoosLKnPlWegUN2yOeKEM=
|
||||
SIZE (nagstamon_0.9.9.tar.gz) = 387268
|
||||
SHA256 (Nagstamon-0.9.11.tar.gz) = DtQaxoYbvSLh3GmQR4eSyj3//hPiVaRKJSJCbSBMP4I=
|
||||
SIZE (Nagstamon-0.9.11.tar.gz) = 399329
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-Nagstamon_Actions_py,v 1.1 2013/07/08 09:10:38 ajacoutot Exp $
|
||||
|
||||
Fix a security issue in the update-checking mechanism (upstream).
|
||||
|
||||
--- Nagstamon/Actions.py.orig Tue Mar 27 15:05:22 2012
|
||||
+++ Nagstamon/Actions.py Mon Jul 8 11:06:26 2013
|
||||
@@ -402,8 +402,10 @@ class CheckForNewVersion(threading.Thread):
|
||||
if s.CheckingForNewVersion == False:
|
||||
# set the flag to lock that connection
|
||||
s.CheckingForNewVersion = True
|
||||
+ # use IFW server to speed up request and secure via https
|
||||
+ result = s.FetchURL("https://nagstamon.ifw-dresden.de/files-nagstamon/latest_version_" +\
|
||||
+ self.output.version, giveback="raw", no_auth=True)
|
||||
# remove newline
|
||||
- result = s.FetchURL("http://nagstamon.sourceforge.net/latest_version_" + self.output.version, giveback="raw")
|
||||
version, error = result.result.split("\n")[0], result.error
|
||||
|
||||
# debug
|
||||
@ -1,6 +1,6 @@
|
||||
--- Nagstamon/Config.py.orig Mon Feb 20 08:57:28 2012
|
||||
+++ Nagstamon/Config.py Fri Apr 13 17:30:52 2012
|
||||
@@ -584,15 +584,15 @@ class Config(object):
|
||||
--- Nagstamon/Config.py.orig Wed Sep 11 08:53:31 2013
|
||||
+++ Nagstamon/Config.py Wed Sep 11 12:13:34 2013
|
||||
@@ -603,15 +603,15 @@ class Config(object):
|
||||
else:
|
||||
# the Linux settings
|
||||
defaultactions = { "RDP": Action(name="RDP", description="Connect via RDP.",\
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-Nagstamon_GUI_py,v 1.1 2011/10/06 10:05:37 ajacoutot Exp $
|
||||
|
||||
Requires py-gnome-extras (from gnome2, not available).
|
||||
|
||||
--- Nagstamon/GUI.py.orig Thu Oct 6 08:28:51 2011
|
||||
+++ Nagstamon/GUI.py Thu Oct 6 08:29:21 2011
|
||||
@@ -17,7 +17,7 @@ import os
|
||||
import platform
|
||||
|
||||
# module egg.trayicon doesnt exists on Windows
|
||||
-if platform.system() != "Windows" and platform.system() != "Darwin":
|
||||
+if platform.system() != "Windows" and platform.system() != "Darwin" and platform.system() != "OpenBSD":
|
||||
try:
|
||||
import egg.trayicon
|
||||
except Exception, err:
|
||||
@ -1,39 +0,0 @@
|
||||
$OpenBSD: patch-Nagstamon_Server_Generic_py,v 1.1 2013/07/08 09:10:38 ajacoutot Exp $
|
||||
|
||||
Fix a security issue in the update-checking mechanism (upstream).
|
||||
|
||||
--- Nagstamon/Server/Generic.py.orig Tue Feb 14 11:21:14 2012
|
||||
+++ Nagstamon/Server/Generic.py Mon Jul 8 11:06:29 2013
|
||||
@@ -946,7 +946,7 @@ class GenericServer(object):
|
||||
return Result()
|
||||
|
||||
|
||||
- def FetchURL(self, url, giveback="obj", cgi_data=None):
|
||||
+ def FetchURL(self, url, giveback="obj", cgi_data=None, no_auth=False):
|
||||
"""
|
||||
get content of given url, cgi_data only used if present
|
||||
"obj" FetchURL gives back a dict full of miserable hosts/services,
|
||||
@@ -957,14 +957,21 @@ class GenericServer(object):
|
||||
"""
|
||||
|
||||
# run this method which checks itself if there is some action to take for initializing connection
|
||||
- self.init_HTTP()
|
||||
+ # if no_auth is true do not use Auth headers, used by Actions.CheckForNewVersion()
|
||||
+ if no_auth == False:
|
||||
+ self.init_HTTP()
|
||||
+ # to avoid race condition and credentials leak use local HTTPheaders
|
||||
+ HTTPheaders = self.HTTPheaders
|
||||
+ else:
|
||||
+ HTTPheaders = dict()
|
||||
+ HTTPheaders["raw"] = HTTPheaders["obj"] = HTTPheaders["obj"] = dict()
|
||||
|
||||
try:
|
||||
try:
|
||||
# debug
|
||||
if str(self.conf.debug_mode) == "True":
|
||||
self.Debug(server=self.get_name(), debug="FetchURL: " + url + " CGI Data: " + str(cgi_data))
|
||||
- request = urllib2.Request(url, cgi_data, self.HTTPheaders[giveback])
|
||||
+ request = urllib2.Request(url, cgi_data, HTTPheaders[giveback])
|
||||
# use opener - if cgi_data is not empty urllib uses a POST request
|
||||
urlcontent = self.urlopener.open(request)
|
||||
del url, cgi_data, request
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2012/04/13 15:40:00 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.5 2013/09/11 10:21:37 ajacoutot Exp $
|
||||
bin/nagstamon
|
||||
bin/nagstamon.py
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/
|
||||
@ -29,6 +29,8 @@ lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Ninja.py
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Ninja.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Opsview.py
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Opsview.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Thruk.py
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Thruk.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/__init__.py
|
||||
@ -46,6 +48,8 @@ lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/history.svg
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/hostdown.wav
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/hosts.png
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/hosts.svg
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/menu.png
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/menu.svg
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagios.png
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagios.svg
|
||||
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user