Skip to content

Commit 5a748a5

Browse files
committed
Bumped Python version to v3.7.13.
Includes OpenSSL 1.1.1o.
1 parent 3a8548f commit 5a748a5

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
@@ -33,12 +33,12 @@ MACOSX_DEPLOYMENT_TARGET=10.8
3333
# PYTHON_VERSION is the full version number (e.g., 3.10.0b3)
3434
# PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
3535
# PYTHON_VER is the major/minor version (e.g., 3.10)
36-
PYTHON_VERSION=3.7.11
36+
PYTHON_VERSION=3.7.13
3737
PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
3838
PYTHON_VER=$(basename $(PYTHON_VERSION))
3939

4040
OPENSSL_VERSION_NUMBER=1.1.1
41-
OPENSSL_REVISION=j
41+
OPENSSL_REVISION=o
4242
OPENSSL_VERSION=$(OPENSSL_VERSION_NUMBER)$(OPENSSL_REVISION)
4343

4444
BZIP2_VERSION=1.0.8

patch/Python/Python.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34065,7 +34065,7 @@ index ba37cf99e2..9815c16a5c 100755
3406534065
;;
3406634066
*)
3406734067
diff --git a/configure b/configure
34068-
index 829dd69bb8..d9d71e5872 100755
34068+
index 455481bc50..ffb14d2f4a 100755
3406934069
--- a/configure
3407034070
+++ b/configure
3407134071
@@ -3260,6 +3260,15 @@
@@ -34114,7 +34114,7 @@ index 829dd69bb8..d9d71e5872 100755
3411434114
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
3411534115
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
3411634116
# or has another value. By not (re)defining it, the defaults come in place.
34117-
@@ -6183,11 +6208,17 @@
34117+
@@ -6185,11 +6210,17 @@
3411834118
fi
3411934119

3412034120
if test "$cross_compiling" = yes; then
@@ -34137,7 +34137,7 @@ index 829dd69bb8..d9d71e5872 100755
3413734137
fi
3413834138

3413934139

34140-
@@ -6906,8 +6937,6 @@
34140+
@@ -6908,8 +6939,6 @@
3414134141
# tweak BASECFLAGS based on compiler and platform
3414234142
case $GCC in
3414334143
yes)
@@ -34146,7 +34146,7 @@ index 829dd69bb8..d9d71e5872 100755
3414634146
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
3414734147
$as_echo_n "checking for -Wextra... " >&6; }
3414834148
ac_save_cc="$CC"
34149-
@@ -11450,6 +11479,10 @@
34149+
@@ -11452,6 +11481,10 @@
3415034150
fi
3415134151
;;
3415234152
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -34157,7 +34157,7 @@ index 829dd69bb8..d9d71e5872 100755
3415734157
*)
3415834158
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
3415934159
# out any dynamic loading
34160-
@@ -18684,7 +18717,17 @@
34160+
@@ -18686,7 +18719,17 @@
3416134161
echo "creating Modules/Setup.local" >&6
3416234162
if test ! -f Modules/Setup.local
3416334163
then
@@ -34176,13 +34176,13 @@ index 829dd69bb8..d9d71e5872 100755
3417634176
fi
3417734177

3417834178
echo "creating Makefile" >&6
34179-
@@ -18701,4 +18744,3 @@
34179+
@@ -18703,4 +18746,3 @@
3418034180
echo "" >&6
3418134181
echo "" >&6
3418234182
fi
3418334183
-
3418434184
diff --git a/configure.ac b/configure.ac
34185-
index f1cc8e9bcb..8898ecf484 100644
34185+
index 1afcba3307..db2afe7e5f 100644
3418634186
--- a/configure.ac
3418734187
+++ b/configure.ac
3418834188
@@ -379,6 +379,15 @@
@@ -34231,7 +34231,7 @@ index f1cc8e9bcb..8898ecf484 100644
3423134231
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
3423234232
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
3423334233
# or has another value. By not (re)defining it, the defaults come in place.
34234-
@@ -1202,11 +1227,17 @@
34234+
@@ -1204,11 +1229,17 @@
3423534235

3423634236
AC_CHECK_TOOLS([READELF], [readelf], [:])
3423734237
if test "$cross_compiling" = yes; then
@@ -34254,7 +34254,7 @@ index f1cc8e9bcb..8898ecf484 100644
3425434254
fi
3425534255
AC_SUBST(READELF)
3425634256

34257-
@@ -1564,8 +1595,6 @@
34257+
@@ -1566,8 +1597,6 @@
3425834258
# tweak BASECFLAGS based on compiler and platform
3425934259
case $GCC in
3426034260
yes)
@@ -34263,7 +34263,7 @@ index f1cc8e9bcb..8898ecf484 100644
3426334263
AC_MSG_CHECKING(for -Wextra)
3426434264
ac_save_cc="$CC"
3426534265
CC="$CC -Wextra -Werror"
34266-
@@ -3539,6 +3568,10 @@
34266+
@@ -3541,6 +3570,10 @@
3426734267
fi
3426834268
;;
3426934269
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
@@ -34274,7 +34274,7 @@ index f1cc8e9bcb..8898ecf484 100644
3427434274
*)
3427534275
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
3427634276
# out any dynamic loading
34277-
@@ -5723,7 +5756,17 @@
34277+
@@ -5725,7 +5758,17 @@
3427834278
echo "creating Modules/Setup.local" >&AS_MESSAGE_FD
3427934279
if test ! -f Modules/Setup.local
3428034280
then
@@ -34293,7 +34293,7 @@ index f1cc8e9bcb..8898ecf484 100644
3429334293
fi
3429434294

3429534295
echo "creating Makefile" >&AS_MESSAGE_FD
34296-
@@ -5740,4 +5783,3 @@
34296+
@@ -5742,4 +5785,3 @@
3429734297
echo "" >&AS_MESSAGE_FD
3429834298
echo "" >&AS_MESSAGE_FD
3429934299
fi

0 commit comments

Comments
 (0)