<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1415ce7e29c746c9d20fdde5522cb29b2373d859">https://github.com/macports/macports-ports/commit/1415ce7e29c746c9d20fdde5522cb29b2373d859</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1415ce7e29c746c9d20fdde5522cb29b2373d859
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Mar 19 08:40:00 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> python35: update to 3.5.7
</span>---
lang/python35/Portfile | 12 +++---
lang/python35/files/libressl-2.7.patch | 76 ----------------------------------
python/py-gdbm/Portfile | 8 ++--
python/py-tkinter/Portfile | 8 ++--
4 files changed, 13 insertions(+), 91 deletions(-)
<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 d25e86c..b347f5c 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;'>@@ -7,8 +7,7 @@ name python35
</span>
epoch 20170810
# Remember to keep py35-tkinter and py35-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.5.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.5.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;'>@@ -26,9 +25,9 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 f5a99f765e765336a3ebbb2a24ca2be3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5a02cb3664ad98d1767c79dfdd88a850b866241f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 b1b4949786732494f4d6675c184aa765 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 782c63473dc5a4fb181409dcc2af9595d1aab92c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +37,7 @@ patchfiles patch-setup.py.diff \
</span> omit-local-site-packages.patch \
patch-xcode4bug.diff \
Modules_posixmodule.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- uuid-64bit.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libressl-2.7.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/python35/files/libressl-2.7.patch b/lang/python35/files/libressl-2.7.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9231d21..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python35/files/libressl-2.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f5befbb0d1526f18eb2b24eabb48c3b761c624a2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Christian Heimes <christian@python.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 24 Mar 2018 18:38:14 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] [3.6] bpo-33127: Compatibility patch for LibreSSL 2.7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (GH-6210) (GH-6214)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LibreSSL < 2.7.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Documentation updates and fixes for failing tests will be provided in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-another patch set.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Christian Heimes <christian@python.org>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Co-authored-by: Christian Heimes <christian@python.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .../2018-03-24-15-08-24.bpo-33127.olJmHv.rst | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Modules/_ssl.c | 24 ++++++++++++-------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Tools/ssl/multissltests.py | 3 ++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 20 insertions(+), 9 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- create mode 100644 Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Modules/_ssl.c b/Modules/_ssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c54e43c2b48a..5e007da858bd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/_ssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/_ssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,6 +101,12 @@ struct py_ssl_library_code {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define OPENSSL_VERSION_1_1 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define PY_OPENSSL_1_1_API 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define PY_OPENSSL_1_1_API 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -129,16 +135,18 @@ struct py_ssl_library_code {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define INVALID_SOCKET (-1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef OPENSSL_VERSION_1_1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* OpenSSL 1.1.0+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef OPENSSL_NO_SSL2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define OPENSSL_NO_SSL2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else /* OpenSSL < 1.1.0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(WITH_THREAD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HAVE_OPENSSL_CRYPTO_LOCK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define OPENSSL_NO_SSL2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef PY_OPENSSL_1_1_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define TLS_method SSLv23_method
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,7 +195,7 @@ X509_STORE_get0_param(X509_STORE *store)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return store->param;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* OpenSSL < 1.1.0 or LibreSSL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum py_ssl_error {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gdbm/Portfile b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bcccfed..d1e3a4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,13 +84,13 @@ subport py34-gdbm {
</span> subport py35-gdbm {
maintainers {jmr @jmroot} openmaintainer
epoch 20170810
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.5.7
</span> revision 0
homepage https://docs.python.org/release/${version}/library/dbm.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 f5a99f765e765336a3ebbb2a24ca2be3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5a02cb3664ad98d1767c79dfdd88a850b866241f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 b1b4949786732494f4d6675c184aa765 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 782c63473dc5a4fb181409dcc2af9595d1aab92c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
</span> set setup_py "setup-py3k.py"
set extract_files "Modules/_gdbmmodule.c Modules/clinic/_gdbmmodule.c.h"
livecheck.regex Python (3.5.\[0-9\]+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tkinter/Portfile b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e62745d..c9ae04f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,13 +80,13 @@ subport py34-tkinter {
</span> subport py35-tkinter {
maintainers {jmr @jmroot} openmaintainer
epoch 20170810
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.5.7
</span> revision 0
homepage https://docs.python.org/release/${version}/library/tkinter.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 f5a99f765e765336a3ebbb2a24ca2be3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5a02cb3664ad98d1767c79dfdd88a850b866241f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 b1b4949786732494f4d6675c184aa765 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 782c63473dc5a4fb181409dcc2af9595d1aab92c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
</span> append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>