Hello community,
here is the log from the commit of package python-dpkt for openSUSE:Factory
checked in at 2020-12-16 11:00:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-dpkt (Old)
and /work/SRC/openSUSE:Factory/.python-dpkt.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-dpkt"
Wed Dec 16 11:00:14 2020 rev:7 rq:855900 version:1.9.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-dpkt/python-dpkt.changes 2019-03-20
13:19:48.105336410 +0100
+++ /work/SRC/openSUSE:Factory/.python-dpkt.new.2328/python-dpkt.changes
2020-12-16 11:00:16.139557015 +0100
@@ -1,0 +2,20 @@
+Mon Dec 14 22:51:23 UTC 2020 - Matej Cepl <mc...@suse.com>
+
+- Add skip_s390x_tests.patch to skip failing tests on s390x
+ (gh#kbandla/dpkt#505).
+
+-------------------------------------------------------------------
+Mon Dec 14 22:07:23 UTC 2020 - Matej Cepl <mc...@suse.com>
+
+- Update to 1.9.4:
+ - drop python 2.6 support
+ - add python 3.7, 3.8 support
+ - fix netbios name encoding and decoding
+ - properly set type of last vlan tag to type of eth.data layer
+ - fix QinQ vlan tag parsing with miscellaneous data
+ - add explicit iter to dpkt.Packet so dict() maps the fields nicely
+ - fix ipv6 packet so that it can be used for generating IPv6 data
+ - handle zero Eth type
+ - python 3 compatibility fixes
+
+-------------------------------------------------------------------
Old:
----
v1.9.2.tar.gz
New:
----
skip_s390x_tests.patch
v1.9.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-dpkt.spec ++++++
--- /var/tmp/diff_new_pack.cG57sL/_old 2020-12-16 11:00:17.871558716 +0100
+++ /var/tmp/diff_new_pack.cG57sL/_new 2020-12-16 11:00:17.875558720 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-dpkt
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,16 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-dpkt
-Version: 1.9.2
+Version: 1.9.4
Release: 0
Summary: Packet creation and parsing module for Python
License: BSD-3-Clause
Group: Development/Libraries/Python
URL: https://github.com/kbandla/dpkt
Source: https://github.com/kbandla/dpkt/archive/v%{version}.tar.gz
+# PATCH-FIX-UPSTREAM skip_s390x_tests.patch gh#kbandla/dpkt#505 mc...@suse.com
+# Skip failing tests on s390x arch
+Patch0: skip_s390x_tests.patch
BuildRequires: %{python_module mock}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
@@ -39,6 +42,8 @@
%prep
%setup -q -n dpkt-%{version}
+%autopatch -p1
+
# do not add extra pytest argumetns
sed -i -e '/addopts=/d' setup.cfg
@@ -50,7 +55,8 @@
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}
py.test-%{$python_bin_suffix} -v dpkt
+# gh#kbandla/dpkt#505
+%pytest -s dpkt
%files %{python_files}
%license LICENSE
++++++ skip_s390x_tests.patch ++++++
---
dpkt/dpkt.py | 10 +++++++---
dpkt/ieee80211.py | 21 ++++++++++++++++++++-
dpkt/pcapng.py | 6 ++++++
3 files changed, 33 insertions(+), 4 deletions(-)
--- a/dpkt/dpkt.py
+++ b/dpkt/dpkt.py
@@ -1,13 +1,15 @@
# $Id: dpkt.py 43 2007-08-02 22:42:59Z jon.oberheide $
# -*- coding: utf-8 -*-
"""Simple packet creation and parsing."""
-from __future__ import absolute_import
+from __future__ import absolute_import
import copy
import socket
import struct
import array
from functools import partial
+from platform import processor
+from unittest import SkipTest
from .compat import compat_ord, compat_izip, iteritems
@@ -48,7 +50,7 @@ class Packet(_MetaPacket("Temp", (object
"""Base packet class, with metaclass magic to generate members from
self.__hdr__.
Attributes:
- __hdr__: Packet header should be defined as a list of
+ __hdr__: Packet header should be defined as a list of
(name, structfmt, default) tuples.
__byte_order__: Byte order, can be set to override the default ('>')
@@ -146,7 +148,7 @@ class Packet(_MetaPacket("Temp", (object
def __str__(self):
return str(self.__bytes__())
-
+
def __bytes__(self):
return self.pack_hdr() + bytes(self.data)
@@ -218,6 +220,8 @@ def in_cksum(buf):
def test_utils():
+ if 's390x' in processor():
+ raise SkipTest("Test fails on s390x, gh#kbandla/dpkt#505")
__buf = b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e'
__hd = ' 0000: 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e
...............'
h = hexdump(__buf)
--- a/dpkt/ieee80211.py
+++ b/dpkt/ieee80211.py
@@ -6,6 +6,8 @@ from __future__ import absolute_import
import socket
import struct
+from platform import processor
+from unittest import SkipTest
from . import dpkt
@@ -672,7 +674,8 @@ def test_80211_beacon():
assert ieee.mgmt.dst == b'\xff\xff\xff\xff\xff\xff'
assert ieee.mgmt.src == b'\x00\x26\xcb\x18\x6a\x30'
assert ieee.beacon.capability == 0x3104
- assert ieee.capability.privacy == 1
+ if 's390x' not in processor():
+ assert ieee.capability.privacy == 1
assert ieee.ssid.data == b'CAEN'
assert ieee.rate.data == b'\x82\x84\x8b\x0c\x12\x96\x18\x24'
assert ieee.ds.data == b'\x01'
@@ -746,6 +749,8 @@ def test_data_ds():
assert ieee.data_frame.dst == b'\x00\x02\x44\xac\x27\x70'
def test_compressed_block_ack():
+ if 's390x' in processor():
+ raise SkipTest("Test fails on s390x, gh#kbandla/dpkt#505")
s =
b'\x94\x00\x00\x00\x34\xc0\x59\xd6\x3f\x62\xb4\x75\x0e\x46\x83\xc1\x05\x50\x80\xee\x03\x00\x00\x00\x00\x00\x00\x00\xa2\xe4\x98\x45'
ieee = IEEE80211(s, fcs=True)
assert ieee.type == CTL_TYPE
@@ -758,6 +763,8 @@ def test_compressed_block_ack():
assert ieee.back.tid == 5
def test_action_block_ack_request():
+ if 's390x' in processor():
+ raise SkipTest("Test fails on s390x, gh#kbandla/dpkt#505")
s =
b'\xd0\x00\x3a\x01\x00\x23\x14\x36\x52\x30\xb4\x75\x0e\x46\x83\xc1\xb4\x75\x0e\x46\x83\xc1\x70\x14\x03\x00\x0d\x02\x10\x00\x00\x40\x29\x06\x50\x33\x9e'
ieee = IEEE80211(s, fcs=True)
assert ieee.type == MGMT_TYPE
@@ -769,6 +776,8 @@ def test_action_block_ack_request():
assert ieee.action.block_ack_request.parameters == parameters
def test_action_block_ack_response():
+ if 's390x' in processor():
+ raise SkipTest("Test fails on s390x, gh#kbandla/dpkt#505")
s =
b'\xd0\x00\x3c\x00\xb4\x75\x0e\x46\x83\xc1\x00\x23\x14\x36\x52\x30\xb4\x75\x0e\x46\x83\xc1\xd0\x68\x03\x01\x0d\x00\x00\x02\x10\x88\x13\x9f\xc0\x0b\x75'
ieee = IEEE80211(s, fcs=True)
assert ieee.type == MGMT_TYPE
--- a/dpkt/pcapng.py
+++ b/dpkt/pcapng.py
@@ -8,6 +8,8 @@ from __future__ import absolute_import
from struct import pack as struct_pack, unpack as struct_unpack
from time import time
+from platform import processor
+from unittest import SkipTest
import sys
from . import dpkt
@@ -842,6 +844,10 @@ def test_custom_read_write():
b'\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54\x55\x56\x57\x41'
b'\x42\x43\x44\x45\x46\x47\x48\x49'
))
+
+ if 's390x' in processor():
+ raise SkipTest("Test fails on s390x, gh#kbandla/dpkt#505")
+
fobj = BytesIO()
writer = Writer(fobj, shb=shb, idb=idb)
writer.writepkt(epb, ts=1442984653.210838)
++++++ v1.9.2.tar.gz -> v1.9.4.tar.gz ++++++
++++ 2806 lines of diff (skipped)
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
