python3.6 (3.6.3~rc1-2+dyson1)dyson/3.6.3_rc1-2+dyson1

7 files changed, 249 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index d0975ff..6b28037 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python3.6 (3.6.3~rc1-2+dyson1) unstable; urgency=medium
+
+  * Package for Dyson
+  * Added patches:
+    - dyson.patch
+    - dyson-socketmodule-ifindex.patch
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Fri, 29 Sep 2017 20:39:44 +0300
+
 python3.6 (3.6.3~rc1-2) unstable; urgency=medium
 
   * Update symbols files for 32bit and big endian architectures.
diff --git a/debian/control.in b/debian/control.in
index d040857..caac115 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,10 +10,10 @@ Build-Depends: debhelper (>= 9), @bd_dpkgdev@
   libgdbm-dev, libdb-dev,
   tk-dev, blt-dev (>= 2.4z), libssl-dev,
   libexpat1-dev, libmpdec-dev (>= 2.4),
-  libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+  libbluetooth-dev [linux-any],
   locales [!armel !avr32 !hppa !ia64 !mipsel],
   libsqlite3-dev, libffi-dev (>= 3.0.5) [!or1k !avr32],
-  libgpm2 [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+  libgpm2 [linux-any],
   mime-support, netbase, bzip2, time, python3@bd_qual@,
   net-tools, xvfb, xauth
 Build-Depends-Indep: python3-sphinx
diff --git a/debian/libpython.symbols.in b/debian/libpython.symbols.in
index 2c9bd18..cc10c9e 100644
--- a/debian/libpython.symbols.in
+++ b/debian/libpython.symbols.in
@@ -1369,7 +1369,7 @@
  _PyRandom_Fini@Base @SVER@
  _PyRandom_Init@Base @SVER@
  (arch=alpha amd64 arm64 ia64 mips64el ppc64el kfreebsd-amd64)_PySHA3_KeccakF1600_FastLoop_Absorb@Base 3.6.3~rc1
- (arch=!alpha !amd64 !arm64 !ia64 !mips64el !ppc64el !kfreebsd-amd64)_PySHA3_KeccakP1600_AddByte@Base 3.6.3~rc1
+ (arch=!alpha !amd64 !arm64 !ia64 !mips64el !ppc64el !kfreebsd-amd64 !illumos-amd64)_PySHA3_KeccakP1600_AddByte@Base 3.6.3~rc1
  _PySHA3_KeccakP1600_AddBytes@Base 3.6.3~rc1
  _PySHA3_KeccakP1600_AddBytesInLane@Base 3.6.3~rc1
  _PySHA3_KeccakP1600_AddLanes@Base 3.6.3~rc1
@@ -1386,8 +1386,8 @@
  _PySHA3_KeccakP1600_OverwriteWithZeroes@Base 3.6.3~rc1
  _PySHA3_KeccakP1600_Permute_12rounds@Base 3.6.3~rc1
  _PySHA3_KeccakP1600_Permute_24rounds@Base 3.6.3~rc1
- (arch=!alpha !amd64 !arm64 !ia64 !mips64el !ppc64el !kfreebsd-amd64)_PySHA3_KeccakP1600_Permute_Nrounds@Base 3.6.3~rc1
- (arch=!alpha !amd64 !arm64 !ia64 !mips64el !ppc64el !kfreebsd-amd64)_PySHA3_KeccakP1600_SetBytesInLaneToZero@Base 3.6.3~rc1
+ (arch=!alpha !amd64 !arm64 !ia64 !mips64el !ppc64el !kfreebsd-amd64 !illumos-amd64)_PySHA3_KeccakP1600_Permute_Nrounds@Base 3.6.3~rc1
+ (arch=!alpha !amd64 !arm64 !ia64 !mips64el !ppc64el !kfreebsd-amd64 !illumos-amd64)_PySHA3_KeccakP1600_SetBytesInLaneToZero@Base 3.6.3~rc1
  _PySHA3_KeccakWidth1600_Sponge@Base 3.6.3~rc1
  _PySHA3_KeccakWidth1600_SpongeAbsorb@Base 3.6.3~rc1
  _PySHA3_KeccakWidth1600_SpongeAbsorbLastFewBits@Base 3.6.3~rc1
diff --git a/debian/patches/dyson-socketmodule-ifindex.patch b/debian/patches/dyson-socketmodule-ifindex.patch
new file mode 100644
index 0000000..3e022d7
--- /dev/null
+++ b/debian/patches/dyson-socketmodule-ifindex.patch
@@ -0,0 +1,80 @@
+Index: python3.6-3.6.3~rc1/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/
+ #include <sys/socket.h>
+ #endif
+ 
++#ifdef HAVE_SYS_SOCKIO_H
++#include <sys/sockio.h>
++#endif
++
+ #ifdef HAVE_NET_IF_H
+ #include <net/if.h>
+ #endif
+@@ -1767,11 +1771,15 @@ getsockaddrarg(PySocketSockObject *s, Py
+     }
+ #endif
+ 
+-#if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFINDEX)
++#if defined(HAVE_NETPACKET_PACKET_H)
+     case AF_PACKET:
+     {
+         struct sockaddr_ll* addr;
++#ifdef SIOCGLIFINDEX
++        struct lifreq lifr;
++#else
+         struct ifreq ifr;
++#endif
+         char *interfaceName;
+         int protoNumber;
+         int hatype = 0;
+@@ -1790,6 +1798,15 @@ getsockaddrarg(PySocketSockObject *s, Py
+                               &protoNumber, &pkttype, &hatype,
+                               &haddr))
+             return 0;
++#ifdef SIOCGLIFINDEX
++        strncpy(lifr.lifr_name, interfaceName, sizeof(lifr.lifr_name));
++        lifr.lifr_name[(sizeof(lifr.lifr_name))-1] = '\0';
++        if (ioctl(s->sock_fd, SIOCGLIFINDEX, &lifr) < 0) {
++            s->errorhandler();
++            PyBuffer_Release(&haddr);
++            return 0;
++        }
++#else
+         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
+             PyBuffer_Release(&haddr);
+             return 0;
+         }
++#endif
+         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
+         addr = (struct sockaddr_ll*)addr_ret;
+         addr->sll_family = AF_PACKET;
+         addr->sll_protocol = htons((short)protoNumber);
++#ifdef SIOCGLIFINDEX
++        addr->sll_ifindex = lifr.lifr_index;
++#else
+         addr->sll_ifindex = ifr.ifr_ifindex;
++#endif
+         addr->sll_pkttype = pkttype;
+         addr->sll_hatype = hatype;
+         if (haddr.buf) {
+Index: python3.6-3.6.3~rc1/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
+ 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 \
++sys/sockio.h \
+ sys/stat.h sys/syscall.h sys/sys_domain.h sys/termio.h sys/time.h \
+ sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \
+ libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
diff --git a/debian/patches/dyson.patch b/debian/patches/dyson.patch
new file mode 100644
index 0000000..2a86648
--- /dev/null
+++ b/debian/patches/dyson.patch
@@ -0,0 +1,150 @@
+Index: python3.6-3.6.3~rc1/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
+   # Marc Recht
+   NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6@<:@A-S@:>@)
+     define_xopen_source=no;;
+-  # From the perspective of Solaris, _XOPEN_SOURCE is not so much a
+-  # request to enable features supported by the standard as a request
+-  # to disable features not supported by the standard.  The best way
+-  # for Python to use Solaris is simply to leave _XOPEN_SOURCE out
+-  # entirely and define __EXTENSIONS__ instead.
+-  SunOS/*)
+-    define_xopen_source=no;;
+   # 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
+   # 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.
+-  AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1,
+-   	    Define to activate Unix95-and-earlier features)
+ 
+   AC_DEFINE(_POSIX_C_SOURCE, 200809L, Define to activate features from IEEE Stds 1003.1-2008)
+ fi
+@@ -861,6 +852,14 @@ cat >> conftest.c <<EOF
+         i386-gnu
+ #elif defined(__APPLE__)
+         darwin
++#elif defined(__sun__)
++# if defined(__x86_64__)
++        x86_64-illumos
++# elif defined(__i386__)
++        i386-illumos
++# else
++#   error unknown platform triplet
++# endif
+ #else
+ # error unknown platform triplet
+ #endif
+@@ -1137,17 +1136,7 @@ if test $enable_shared = "yes"; then
+           LDLIBRARY='libpython$(LDVERSION).dll.a'
+           DLLLIBRARY='libpython$(LDVERSION).dll'
+           ;;
+-    SunOS*)
+-	  LDLIBRARY='libpython$(LDVERSION).so'
+-	  BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
+-	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+-	  INSTSONAME="$LDLIBRARY".$SOVERSION
+-	  if test "$with_pydebug" != yes
+-	  then
+-	      PY3LIBRARY=libpython3.so
+-	  fi
+-          ;;
+-    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
++    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|SunOS*)
+ 	  LDLIBRARY='libpython$(LDVERSION).so'
+ 	  BLDLIBRARY='-L. -lpython$(LDVERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+@@ -2436,14 +2425,6 @@ then
+ 		;;
+ 	IRIX/5*) LDSHARED="ld -shared";;
+ 	IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
+-	SunOS/5*)
+-		if test "$GCC" = "yes" ; then
+-			LDSHARED='$(CC) -shared'
+-			LDCXXSHARED='$(CXX) -shared'
+-		else
+-			LDSHARED='$(CC) -G'
+-			LDCXXSHARED='$(CXX) -G'
+-		fi ;;
+ 	hp*|HP*)
+ 		if test "$GCC" = "yes" ; then
+ 			LDSHARED='$(CC) -shared'
+@@ -2510,7 +2491,7 @@ then
+ 			BLDSHARED="$LDSHARED"
+ 		fi
+ 		;;
+-	Linux*|GNU*|QNX*)
++	Linux*|GNU*|QNX*|SunOS*)
+ 		LDSHARED='$(CC) -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
+ 		LDCXXSHARED='$(CXX) -shared -Wl,-O1 -Wl,-Bsymbolic-functions';;
+ 	BSD/OS*/4*)
+@@ -2569,18 +2550,12 @@ AC_MSG_CHECKING(CCSHARED)
+ if test -z "$CCSHARED"
+ then
+ 	case $ac_sys_system/$ac_sys_release in
+-	SunOS*) if test "$GCC" = yes;
+-		then CCSHARED="-fPIC";
+-		elif test `uname -p` = sparc;
+-		then CCSHARED="-xcode=pic32";
+-		else CCSHARED="-Kpic";
+-		fi;;
+ 	hp*|HP*) if test "$GCC" = yes;
+ 		 then CCSHARED="-fPIC";
+ 		 else CCSHARED="+z";
+ 		 fi;;
+ 	Linux-android*) ;;
+-	Linux*|GNU*) CCSHARED="-fPIC";;
++	Linux*|GNU*|SunOS*) CCSHARED="-fPIC";;
+ 	BSD/OS*/4*) CCSHARED="-fpic";;
+ 	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
+ 	OpenUNIX*|UnixWare*)
+@@ -2612,7 +2587,7 @@ then
+ #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
+ 	BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ 	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
+-	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions";;
++	Linux*|GNU*|SunOS*) LINKFORSHARED="-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions";;
+ 	# -u libsys_s pulls in all symbols in libsys
+ 	Darwin/*)
+ 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+@@ -2635,13 +2610,6 @@ then
+ 		then
+ 			LINKFORSHARED="-Wl,--export-dynamic"
+ 		fi;;
+-	SunOS/5*) case $CC in
+-		  *gcc*)
+-		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
+-		    then
+-			LINKFORSHARED="-Xlinker --export-dynamic"
+-		    fi;;
+-		  esac;;
+ 	CYGWIN*)
+ 		if test $enable_shared = "no"
+ 		then
+@@ -2692,9 +2660,9 @@ AC_MSG_RESULT($SHLIBS)
+ 
+ 
+ # checks for libraries
+-AC_CHECK_LIB(sendfile, sendfile)
+-AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
+-AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
++AC_SEARCH_LIBS(sendfile, sendfile)
++AC_SEARCH_LIBS(dl, dlopen)
++AC_SEARCH_LIBS(shl_load, dld)	# Dynamic linking for HP-UX
+ 
+ # only check for sem_init if thread support is requested
+ if test "$with_threads" = "yes" -o -z "$with_threads"; then
+@@ -4654,7 +4622,7 @@ AC_MSG_RESULT($SOABI)
+ 
+ AC_SUBST(EXT_SUFFIX)
+ case $ac_sys_system in
+-    Linux*|GNU*|Darwin)
++    Linux*|GNU*|Darwin|SunOS*)
+ 	EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};;
+     *)
+ 	EXT_SUFFIX=${SHLIB_SUFFIX};;
diff --git a/debian/patches/series b/debian/patches/series
index 9eed915..282b3af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,5 @@ reproducible-buildinfo.diff
 pydoc-use-pager.diff
 pyhash.diff
 update-tls-protocol.diff
+dyson.patch
+dyson-socketmodule-ifindex.patch
diff --git a/debian/rules b/debian/rules
index 6669a0b..340dcbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,8 @@ else ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
   PLAT = gnukfreebsd10
 else ifeq ($(DEB_HOST_ARCH_OS),hurd)
   PLAT = gnu0
+else ifeq ($(DEB_HOST_ARCH_OS),illumos)
+  PLAT = sunos5
 else
   $(warning unhandled operating system name: $(DEB_HOST_ARCH_OS))
   PLAT = unknown
@@ -1445,7 +1447,7 @@ stamps/stamp-patch:
 	dh_testdir
 	uname -a
 	@echo USER=$$USER, LOGNAME=$$LOGNAME
-	@grep ^Mem /proc/meminfo
+	@grep ^Mem /proc/meminfo || true
 	@echo "DEB_BUILD_OPTIONS: $$DEB_BUILD_OPTIONS"
 
 	rm -rf autom4te.cache configure