Skip to content

Commit 61c6afa

Browse files
committed
Updated patch for Python 3.8.13.
Includes OpenSSL 1.1.1n.
1 parent 1ccbe46 commit 61c6afa

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ MACOSX_DEPLOYMENT_TARGET=10.8
3636
# PYTHON_VERSION is the full version number (e.g., 3.10.0b3)
3737
# PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
3838
# PYTHON_VER is the major/minor version (e.g., 3.10)
39-
PYTHON_VERSION=3.8.11
39+
PYTHON_VERSION=3.8.13
4040
PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
4141
PYTHON_VER=$(basename $(PYTHON_VERSION))
4242

4343
OPENSSL_VERSION_NUMBER=1.1.1
44-
OPENSSL_REVISION=j
44+
OPENSSL_REVISION=n
4545
OPENSSL_VERSION=$(OPENSSL_VERSION_NUMBER)$(OPENSSL_REVISION)
4646

4747
BZIP2_VERSION=1.0.8

patch/Python/Python.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15755,7 +15755,7 @@ index ba37cf99e2..9815c16a5c 100755
1575515755
;;
1575615756
*)
1575715757
diff --git a/configure b/configure
15758-
index 936f3d4596..da05d0a86c 100755
15758+
index c091865aff..35ec7f1a4c 100755
1575915759
--- a/configure
1576015760
+++ b/configure
1576115761
@@ -3268,6 +3268,15 @@
@@ -15804,7 +15804,7 @@ index 936f3d4596..da05d0a86c 100755
1580415804
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
1580515805
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
1580615806
# or has another value. By not (re)defining it, the defaults come in place.
15807-
@@ -6162,11 +6187,17 @@
15807+
@@ -6164,11 +6189,17 @@
1580815808
fi
1580915809

1581015810
if test "$cross_compiling" = yes; then
@@ -15827,7 +15827,7 @@ index 936f3d4596..da05d0a86c 100755
1582715827
fi
1582815828

1582915829

15830-
@@ -6917,8 +6948,6 @@
15830+
@@ -6919,8 +6950,6 @@
1583115831
# tweak BASECFLAGS based on compiler and platform
1583215832
case $GCC in
1583315833
yes)
@@ -15836,7 +15836,7 @@ index 936f3d4596..da05d0a86c 100755
1583615836
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
1583715837
$as_echo_n "checking for -Wextra... " >&6; }
1583815838
ac_save_cc="$CC"
15839-
@@ -11491,6 +11520,10 @@
15839+
@@ -11493,6 +11522,10 @@
1584015840
fi
1584115841
;;
1584215842
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -15847,7 +15847,7 @@ index 936f3d4596..da05d0a86c 100755
1584715847
*)
1584815848
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
1584915849
# out any dynamic loading
15850-
@@ -18749,7 +18782,17 @@
15850+
@@ -18751,7 +18784,17 @@
1585115851
echo "creating Modules/Setup.local" >&6
1585215852
if test ! -f Modules/Setup.local
1585315853
then
@@ -15866,13 +15866,13 @@ index 936f3d4596..da05d0a86c 100755
1586615866
fi
1586715867

1586815868
echo "creating Makefile" >&6
15869-
@@ -18766,4 +18809,3 @@
15869+
@@ -18768,4 +18811,3 @@
1587015870
echo "" >&6
1587115871
echo "" >&6
1587215872
fi
1587315873
-
1587415874
diff --git a/configure.ac b/configure.ac
15875-
index e02cc2c656..599bfa153f 100644
15875+
index de83332dd3..d99c988975 100644
1587615876
--- a/configure.ac
1587715877
+++ b/configure.ac
1587815878
@@ -392,6 +392,15 @@
@@ -15921,7 +15921,7 @@ index e02cc2c656..599bfa153f 100644
1592115921
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
1592215922
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
1592315923
# or has another value. By not (re)defining it, the defaults come in place.
15924-
@@ -1199,11 +1224,17 @@
15924+
@@ -1201,11 +1226,17 @@
1592515925

1592615926
AC_CHECK_TOOLS([READELF], [readelf], [:])
1592715927
if test "$cross_compiling" = yes; then
@@ -15944,7 +15944,7 @@ index e02cc2c656..599bfa153f 100644
1594415944
fi
1594515945
AC_SUBST(READELF)
1594615946

15947-
@@ -1582,8 +1613,6 @@
15947+
@@ -1584,8 +1615,6 @@
1594815948
# tweak BASECFLAGS based on compiler and platform
1594915949
case $GCC in
1595015950
yes)
@@ -15953,7 +15953,7 @@ index e02cc2c656..599bfa153f 100644
1595315953
AC_MSG_CHECKING(for -Wextra)
1595415954
ac_save_cc="$CC"
1595515955
CC="$CC -Wextra -Werror"
15956-
@@ -3555,6 +3584,10 @@
15956+
@@ -3557,6 +3586,10 @@
1595715957
fi
1595815958
;;
1595915959
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -15964,7 +15964,7 @@ index e02cc2c656..599bfa153f 100644
1596415964
*)
1596515965
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
1596615966
# out any dynamic loading
15967-
@@ -5687,7 +5720,17 @@
15967+
@@ -5689,7 +5722,17 @@
1596815968
echo "creating Modules/Setup.local" >&AS_MESSAGE_FD
1596915969
if test ! -f Modules/Setup.local
1597015970
then
@@ -15983,7 +15983,7 @@ index e02cc2c656..599bfa153f 100644
1598315983
fi
1598415984

1598515985
echo "creating Makefile" >&AS_MESSAGE_FD
15986-
@@ -5704,4 +5747,3 @@
15986+
@@ -5706,4 +5749,3 @@
1598715987
echo "" >&AS_MESSAGE_FD
1598815988
echo "" >&AS_MESSAGE_FD
1598915989
fi

0 commit comments

Comments
 (0)