<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/259e6a39c42a067553734bb80f62bd2a4513f88f">https://github.com/macports/macports-ports/commit/259e6a39c42a067553734bb80f62bd2a4513f88f</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 259e6a39c42 python*: switch back to openssl 1.1
</span>259e6a39c42 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 259e6a39c42a067553734bb80f62bd2a4513f88f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Nov 9 12:28:21 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> python*: switch back to openssl 1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream support for 3 isn't done yet.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/63857
</span>---
lang/python27/Portfile | 6 ++++--
lang/python27/files/openssl_ver.patch | 4 ++--
lang/python310/Portfile | 6 ++++--
lang/python34/Portfile | 6 ++++--
lang/python35/Portfile | 6 ++++--
lang/python36/Portfile | 6 ++++--
lang/python37/Portfile | 6 ++++--
lang/python38/Portfile | 7 ++++---
lang/python39/Portfile | 5 ++++-
9 files changed, 34 insertions(+), 18 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 57d4470c4c6..220061d8c59 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;'>@@ -2,13 +2,14 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span> PortGroup clang_dependency 1.0
name python27
epoch 2
# Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
version 2.7.18
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,12 +55,13 @@ depends_lib port:bzip2 \
</span> port:libedit \
port:libffi \
port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:sqlite3 \
port:zlib
depends_run port:python_select \
port:python2_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
set stdprefix ${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/files/openssl_ver.patch b/lang/python27/files/openssl_ver.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d1031a331ce..d9d21f94489 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/files/openssl_ver.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python27/files/openssl_ver.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> The detection of OPENSSL_VERSION_NUMBER is fragile and stopped working.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-We know we have at least openssl 3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We know we have at least openssl 1.1.
</span> --- setup.py.orig 2021-11-08 08:54:46.000000000 +1100
+++ setup.py 2021-11-08 09:04:30.000000000 +1100
@@ -874,7 +874,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ We know we have at least openssl 3.
</span>
# find out which version of OpenSSL we have
- openssl_ver = 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ openssl_ver = 0x30000000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ openssl_ver = 0x101010cf
</span> openssl_ver_re = re.compile(
'^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310/Portfile b/lang/python310/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d549c6d0228..bc1bafc42fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,13 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name python310
# Remember to keep py310-tkinter and py310-gdbm's versions sync'd with this
version 3.10.0
<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 branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,13 +49,14 @@ depends_lib port:bzip2 \
</span> port:libedit \
port:libffi \
port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:sqlite3 \
port:xz \
port:zlib
depends_run port:python_select \
port:python3_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # blacklist llvm-gcc-4.2 compiler known to produce bad code
compiler.blacklist-append *llvm-gcc-4.2
<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 fec78e2eb95..138a7cfbada 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;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span> PortGroup deprecated 1.0
name python34
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +10,7 @@ name python34
</span> epoch 20170810
# Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this
version 3.4.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 8
</span>
deprecated.eol_version yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,13 +56,14 @@ depends_lib port:bzip2 \
</span> port:libedit \
port:libffi \
port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:sqlite3 \
port:xz \
port:zlib
depends_run port:python_select \
port:python3_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin arm {
known_fail yes
if {$build_arch ne "x86_64"} {
<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 03df57cfa57..55908f127c2 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;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span> PortGroup deprecated 1.0
name python35
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +10,7 @@ name python35
</span> epoch 20170810
# Remember to keep py35-tkinter and py35-gdbm's versions sync'd with this
version 3.5.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span>
deprecated.eol_version yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,13 +55,14 @@ depends_lib port:bzip2 \
</span> port:libedit \
port:libffi \
port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:sqlite3 \
port:xz \
port:zlib
depends_run port:python_select \
port:python3_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin arm {
known_fail yes
if {$build_arch ne "x86_64"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python36/Portfile b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 026ea73da1c..249c23ed423 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,13 +2,14 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name python36
epoch 20170717
# Remember to keep py36-tkinter and py36-gdbm's versions sync'd with this
version 3.6.15
<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;'>@@ -48,13 +49,14 @@ depends_lib port:bzip2 \
</span> port:libedit \
port:libffi \
port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:sqlite3 \
port:xz \
port:zlib
depends_run port:python_select \
port:python3_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin arm {
known_fail yes
if {$build_arch ne "x86_64"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python37/Portfile b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fc840f62f80..334017ec89e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,13 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name python37
# Remember to keep py37-tkinter and py37-gdbm's versions sync'd with this
version 3.7.12
<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;'>@@ -46,13 +47,14 @@ depends_lib port:bzip2 \
</span> port:libedit \
port:libffi \
port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:sqlite3 \
port:xz \
port:zlib
depends_run port:python_select \
port:python3_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # blacklist llvm-gcc-4.2 compiler known to produce bad code
compiler.blacklist-append *llvm-gcc-4.2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/Portfile b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 26c2ba8ee0f..8677d74b1dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,14 +2,14 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup clang_dependency 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name python38
epoch 1
# Remember to keep py38-tkinter, py38-htmldocs, and py38-gdbm's versions sync'd with this
version 3.8.12
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,13 +55,14 @@ depends_lib port:bzip2 \
</span> port:libedit \
port:libffi \
port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:sqlite3 \
port:xz \
port:zlib
depends_run port:python_select \
port:python3_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # blacklist llvm-gcc-4.2 compiler known to produce bad code
compiler.blacklist-append *llvm-gcc-4.2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39/Portfile b/lang/python39/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fc4f95fb92e..ff16fa59156 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python39/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,11 +2,13 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name python39
# Remember to keep py39-tkinter and py39-gdbm's versions sync'd with this
version 3.9.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,13 +50,14 @@ depends_lib port:bzip2 \
</span> port:libedit \
port:libffi \
port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:sqlite3 \
port:xz \
port:zlib
depends_run port:python_select \
port:python3_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # blacklist llvm-gcc-4.2 compiler known to produce bad code
compiler.blacklist-append *llvm-gcc-4.2
</pre><pre style='margin:0'>
</pre>