Request 5076 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 5076 (accepted)

update and fix

Created by Aloysius over 4 years ago
In state accepted
Package maintainer: posophe

Submit python-scapy

Submit package home:Aloysius:branches:Extra / python-scapy to package Extra / python-scapy

python-scapy.changes Changed

@@ -1,4 +1,71 @@
 -------------------------------------------------------------------
+Tue Apr 21 09:10:38 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 2.4.3
+  * Core
+    + 364 commits since v2.4.2
+    + latency improvements
+    + sniff() can be used to test BPF fiters on pcap files
+    + more unit tests and Python3 compatibility
+    + asynchronous sniffing
+    + UTScapy vim syntax highlighting
+    + drop distutils for setuptools
+    + Console / IPython integration improvements
+  Layers
+  * New
+    + HTTP (from the deprecated scapy-http module), TLS 1.3, ATA
+      over Ethernet, OVD, IEC 60870-5-104, enip
+  * Improved
+    + NetflowV9, ISOTP, Zigbee, RTR, BLE, PPI, DNS, LLDP
+    + Bluetooth/BTLE rework
+    + PPI / 802.11 improvements
+  version 2.4.2:
+  * Gabriel Potter is officially part of the Scapy maintainers
+    team
+  * PEP08 compliance (see #1277)
+  * Speed improvements (see #642)
+  * Core
+    + 253 merged pull requests since v2.4.0
+    + Python 3.7 support
+    + Enhanced Windows support
+    + unit testing is now 100% tox based
+  Layers
+  * Many automotive related layers added (ISO-TP...)
+  * New
+    + EtherCat
+    + OPCDA
+    + SOCKS
+    + USBpcap
+    + RPKI
+  * Improved
+    + MACsec, MQTT, MPLS, DNS, ARP, Dot15d4, Zigbee,
+      Bluetooth4LE, RadioTap
+    + Enhanced monitor mode support
+  * Other
+    + addresses a v2.4.0 vulnerability
+  version 2.4.0:
+  * Python3 support
+  * 85% code coverage
+  * Core
+    + Pcap/PcapNg improvements
+    + enhanced Windows support
+    + Krack AP module
+    + iPython support
+    + automatically tested
+  * Layers
+    + TLS (including TLS1.3), X.509
+  * New
+    + HTTP/2, EAP-TTLS, TACACS, MQTT
+  * Improved
+    + IPv6, SCTP, NTP, PPTP, CDP, BGP, ISIS
+
+- Use singlespec syntax
+
+- Refreshed python-scapy-no-buildtime.patch
+
+- Spec cleanup
+
+-------------------------------------------------------------------
 Fri Apr 11 08:41:56 UTC 2014 - p.drouand@gmail.com
 
 - Specfile cleanup

python-scapy.spec Changed

@@ -1,35 +1,38 @@
-#  
-# spec file for package python-scapy 
-#  
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.  
-#  
-# All modifications and additions to the file contributed by third parties  
-# remain the property of their copyright owners, unless otherwise agreed  
-# upon. The license for this file, and modifications and additions to the  
-# file, is the same license as for the pristine package itself (unless the  
-# license for the pristine package is not an Open Source License, in which  
-# case the license is the MIT License). An "Open Source License" is a  
-# license that conforms to the Open Source Definition (Version 1.9)  
-# published by the Open Source Initiative.  
-  
-# Please submit bugfixes or comments via http://bugs.opensuse.org/  
+#
+# spec file for package python-scapy
+#
+# Copyright (c) 2020 Packman Team <packman@links2linux.de>
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
 #
 
-Name:               python-scapy
-Version:            2.2.0
-Release:            0
-Summary:            Interactive Packet Manipulation Tool
-Source:             http://www.secdev.org/projects/scapy/files/scapy-%{version}.tar.gz
-Patch1:             python-scapy-no-buildtime.patch
-Url:                http://www.secdev.org/projects/scapy/
-Group:              Productivity/Networking/Security
-License:            GPL-2.0
-BuildRoot:          %{_tmppath}/build-%{name}-%{version}
-BuildRequires:      python-devel
-BuildRequires:      python-sphinx
-%if 0%{?suse_version} > 1110
-BuildArch:          noarch
-%endif
+
+Name:           python-scapy
+Version:        2.4.3
+Release:        0
+Summary:        Interactive Packet Manipulation Tool
+License:        GPL-2.0-or-later
+URL:            https://scapy.net
+Source0:        https://github.com/secdev/scapy/archive/v%{version}.tar.gz#/scapy-%{version}.tar.gz
+Patch1:         python-scapy-no-buildtime.patch
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3-Sphinx
+BuildArch:      noarch
+%python_subpackages
+
 
 %description
 Scapy is a powerful interactive packet manipulation tool, packet generator,
@@ -43,27 +46,26 @@
 arpspoof, firewalk, irpas, tethereal, tcpdump, etc.
 
 %prep
-%setup -q -n scapy-%{version}
-%patch1 -p1
-# For rpmlint warning: remove shebang from python library:
-sed -i '/^#!/d' ./scapy/layers/inet6.py
-sed -i '/^#!/d' ./scapy/tools/check_asdis.py
+%autosetup -p1 -n scapy-%{version}
+# remove shebang
+find scapy -type f -name "*.py" -exec sed -i '/^#!/d' {} \;
 
 %build
-python setup.py build
-
-make -C doc/scapy html
+%python_build
+%make_build -C doc/scapy html
 rm doc/scapy/_build/html/.buildinfo doc/scapy/_build/html/_static/_dummy
 
 %install
-python setup.py install --prefix="%{_prefix}" --root="%{buildroot}"
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%files
-%defattr(-,root,root)
+%files %{python_files}
+%license LICENSE
+%doc README
 %doc doc/scapy/_build/html
-%{_bindir}/UTscapy
-%{_bindir}/scapy
-%{python_sitelib}
-%{_mandir}/man1/scapy.1%{ext_man}
+%python3_only %{_bindir}/UTscapy
+%python3_only %{_bindir}/scapy
+%{_mandir}/man1/scapy.1%{?ext_man}
+%{python_sitelib}/*
 
 %changelog

python-scapy-no-buildtime.patch Changed

@@ -1,24 +1,34 @@
-Index: scapy-2.2.0/doc/scapy/conf.py
+Index: scapy-2.4.3/doc/scapy/conf.py
 ===================================================================
---- scapy-2.2.0.orig/doc/scapy/conf.py
-+++ scapy-2.2.0/doc/scapy/conf.py
-@@ -108,7 +108,7 @@ html_static_path = ['_static']
+--- scapy-2.4.3.orig/doc/scapy/conf.py
++++ scapy-2.4.3/doc/scapy/conf.py
+@@ -12,8 +12,6 @@
+ # All configuration values have a default; values that are commented out
+ # serve to show the default.
  
- # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
- # using the given strftime format.
--html_last_updated_fmt = '%b %d, %Y'
-+html_last_updated_fmt = 'package build day'
+-import datetime
+-
+ # If extensions (or modules to document with autodoc) are in another directory,
+ # add these directories to sys.path here. If the directory is relative to the
+ # documentation root, use os.path.abspath to make it absolute, like shown here.
+@@ -48,8 +46,7 @@ master_doc = 'index'
  
- # If true, SmartyPants will be used to convert quotes and dashes to
- # typographically correct entities.
-Index: scapy-2.2.0/doc/scapy/index.rst
+ # General information about the project.
+ project = 'Scapy'
+-year = datetime.datetime.now().year
+-copyright = '2008-%s Philippe Biondi and the Scapy community' % year
++copyright = '2008-2019 Philippe Biondi and the Scapy community'
+ 
+ # The version info for the project you're documenting, acts as replacement for
+ # |version| and |release|, also used in various other places throughout the
+Index: scapy-2.4.3/doc/scapy/index.rst
 ===================================================================
---- scapy-2.2.0.orig/doc/scapy/index.rst
-+++ scapy-2.2.0/doc/scapy/index.rst
-@@ -6,7 +6,6 @@ Welcome to Scapy's documentation!
- =================================
+--- scapy-2.4.3.orig/doc/scapy/index.rst
++++ scapy-2.4.3/doc/scapy/index.rst
+@@ -11,7 +11,6 @@ Welcome to Scapy's documentation!
  
- :Release: |version|
+ :Version: |version|
+ :Release: |release|
 -:Date: |today|
  
  This document is under a `Creative Commons Attribution - Non-Commercial

scapy-2.2.0.tar.gz -> scapy-2.4.3.tar.gz Changed

Build Results
RPM Lint

Refresh

Comments for request 5076 0

Request History

Aloysius created request over 4 years ago

update and fix

olh accepted request over 4 years ago