From 53449939fc09958bedef349900009b0185970ae6 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Thu, 16 Nov 2017 11:48:38 +0100 Subject: [PATCH] Update to upstream release 0.3.7 and modules to 0.1.5 Resolves: #1492446 --- .gitignore | 2 + ...d-crash-at-SequenceOf-native-decoder.patch | 40 ------------------- python-pyasn1.spec | 12 +++--- sources | 4 +- 4 files changed, 11 insertions(+), 47 deletions(-) delete mode 100644 0001-Backport-fixed-crash-at-SequenceOf-native-decoder.patch diff --git a/.gitignore b/.gitignore index e4bf478..41d4ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ pyasn1-0.0.9a.tar.gz /v0.0.11.tar.gz /v0.3.4.tar.gz /v0.1.2.tar.gz +/v0.1.5.tar.gz +/v0.3.7.tar.gz diff --git a/0001-Backport-fixed-crash-at-SequenceOf-native-decoder.patch b/0001-Backport-fixed-crash-at-SequenceOf-native-decoder.patch deleted file mode 100644 index d3ac583..0000000 --- a/0001-Backport-fixed-crash-at-SequenceOf-native-decoder.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8f2d36aa772b5f83477ceecd0611532895773e0c Mon Sep 17 00:00:00 2001 -From: Rob Crittenden -Date: Fri, 15 Sep 2017 11:17:33 -0400 -Subject: [PATCH] Backport fixed crash at SequenceOf native decoder - -Upstream change 218acc52cd4574df07536e1bc81bc1eb7a410573 ---- ---- - CHANGES.rst | 1 + - pyasn1/codec/native/decoder.py | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CHANGES.rst b/CHANGES.rst -index dfdf3ce..9cf0f50 100644 ---- a/CHANGES.rst -+++ b/CHANGES.rst -@@ -8,6 +8,7 @@ Revision 0.3.4, released 07-09-2017 - - Fixed unnecessary duplicate tags detection at NamesType.tagMap - - Fixed crash at SEQUENCE and SEQUENCE OF CER encoder when running - in schemaless mode -+- Fixed crash at SequenceOf native decoder - - Fixed Character types instantiation from OctetString type -- double - unicode decoding may have scrambled the data - -diff --git a/pyasn1/codec/native/decoder.py b/pyasn1/codec/native/decoder.py -index 4c7df95..ccecb5c 100644 ---- a/pyasn1/codec/native/decoder.py -+++ b/pyasn1/codec/native/decoder.py -@@ -38,7 +38,7 @@ class SequenceOfOrSetOfDecoder(object): - asn1Value = asn1Spec.clone() - - for pyValue in pyObject: -- asn1Value.append(decoderFunc(pyValue, asn1Spec.componentType.asn1Object)) -+ asn1Value.append(decoderFunc(pyValue, asn1Spec.componentType)) - - return asn1Value - --- -2.9.5 - diff --git a/python-pyasn1.spec b/python-pyasn1.spec index 0086ea3..300f3f3 100644 --- a/python-pyasn1.spec +++ b/python-pyasn1.spec @@ -5,11 +5,11 @@ %endif %global module pyasn1 -%global modules_version 0.1.2 +%global modules_version 0.1.5 Name: python-pyasn1 -Version: 0.3.4 -Release: 2%{?dist} +Version: 0.3.7 +Release: 1%{?dist} Summary: ASN.1 tools for Python License: BSD Group: System Environment/Libraries @@ -19,7 +19,6 @@ URL: http://pyasn1.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools -Patch1: 0001-Backport-fixed-crash-at-SequenceOf-native-decoder.patch %if 0%{?with_python3} BuildRequires: python3-devel @@ -74,7 +73,6 @@ BuildRequires: python-sphinx %prep %setup -n %{module}-%{version} -q -b1 -%patch1 -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -168,6 +166,10 @@ rm -rf $RPM_BUILD_ROOT %doc doc/build/html/* %changelog +* Thu Nov 16 2017 Christian Heimes - 0.3.7-1 +- Update to upstream release 0.3.7 (#1492446) +- Update modules to 0.1.5 + * Fri Sep 29 2017 Troy Dawson - 0.3.4-2 - Cleanup spec file conditionals diff --git a/sources b/sources index faca8d7..51fe860 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v0.3.4.tar.gz) = f2e8082ef8a1868c1b9dff40b5d3cf576d7ff65472174bc11e8977c25c7012c9f3795117057ea6feae16cf9ecb28284771a049bddf29dc74b169d31f502a8b77 -SHA512 (v0.1.2.tar.gz) = cb35328ef6f0581c3272327dcdbd6b0cf2f98b7e04cd2f4e2e5fe7a22c5800d357055fdc5fa9395996276c6531823e8f89c95ac826f4afdb55b10fb2ff27e4b7 +SHA512 (v0.1.5.tar.gz) = 0d7f631fdbcb4c89ccf65b91c106483f536daadd099f5b3fb9b144bbcfcb0619bf818fa18715b8f61baf10699421a1af80f003781a5ebac28ebb4f4e7f677c1a +SHA512 (v0.3.7.tar.gz) = 0f35ca77361ee4913a280a32dfb6720244b2ae3e927620045a5f4879f2d50595e8dd5ec886b707ac76763887c178b0ab95b8a4b5184de83d7e98fe56b7b35c34