Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/scapy.git#3e8e1beba5f8349e5a8921ebd9fb605eff77f277

.gitignore

@@ -5,3 +5,4 @@ scapy-2.0.0.10.tar.gz
 /scapy-2.4.0rc5.tar.gz
 /scapy-2.4.0.tar.gz
 /scapy-2.4.3.tar.gz
+/scapy-2.4.4.tar.gz

scapy-2.4.3-libc.patch

@@ -0,0 +1,12 @@
+diff -u --recursive scapy-2.4.3-vanilla/scapy/arch/bpf/core.py scapy-2.4.3/scapy/arch/bpf/core.py
+--- scapy-2.4.3-vanilla/scapy/arch/bpf/core.py	2019-08-04 11:12:30.000000000 -0500
++++ scapy-2.4.3/scapy/arch/bpf/core.py	2021-03-11 13:30:35.033061720 -0600
+@@ -28,7 +28,7 @@
+ 
+ # ctypes definitions
+ 
+-LIBC = cdll.LoadLibrary(find_library("libc"))
++LIBC = cdll.LoadLibrary(find_library("c"))
+ LIBC.ioctl.argtypes = [c_int, c_ulong, c_char_p]
+ LIBC.ioctl.restype = c_int
+ 

scapy.spec

@@ -1,11 +1,11 @@
 Name:           scapy
-Version:        2.4.3
-Release:        7%{?dist}
+Version:        2.4.4
+Release:        1%{?dist}
 Summary:        Interactive packet manipulation tool and network scanner
 
 %global         gituser         secdev
 %global         gitname         scapy
-%global         commit          3047580162a9407ef05fe981983cacfa698f1159
+%global         commit          95ba5b8504152a1f820bbe679ccf03668cb5118f
 %global         shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 License:        GPLv2
@@ -14,7 +14,7 @@ URL:            http://www.secdev.org/projects/scapy/
 #               https://bitbucket.org/secdev/scapy/pull-request/80
 #               https://scapy.readthedocs.io/en/latest/introduction.html
 Source0:        https://github.com/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0:         https://github.com/secdev/scapy/commit/0c3d5e417bbd923c4729d15572c3d693d58aff81.patch#/scapy-2.4.3-ethertypes.patch
+Patch1:         scapy-2.4.3-libc.patch
 
 %global         common_desc %{expand:
 Scapy is a powerful interactive packet manipulation program built on top
@@ -52,11 +52,13 @@ BuildRequires:  sed
 %if 0%{?with_python2}
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
+BuildRequires:  python2-tox
 %endif
 
 %if 0%{?with_python3}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-tox
 %endif
 
 # Recommends only supported on fedora and rhel8+
@@ -227,6 +229,12 @@ ln -s %{_bindir}/UTscapy3 %{buildroot}%{_bindir}/UTscapy
 
 
 %changelog
+* Fri Mar 12 2021 Michal Ambroz <rebus _AT seznam.cz> - 2.4.4-1
+- bump to 2.4.4 release
+
+* Thu Mar 11 2021 W. Michael Petullo <mike@flyn.org> - 2.4.3-8
+- Patch to fix loading libc.a; see https://bugs.python.org/issue42580
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (scapy-2.4.3.tar.gz) = 48bf86ed851f4b15d4f3b1e2668f1516fff712b67d709963cb986076cfeec0724e20b400a75368309f3d99a45d7b1082fd049fbb67edef0ab5d838e2ae141e44
+SHA512 (scapy-2.4.4.tar.gz) = d6078901839157b3f3d63c304f43f88a41b9bd2fb32cc917624c12fe822818d02256d6661b5076689c0f59c51e4ab35195ddf555f0d1f6df95faac1c646ee8c6