Skip to content

Commit d387d0a

Browse files
committed
Update patch for v3.11.0rc2
1 parent aaf2eb8 commit d387d0a

File tree

2 files changed

+14
-23
lines changed

2 files changed

+14
-23
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ BUILD_NUMBER=custom
3939
# PYTHON_VERSION is the full version number (e.g., 3.10.0b3)
4040
# PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
4141
# PYTHON_VER is the major/minor version (e.g., 3.10)
42-
PYTHON_VERSION=3.11.0rc1
42+
PYTHON_VERSION=3.11.0rc2
4343
PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
4444
PYTHON_VER=$(basename $(PYTHON_VERSION))
4545

patch/Python/Python.patch

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ index ebe3711827..ea00c3176d 100644
325325
return f"{osname}-{release}-{machine}"
326326

327327
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
328-
index 39b3530905..ef1fa18624 100644
328+
index 46087a98a2..ea8c228f65 100644
329329
--- a/Lib/test/support/__init__.py
330330
+++ b/Lib/test/support/__init__.py
331331
@@ -47,7 +47,7 @@
@@ -459,7 +459,7 @@ index 05d9107b28..6df2bcf163 100644
459459
proto = MyProto(loop=self.loop)
460460
server, path = self._make_ssl_unix_server(
461461
diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
462-
index 098a0da344..65aa7abe7c 100644
462+
index 0c49099bc4..c972bade4b 100644
463463
--- a/Lib/test/test_asyncio/test_streams.py
464464
+++ b/Lib/test/test_asyncio/test_streams.py
465465
@@ -17,6 +17,7 @@
@@ -587,7 +587,7 @@ index daccbae5b4..607e40eb66 100644
587587
'largefile',
588588
'test requires %s bytes and a long time to run' % self.LARGE)
589589
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
590-
index 71926a5432..0ef83b9f51 100644
590+
index 350f4a57e2..54ef53a4c1 100644
591591
--- a/Lib/test/test_logging.py
592592
+++ b/Lib/test/test_logging.py
593593
@@ -43,6 +43,7 @@
@@ -797,7 +797,7 @@ index a2c4ab5081..45927b3163 100644
797797
'need os.get_terminal_size()')
798798
def test_stty_match(self):
799799
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
800-
index 72e3394df2..832ee517f6 100644
800+
index b07954989f..ac634d421c 100644
801801
--- a/Lib/test/test_socket.py
802802
+++ b/Lib/test/test_socket.py
803803
@@ -1,5 +1,6 @@
@@ -816,7 +816,7 @@ index 72e3394df2..832ee517f6 100644
816816
# avoid the 'echo' service on this platform, as there is an
817817
# assumption breaking non-standard port/protocol entry
818818
services = ('daytime', 'qotd', 'domain')
819-
@@ -3552,7 +3553,7 @@
819+
@@ -3563,7 +3564,7 @@
820820
def _testFDPassCMSG_LEN(self):
821821
self.createAndSendFDs(1)
822822

@@ -825,7 +825,7 @@ index 72e3394df2..832ee517f6 100644
825825
@unittest.skipIf(AIX, "skipping, see issue #22397")
826826
@requireAttrs(socket, "CMSG_SPACE")
827827
def testFDPassSeparate(self):
828-
@@ -3563,7 +3564,7 @@
828+
@@ -3574,7 +3575,7 @@
829829
maxcmsgs=2)
830830

831831
@testFDPassSeparate.client_skip
@@ -834,7 +834,7 @@ index 72e3394df2..832ee517f6 100644
834834
@unittest.skipIf(AIX, "skipping, see issue #22397")
835835
def _testFDPassSeparate(self):
836836
fd0, fd1 = self.newFDs(2)
837-
@@ -3576,7 +3577,7 @@
837+
@@ -3587,7 +3588,7 @@
838838
array.array("i", [fd1]))]),
839839
len(MSG))
840840

@@ -843,7 +843,7 @@ index 72e3394df2..832ee517f6 100644
843843
@unittest.skipIf(AIX, "skipping, see issue #22397")
844844
@requireAttrs(socket, "CMSG_SPACE")
845845
def testFDPassSeparateMinSpace(self):
846-
@@ -3590,7 +3591,7 @@
846+
@@ -3601,7 +3602,7 @@
847847
maxcmsgs=2, ignoreflags=socket.MSG_CTRUNC)
848848

849849
@testFDPassSeparateMinSpace.client_skip
@@ -852,7 +852,7 @@ index 72e3394df2..832ee517f6 100644
852852
@unittest.skipIf(AIX, "skipping, see issue #22397")
853853
def _testFDPassSeparateMinSpace(self):
854854
fd0, fd1 = self.newFDs(2)
855-
@@ -3614,7 +3615,7 @@
855+
@@ -3625,7 +3626,7 @@
856856
nbytes = self.sendmsgToServer([msg])
857857
self.assertEqual(nbytes, len(msg))
858858

@@ -861,7 +861,7 @@ index 72e3394df2..832ee517f6 100644
861861
def testFDPassEmpty(self):
862862
# Try to pass an empty FD array. Can receive either no array
863863
# or an empty array.
864-
@@ -4434,28 +4435,33 @@
864+
@@ -4445,28 +4446,33 @@
865865
pass
866866

867867
@requireAttrs(socket.socket, "sendmsg")
@@ -1239,7 +1239,7 @@ index 9132f13e81..36e00f7bfd 100644
12391239

12401240

12411241
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
1242-
index 3026bb6a34..42f503abe6 100644
1242+
index 4847c1cb87..4a4c890846 100644
12431243
--- a/Modules/faulthandler.c
12441244
+++ b/Modules/faulthandler.c
12451245
@@ -1,3 +1,7 @@
@@ -1742,7 +1742,7 @@ index d74fb6deac..a30f74f03d 100755
17421742
# Blank kernel with real OS is always fine.
17431743
;;
17441744
diff --git a/configure b/configure
1745-
index 91227f00be..d75c8c48fc 100755
1745+
index 784f8d3060..2ca708e27b 100755
17461746
--- a/configure
17471747
+++ b/configure
17481748
@@ -836,6 +836,8 @@
@@ -2316,7 +2316,7 @@ index 91227f00be..d75c8c48fc 100755
23162316

23172317

23182318
diff --git a/configure.ac b/configure.ac
2319-
index 77fb609b74..72acc6e054 100644
2319+
index ab5e1de6fa..99d3147959 100644
23202320
--- a/configure.ac
23212321
+++ b/configure.ac
23222322
@@ -545,6 +545,15 @@
@@ -2452,15 +2452,6 @@ index 77fb609b74..72acc6e054 100644
24522452
fi
24532453
AC_SUBST(READELF)
24542454

2455-
@@ -2066,7 +2138,7 @@
2456-
dnl build with WASM debug info if either Py_DEBUG is set or the target is
2457-
dnl node-debug or browser-debug.
2458-
AS_VAR_IF([Py_DEBUG], [yes], [wasm_debug=yes], [wasm_debug=no])
2459-
-
2460-
+
2461-
dnl Start with 20 MB and allow to grow
2462-
AS_VAR_APPEND([LDFLAGS_NODIST], [" -sALLOW_MEMORY_GROWTH -sTOTAL_MEMORY=20971520"])
2463-
24642455
@@ -3129,6 +3201,9 @@
24652456
BLDSHARED="$LDSHARED"
24662457
fi

0 commit comments

Comments
 (0)