Skip to content

Commit 25573f1

Browse files
mceplbmwiedemann
authored andcommitted
Update python312 to version 3.12.0b1 / rev 2 via SR 1090558
https://build.opensuse.org/request/show/1090558 by user mcepl + dimstar_suse - Add 00398-fix-stack-overwrite-on-32-bit-in-perf-map-test-harness-gh-104811-104823.patch gh#python/cpython#104811 - Refresh all patches - Update to 3.12.0b1: Full changelog can be found here https://docs.python.org/dev/whatsnew/changelog.html#python-3-12-0-beta-1
1 parent ae3ad2f commit 25573f1

16 files changed

+173
-76
lines changed

packages/p/python312/.files

121 Bytes
Binary file not shown.

packages/p/python312/.rev

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,18 @@
77
<comment>New version of the Python interpreter for the further development of the package.</comment>
88
<requestid>1084321</requestid>
99
</revision>
10+
<revision rev="2" vrev="1">
11+
<srcmd5>cb80450fac92b7b0ff74a1e5d7d5a8fb</srcmd5>
12+
<version>3.12.0b1</version>
13+
<time>1685830370</time>
14+
<user>dimstar_suse</user>
15+
<comment>- Add 00398-fix-stack-overwrite-on-32-bit-in-perf-map-test-harness-gh-104811-104823.patch
16+
gh#python/cpython#104811
17+
- Refresh all patches
18+
- Update to 3.12.0b1:
19+
Full changelog can be found here
20+
https://docs.python.org/dev/whatsnew/changelog.html#python-3-12-0-beta-1
21+
</comment>
22+
<requestid>1090558</requestid>
23+
</revision>
1024
</revisionlist>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Carl Meyer <[email protected]>
3+
Date: Tue, 23 May 2023 16:04:31 -0600
4+
Subject: [PATCH] 00398: fix stack overwrite on 32-bit in perf map test harness
5+
(#104811)
6+
7+
---
8+
Modules/_testinternalcapi.c | 13 +++++++++----
9+
1 file changed, 9 insertions(+), 4 deletions(-)
10+
11+
Index: Python-3.12.0b1/Modules/_testinternalcapi.c
12+
===================================================================
13+
--- Python-3.12.0b1.orig/Modules/_testinternalcapi.c
14+
+++ Python-3.12.0b1/Modules/_testinternalcapi.c
15+
@@ -762,19 +762,24 @@ clear_extension(PyObject *self, PyObject
16+
static PyObject *
17+
write_perf_map_entry(PyObject *self, PyObject *args)
18+
{
19+
+ PyObject *code_addr_v;
20+
const void *code_addr;
21+
unsigned int code_size;
22+
const char *entry_name;
23+
24+
- if (!PyArg_ParseTuple(args, "KIs", &code_addr, &code_size, &entry_name))
25+
+ if (!PyArg_ParseTuple(args, "OIs", &code_addr_v, &code_size, &entry_name))
26+
return NULL;
27+
+ code_addr = PyLong_AsVoidPtr(code_addr_v);
28+
+ if (code_addr == NULL) {
29+
+ return NULL;
30+
+ }
31+
32+
int ret = PyUnstable_WritePerfMapEntry(code_addr, code_size, entry_name);
33+
- if (ret == -1) {
34+
- PyErr_SetString(PyExc_OSError, "Failed to write performance map entry");
35+
+ if (ret < 0) {
36+
+ PyErr_SetFromErrno(PyExc_OSError);
37+
return NULL;
38+
}
39+
- return Py_BuildValue("i", ret);
40+
+ return PyLong_FromLong(ret);
41+
}
42+
43+
static PyObject *

packages/p/python312/F00251-change-user-install-location.patch

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ Co-authored-by: Lumír Balhar <[email protected]>
2929
Lib/test/test_sysconfig.py | 17 +++++++++++--
3030
3 files changed, 71 insertions(+), 4 deletions(-)
3131

32-
diff --git a/Lib/site.py b/Lib/site.py
33-
index 7faf1c6f6a..e2ace71d18 100644
34-
--- a/Lib/site.py
35-
+++ b/Lib/site.py
32+
Index: Python-3.12.0b1/Lib/site.py
33+
===================================================================
34+
--- Python-3.12.0b1.orig/Lib/site.py
35+
+++ Python-3.12.0b1/Lib/site.py
3636
@@ -377,8 +377,15 @@ def getsitepackages(prefixes=None):
3737
return sitepackages
3838

@@ -50,11 +50,11 @@ index 7faf1c6f6a..e2ace71d18 100644
5050
for sitedir in getsitepackages(prefixes):
5151
if os.path.isdir(sitedir):
5252
addsitedir(sitedir, known_paths)
53-
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
54-
index c61100a6da..30143e577e 100644
55-
--- a/Lib/sysconfig.py
56-
+++ b/Lib/sysconfig.py
57-
@@ -104,6 +104,11 @@
53+
Index: Python-3.12.0b1/Lib/sysconfig.py
54+
===================================================================
55+
--- Python-3.12.0b1.orig/Lib/sysconfig.py
56+
+++ Python-3.12.0b1/Lib/sysconfig.py
57+
@@ -104,6 +104,11 @@ if os.name == 'nt':
5858
else:
5959
_INSTALL_SCHEMES['venv'] = _INSTALL_SCHEMES['posix_venv']
6060

@@ -66,7 +66,7 @@ index c61100a6da..30143e577e 100644
6666

6767
# NOTE: site.py has copy of this function.
6868
# Sync it when modify this function.
69-
@@ -163,6 +168,19 @@ def joinuser(*args):
69+
@@ -163,6 +168,19 @@ if _HAS_USER_BASE:
7070
},
7171
}
7272

@@ -86,7 +86,7 @@ index c61100a6da..30143e577e 100644
8686
_SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include',
8787
'scripts', 'data')
8888

