Skip to content

Commit 94ca5cd

Browse files
committed
Bumped Python version to v3.8.9.
Includes OpenSSL 1.1.1j.
1 parent a30a9b4 commit 94ca5cd

File tree

3 files changed

+41
-41
lines changed

3 files changed

+41
-41
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ BUILD_NUMBER=custom
3030
MACOSX_DEPLOYMENT_TARGET=10.8
3131

3232
# Version of packages that will be compiled by this meta-package
33-
PYTHON_VERSION=3.8.8
33+
PYTHON_VERSION=3.8.9
3434
PYTHON_VER=$(basename $(PYTHON_VERSION))
3535

3636
OPENSSL_VERSION_NUMBER=1.1.1
37-
OPENSSL_REVISION=i
37+
OPENSSL_REVISION=j
3838
OPENSSL_VERSION=$(OPENSSL_VERSION_NUMBER)$(OPENSSL_REVISION)
3939

4040
BZIP2_VERSION=1.0.8

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Python Apple Support
22
====================
33

4-
**This repository branch builds a packaged version of Python 3.8.7**.
4+
**This repository branch builds a packaged version of Python 3.8.9**.
55
Other Python versions are available by cloning other branches of the main
66
repository.
77

patch/Python/Python.patch

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11404,7 +11404,7 @@ index 9fa21cca38..e346fb4390 100644
1140411404
return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages'
1140511405

1140611406
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
11407-
index eecb1e7f25..1d3b59c73a 100644
11407+
index d4d04a5c34..c5ac3d1525 100644
1140811408
--- a/Lib/subprocess.py
1140911409
+++ b/Lib/subprocess.py
1141011410
@@ -741,6 +741,9 @@
@@ -11417,7 +11417,7 @@ index eecb1e7f25..1d3b59c73a 100644
1141711417
_cleanup()
1141811418
# Held while anything is calling waitpid before returncode has been
1141911419
# updated to prevent clobbering returncode if wait() or poll() are
11420-
@@ -1725,7 +1728,7 @@
11420+
@@ -1723,7 +1726,7 @@
1142111421
raise SubprocessError("Unknown child exit status!")
1142211422

1142311423

@@ -11426,7 +11426,7 @@ index eecb1e7f25..1d3b59c73a 100644
1142611426
_WNOHANG=os.WNOHANG, _ECHILD=errno.ECHILD):
1142711427
"""Check if child process has terminated. Returns returncode
1142811428
attribute.
11429-
@@ -1734,6 +1737,8 @@
11429+
@@ -1732,6 +1735,8 @@
1143011430
outside of the local scope (nor can any methods it calls).
1143111431

1143211432
"""
@@ -11770,7 +11770,7 @@ index 7547127018..8032f9182b 100644
1177011770

1177111771
@support.reap_threads
1177211772
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
11773-
index a5ece9bd61..0ab52db757 100644
11773+
index 871a9c7a25..ea2052bf90 100644
1177411774
--- a/Lib/test/test_cmd_line.py
1177511775
+++ b/Lib/test/test_cmd_line.py
1177611776
@@ -66,6 +66,7 @@
@@ -11797,31 +11797,31 @@ index a5ece9bd61..0ab52db757 100644
1179711797
def test_undecodable_code(self):
1179811798
undecodable = b"\xff"
1179911799
env = os.environ.copy()
11800-
@@ -223,6 +226,7 @@
11801-
)
11802-
check_output(text)
11800+
@@ -257,6 +260,7 @@
11801+
self.assertEqual(stdout, expected)
11802+
self.assertEqual(p.returncode, 0)
1180311803

1180411804
+ @unittest.skipUnless(os.allows_subprocesses, 'Test requires support for subprocesses.')
1180511805
def test_unbuffered_output(self):
1180611806
# Test expected operation of the '-u' switch
1180711807
for stream in ('stdout', 'stderr'):
11808-
@@ -281,6 +285,7 @@
11808+
@@ -315,6 +319,7 @@
1180911809
# for empty and unset PYTHONPATH
1181011810
self.assertEqual(out1, out2)
1181111811

