r814 - in zenoss/trunk/debian: . patches

Wed Apr 18 09:54:45 UTC 2007

Author: bzed-guest
Date: 2007-04-18 09:54:44 +0000 (Wed, 18 Apr 2007)
New Revision: 814

Added:
   zenoss/trunk/debian/patches/pysnmp-v3-for-Products.dpatch
   zenoss/trunk/debian/zenoss.dzinstance
Modified:
   zenoss/trunk/debian/control
   zenoss/trunk/debian/patches/00list
   zenoss/trunk/debian/rules
Log:
- pysnmp v3 for zenoss patch
- several other changes


Modified: zenoss/trunk/debian/control
===================================================================

--- zenoss/trunk/debian/control	2007-04-18 00:19:48 UTC (rev 813)
+++ zenoss/trunk/debian/control	2007-04-18 09:54:44 UTC (rev 814)
@@ -21,7 +21,7 @@
  zope-cmfcore1.6, zope-genericsetup, zope-pas, zope-pluginregistry,
  libart-2.0-2 (>= 2.3.17), libfreetype6 (>= 2.1.9), libsmi2,
  rrdtool (>= 1.2.15)
-Recommends: mysql-server-5.0 (>= 5.0.22), sendpage-client, klogd, zenoss-plugins
+Recommends: mysql-server-5.0 (>= 5.0.22), sendpage-server, klogd, zenoss-plugins
 Description: infrastucture monitoring and managment system
  Zenoss is an integrated system to monitor and manage your
  IT infrastructure. It has the following features:

Modified: zenoss/trunk/debian/patches/00list
===================================================================
--- zenoss/trunk/debian/patches/00list	2007-04-18 00:19:48 UTC (rev 813)
+++ zenoss/trunk/debian/patches/00list	2007-04-18 09:54:44 UTC (rev 814)
@@ -1,3 +1,4 @@
-pdis-distutils.dpatch
-testgen-distutils.dpatch
-zenplugins-distutils.dpatch
+pdis-distutils
+testgen-distutils
+zenplugins-distutils
+pysnmp-v3-for-Products

