Update Dyson patches

2 files changed, 32 insertions, 32 deletions

diff --git a/debian/patches/dyson-socketmodule-ifindex.patch b/debian/patches/dyson-socketmodule-ifindex.patch
index 78916b5..8aa4ccd 100644
--- a/debian/patches/dyson-socketmodule-ifindex.patch
+++ b/debian/patches/dyson-socketmodule-ifindex.patch
@@ -1,8 +1,8 @@
-Index: python3.7.git/Modules/socketmodule.c
+Index: python3.8.git/Modules/socketmodule.c
 ===================================================================
---- python3.7.git.orig/Modules/socketmodule.c
-+++ python3.7.git/Modules/socketmodule.c
-@@ -278,6 +278,10 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/
+--- python3.8.git.orig/Modules/socketmodule.c
++++ python3.8.git/Modules/socketmodule.c
+@@ -281,6 +281,10 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/
  #include <sys/socket.h>
  #endif
  
@@ -13,7 +13,7 @@ Index: python3.7.git/Modules/socketmodule.c
  #ifdef HAVE_NET_IF_H
  #include <net/if.h>
  #endif
-@@ -1892,11 +1896,15 @@ getsockaddrarg(PySocketSockObject *s, Py
+@@ -1983,11 +1987,15 @@ getsockaddrarg(PySocketSockObject *s, Py
      }
  #endif /* USE_BLUETOOTH */
  
@@ -30,10 +30,10 @@ Index: python3.7.git/Modules/socketmodule.c
          const char *interfaceName;
          int protoNumber;
          int hatype = 0;
-@@ -1915,6 +1923,15 @@ getsockaddrarg(PySocketSockObject *s, Py
-                               &protoNumber, &pkttype, &hatype,
-                               &haddr))
+@@ -2017,6 +2025,15 @@ getsockaddrarg(PySocketSockObject *s, Py
+             }
              return 0;
+         }
 +#ifdef SIOCGLIFINDEX
 +        strncpy(lifr.lifr_name, interfaceName, sizeof(lifr.lifr_name));
 +        lifr.lifr_name[(sizeof(lifr.lifr_name))-1] = '\0';
@@ -46,7 +46,7 @@ Index: python3.7.git/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) {
-@@ -1922,6 +1939,7 @@ getsockaddrarg(PySocketSockObject *s, Py
+@@ -2024,6 +2041,7 @@ getsockaddrarg(PySocketSockObject *s, Py
              PyBuffer_Release(&haddr);
              return 0;
          }
@@ -54,7 +54,7 @@ Index: python3.7.git/Modules/socketmodule.c
          if (haddr.buf && haddr.len > 8) {
              PyErr_SetString(PyExc_ValueError,
                              "Hardware address must be 8 bytes or less");
-@@ -1938,7 +1956,11 @@ getsockaddrarg(PySocketSockObject *s, Py
+@@ -2040,7 +2058,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.7.git/Modules/socketmodule.c
          addr->sll_pkttype = pkttype;
          addr->sll_hatype = hatype;
          if (haddr.buf) {
-Index: python3.7.git/configure.ac
+Index: python3.8.git/configure.ac
 ===================================================================
---- 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
+--- python3.8.git.orig/configure.ac
++++ python3.8.git/configure.ac
+@@ -2126,6 +2126,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 8526be3..53d4e40 100644
--- a/debian/patches/dyson.patch
+++ b/debian/patches/dyson.patch
@@ -1,8 +1,8 @@
-Index: python3.7.git/configure.ac
+Index: python3.8.git/configure.ac
 ===================================================================
---- python3.7.git.orig/configure.ac
-+++ python3.7.git/configure.ac
-@@ -465,13 +465,6 @@ case $ac_sys_system/$ac_sys_release in
+--- python3.8.git.orig/configure.ac
++++ python3.8.git/configure.ac
+@@ -473,13 +473,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.7.git/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.
-@@ -520,8 +513,6 @@ then
+@@ -533,8 +526,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,10 +25,10 @@ Index: python3.7.git/configure.ac
  
    AC_DEFINE(_POSIX_C_SOURCE, 200809L, Define to activate features from IEEE Stds 1003.1-2008)
  fi
-@@ -866,6 +857,14 @@ cat >> conftest.c <<EOF
-         i386-gnu
- #elif defined(__APPLE__)
+@@ -844,6 +835,14 @@ cat >> conftest.c <<EOF
          darwin
+ #elif defined(__VXWORKS__)
+         vxworks
 +#elif defined(__sun__)
 +# if defined(__x86_64__)
 +        x86_64-illumos
@@ -40,7 +40,7 @@ Index: python3.7.git/configure.ac
  #else
  # error unknown platform triplet
  #endif
-@@ -1131,17 +1130,7 @@ if test $enable_shared = "yes"; then
+@@ -1109,17 +1108,7 @@ if test $enable_shared = "yes"; then
            LDLIBRARY='libpython$(LDVERSION).dll.a'
            DLLLIBRARY='libpython$(LDVERSION).dll'
            ;;
@@ -59,16 +59,16 @@ Index: python3.7.git/configure.ac
  	  LDLIBRARY='libpython$(LDVERSION).so'
  	  BLDLIBRARY='-L. -lpython$(LDVERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-@@ -2610,7 +2599,7 @@ then
+@@ -2591,7 +2580,7 @@ then
  			BLDSHARED="$LDSHARED"
  		fi
  		;;
--	Linux*|GNU*|QNX*)
-+	Linux*|GNU*|QNX*|SunOS*)
+-	Linux*|GNU*|QNX*|VxWorks*)
++	Linux*|GNU*|QNX*|VxWorks*|SunOS*)
  		LDSHARED='$(CC) -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
  		LDCXXSHARED='$(CXX) -shared -Wl,-O1 -Wl,-Bsymbolic-functions';;
  	FreeBSD*)
-@@ -2703,7 +2692,7 @@ then
+@@ -2686,7 +2675,7 @@ then
  	    LINKFORSHARED="-Wl,-E -Wl,+s";;
  #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
  	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
@@ -77,7 +77,7 @@ Index: python3.7.git/configure.ac
  	# -u libsys_s pulls in all symbols in libsys
  	Darwin/*)
  		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
-@@ -2726,13 +2715,6 @@ then
+@@ -2711,13 +2700,6 @@ then
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
  		fi;;
@@ -91,7 +91,7 @@ Index: python3.7.git/configure.ac
  	CYGWIN*)
  		if test $enable_shared = "no"
  		then
-@@ -2783,9 +2765,9 @@ AC_MSG_RESULT($SHLIBS)
+@@ -2770,9 +2752,9 @@ AC_MSG_RESULT($SHLIBS)
  
  
  # checks for libraries
@@ -104,12 +104,12 @@ Index: python3.7.git/configure.ac
  
  # checks for uuid.h location
  AC_CHECK_HEADERS([uuid/uuid.h uuid.h])
-@@ -4753,7 +4735,7 @@ AC_MSG_RESULT($SOABI)
+@@ -4657,7 +4639,7 @@ fi
  
  AC_SUBST(EXT_SUFFIX)
  case $ac_sys_system in
--    Linux*|GNU*|Darwin)
-+    Linux*|GNU*|Darwin|SunOS*)
+-    Linux*|GNU*|Darwin|VxWorks)
++    Linux*|GNU*|Darwin|VxWorks|SunOS*)
  	EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};;
      *)
  	EXT_SUFFIX=${SHLIB_SUFFIX};;