Merge ~fheimes/ubuntu/+source/scapy/+git/scapy:scapy-lp1908280-hirsute into ~fheimes/ubuntu/+source/scapy/+git/scapy:importer/ubuntu/hirsute-devel

[Frank Heimes]

scapy fails to load BPF program
 The scapy sniff() function loads a BPF program into the kernel
 which apparently fails to load on s390x
 This patch contains a backport of upstream commit 474eb1f6
 - scapy/arch/common.py: remove workaround for bpf handling that's broken
   in PyPy 7.3.0 from common code
 - scapy/arch/linux.py: and add the workaround for bp handling to Linux code
   that's broken PyPy in 7.3.2
 - scapy/libs/structures.py: add class sock_fprog

[Christian Ehrhardt  (paelzer)]

LGTM, and the fact that it is applied upstream will help to make it a sync later on.
There isn't much more to say, the old issues we discussed in the past on other cases are no more present (yay), so +1 from me.

Let me know if you want/need sponsoring of this.

review: Approve

[Frank Heimes (fheimes)]

Thanks Christian for the review and +1.

Yes, sponsoring on top would be great ! :-)

[Christian Ehrhardt  (paelzer)]

Ah while checking in git, one thing to mention - it is one commit.
Since it isn't in gut-ubuntu properly it won't make a difference.
But if it would have been then individual commits would be better.

[Christian Ehrhardt  (paelzer)]

Sponsored

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading scapy_2.4.4-4ubuntu1.dsc: done.
  Uploading scapy_2.4.4-4ubuntu1.debian.tar.xz: done.
  Uploading scapy_2.4.4-4ubuntu1_source.buildinfo: done.
  Uploading scapy_2.4.4-4ubuntu1_source.changes: done.
Successfully uploaded packages.

(We discussed an odd unclean'ness of this git repo), but I double checked the generated changes - they LGTM just as the proposed changes here.

Unmerged commits

930d9aa... by Frank Heimes on 2021-02-02

scapy-lp1908280-hirsute.patch - scapy fails to load BPF program on s390x

diff --git a/debian/changelog b/debian/changelog
index 27fd49d..cd83b74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+scapy (2.4.4-4ubuntu1) hirsute; urgency=medium
+
+  * debian/patches/scapy-lp1908280-hirsute.patch:
+    scapy fails to load BPF program
+    sock_fprog needs to be used instead of bpf_program
+    Thanks to Ilya Leoshkevich (LP: #1908280)
+
+ -- Frank Heimes <[e-mail]>  Tue, 02 Feb 2021 20:10:19 +0100
+
 scapy (2.4.4-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index be231b8..5cc669c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: scapy
-Maintainer: Debian Security Tools <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Security Tools <[e-mail]>
 Uploaders: Raphaël Hertzog <[e-mail]>
 Section: python
 Priority: optional
diff --git a/debian/patches/scapy-lp1908280-hirsute.patch b/debian/patches/scapy-lp1908280-hirsute.patch
new file mode 100644
index 0000000..6956882
--- /dev/null
+++ b/debian/patches/scapy-lp1908280-hirsute.patch
@@ -0,0 +1,93 @@
+Description: scapy fails to load BPF program
+ The scapy sniff() function loads a BPF program into the kernel
+ which apparently fails to load on s390x
+ This patch contains a backport of upstream commit 474eb1f6
+ - scapy/arch/common.py: remove workaround for bpf handling that's broken
+   in PyPy 7.3.0 from common code
+ - scapy/arch/linux.py: and add the workaround for bp handling to Linux code
+   that's broken PyPy in 7.3.2
+ - scapy/libs/structures.py: add class sock_fprog
+Author: Ilya Leoshkevich <[e-mail]>
+Origin: https://github.com/secdev/scapy/commit/474eb1f6930601e444227445f9e315b35c06a996
+Bug-IBM: IBM Bugzilla 188965
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1908280
+Forwarded: not-needed
+Applied-Upstream: > v2.4.4
+Reviewed-by: Frank Heimes <[e-mail]>
+Last-Update: 2021-02-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/scapy/arch/common.py
++++ b/scapy/arch/common.py
+@@ -10,7 +10,6 @@
+ import ctypes
+ import socket
+ import struct
+-import sys
+ import time
+ from scapy.consts import WINDOWS
+ from scapy.config import conf
+@@ -128,11 +127,4 @@
+         raise Scapy_Exception(
+             "Failed to compile filter expression %s (%s)" % (filter_exp, ret)
+         )
+-    if conf.use_pypy and sys.pypy_version_info <= (7, 3, 0):
+-        # PyPy < 7.3.0 has a broken behavior
+-        # https://bitbucket.org/pypy/pypy/issues/3114
+-        return struct.pack(
+-            'HL',
+-            bpf.bf_len, ctypes.addressof(bpf.bf_insns.contents)
+-        )
+     return bpf
+--- a/scapy/arch/linux.py
++++ b/scapy/arch/linux.py
+@@ -11,11 +11,13 @@
+ 
+ 
+ import array
++import ctypes
+ from fcntl import ioctl
+ import os
+ from select import select
+ import socket
+ import struct
++import sys
+ import time
+ 
+ import subprocess
+@@ -24,6 +26,7 @@
+ from scapy.consts import LINUX
+ import scapy.utils
+ import scapy.utils6
++from scapy.libs.structures import sock_fprog
+ from scapy.packet import Packet, Padding
+ from scapy.config import conf
+ from scapy.data import MTU, ETH_P_ALL, SOL_PACKET, SO_ATTACH_FILTER, \
+@@ -140,6 +143,15 @@
+     :param iface: the interface used to compile
+     """
+     bp = compile_filter(bpf_filter, iface)
++    if conf.use_pypy and sys.pypy_version_info <= (7, 3, 2):
++        # PyPy < 7.3.2 has a broken behavior
++        # https://foss.heptapod.net/pypy/pypy/-/issues/3298
++        bp = struct.pack(
++            'HL',
++            bp.bf_len, ctypes.addressof(bp.bf_insns.contents)
++        )
++    else:
++        bp = sock_fprog(bp.bf_len, bp.bf_insns)
+     sock.setsockopt(socket.SOL_SOCKET, SO_ATTACH_FILTER, bp)
+ 
+ 
+--- a/scapy/libs/structures.py
++++ b/scapy/libs/structures.py
+@@ -21,3 +21,9 @@
+     """"Structure for BIOCSETF"""
+     _fields_ = [('bf_len', ctypes.c_int),
+                 ('bf_insns', ctypes.POINTER(bpf_insn))]
++
++
++class sock_fprog(ctypes.Structure):
++    """"Structure for SO_ATTACH_FILTER"""
++    _fields_ = [('len', ctypes.c_ushort),
++                ('filter', ctypes.POINTER(bpf_insn))]
diff --git a/debian/patches/series b/debian/patches/series
index 00e700d..c3610a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Change-path-in-test-for-autopkgtest.patch
 add-support-for-python3.9.patch
 Fix-find-library-libc-for-python-3.9.patch
 upstream-42d58d8729.patch
+scapy-lp1908280-hirsute.patch