[Python-modules-commits] r2179 - in
/packages/pysnmp-se/trunk/debian: ./ patches/
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Thu Apr 26 13:33:24 UTC 2007
Author: zack
Date: Thu Apr 26 13:33:22 2007
New Revision: 2179
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2179
Log:
added patches from zenoss
Added:
packages/pysnmp-se/trunk/debian/patches/
packages/pysnmp-se/trunk/debian/patches/00dpatch.conf
packages/pysnmp-se/trunk/debian/patches/00list
packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch02.dpatch (with props)
packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch03.dpatch (with props)
packages/pysnmp-se/trunk/debian/patches/HP_malformed_package-zenoss_patch04.dpatch (with props)
packages/pysnmp-se/trunk/debian/patches/unsigned_integers-zenoss_patch01.dpatch (with props)
Modified:
packages/pysnmp-se/trunk/debian/changelog
packages/pysnmp-se/trunk/debian/control
packages/pysnmp-se/trunk/debian/rules
Modified: packages/pysnmp-se/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/pysnmp-se/trunk/debian/changelog?rev=2179&op=diff
==============================================================================
--- packages/pysnmp-se/trunk/debian/changelog (original)
+++ packages/pysnmp-se/trunk/debian/changelog Thu Apr 26 13:33:22 2007
@@ -1,3 +1,18 @@
+pysnmp-se (3.5.2-3) unstable; urgency=low
+
+ * debian/control
+ - added build-depends-indep on python-pysnmp-common
+ - added build-dep on dpatch
+ * debian/rules
+ - added dpatch CDBS rules file
+ * debian/patches/*
+ - added 4 patches from Zenoss which fixes various issues pysnmp series
+ 3.x: unsigned_integers-zenoss_patch01, 64_bit_IPs-zenoss_patch02,
+ 64_bit_IPs-zenoss_patch03, HP_malformed_package-zenoss_patch04
+ (Closes: #420964)
+
+ -- Stefano Zacchiroli <zack at debian.org> Thu, 26 Apr 2007 15:28:24 +0200
+
pysnmp-se (3.5.2-2) unstable; urgency=low
* Uploading to unstable.
Modified: packages/pysnmp-se/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/pysnmp-se/trunk/debian/control?rev=2179&op=diff
==============================================================================
--- packages/pysnmp-se/trunk/debian/control (original)
+++ packages/pysnmp-se/trunk/debian/control Thu Apr 26 13:33:22 2007
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python, python-support (>= 0.4)
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), dpatch, python, python-support (>= 0.4)
+Build-Depends-Indep: python-pysnmp-common
XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/pysnmp-se/trunk/
XS-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/trunk/packages/pysnmp-se/trunk/
Standards-Version: 3.7.2
Added: packages/pysnmp-se/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/python-modules/packages/pysnmp-se/trunk/debian/patches/00dpatch.conf?rev=2179&op=file
==============================================================================
--- packages/pysnmp-se/trunk/debian/patches/00dpatch.conf (added)
+++ packages/pysnmp-se/trunk/debian/patches/00dpatch.conf Thu Apr 26 13:33:22 2007
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs
Added: packages/pysnmp-se/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/pysnmp-se/trunk/debian/patches/00list?rev=2179&op=file
==============================================================================
--- packages/pysnmp-se/trunk/debian/patches/00list (added)
+++ packages/pysnmp-se/trunk/debian/patches/00list Thu Apr 26 13:33:22 2007
@@ -1,0 +1,4 @@
+unsigned_integers-zenoss_patch01.dpatch
+64_bit_IPs-zenoss_patch02.dpatch
+64_bit_IPs-zenoss_patch03.dpatch
+HP_malformed_package-zenoss_patch04.dpatch
Added: packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch02.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch02.dpatch?rev=2179&op=file
==============================================================================
--- packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch02.dpatch (added)
+++ packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch02.dpatch Thu Apr 26 13:33:22 2007
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 64_bit_IPs-zenoss_patch02.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: handle clients that accidentally give us 64 bit IP addresses
+## DP: See http://dev.zenoss.org/trac/browser/trunk/inst/externallibs/pysnmp-3.4.3.patch02
+
+ at DPATCH@
+diff -urNad trunk~/pysnmp/proto/rfc1155.py trunk/pysnmp/proto/rfc1155.py
+--- trunk~/pysnmp/proto/rfc1155.py 2007-04-26 13:52:14.000000000 +0200
++++ trunk/pysnmp/proto/rfc1155.py 2007-04-26 13:52:18.000000000 +0200
+@@ -92,6 +92,11 @@
+ return '%d.%d.%d.%d' % (ord(value[0]), ord(value[1]), \
+ ord(value[2]), ord(value[3]))
+
++class Bug(IpAddress):
++ sizeConstraint = (4, 8)
++ def _oconv(self, value):
++ return IpAddress._oconv(self, value[:-4])
++
+ class Counter(Unsigned):
+ """SNMP Counter object
+ """
+@@ -156,8 +161,8 @@
+ class NetworkAddress(Choice):
+ """SMI NetworkAddress
+ """
+- choiceNames = [ 'internet' ]
+- choiceComponents = [ IpAddress ]
++ choiceNames = [ 'internet', 'bug' ]
++ choiceComponents = [ IpAddress, Bug ]
+
+ # Initialize to Internet address
+ initialComponent = choiceComponents[0]
+@@ -178,7 +183,7 @@
+ """Constructed objects
+ """
+ choiceNames = [ 'address', 'counter', 'gauge', 'ticks', 'arbitrary' ]
+- choiceComponents = [ NetworkAddress, Counter, Gauge, TimeTicks, Opaque ]
++ choiceComponents = [ NetworkAddress, Counter, Gauge, TimeTicks, Opaque]
+
+ class ObjectSyntax(Choice):
+ """Syntax of objects in MIB
Propchange: packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch02.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch03.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch03.dpatch?rev=2179&op=file
==============================================================================
--- packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch03.dpatch (added)
+++ packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch03.dpatch Thu Apr 26 13:33:22 2007
@@ -1,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 64_bit_IPs-zenoss_patch03.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: another workaround for a 64-bit issue
+## DP: See http://dev.zenoss.org/trac/browser/trunk/inst/externallibs/pysnmp-3.4.3.patch03
+
+ at DPATCH@
+diff -urNad trunk~/pysnmp/proto/rfc1155.py trunk/pysnmp/proto/rfc1155.py
+--- trunk~/pysnmp/proto/rfc1155.py 2007-04-26 13:55:01.000000000 +0200
++++ trunk/pysnmp/proto/rfc1155.py 2007-04-26 13:55:07.000000000 +0200
+@@ -111,6 +111,13 @@
+
+
+
++class BigCounter(Unsigned):
++ """SNMP Counter object
++ """
++ # Implicit tagging
++ tagClass = tagClasses['APPLICATION']
++ tagId = 0x01
++
+ class Gauge(Unsigned):
+ """SNMP Gauge object
+ """
+@@ -182,8 +189,8 @@
+ class ApplicationSyntax(Choice):
+ """Constructed objects
+ """
+- choiceNames = [ 'address', 'counter', 'gauge', 'ticks', 'arbitrary' ]
+- choiceComponents = [ NetworkAddress, Counter, Gauge, TimeTicks, Opaque]
++ choiceNames = [ 'address', 'counter', 'gauge', 'ticks', 'arbitrary', 'bug' ]
++ choiceComponents = [ NetworkAddress, Counter, Gauge, TimeTicks, Opaque, BigCounter]
+
+ class ObjectSyntax(Choice):
+ """Syntax of objects in MIB
Propchange: packages/pysnmp-se/trunk/debian/patches/64_bit_IPs-zenoss_patch03.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/pysnmp-se/trunk/debian/patches/HP_malformed_package-zenoss_patch04.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/pysnmp-se/trunk/debian/patches/HP_malformed_package-zenoss_patch04.dpatch?rev=2179&op=file
==============================================================================
--- packages/pysnmp-se/trunk/debian/patches/HP_malformed_package-zenoss_patch04.dpatch (added)
+++ packages/pysnmp-se/trunk/debian/patches/HP_malformed_package-zenoss_patch04.dpatch Thu Apr 26 13:33:22 2007
@@ -1,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## HP_malformed_package-zenoss_patch04.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: work-around yet-another-none-compliant packet, brough to you by an HP
+## DP: LaserJet 3055.
+## DP: See http://dev.zenoss.org/trac/browser/trunk/inst/externallibs/pysnmp-3.4.3.patch04
+
+ at DPATCH@
+diff -urNad trunk~/pysnmp/proto/rfc1155.py trunk/pysnmp/proto/rfc1155.py
+--- trunk~/pysnmp/proto/rfc1155.py 2007-04-26 13:57:44.000000000 +0200
++++ trunk/pysnmp/proto/rfc1155.py 2007-04-26 13:57:48.000000000 +0200
+@@ -118,6 +118,15 @@
+ tagClass = tagClasses['APPLICATION']
+ tagId = 0x01
+
++class BigCounter2(Counter):
++ """SMI Counter64 object
++ """
++ # Implicit tagging
++ tagId = 0x06
++
++ # Subtyping -- value range constraint
++ valueRangeConstraint = (0, 18446744073709551615L)
++
+ class Gauge(Unsigned):
+ """SNMP Gauge object
+ """
+@@ -189,8 +198,8 @@
+ class ApplicationSyntax(Choice):
+ """Constructed objects
+ """
+- choiceNames = [ 'address', 'counter', 'gauge', 'ticks', 'arbitrary', 'bug' ]
+- choiceComponents = [ NetworkAddress, Counter, Gauge, TimeTicks, Opaque, BigCounter]
++ choiceNames = [ 'address', 'counter', 'gauge', 'ticks', 'arbitrary', 'bug', 'bug2' ]
++ choiceComponents = [ NetworkAddress, Counter, Gauge, TimeTicks, Opaque, BigCounter, BigCounter2]
+
+ class ObjectSyntax(Choice):
+ """Syntax of objects in MIB
Propchange: packages/pysnmp-se/trunk/debian/patches/HP_malformed_package-zenoss_patch04.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/pysnmp-se/trunk/debian/patches/unsigned_integers-zenoss_patch01.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/pysnmp-se/trunk/debian/patches/unsigned_integers-zenoss_patch01.dpatch?rev=2179&op=file
==============================================================================
--- packages/pysnmp-se/trunk/debian/patches/unsigned_integers-zenoss_patch01.dpatch (added)
+++ packages/pysnmp-se/trunk/debian/patches/unsigned_integers-zenoss_patch01.dpatch Thu Apr 26 13:33:22 2007
@@ -1,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## unsigned-integers_by-zenoss.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Added the unsigned data type, since many integer values are actually
+## DP: unsigned quantities.
+## DP: See http://dev.zenoss.org/trac/browser/trunk/inst/externallibs/pysnmp-3.4.3.patch01
+
+ at DPATCH@
+diff -urNad trunk~/pysnmp/proto/rfc1155.py trunk/pysnmp/proto/rfc1155.py
+--- trunk~/pysnmp/proto/rfc1155.py 2005-03-05 01:05:12.000000000 +0100
++++ trunk/pysnmp/proto/rfc1155.py 2007-04-26 13:41:08.000000000 +0200
+@@ -40,6 +40,12 @@
+ """
+ pass
+
++class Unsigned(univ.Integer):
++
++ def _berDecode(self, input):
++ # always unsigned
++ return univ.Integer._berDecode(self, '\0' + input)
++
+ # ApplicationSyntax
+
+ class IpAddress(univ.OctetString):
+@@ -86,7 +92,7 @@
+ return '%d.%d.%d.%d' % (ord(value[0]), ord(value[1]), \
+ ord(value[2]), ord(value[3]))
+
+-class Counter(univ.Integer):
++class Counter(Unsigned):
+ """SNMP Counter object
+ """
+ # Implicit tagging
+@@ -100,7 +106,7 @@
+
+
+
+-class Gauge(univ.Integer):
++class Gauge(Unsigned):
+ """SNMP Gauge object
+ """
+ # Implicit tagging
+@@ -112,7 +118,7 @@
+ constraints.ValueRangeConstraint(0, 4294967295L),
+ )
+
+-class TimeTicks(univ.Integer):
++class TimeTicks(Unsigned):
+ """SNMP TIMETICKS object
+ """
+ # Implicit tagging
Propchange: packages/pysnmp-se/trunk/debian/patches/unsigned_integers-zenoss_patch01.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/pysnmp-se/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pysnmp-se/trunk/debian/rules?rev=2179&op=diff
==============================================================================
--- packages/pysnmp-se/trunk/debian/rules (original)
+++ packages/pysnmp-se/trunk/debian/rules Thu Apr 26 13:33:22 2007
@@ -2,6 +2,7 @@
DEB_PYTHON_SYSTEM = pysupport
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
PKG = python-pysnmp-se
PKGDIR = debian/$(PKG)
LIBDIR = $(PKGDIR)/usr/share/python-support/$(PKG)
More information about the Python-modules-commits
mailing list