From 18741604403f7d8242a25da75fba1d0cb01786f4 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Sun, 1 Dec 2019 18:00:29 +0300 Subject: Update Dyson patches --- debian/patches/dyson-socketmodule-ifindex.patch | 28 +++++------ debian/patches/dyson.patch | 67 ++++++------------------- 2 files changed, 30 insertions(+), 65 deletions(-) diff --git a/debian/patches/dyson-socketmodule-ifindex.patch b/debian/patches/dyson-socketmodule-ifindex.patch index 3e022d7..78916b5 100644 --- a/debian/patches/dyson-socketmodule-ifindex.patch +++ b/debian/patches/dyson-socketmodule-ifindex.patch @@ -1,8 +1,8 @@ -Index: python3.6-3.6.3~rc1/Modules/socketmodule.c +Index: python3.7.git/Modules/socketmodule.c =================================================================== ---- python3.6-3.6.3~rc1.orig/Modules/socketmodule.c -+++ python3.6-3.6.3~rc1/Modules/socketmodule.c -@@ -284,6 +284,10 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/ +--- python3.7.git.orig/Modules/socketmodule.c ++++ python3.7.git/Modules/socketmodule.c +@@ -278,6 +278,10 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/ #include #endif @@ -13,9 +13,9 @@ Index: python3.6-3.6.3~rc1/Modules/socketmodule.c #ifdef HAVE_NET_IF_H #include #endif -@@ -1767,11 +1771,15 @@ getsockaddrarg(PySocketSockObject *s, Py +@@ -1892,11 +1896,15 @@ getsockaddrarg(PySocketSockObject *s, Py } - #endif + #endif /* USE_BLUETOOTH */ -#if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFINDEX) +#if defined(HAVE_NETPACKET_PACKET_H) @@ -27,10 +27,10 @@ Index: python3.6-3.6.3~rc1/Modules/socketmodule.c +#else struct ifreq ifr; +#endif - char *interfaceName; + const char *interfaceName; int protoNumber; int hatype = 0; -@@ -1790,6 +1798,15 @@ getsockaddrarg(PySocketSockObject *s, Py +@@ -1915,6 +1923,15 @@ getsockaddrarg(PySocketSockObject *s, Py &protoNumber, &pkttype, &hatype, &haddr)) return 0; @@ -46,7 +46,7 @@ Index: python3.6-3.6.3~rc1/Modules/socketmodule.c strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name)); ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0'; if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) { -@@ -1797,6 +1814,7 @@ getsockaddrarg(PySocketSockObject *s, Py +@@ -1922,6 +1939,7 @@ getsockaddrarg(PySocketSockObject *s, Py PyBuffer_Release(&haddr); return 0; } @@ -54,7 +54,7 @@ Index: python3.6-3.6.3~rc1/Modules/socketmodule.c if (haddr.buf && haddr.len > 8) { PyErr_SetString(PyExc_ValueError, "Hardware address must be 8 bytes or less"); -@@ -1813,7 +1831,11 @@ getsockaddrarg(PySocketSockObject *s, Py +@@ -1938,7 +1956,11 @@ getsockaddrarg(PySocketSockObject *s, Py addr = (struct sockaddr_ll*)addr_ret; addr->sll_family = AF_PACKET; addr->sll_protocol = htons((short)protoNumber); @@ -66,11 +66,11 @@ Index: python3.6-3.6.3~rc1/Modules/socketmodule.c addr->sll_pkttype = pkttype; addr->sll_hatype = hatype; if (haddr.buf) { -Index: python3.6-3.6.3~rc1/configure.ac +Index: python3.7.git/configure.ac =================================================================== ---- python3.6-3.6.3~rc1.orig/configure.ac -+++ python3.6-3.6.3~rc1/configure.ac -@@ -2053,6 +2053,7 @@ poll.h sys/devpoll.h sys/epoll.h sys/pol +--- python3.7.git.orig/configure.ac ++++ python3.7.git/configure.ac +@@ -2147,6 +2147,7 @@ poll.h sys/devpoll.h sys/epoll.h sys/pol sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ sys/kern_control.h sys/loadavg.h sys/lock.h sys/mkdev.h sys/modem.h \ sys/param.h sys/random.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ diff --git a/debian/patches/dyson.patch b/debian/patches/dyson.patch index 2a86648..8526be3 100644 --- a/debian/patches/dyson.patch +++ b/debian/patches/dyson.patch @@ -1,8 +1,8 @@ -Index: python3.6-3.6.3~rc1/configure.ac +Index: python3.7.git/configure.ac =================================================================== ---- python3.6-3.6.3~rc1.orig/configure.ac -+++ python3.6-3.6.3~rc1/configure.ac -@@ -466,13 +466,6 @@ case $ac_sys_system/$ac_sys_release in +--- python3.7.git.orig/configure.ac ++++ python3.7.git/configure.ac +@@ -465,13 +465,6 @@ case $ac_sys_system/$ac_sys_release in # Marc Recht NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6@<:@A-S@:>@) define_xopen_source=no;; @@ -16,7 +16,7 @@ Index: python3.6-3.6.3~rc1/configure.ac # On UnixWare 7, u_long is never defined with _XOPEN_SOURCE, # but used in /usr/include/netinet/tcp.h. Reported by Tim Rice. # Reconfirmed for 7.1.4 by Martin v. Loewis. -@@ -525,8 +518,6 @@ then +@@ -520,8 +513,6 @@ then # definition of _XOPEN_SOURCE_EXTENDED and _POSIX_C_SOURCE, or else # several APIs are not declared. Since this is also needed in some # cases for HP-UX, we define it globally. @@ -25,7 +25,7 @@ Index: python3.6-3.6.3~rc1/configure.ac AC_DEFINE(_POSIX_C_SOURCE, 200809L, Define to activate features from IEEE Stds 1003.1-2008) fi -@@ -861,6 +852,14 @@ cat >> conftest.c <> conftest.c <