1181211812
+ @unittest.skipUnless(os.allows_subprocesses, 'Test requires support for subprocesses.')
1181311813
def test_displayhook_unencodable(self):
1181411814
for encoding in ('ascii', 'latin-1', 'utf-8'):
1181511815
env = os.environ.copy()
11816-
@@ -299,6 +304,7 @@
11816+
@@ -333,6 +338,7 @@
1181711817
escaped = repr(text).encode(encoding, 'backslashreplace')
1181811818
self.assertIn(escaped, data)
1181911819

1182011820
+ @unittest.skipUnless(os.allows_subprocesses, 'Test requires support for subprocesses.')
1182111821
def check_input(self, code, expected):
1182211822
with tempfile.NamedTemporaryFile("wb+") as stdin:
1182311823
sep = os.linesep.encode('ASCII')
11824-
@@ -374,6 +380,7 @@
11824+
@@ -408,6 +414,7 @@
1182511825
@unittest.skipIf(os.name != 'posix', "test needs POSIX semantics")
1182611826
@unittest.skipIf(sys.platform == "vxworks",
1182711827
"test needs preexec support in subprocess.Popen")
@@ -12062,7 +12062,7 @@ index 9ad05fadef..05d1ba1f82 100644
1206212062
"""Test loading extension modules with multi-phase initialization (PEP 489)
1206312063
"""
1206412064
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
12065-
index 8eef332b8e..4b78f00fbc 100644
12065+
index 9d79caac8c..a7ee4f2f09 100644
1206612066
--- a/Lib/test/test_io.py
1206712067
+++ b/Lib/test/test_io.py
1206812068
@@ -600,7 +600,7 @@
@@ -12586,10 +12586,10 @@ index 458998a62f..577cf5f385 100644
1258612586
cmd = 'for i in 0 1 2 3 4 5 6 7 8 9; do echo testing...; sleep 1; done'
1258712587
with os.popen(cmd) as p:
1258812588
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
12589-
index 77306170d9..4b865f4769 100644
12589+
index 37940c8dcf..f975f7befe 100644
1259012590
--- a/Lib/test/test_shutil.py
1259112591
+++ b/Lib/test/test_shutil.py
12592-
@@ -1660,6 +1660,8 @@
12592+
@@ -1662,6 +1662,8 @@
1259312593
self.assertEqual(['pol'], os.listdir(rv))
1259412594

1259512595

@@ -12598,7 +12598,7 @@ index 77306170d9..4b865f4769 100644
1259812598
class TestWhich(unittest.TestCase):
1259912599

1260012600
def setUp(self):
12601-
@@ -2513,6 +2515,7 @@
12601+
@@ -2550,6 +2552,7 @@
1260212602
self.assertGreaterEqual(size.lines, 0)
1260312603

1260412604
@unittest.skipUnless(os.isatty(sys.__stdout__.fileno()), "not on tty")
@@ -12750,7 +12750,7 @@ index f9370d8e52..f6d1637f64 100644
1275012750
class RecvmsgIntoSCMRightsStreamTest(RecvmsgIntoMixin, SCMRightsTest,
1275112751
SendrecvmsgUnixStreamTestBase):
1275212752
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
12753-
index 8aed4b61a2..da0b9a047b 100644
12753+
index 1e5224df01..3cd83042d8 100644
1275412754
--- a/Lib/test/test_socketserver.py
1275512755
+++ b/Lib/test/test_socketserver.py
1275612756
@@ -8,6 +8,7 @@
@@ -12828,7 +12828,7 @@ index 2accad1aee..4824b6c8d0 100644
1282812828
import distutils.text_file
1282912829
import distutils.unixccompiler
1283012830
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
12831-
index af0e54bd0e..6f4fbdf718 100644
12831+
index 140c65aa3b..2301adde7b 100644
1283212832
--- a/Lib/test/test_sys.py
1283312833
+++ b/Lib/test/test_sys.py
1283412834
@@ -108,6 +108,7 @@
@@ -33963,10 +33963,10 @@ index a9ba7a436f..e40b6b95cd 100644
3396333963
+ return ret;
3396433964
+}
3396533965
diff --git a/aclocal.m4 b/aclocal.m4
33966-
index f98db73656..31ea12d06c 100644
33966+
index 04342a4982..b027647376 100644
3396733967
--- a/aclocal.m4
3396833968
+++ b/aclocal.m4
33969-
@@ -156,7 +156,7 @@
33969+
@@ -365,7 +365,7 @@
3397033970
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
3397133971

