From 656ae31a445a7e10a75b2f44af8ee8fe380bf783 Mon Sep 17 00:00:00 2001
From: "Jonathan J. Helmus" <jjhelmus@gmail.com>
Date: Thu, 21 May 2026 13:37:38 -0500
Subject: [PATCH 1/2] include missing vm_sockets.h for socket.AF_VSOCK

Include vm_sockets.h which is missing from the kernel UAPI headers in
version 3.16 of the kernel. This file is missing due to a typo in the
Kbuild file. The file is needed for CPython to make socket.AF_VSOCK
available.

closes #1050
---
 cpython-unix/build.Dockerfile     | 7 +++++++
 pythonbuild/disttests/__init__.py | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/cpython-unix/build.Dockerfile b/cpython-unix/build.Dockerfile
index 5a5dcad8a..e10c0f02d 100644
--- a/cpython-unix/build.Dockerfile
+++ b/cpython-unix/build.Dockerfile
@@ -7,12 +7,14 @@
 # Compression packages are needed to extract archives.
 #
 # Various other build tools are needed for various building.
+# Note linux-headers is installed to source a missing UAPI header, see below
 RUN ulimit -n 10000 && apt-get install \
     bzip2 \
     ca-certificates \
     curl \
     file \
     libc6-dev \
+    linux-headers-3.16.0-6-common \
     libffi-dev \
     make \
     patch \
@@ -23,3 +25,8 @@ RUN ulimit -n 10000 && apt-get install \
     unzip \
     zip \
     zlib1g-dev
+
+# Debian Jessie's linux-libc-dev is missing the vm_sockets header due to a typo
+# see https://lists.openwall.net/netdev/2014/12/01/2
+RUN install -m 0644 /usr/src/linux-headers-3.16.0-6-common/include/uapi/linux/vm_sockets.h \
+    /usr/include/linux/vm_sockets.h
\ No newline at end of file
diff --git a/pythonbuild/disttests/__init__.py b/pythonbuild/disttests/__init__.py
index f7186e13d..4761abc69 100644
--- a/pythonbuild/disttests/__init__.py
+++ b/pythonbuild/disttests/__init__.py
@@ -320,6 +320,13 @@ def assertPythonWorks(path: Path, argv0: Optional[str] = None):
         with self.subTest(msg="weird argv[0]"):
             assertPythonWorks(sys.executable, argv0="/dev/null")
 
+    @unittest.skipUnless(sys.platform == "linux", "Linux-specific socket constant")
+    def test_socket_af_vsock(self):
+        import socket
+
+        self.assertTrue(hasattr(socket, "AF_VSOCK"))
+        self.assertEqual(socket.AF_VSOCK, 40)
+
     @unittest.skipUnless(sys.platform == "linux", "Linux-specific prctl")
     @unittest.skipIf(
         "static" in os.environ["BUILD_OPTIONS"],

From 66fa9b24bfcb982fefeb54025bc3175c8ba638d2 Mon Sep 17 00:00:00 2001
From: "Jonathan J. Helmus" <jjhelmus@gmail.com>
Date: Thu, 21 May 2026 15:14:27 -0500
Subject: [PATCH 2/2] skip af_vsock test on musl builds

---
 pythonbuild/disttests/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pythonbuild/disttests/__init__.py b/pythonbuild/disttests/__init__.py
index 4761abc69..69d730e8c 100644
--- a/pythonbuild/disttests/__init__.py
+++ b/pythonbuild/disttests/__init__.py
@@ -321,6 +321,11 @@ def assertPythonWorks(path: Path, argv0: Optional[str] = None):
             assertPythonWorks(sys.executable, argv0="/dev/null")
 
     @unittest.skipUnless(sys.platform == "linux", "Linux-specific socket constant")
+    # TODO(jjh) remove when musl builds use a sysroot
+    @unittest.skipIf(
+        os.environ["TARGET_TRIPLE"].endswith("-musl"),
+        "kernel headers not available in musl",
+    )
     def test_socket_af_vsock(self):
         import socket