rpms/python-pyasn1
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream 0.0.12a

Browse Source 
Resolves: #663004
This commit is contained in:
Rob Crittenden 2010-12-22 16:17:36 -05:00
parent 26d3b1019d
commit 35af56fe9e
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
pyasn1-0.0.9a.tar.gz pyasn1-0.0.9a.tar.gz
/pyasn1-0.0.12a.tar.gz

31
pyasn1-any.patch
View File

@ -1,7 +1,7 @@
diff -uN --recursive pyasn1-0.0.9a/pyasn1/v1/codec/ber/decoder.py pyasn1-0.0.9a.any/pyasn1/v1/codec/ber/decoder.py diff -u --recursive pyasn1-0.0.12a/pyasn1/codec/ber/decoder.py pyasn1-0.0.12a.any/pyasn1/codec/ber/decoder.py
--- pyasn1-0.0.9a/pyasn1/v1/codec/ber/decoder.py 2008-11-23 06:45:14.000000000 -0500 --- pyasn1-0.0.12a/pyasn1/codec/ber/decoder.py 2010-11-19 12:43:25.000000000 -0500
+++ pyasn1-0.0.9a.any/pyasn1/v1/codec/ber/decoder.py 2009-11-16 15:36:38.000000000 -0500 +++ pyasn1-0.0.12a.any/pyasn1/codec/ber/decoder.py 2010-12-22 15:22:03.000000000 -0500
@@ -312,6 +312,29 @@ @@ -316,6 +316,29 @@
class UTCTimeDecoder(OctetStringDecoder): class UTCTimeDecoder(OctetStringDecoder):
protoComponent = useful.UTCTime() protoComponent = useful.UTCTime()
@ -31,7 +31,7 @@ diff -uN --recursive pyasn1-0.0.9a/pyasn1/v1/codec/ber/decoder.py pyasn1-0.0.9a.
codecMap = { codecMap = {
eoo.endOfOctets.tagSet: EndOfOctetsDecoder(), eoo.endOfOctets.tagSet: EndOfOctetsDecoder(),
univ.Integer.tagSet: IntegerDecoder(), univ.Integer.tagSet: IntegerDecoder(),
@@ -352,6 +375,7 @@ @@ -359,6 +382,7 @@
# Decode tag & length # Decode tag & length
while state != stStop: while state != stStop:
if state == stDecodeTag: if state == stDecodeTag:
@ -39,7 +39,7 @@ diff -uN --recursive pyasn1-0.0.9a/pyasn1/v1/codec/ber/decoder.py pyasn1-0.0.9a.
# Decode tag # Decode tag
if not substrate: if not substrate:
raise error.SubstrateUnderrunError( raise error.SubstrateUnderrunError(
@@ -415,6 +439,7 @@ @@ -422,6 +446,7 @@
raise error.SubstrateUnderrunError( raise error.SubstrateUnderrunError(
'%d-octet short' % (length - len(substrate)) '%d-octet short' % (length - len(substrate))
) )
@ -47,7 +47,7 @@ diff -uN --recursive pyasn1-0.0.9a/pyasn1/v1/codec/ber/decoder.py pyasn1-0.0.9a.
if state == stGetValueDecoder: if state == stGetValueDecoder:
if asn1Spec is None: if asn1Spec is None:
state = stGetValueDecoderByTag state = stGetValueDecoderByTag
@@ -457,7 +482,12 @@ @@ -464,7 +489,12 @@
__chosenSpec = asn1Spec __chosenSpec = asn1Spec
else: else:
__chosenSpec = None __chosenSpec = None
@ -61,10 +61,9 @@ diff -uN --recursive pyasn1-0.0.9a/pyasn1/v1/codec/ber/decoder.py pyasn1-0.0.9a.
__chosenSpec.getTypeMap().has_key(tagSet): __chosenSpec.getTypeMap().has_key(tagSet):
state = stTryAsExplicitTag state = stTryAsExplicitTag
else: else:
Binary files pyasn1-0.0.9a/pyasn1/v1/codec/ber/.decoder.py.swp and pyasn1-0.0.9a.any/pyasn1/v1/codec/ber/.decoder.py.swp differ diff -u --recursive pyasn1-0.0.12a/pyasn1/codec/ber/encoder.py pyasn1-0.0.12a.any/pyasn1/codec/ber/encoder.py
diff -uN --recursive pyasn1-0.0.9a/pyasn1/v1/codec/ber/encoder.py pyasn1-0.0.9a.any/pyasn1/v1/codec/ber/encoder.py --- pyasn1-0.0.12a/pyasn1/codec/ber/encoder.py 2010-11-19 12:43:25.000000000 -0500
--- pyasn1-0.0.9a/pyasn1/v1/codec/ber/encoder.py 2008-05-17 05:59:56.000000000 -0400 +++ pyasn1-0.0.12a.any/pyasn1/codec/ber/encoder.py 2010-12-22 15:22:03.000000000 -0500
+++ pyasn1-0.0.9a.any/pyasn1/v1/codec/ber/encoder.py 2009-11-16 15:36:38.000000000 -0500
@@ -194,6 +194,16 @@ @@ -194,6 +194,16 @@
) + substrate ) + substrate
return substrate, 1 return substrate, 1
@ -75,7 +74,7 @@ diff -uN --recursive pyasn1-0.0.9a/pyasn1/v1/codec/ber/encoder.py pyasn1-0.0.9a.
+ return chr(t[0]|t[1]|t[2]|tag.tagFormatConstructed) + return chr(t[0]|t[1]|t[2]|tag.tagFormatConstructed)
+ else: + else:
+ return chr(t[0]|t[1]|t[2]) + return chr(t[0]|t[1]|t[2])
+ def _encodeValue(self, encodeFun, value, defMode, maxChunkSize): + def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+ assert len(value._value) <= maxChunkSize + assert len(value._value) <= maxChunkSize
+ return str(value._value), 0 + return str(value._value), 0
+ +
@ -94,10 +93,10 @@ diff -uN --recursive pyasn1-0.0.9a/pyasn1/v1/codec/ber/encoder.py pyasn1-0.0.9a.
if not concreteEncoder: if not concreteEncoder:
# XXX # XXX
baseTagSet = tagSet.getBaseTag() baseTagSet = tagSet.getBaseTag()
diff -uN --recursive pyasn1-0.0.9a/pyasn1/v1/type/univ.py pyasn1-0.0.9a.any/pyasn1/v1/type/univ.py diff -u --recursive pyasn1-0.0.12a/pyasn1/type/univ.py pyasn1-0.0.12a.any/pyasn1/type/univ.py
--- pyasn1-0.0.9a/pyasn1/v1/type/univ.py 2008-11-23 06:45:35.000000000 -0500 --- pyasn1-0.0.12a/pyasn1/type/univ.py 2010-11-19 12:43:25.000000000 -0500
+++ pyasn1-0.0.9a.any/pyasn1/v1/type/univ.py 2009-11-16 15:36:38.000000000 -0500 +++ pyasn1-0.0.12a.any/pyasn1/type/univ.py 2010-12-22 15:22:03.000000000 -0500
@@ -629,5 +629,10 @@ @@ -639,5 +639,10 @@
def setDefaultComponents(self): pass def setDefaultComponents(self): pass

7
python-pyasn1.spec
View File

@ -3,8 +3,8 @@
%define module pyasn1 %define module pyasn1
Name: python-pyasn1 Name: python-pyasn1
Version: 0.0.9a Version: 0.0.12a
Release: 2%{?dist} Release: 1%{?dist}
Summary: ASN.1 tools for Python Summary: ASN.1 tools for Python
License: BSD License: BSD
Group: System Environment/Libraries Group: System Environment/Libraries
@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Dec 22 2010 Rob Crittenden <rcritten@redhat.com> - 0.0.12a-1
- Update to upstream version 0.0.12a
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.0.9a-2 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.0.9a-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild

2
sources
View File

@ -1 +1 @@
a6b26c57bae5484381cd558c15277c03 pyasn1-0.0.9a.tar.gz ab73da1ea0acf4a510b3f67f2d5a2b6f pyasn1-0.0.12a.tar.gz