Added: zenoss/trunk/debian/patches/pysnmp-v3-for-Products.dpatch
===================================================================
--- zenoss/trunk/debian/patches/pysnmp-v3-for-Products.dpatch	2007-04-18 00:19:48 UTC (rev 813)
+++ zenoss/trunk/debian/patches/pysnmp-v3-for-Products.dpatch	2007-04-18 09:54:44 UTC (rev 814)
@@ -0,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pysnmp-v3-for-Products.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: make sure we use the same pysnmp version as twisted-snmp
+## DP: twisted-snmp and zenoss both require v3, which is provided
+## DP: by Debian's python-pysnmp-se package.
+
+ at DPATCH@
+diff -urNad trunk~/Products/DataCollector/zenmodeler.py trunk/Products/DataCollector/zenmodeler.py
+--- trunk~/Products/DataCollector/zenmodeler.py	2007-04-12 23:11:33.000000000 +0200
++++ trunk/Products/DataCollector/zenmodeler.py	2007-04-18 11:44:34.000000000 +0200
+@@ -15,6 +15,11 @@
+ import transaction
+ import DateTime
+ from twisted.internet import reactor
++
++#Debian provides several versions of pysnmp,
++#make sure we use the right one
++os.environ['PYSNMP_API_VERSION'] = 'v3'
++
+ from pysnmp.error import PySnmpError
+ 
+ from Products.ZenUtils.ZCmdBase import ZCmdBase
+diff -urNad trunk~/Products/SnmpCollector/SnmpCollector.py trunk/Products/SnmpCollector/SnmpCollector.py
+--- trunk~/Products/SnmpCollector/SnmpCollector.py	2007-04-12 23:11:34.000000000 +0200
++++ trunk/Products/SnmpCollector/SnmpCollector.py	2007-04-18 11:44:01.000000000 +0200
+@@ -31,6 +31,10 @@
+ from Products.ZenUtils.Exceptions import ZentinelException
+ from Products.ZenModel.Exceptions import *
+ 
++#Debian provides several versions of pysnmp,
++#make sure we use the right one
++os.environ['PYSNMP_API_VERSION'] = 'v3'
++
+ from SnmpSession import SnmpSession, ZenSnmpError
+ from pysnmp.error import PySnmpError
+ 
+diff -urNad trunk~/Products/SnmpCollector/SnmpSession.py trunk/Products/SnmpCollector/SnmpSession.py
+--- trunk~/Products/SnmpCollector/SnmpSession.py	2007-04-12 23:11:34.000000000 +0200
++++ trunk/Products/SnmpCollector/SnmpSession.py	2007-04-18 11:43:20.000000000 +0200
+@@ -16,6 +16,10 @@
+ from struct import unpack
+ import Globals
+ 
++#Debian provides several versions of pysnmp,
++#make sure we use the right one
++os.environ['PYSNMP_API_VERSION'] = 'v3'
++
+ from pysnmp.compat.pysnmp2x import asn1, v1
+ from pysnmp.proto import v2c
+ from pysnmp.mapping.udp import role
+diff -urNad trunk~/Products/ZenModel/ZenossInfo.py trunk/Products/ZenModel/ZenossInfo.py
+--- trunk~/Products/ZenModel/ZenossInfo.py	2007-04-12 23:11:37.000000000 +0200
++++ trunk/Products/ZenModel/ZenossInfo.py	2007-04-18 11:42:40.000000000 +0200
+@@ -178,6 +178,9 @@
+             v = Version(*getpySNMPVersion())
+             v.full()
+         """
++        #Debian provides several versions of pysnmp,
++        #make sure we use the right one
++        os.environ['PYSNMP_API_VERSION'] = 'v3'
+         from pysnmp.version import getVersion
+         return Version('PySNMP', *getVersion())
+ 
+diff -urNad trunk~/Products/ZenRRD/tests/badPackets.py trunk/Products/ZenRRD/tests/badPackets.py
+--- trunk~/Products/ZenRRD/tests/badPackets.py	2007-04-12 23:11:34.000000000 +0200
++++ trunk/Products/ZenRRD/tests/badPackets.py	2007-04-18 11:46:14.000000000 +0200
+@@ -2,6 +2,11 @@
+ sys.path.insert(0, '/home/ecn/work/zenoss/home/lib/python')
+ # sys.path.insert(0, '/home/ecn/work/zenoss/inst/build/pysnmp-3.4.3')
+ #from pysnmp.proto.v1 import Response
++
++#Debian provides several versions of pysnmp,
++#make sure we use the right one
++os.environ['PYSNMP_API_VERSION'] = 'v3'
++
+ from pysnmp.proto.v2c import Response
+ 
+ msg='05\x02\x01\x00\x04\x06public\xa2(\x02\x02\x03\x11\x02\x01\x00\x02\x01\x000\x1c0\x1a\x06\x0e+\x06\x01\x02\x01\x07\x05\x01\x01\x00\x00\x00\x00D@\x08\x00\x00\x00\x00\x00\x00\x00\x00'


Property changes on: zenoss/trunk/debian/patches/pysnmp-v3-for-Products.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: zenoss/trunk/debian/rules
===================================================================
--- zenoss/trunk/debian/rules	2007-04-18 00:19:48 UTC (rev 813)
+++ zenoss/trunk/debian/rules	2007-04-18 09:54:44 UTC (rev 814)
@@ -67,8 +67,9 @@
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
-	dh_pysupport -pzenoss-plugins
-	dh_installzope 
+	dh_pysupport
+	dh_installzope
+	dh_installzopeinstance -pzenoss zenoss
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
@@ -91,6 +92,7 @@
 # 
 #
 update-dzhandles:
+	set -e ;\
 	find Products/ -mindepth 1 -maxdepth 1 -type d | \
 		grep -v \.svn | \
 		sed 's,Products/,,g' | \
@@ -108,6 +110,7 @@
 # get-orig-source will drop the orig.tar.gz in
 # ../tarballs, if the directory exists
 get-orig-source:
+	set -e ;\
 	if test -d ../tarballs; then \
 		packbase="../tarballs" ;\
 	else	packbase="." ;\

Added: zenoss/trunk/debian/zenoss.dzinstance
===================================================================
--- zenoss/trunk/debian/zenoss.dzinstance	2007-04-18 00:19:48 UTC (rev 813)
+++ zenoss/trunk/debian/zenoss.dzinstance	2007-04-18 09:54:44 UTC (rev 814)
@@ -0,0 +1,7 @@
+Package: zenoss
+ZopeVersion: 2.9
+Name: zenoss
+Addon-Mode: manual
+Addon-Technique: tree-linked
+Restart-Policy: end
+Products: ZenModel SnmpCollector SiteScopeParser DataCollector ZenRelations ZenRRD ZenEvents ZenStatus ZenTestCase ZenReports ZenWidgets ZenTestRunner ZenUITests ZenUtils