89-
@@ -263,11 +281,40 @@ def _extend_dict(target_dict, other_dict):
89+
@@ -263,11 +281,40 @@ def _extend_dict(target_dict, other_dict
9090
target_dict[key] = value
9191

9292

@@ -128,11 +128,11 @@ index c61100a6da..30143e577e 100644
128128
if os.name == 'nt':
129129
# On Windows we want to substitute 'lib' for schemes rather
130130
# than the native value (without modifying vars, in case it
131-
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
132-
index b6dbf3d52c..4f06a7673c 100644
133-
--- a/Lib/test/test_sysconfig.py
134-
+++ b/Lib/test/test_sysconfig.py
135-
@@ -110,8 +110,19 @@ def test_get_path(self):
131+
Index: Python-3.12.0b1/Lib/test/test_sysconfig.py
132+
===================================================================
133+
--- Python-3.12.0b1.orig/Lib/test/test_sysconfig.py
134+
+++ Python-3.12.0b1/Lib/test/test_sysconfig.py
135+
@@ -110,8 +110,19 @@ class TestSysConfig(unittest.TestCase):
136136
for scheme in _INSTALL_SCHEMES:
137137
for name in _INSTALL_SCHEMES[scheme]:
138138
expected = _INSTALL_SCHEMES[scheme][name].format(**config_vars)
@@ -153,7 +153,7 @@ index b6dbf3d52c..4f06a7673c 100644
153153
os.path.normpath(expected),
154154
)
155155

156-
@@ -335,7 +346,7 @@ def test_get_config_h_filename(self):
156+
@@ -335,7 +346,7 @@ class TestSysConfig(unittest.TestCase):
157157
self.assertTrue(os.path.isfile(config_h), config_h)
158158

159159
def test_get_scheme_names(self):
@@ -162,7 +162,7 @@ index b6dbf3d52c..4f06a7673c 100644
162162
if HAS_USER_BASE:
163163
wanted.extend(['nt_user', 'osx_framework_user', 'posix_user'])
164164
self.assertEqual(get_scheme_names(), tuple(sorted(wanted)))
165-
@@ -347,6 +358,8 @@ def test_symlink(self): # Issue 7880
165+
@@ -347,6 +358,8 @@ class TestSysConfig(unittest.TestCase):
166166
cmd = "-c", "import sysconfig; print(sysconfig.get_platform())"
167167
self.assertEqual(py.call_real(*cmd), py.call_link(*cmd))
168168