3397233972
pkg_failed=no
@@ -33975,7 +33975,7 @@ index f98db73656..31ea12d06c 100644
3397533975

3397633976
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
3397733977
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
33978-
@@ -166,11 +166,11 @@
33978+
@@ -375,11 +375,11 @@
3397933979
See the pkg-config man page for more details.])
3398033980

3398133981
if test $pkg_failed = yes; then
@@ -33989,7 +33989,7 @@ index f98db73656..31ea12d06c 100644
3398933989
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
3399033990
fi
3399133991
# Put the nasty error message in config.log where it belongs
33992-
@@ -187,7 +187,7 @@
33992+
@@ -396,7 +396,7 @@
3399333993
_PKG_TEXT])[]dnl
3399433994
])
3399533995
elif test $pkg_failed = untried; then
@@ -34025,10 +34025,10 @@ index ba37cf99e2..9815c16a5c 100755
3402534025
;;
3402634026
*)
3402734027
diff --git a/configure b/configure
34028-
index c164d68c4e..132ca95186 100755
34028+
index c737256c15..d8d542e7cc 100755
3402934029
--- a/configure
3403034030
+++ b/configure
34031-
@@ -3275,6 +3275,15 @@
34031+
@@ -3263,6 +3263,15 @@
3403234032
*-*-cygwin*)
3403334033
ac_sys_system=Cygwin
3403434034
;;
@@ -34044,7 +34044,7 @@ index c164d68c4e..132ca95186 100755
3404434044
*-*-vxworks*)
3404534045
ac_sys_system=VxWorks
3404634046
;;
34047-
@@ -3325,6 +3334,15 @@
34047+
@@ -3313,6 +3322,15 @@
3404834048
*-*-cygwin*)
3404934049
_host_cpu=
3405034050
;;
@@ -34060,7 +34060,7 @@ index c164d68c4e..132ca95186 100755
3406034060
*-*-vxworks*)
3406134061
_host_cpu=$host_cpu
3406234062
;;
34063-
@@ -3400,6 +3418,13 @@
34063+
@@ -3388,6 +3406,13 @@
3406434064
define_xopen_source=no;;
3406534065
Darwin/[12][0-9].*)
3406634066
define_xopen_source=no;;
@@ -34074,7 +34074,7 @@ index c164d68c4e..132ca95186 100755
3407434074
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
3407534075
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
3407634076
# or has another value. By not (re)defining it, the defaults come in place.
34077-
@@ -6169,11 +6194,17 @@
34077+
@@ -6157,11 +6182,17 @@
3407834078
fi
3407934079

3408034080
if test "$cross_compiling" = yes; then
@@ -34097,7 +34097,7 @@ index c164d68c4e..132ca95186 100755
3409734097
fi
3409834098

3409934099

34100-
@@ -6924,8 +6955,6 @@
34100+
@@ -6912,8 +6943,6 @@
3410134101
# tweak BASECFLAGS based on compiler and platform
3410234102
case $GCC in
3410334103
yes)
@@ -34106,7 +34106,7 @@ index c164d68c4e..132ca95186 100755
3410634106
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
3410734107
$as_echo_n "checking for -Wextra... " >&6; }
3410834108
ac_save_cc="$CC"
34109-
@@ -11488,6 +11517,10 @@
34109+
@@ -11476,6 +11505,10 @@
3411034110
fi
3411134111
;;
3411234112
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -34117,7 +34117,7 @@ index c164d68c4e..132ca95186 100755
3411734117
*)
3411834118
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
3411934119
# out any dynamic loading
34120-
@@ -18720,7 +18753,17 @@
34120+
@@ -18709,7 +18742,17 @@
3412134121
echo "creating Modules/Setup.local" >&6
3412234122
if test ! -f Modules/Setup.local
3412334123
then
@@ -34136,16 +34136,16 @@ index c164d68c4e..132ca95186 100755
3413634136
fi
3413734137

