<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b8e715ba072183a3f3c71395b7b31bd4a6fcf059">https://github.com/macports/macports-ports/commit/b8e715ba072183a3f3c71395b7b31bd4a6fcf059</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b8e715b python27, python3[1-5]: Fix uuid command on some systems
</span>b8e715b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b8e715ba072183a3f3c71395b7b31bd4a6fcf059
</span>Author: Riccardo Mottola <rm@gnu.org>
AuthorDate: Sat Aug 25 23:50:01 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> python27, python3[1-5]: Fix uuid command on some systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57034
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Ryan Schmidt <ryandesign@macports.org>
</span>---
lang/python27/Portfile | 4 +++-
lang/python27/files/uuid-64bit.patch | 42 ++++++++++++++++++++++++++++++++++++
lang/python31/Portfile | 6 ++++--
lang/python31/files/uuid-64bit.patch | 40 ++++++++++++++++++++++++++++++++++
lang/python32/Portfile | 5 +++--
lang/python32/files/uuid-64bit.patch | 40 ++++++++++++++++++++++++++++++++++
lang/python33/Portfile | 5 +++--
lang/python33/files/uuid-64bit.patch | 40 ++++++++++++++++++++++++++++++++++
lang/python34/Portfile | 4 +++-
lang/python34/files/uuid-64bit.patch | 42 ++++++++++++++++++++++++++++++++++++
lang/python35/Portfile | 4 +++-
lang/python35/files/uuid-64bit.patch | 42 ++++++++++++++++++++++++++++++++++++
12 files changed, 265 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/Portfile b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f6f6ec..f08da25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ name python27
</span> epoch 2
# Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
version 2.7.15
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +37,8 @@ patchfiles patch-Makefile.pre.in.diff \
</span> patch-Lib-ctypes-macholib-dyld.py.diff \
patch-configure.diff \
patch-libedit.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- enable-loadable-sqlite-extensions.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable-loadable-sqlite-extensions.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid-64bit.patch
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/files/uuid-64bit.patch b/lang/python27/files/uuid-64bit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2746880
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python27/files/uuid-64bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix uuid failure on systems with 64-bit hardware addresses:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.python.org/issue32502
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backported from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/python/cpython/commit/d69794f4df81de731cc66dc82136e28bee691e1e#diff-9d2d23bf4362c9ec2b6dd4b64b73756c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/uuid.py.orig 2018-04-29 17:47:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/uuid.py 2018-08-25 23:35:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -522,6 +522,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_WIN32 = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_UNIX = [_unixdll_getnode, _ifconfig_getnode, _arp_getnode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _lanscan_getnode, _netstat_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def getnode():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Get the hardware address as a 48-bit positive integer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -537,18 +543,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform == 'win32':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_unixdll_getnode, _ifconfig_getnode, _arp_getnode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _lanscan_getnode, _netstat_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for getter in getters + [_random_getnode]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = getter()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if _node is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_node is not None) and (0 <= _node < (1 << 48)):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _node
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert False, '_random_getnode() returned invalid value: {}'.format(_node)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _last_timestamp = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/Portfile b/lang/python31/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5b23c21..35fdd09 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python31/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,8 @@ name python31
</span> epoch 1
# Remember to keep py31-tkinter and py31-gdbm's versions sync'd with this
version 3.1.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +36,8 @@ patchfiles patch-setup.py.diff \
</span> patch-setup.py-disabled_modules.diff \
patch-libedit.diff \
patch-Lib-site.py-omit_local_site_packages.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Include-pyport.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Include-pyport.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid-64bit.patch
</span>
# https://bugs.python.org/issue21811
patchfiles-append patch-configure_configure.ac-yosemite_configure_fixes.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/uuid-64bit.patch b/lang/python31/files/uuid-64bit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..141a90b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python31/files/uuid-64bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix uuid failure on systems with 64-bit hardware addresses:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.python.org/issue32502
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backported from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/python/cpython/commit/d69794f4df81de731cc66dc82136e28bee691e1e#diff-9d2d23bf4362c9ec2b6dd4b64b73756c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/uuid.py.orig 2012-04-09 18:25:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/uuid.py 2018-08-26 02:33:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -479,6 +479,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_WIN32 = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_UNIX = [_unixdll_getnode, _ifconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def getnode():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Get the hardware address as a 48-bit positive integer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -494,17 +499,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform == 'win32':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_unixdll_getnode, _ifconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for getter in getters + [_random_getnode]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = getter()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if _node is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_node is not None) and (0 <= _node < (1 << 48)):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _node
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert False, '_random_getnode() returned invalid value: {}'.format(_node)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _last_timestamp = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python32/Portfile b/lang/python32/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bab88ba..6df87ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python32/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python32/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ name python32
</span> epoch 20120412
# Remember to keep py32-tkinter and py32-gdbm's versions sync'd with this
version 3.2.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,8 @@ patchfiles patch-setup.py.diff \
</span> patch-setup.py-disabled_modules.diff \
patch-libedit.diff \
patch-Lib-site.py-omit_local_site_packages.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Include-pyport.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Include-pyport.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid-64bit.patch
</span>
# https://bugs.python.org/issue21811
patchfiles-append patch-configure_configure.ac-yosemite_configure_fixes.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python32/files/uuid-64bit.patch b/lang/python32/files/uuid-64bit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b7a9055
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python32/files/uuid-64bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix uuid failure on systems with 64-bit hardware addresses:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.python.org/issue32502
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backported from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/python/cpython/commit/d69794f4df81de731cc66dc82136e28bee691e1e#diff-9d2d23bf4362c9ec2b6dd4b64b73756c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/uuid.py.orig 2014-10-12 01:52:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/uuid.py 2018-08-26 02:34:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -494,6 +494,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_WIN32 = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_UNIX = [_unixdll_getnode, _ifconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def getnode():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Get the hardware address as a 48-bit positive integer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -509,17 +514,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform == 'win32':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_unixdll_getnode, _ifconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for getter in getters + [_random_getnode]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = getter()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if _node is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_node is not None) and (0 <= _node < (1 << 48)):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _node
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert False, '_random_getnode() returned invalid value: {}'.format(_node)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _last_timestamp = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python33/Portfile b/lang/python33/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b9ba31e..63fb09b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name python33
</span> epoch 20141012
# Remember to keep py33-tkinter and py33-gdbm's versions sync'd with this
version 3.3.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,8 @@ patchfiles patch-setup.py.diff \
</span> patch-configure.diff \
patch-libedit.diff \
omit-local-site-packages.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Include-pyport.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Include-pyport.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid-64bit.patch
</span>
# https://bugs.python.org/issue21811
patchfiles-append yosemite-configure-fixes.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python33/files/uuid-64bit.patch b/lang/python33/files/uuid-64bit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..68f8b6f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python33/files/uuid-64bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix uuid failure on systems with 64-bit hardware addresses:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.python.org/issue32502
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backported from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/python/cpython/commit/d69794f4df81de731cc66dc82136e28bee691e1e#diff-9d2d23bf4362c9ec2b6dd4b64b73756c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/uuid.py.orig 2017-09-19 02:32:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/uuid.py 2018-08-26 02:34:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -490,6 +490,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_WIN32 = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_UNIX = [_unixdll_getnode, _ifconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def getnode():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Get the hardware address as a 48-bit positive integer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -505,17 +510,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform == 'win32':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_unixdll_getnode, _ifconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for getter in getters + [_random_getnode]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = getter()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if _node is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_node is not None) and (0 <= _node < (1 << 48)):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _node
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert False, '_random_getnode() returned invalid value: {}'.format(_node)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _last_timestamp = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python34/Portfile b/lang/python34/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d7dcc48..3f7e2e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python34/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python34/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ name python34
</span> epoch 20170810
# Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this
version 3.4.9
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +36,8 @@ patchfiles patch-setup.py.diff \
</span> patch-Lib-ctypes-macholib-dyld.py.diff \
patch-libedit.diff \
omit-local-site-packages.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Include-pyport.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Include-pyport.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid-64bit.patch
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python34/files/uuid-64bit.patch b/lang/python34/files/uuid-64bit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2746880
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python34/files/uuid-64bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix uuid failure on systems with 64-bit hardware addresses:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.python.org/issue32502
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backported from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/python/cpython/commit/d69794f4df81de731cc66dc82136e28bee691e1e#diff-9d2d23bf4362c9ec2b6dd4b64b73756c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/uuid.py.orig 2018-04-29 17:47:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/uuid.py 2018-08-25 23:35:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -522,6 +522,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_WIN32 = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_UNIX = [_unixdll_getnode, _ifconfig_getnode, _arp_getnode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _lanscan_getnode, _netstat_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def getnode():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Get the hardware address as a 48-bit positive integer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -537,18 +543,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform == 'win32':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_unixdll_getnode, _ifconfig_getnode, _arp_getnode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _lanscan_getnode, _netstat_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for getter in getters + [_random_getnode]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = getter()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if _node is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_node is not None) and (0 <= _node < (1 << 48)):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _node
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert False, '_random_getnode() returned invalid value: {}'.format(_node)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _last_timestamp = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python35/Portfile b/lang/python35/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3410ce4..584e3da3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ name python35
</span> epoch 20170810
# Remember to keep py35-tkinter and py35-gdbm's versions sync'd with this
version 3.5.6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +37,8 @@ patchfiles patch-setup.py.diff \
</span> patch-libedit.diff \
omit-local-site-packages.patch \
patch-xcode4bug.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Modules_posixmodule.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Modules_posixmodule.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid-64bit.patch
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python35/files/uuid-64bit.patch b/lang/python35/files/uuid-64bit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9fa3596
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python35/files/uuid-64bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix uuid failure on systems with 64-bit hardware addresses:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.python.org/issue32502
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backported from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/python/cpython/commit/d69794f4df81de731cc66dc82136e28bee691e1e#diff-9d2d23bf4362c9ec2b6dd4b64b73756c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/uuid.py.orig 2018-08-02 04:19:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/uuid.py 2018-08-26 02:26:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -527,6 +527,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_WIN32 = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_NODE_GETTERS_UNIX = [_unixdll_getnode, _ifconfig_getnode, _ip_getnode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _arp_getnode, _lanscan_getnode, _netstat_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def getnode():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Get the hardware address as a 48-bit positive integer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -542,18 +548,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform == 'win32':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getters = [_unixdll_getnode, _ifconfig_getnode, _ip_getnode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _arp_getnode, _lanscan_getnode, _netstat_getnode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getters = _NODE_GETTERS_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for getter in getters + [_random_getnode]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _node = getter()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if _node is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_node is not None) and (0 <= _node < (1 << 48)):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _node
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert False, '_random_getnode() returned invalid value: {}'.format(_node)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _last_timestamp = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>