packages/p/python312/Python-3.12.0a7.tar.xz

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/p/python312/Python-3.12.0a7.tar.xz.asc

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/ipfs/bafybeifpwez7avzhs6j6hcrhbd2r3jny5niplprj5ofciwkegxsbiiri2e
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----BEGIN PGP SIGNATURE-----
2+
3+
iQKTBAABCgB9FiEEcWlgX2LHUTVtBUomqCHmgOX6YwUFAmRrW0VfFIAAAAAALgAo
4+
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDcx
5+
Njk2MDVGNjJDNzUxMzU2RDA1NEEyNkE4MjFFNjgwRTVGQTYzMDUACgkQqCHmgOX6
6+
YwUPOg/9GRDnAfe68z7VrKn8owGDL+YQe5Wfj9eDlAo1nG4ncozx2oDmq2k/VFXG
7+
sKSMzatc+K08awmd48w0lCX+GV0EwlOWcTzmFiXliw0UNQ0lfG+Dj8QidGO/CcRQ
8+
U2JUqpyohwJnONjcxB2aIfa0VXKrNY9cAvJGiqwxq+sn4fDrOOKEANOgxisSD2ia
9+
MlU1rYIwDoqC+shLQyv6Dq8WkPsKLYEtHaymT6i7oWcq2+1SZexNkRPdVvC0BGbz
10+
XVCNRq3NsSDxSJLYfmw5METwJ/ZEHPQ3G8VqktLZ61A5foq6Zk08xBYgA3qVstrU
11+
Nrd33qxMZNPlaZFNAlg07FTqlHd056zL/XeYVEu+/J51xiY0aP+XtpEJHsJLcxMP
12+
nBSySwO11SOaMW+1lM6/ylkGmo2N62VrYwfT05t3t5PP5Cz71G5D+lLchcnvbGEu
13+
edeABX5GNcwMvoJL+Dkk4d8kuDiA3UEyytoefko06Qri1wThAdONXRxE9dG0AoNg
14+
VzeD1v7ld2cJ0Of9/ArdJFjNo7LBa9kpE0/Rmn18YbRJZSI/pbRmLvHkqVmpKBTU
15+
rk5sK+wFb5VoXEY3MziClmydQW3UybYk/Eybq0ea+9cpkCWKemVSHCC5t9TX/X35
16+
d4rc2SRAkdgP7a/2V/ZK10lXmq6bCGvdXce8Qd3g14Bq9mBk5cI=
17+
=3HQL
18+
-----END PGP SIGNATURE-----

packages/p/python312/bpo-31046_ensurepip_honours_prefix.patch

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ Co-Authored-By: Xavier de Gaye <[email protected]>
1313
5 files changed, 34 insertions(+), 9 deletions(-)
1414
create mode 100644 Misc/NEWS.d/next/Build/2019-12-16-17-50-42.bpo-31046.XA-Qfr.rst
1515