3413834138
echo "creating Makefile" >&6
34139-
@@ -18737,4 +18780,3 @@
34139+
@@ -18726,4 +18769,3 @@
3414034140
echo "" >&6
3414134141
echo "" >&6
3414234142
fi
3414334143
-
3414434144
diff --git a/configure.ac b/configure.ac
34145-
index fc082a3cd2..9dcb1e6668 100644
34145+
index 040ddfc791..3305f18b9a 100644
3414634146
--- a/configure.ac
3414734147
+++ b/configure.ac
34148-
@@ -379,6 +379,15 @@
34148+
@@ -386,6 +386,15 @@
3414934149
*-*-cygwin*)
3415034150
ac_sys_system=Cygwin
3415134151
;;
@@ -34161,7 +34161,7 @@ index fc082a3cd2..9dcb1e6668 100644
3416134161
*-*-vxworks*)
3416234162
ac_sys_system=VxWorks
3416334163
;;
34164-
@@ -428,6 +437,15 @@
34164+
@@ -435,6 +444,15 @@
3416534165
*-*-cygwin*)
3416634166
_host_cpu=
3416734167
;;
@@ -34177,7 +34177,7 @@ index fc082a3cd2..9dcb1e6668 100644
3417734177
*-*-vxworks*)
3417834178
_host_cpu=$host_cpu
3417934179
;;
34180-
@@ -500,6 +518,13 @@
34180+
@@ -507,6 +525,13 @@
3418134181
define_xopen_source=no;;
3418234182
Darwin/@<:@[12]@:>@@<:@0-9@:>@.*)
3418334183
define_xopen_source=no;;
@@ -34191,7 +34191,7 @@ index fc082a3cd2..9dcb1e6668 100644
3419134191
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
3419234192
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
3419334193
# or has another value. By not (re)defining it, the defaults come in place.
34194-
@@ -1186,11 +1211,17 @@
34194+
@@ -1193,11 +1218,17 @@
3419534195

3419634196
AC_CHECK_TOOLS([READELF], [readelf], [:])
3419734197
if test "$cross_compiling" = yes; then
@@ -34214,7 +34214,7 @@ index fc082a3cd2..9dcb1e6668 100644
3421434214
fi
3421534215
AC_SUBST(READELF)
3421634216

34217-
@@ -1569,8 +1600,6 @@
34217+
@@ -1576,8 +1607,6 @@
3421834218
# tweak BASECFLAGS based on compiler and platform
3421934219
case $GCC in
3422034220
yes)
@@ -34223,7 +34223,7 @@ index fc082a3cd2..9dcb1e6668 100644
3422334223
AC_MSG_CHECKING(for -Wextra)
3422434224
ac_save_cc="$CC"
3422534225
CC="$CC -Wextra -Werror"
34226-
@@ -3532,6 +3561,10 @@
34226+
@@ -3539,6 +3568,10 @@
3422734227
fi
3422834228
;;
3422934229
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -34234,7 +34234,7 @@ index fc082a3cd2..9dcb1e6668 100644
3423434234
*)
3423534235
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
3423634236
# out any dynamic loading
34237-
@@ -5658,7 +5691,17 @@
34237+
@@ -5665,7 +5698,17 @@
3423834238
echo "creating Modules/Setup.local" >&AS_MESSAGE_FD
3423934239
if test ! -f Modules/Setup.local
3424034240
then
@@ -34253,7 +34253,7 @@ index fc082a3cd2..9dcb1e6668 100644
3425334253
fi
3425434254

3425534255
echo "creating Makefile" >&AS_MESSAGE_FD
34256-
@@ -5675,4 +5718,3 @@
34256+
@@ -5682,4 +5725,3 @@
3425734257
echo "" >&AS_MESSAGE_FD
3425834258
echo "" >&AS_MESSAGE_FD
3425934259
fi

0 commit comments

Comments
 (0)