1 files changed, 0 insertions, 71 deletions
diff --git a/lang/python35/patches/patch-Modules_socketmodule.c b/lang/python35/patches/patch-Modules_socketmodule.c
deleted file mode 100644
index 46f40438c9f..00000000000
--- a/lang/python35/patches/patch-Modules_socketmodule.c
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-Modules_socketmodule.c,v 1.1 2017/05/30 14:04:54 bouyer Exp $
-
-Support NetBSD's socketcan implementation
-
---- Modules/socketmodule.c.orig	2017-01-17 08:57:53.000000000 +0100
-+++ Modules/socketmodule.c	2017-05-30 15:43:04.200284076 +0200
-@@ -1346,8 +1346,13 @@
-         /* need to look up interface name given index */
-         if (a->can_ifindex) {
-             ifr.ifr_ifindex = a->can_ifindex;
-+#ifdef __NetBSD__
-+            if (if_indextoname(a->can_ifindex, ifr.ifr_name) != NULL)
-+                ifname = ifr.ifr_name;
-+#else
-             if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
-                 ifname = ifr.ifr_name;
-+#endif /* __NetBSD__ */
-         }
- 
-         return Py_BuildValue("O&h", PyUnicode_DecodeFSDefault,
-@@ -1834,12 +1839,14 @@
-     }
- #endif
- 
--#if defined(AF_CAN) && defined(CAN_RAW) && defined(CAN_BCM)
-+#if defined(AF_CAN) && defined(CAN_RAW)
-     case AF_CAN:
-         switch (s->sock_proto) {
-         case CAN_RAW:
-+#ifdef CAN_BCM
-         /* fall-through */
-         case CAN_BCM:
-+#endif
-         {
-             struct sockaddr_can *addr;
-             PyObject *interfaceName;
-@@ -1859,7 +1866,12 @@
-             } else if ((size_t)len < sizeof(ifr.ifr_name)) {
-                 strncpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName), sizeof(ifr.ifr_name));
-                 ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
--                if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
-+#ifdef __NetBSD__
-+                if ((ifr.ifr_ifindex = if_nametoindex(ifr.ifr_name)) == 0)
-+#else
-+                if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0)
-+#endif
-+		{
-                     s->errorhandler();
-                     Py_DECREF(interfaceName);
-                     return 0;
-@@ -6688,6 +6700,20 @@
-     PyModule_AddIntConstant(m, "CAN_BCM_RX_TIMEOUT", RX_TIMEOUT);
-     PyModule_AddIntConstant(m, "CAN_BCM_RX_CHANGED", RX_CHANGED);
- #endif
-+#ifdef HAVE_NETCAN_CAN_H
-+    PyModule_AddIntMacro(m, CAN_EFF_FLAG);
-+    PyModule_AddIntMacro(m, CAN_RTR_FLAG);
-+    PyModule_AddIntMacro(m, CAN_ERR_FLAG);
-+
-+    PyModule_AddIntMacro(m, CAN_SFF_MASK);
-+    PyModule_AddIntMacro(m, CAN_EFF_MASK);
-+    PyModule_AddIntMacro(m, CAN_ERR_MASK);
-+
-+    PyModule_AddIntMacro(m, CAN_RAW_FILTER);
-+    /* PyModule_AddIntMacro(m, CAN_RAW_ERR_FILTER); */
-+    PyModule_AddIntMacro(m, CAN_RAW_LOOPBACK);
-+    PyModule_AddIntMacro(m, CAN_RAW_RECV_OWN_MSGS);
-+#endif
- #ifdef SOL_RDS
-     PyModule_AddIntMacro(m, SOL_RDS);
- #endif