16-
--- a/Doc/library/ensurepip.rst
17-
+++ b/Doc/library/ensurepip.rst
16+
Index: Python-3.12.0b1/Doc/library/ensurepip.rst
17+
===================================================================
18+
--- Python-3.12.0b1.orig/Doc/library/ensurepip.rst
19+
+++ Python-3.12.0b1/Doc/library/ensurepip.rst
1820
@@ -59,8 +59,9 @@ is at least as recent as the one availab
1921
By default, ``pip`` is installed into the current virtual environment
2022
(if one is active) or into the system site packages (if there is no
@@ -53,9 +55,11 @@ Co-Authored-By: Xavier de Gaye <[email protected]>
5355
.. audit-event:: ensurepip.bootstrap root ensurepip.bootstrap
5456

5557
.. note::
56-
--- a/Lib/ensurepip/__init__.py
57-
+++ b/Lib/ensurepip/__init__.py
58-
@@ -122,27 +122,27 @@ def _disable_pip_configuration_settings(
58+
Index: Python-3.12.0b1/Lib/ensurepip/__init__.py
59+
===================================================================
60+
--- Python-3.12.0b1.orig/Lib/ensurepip/__init__.py
61+
+++ Python-3.12.0b1/Lib/ensurepip/__init__.py
62+
@@ -120,27 +120,27 @@ def _disable_pip_configuration_settings(
5963
os.environ['PIP_CONFIG_FILE'] = os.devnull
6064

6165

@@ -88,7 +92,7 @@ Co-Authored-By: Xavier de Gaye <[email protected]>
8892

8993
Note that calling this function will alter both sys.path and os.environ.
9094
"""
91-
@@ -192,6 +192,8 @@ def _bootstrap(*, root=None, upgrade=Fal
95+
@@ -190,6 +190,8 @@ def _bootstrap(*, root=None, upgrade=Fal
9296
args = ["install", "--no-cache-dir", "--no-index", "--find-links", tmpdir]
9397
if root:
9498
args += ["--root", root]
@@ -97,7 +101,7 @@ Co-Authored-By: Xavier de Gaye <[email protected]>
97101
if upgrade:
98102
args += ["--upgrade"]
99103
if user:
100-
@@ -267,6 +269,11 @@ def _main(argv=None):
104+
@@ -265,6 +267,11 @@ def _main(argv=None):
101105
help="Install everything relative to this alternate root directory.",
102106
)
103107
parser.add_argument(
@@ -109,17 +113,19 @@ Co-Authored-By: Xavier de Gaye <[email protected]>
109113
"--altinstall",
110114
action="store_true",
111115
default=False,
112-
@@ -285,6 +292,7 @@ def _main(argv=None):
116+
@@ -283,6 +290,7 @@ def _main(argv=None):
113117

114118
return _bootstrap(
115119
root=args.root,
116120
+ prefix=args.prefix,
117121
upgrade=args.upgrade,
118122
user=args.user,
119123
verbosity=args.verbosity,
120-
--- a/Lib/test/test_ensurepip.py
121-
+++ b/Lib/test/test_ensurepip.py
122-
@@ -112,6 +112,17 @@ class TestBootstrap(EnsurepipMixin, unit
124+
Index: Python-3.12.0b1/Lib/test/test_ensurepip.py
125+
===================================================================
126+
--- Python-3.12.0b1.orig/Lib/test/test_ensurepip.py
127+
+++ Python-3.12.0b1/Lib/test/test_ensurepip.py
128+
@@ -105,6 +105,17 @@ class TestBootstrap(EnsurepipMixin, unit
123129
unittest.mock.ANY,
124130
)
125131

@@ -129,35 +135,39 @@ Co-Authored-By: Xavier de Gaye <[email protected]>
129135
+ [
130136
+ "install", "--no-cache-dir", "--no-index", "--find-links",
131137
+ unittest.mock.ANY, "--prefix", "/foo/bar/",
132-
+ "setuptools", "pip",
138+
+ "pip",
133139
+ ],
134140
+ unittest.mock.ANY,
135141
+ )
136142
+
137143
def test_bootstrapping_with_user(self):
138144
ensurepip.bootstrap(user=True)
139145

140-
--- a/Makefile.pre.in
141-
+++ b/Makefile.pre.in
142-
@@ -1832,7 +1832,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoni
146+
Index: Python-3.12.0b1/Makefile.pre.in
147+
===================================================================
148+
--- Python-3.12.0b1.orig/Makefile.pre.in
149+
+++ Python-3.12.0b1/Makefile.pre.in
150+
@@ -1908,7 +1908,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoni
143151
install|*) ensurepip="" ;; \
144152
esac; \
145153
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
146154
- $$ensurepip --root=$(DESTDIR)/ ; \
147155
+ $$ensurepip --root=$(DESTDIR)/ --prefix=$(prefix) ; \
148156
fi
149157

150-
altinstall: commoninstall
151-
@@ -1842,7 +1842,7 @@ altinstall: commoninstall
158+
.PHONY: altinstall
159+
@@ -1919,7 +1919,7 @@ altinstall: commoninstall
152160
install|*) ensurepip="--altinstall" ;; \
153161
esac; \
154162
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
155163
- $$ensurepip --root=$(DESTDIR)/ ; \
156164
+ $$ensurepip --root=$(DESTDIR)/ --prefix=$(prefix) ; \
157165
fi
158166

159-
commoninstall: check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
167+
.PHONY: commoninstall
168+
Index: Python-3.12.0b1/Misc/NEWS.d/next/Build/2019-12-16-17-50-42.bpo-31046.XA-Qfr.rst
169+
===================================================================
160170
--- /dev/null
161-
+++ b/Misc/NEWS.d/next/Build/2019-12-16-17-50-42.bpo-31046.XA-Qfr.rst
171+
+++ Python-3.12.0b1/Misc/NEWS.d/next/Build/2019-12-16-17-50-42.bpo-31046.XA-Qfr.rst
162172
@@ -0,0 +1 @@
163173
+A directory prefix can now be specified when using :mod:`ensurepip`.

packages/p/python312/fix_configure_rst.patch

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
Misc/NEWS | 2 +-
44
2 files changed, 1 insertion(+), 3 deletions(-)
55

6-
--- a/Doc/using/configure.rst
7-
+++ b/Doc/using/configure.rst
8-
@@ -576,13 +576,11 @@ macOS Options
6+
Index: Python-3.12.0b1/Doc/using/configure.rst
7+
===================================================================
8+
--- Python-3.12.0b1.orig/Doc/using/configure.rst
9+
+++ Python-3.12.0b1/Doc/using/configure.rst
10+
@@ -599,13 +599,11 @@ macOS Options
911

1012
See ``Mac/README.rst``.
1113

@@ -19,9 +21,11 @@
1921
.. cmdoption:: --enable-framework=INSTALLDIR
2022

2123
Create a Python.framework rather than a traditional Unix install. Optional
22-
--- a/Misc/NEWS
23-
+++ b/Misc/NEWS
24-
@@ -9560,7 +9560,7 @@ C API
24+
Index: Python-3.12.0b1/Misc/NEWS
25+
===================================================================
26+
--- Python-3.12.0b1.orig/Misc/NEWS
27+
+++ Python-3.12.0b1/Misc/NEWS
28+
@@ -10780,7 +10780,7 @@ C API
2529
- bpo-40939: Removed documentation for the removed ``PyParser_*`` C API.
2630

2731
- bpo-43795: The list in :ref:`stable-abi-list` now shows the public name

0 commit comments

Comments
 (0)