1 |
commit: 9730662003a5e3bfe2d010896a792a192bdc69fe |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 29 10:43:53 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 29 10:43:53 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/python.git/commit/?id=97306620 |
7 |
|
8 |
dev-lang/python: Redo patchset for 3.5.9 |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-lang/python/Manifest | 2 +- |
13 |
dev-lang/python/files/3.6-disable-nis.patch | 4 ++ |
14 |
.../files/python-3.5-distutils-OO-build.patch | 80 ---------------------- |
15 |
.../python/files/python-3.5.5-hash-unaligned.patch | 5 ++ |
16 |
dev-lang/python/python-3.5.9.ebuild | 11 +-- |
17 |
5 files changed, 13 insertions(+), 89 deletions(-) |
18 |
|
19 |
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest |
20 |
index 2de11b4..39ffe3c 100644 |
21 |
--- a/dev-lang/python/Manifest |
22 |
+++ b/dev-lang/python/Manifest |
23 |
@@ -4,4 +4,4 @@ DIST Python-3.3.5.tar.xz 12116308 SHA256 abe99b484434503d8b23be0f243ec27139e743a |
24 |
DIST Python-3.4.10.tar.xz 14559088 SHA256 d46a8f6fe91679e199c671b1b0a30aaf172d2acb5bcab25beb35f16c3d195b4e SHA512 d5d27d68049b61f135e21b12a800dbd4fc521d6935de178de6e2e88a989cda511d3c8fead90d14e38d2db0e528a74b22674e0da01c51ff4fad7d335ec6c3dbbc WHIRLPOOL 84608931cd785eddd234d207be2caa273575067d7687a0ed05217e2f2ae410da684fcf5ed65cfa17dd8eda082844bb4067cdcb4a277ceb20845ffa9f3baa6f58 |
25 |
DIST Python-3.5.9.tar.xz 15388876 SHA256 c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049 SHA512 58127793adef42ed57ae4d56338268866e14c2d084f09f57f26fc6b1c9454e70cc6d3dffc638f8d56f182acc0884021a4dbb578f312dd6fc01995fa85e31377e WHIRLPOOL 16f4a6938ed1004cbb10a9b60621d70f8e52a36771fbb55cf5fb3211ad98daa2c9cf181789c226d51c4f65cefce056dfff73031f61c1ce35e96e24bd2db186b3 |
26 |
DIST python-gentoo-patches-3.4.6-0.tar.xz 11728 SHA256 93e7c8487deefc36c612403fb6c82e495c46846a1952f9ed85f82af41840be4a SHA512 41c22dc8f1db8800fc0b97eed2b27bf1873e5de1369bd4aecf7a7a91e609a78e45a4b56fc89d575317f33a7704c0c1cad1494e8a993415a198f256e8338f49ab WHIRLPOOL 851945e7ccea985a88bcbd71bc404bc34c27a0e335386e9ed15fa9876aab3285ff559936fb2dcadf7ac0594a7cb03ac3a9e4135b67b350c5fdf33e9a44ca0654 |
27 |
-DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 SHA256 30c9dbcd5c11ed025b9d8dd201da84c5b9f9756f9b6ba77ccaebc6b79a91e320 SHA512 d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec WHIRLPOOL 2191dc89805c1bc11d125005a5c5dd0e5fe635eb0a3d6698bef8b55f54741edc3b3e2588bb21f5eda517963489c15296cd5fd265c8a548d78be6093698e6b002 |
28 |
+DIST python-gentoo-patches-3.5.9.tar.xz 13548 SHA256 97d1252935e398a31ed3634f50b70ed17b38bd8c5ea10fad601912ca58fdee5f SHA512 def5435a315e58d3794d8bce8fb04105a36ff37bd90a437cf7588a0c0ec8d420af5b68009ab153823286e71e52056e12a0eba4dc4d958eeb8d6b914b24f0de81 WHIRLPOOL 139ffbd3aa2ca349f1b8254d7326942111b448d2b2c8649a37550fb1f5095fed488c0a2748120a8b39b514502b25ac9fcc9bf2130da7927e19d11e8fd649ade8 |
29 |
|
30 |
diff --git a/dev-lang/python/files/3.6-disable-nis.patch b/dev-lang/python/files/3.6-disable-nis.patch |
31 |
index 4e81847..ccfb890 100644 |
32 |
--- a/dev-lang/python/files/3.6-disable-nis.patch |
33 |
+++ b/dev-lang/python/files/3.6-disable-nis.patch |
34 |
@@ -1,3 +1,7 @@ |
35 |
+From 2ed81ae3d36c2e0dd709240169fdccd6b3cd1a27 Mon Sep 17 00:00:00 2001 |
36 |
+From: Mike Gilbert <floppym@g.o> |
37 |
+Date: Wed, 4 Jul 2018 11:39:21 -0400 |
38 |
+Subject: [PATCH 7/8] Disable nis |
39 |
--- a/setup.py |
40 |
+++ b/setup.py |
41 |
@@ -1332,17 +1332,7 @@ class PyBuildExt(build_ext): |
42 |
|
43 |
diff --git a/dev-lang/python/files/python-3.5-distutils-OO-build.patch b/dev-lang/python/files/python-3.5-distutils-OO-build.patch |
44 |
deleted file mode 100644 |
45 |
index 8af8c30..0000000 |
46 |
--- a/dev-lang/python/files/python-3.5-distutils-OO-build.patch |
47 |
+++ /dev/null |
48 |
@@ -1,80 +0,0 @@ |
49 |
-From 90507018442f9adabb586fd3d0a0206b9c2f2f50 Mon Sep 17 00:00:00 2001 |
50 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
51 |
-Date: Sun, 5 Jun 2016 08:18:01 +0200 |
52 |
-Subject: [PATCH] distutils: make -OO enable both opt-1 and opt-2 optimization |
53 |
- |
54 |
-Bug: http://bugs.python.org/issue27226 |
55 |
-Bug: https://bugs.gentoo.org/585060 |
56 |
---- |
57 |
- Lib/distutils/command/build_py.py | 8 ++++---- |
58 |
- Lib/distutils/command/install_lib.py | 12 ++++++------ |
59 |
- 2 files changed, 10 insertions(+), 10 deletions(-) |
60 |
- |
61 |
-diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py |
62 |
-index cf0ca57..838d4e4 100644 |
63 |
---- a/Lib/distutils/command/build_py.py |
64 |
-+++ b/Lib/distutils/command/build_py.py |
65 |
-@@ -315,9 +315,9 @@ class build_py (Command): |
66 |
- if self.compile: |
67 |
- outputs.append(importlib.util.cache_from_source( |
68 |
- filename, optimization='')) |
69 |
-- if self.optimize > 0: |
70 |
-+ for opt in range(1, self.optimize + 1): |
71 |
- outputs.append(importlib.util.cache_from_source( |
72 |
-- filename, optimization=self.optimize)) |
73 |
-+ filename, optimization=opt)) |
74 |
- |
75 |
- outputs += [ |
76 |
- os.path.join(build_dir, filename) |
77 |
-@@ -387,8 +387,8 @@ class build_py (Command): |
78 |
- if self.compile: |
79 |
- byte_compile(files, optimize=0, |
80 |
- force=self.force, prefix=prefix, dry_run=self.dry_run) |
81 |
-- if self.optimize > 0: |
82 |
-- byte_compile(files, optimize=self.optimize, |
83 |
-+ for opt in range(1, self.optimize + 1): |
84 |
-+ byte_compile(files, optimize=opt, |
85 |
- force=self.force, prefix=prefix, dry_run=self.dry_run) |
86 |
- |
87 |
- class build_py_2to3(build_py, Mixin2to3): |
88 |
-diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py |
89 |
-index 6154cf0..049b662 100644 |
90 |
---- a/Lib/distutils/command/install_lib.py |
91 |
-+++ b/Lib/distutils/command/install_lib.py |
92 |
-@@ -24,8 +24,8 @@ class install_lib(Command): |
93 |
- # 2) compile .pyc only (--compile --no-optimize; default) |
94 |
- # 3) compile .pyc and "opt-1" .pyc (--compile --optimize) |
95 |
- # 4) compile "opt-1" .pyc only (--no-compile --optimize) |
96 |
-- # 5) compile .pyc and "opt-2" .pyc (--compile --optimize-more) |
97 |
-- # 6) compile "opt-2" .pyc only (--no-compile --optimize-more) |
98 |
-+ # 5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more) |
99 |
-+ # 6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more) |
100 |
- # |
101 |
- # The UI for this is two options, 'compile' and 'optimize'. |
102 |
- # 'compile' is strictly boolean, and only decides whether to |
103 |
-@@ -132,8 +132,8 @@ class install_lib(Command): |
104 |
- byte_compile(files, optimize=0, |
105 |
- force=self.force, prefix=install_root, |
106 |
- dry_run=self.dry_run) |
107 |
-- if self.optimize > 0: |
108 |
-- byte_compile(files, optimize=self.optimize, |
109 |
-+ for opt in range(1, self.optimize + 1): |
110 |
-+ byte_compile(files, optimize=opt, |
111 |
- force=self.force, prefix=install_root, |
112 |
- verbose=self.verbose, dry_run=self.dry_run) |
113 |
- |
114 |
-@@ -167,9 +167,9 @@ class install_lib(Command): |
115 |
- if self.compile: |
116 |
- bytecode_files.append(importlib.util.cache_from_source( |
117 |
- py_file, optimization='')) |
118 |
-- if self.optimize > 0: |
119 |
-+ for opt in range(1, self.optimize + 1): |
120 |
- bytecode_files.append(importlib.util.cache_from_source( |
121 |
-- py_file, optimization=self.optimize)) |
122 |
-+ py_file, optimization=opt)) |
123 |
- |
124 |
- return bytecode_files |
125 |
- |
126 |
--- |
127 |
-2.8.3 |
128 |
- |
129 |
|
130 |
diff --git a/dev-lang/python/files/python-3.5.5-hash-unaligned.patch b/dev-lang/python/files/python-3.5.5-hash-unaligned.patch |
131 |
index c418f40..7861bfb 100644 |
132 |
--- a/dev-lang/python/files/python-3.5.5-hash-unaligned.patch |
133 |
+++ b/dev-lang/python/files/python-3.5.5-hash-unaligned.patch |
134 |
@@ -1,3 +1,8 @@ |
135 |
+From 0d17e60b33aca1a4d151a8a2bd6eaa331f0ec658 Mon Sep 17 00:00:00 2001 |
136 |
+From: Rolf Eike Beer <eike@×××××××.de> |
137 |
+Date: Sun, 13 May 2018 04:40:03 -0700 |
138 |
+Subject: [PATCH] bpo-28055: Fix unaligned accesses in siphash24(). (GH-6123) |
139 |
+ |
140 |
The hash implementation casts the input pointer to uint64_t* and directly reads |
141 |
from this, which may cause unaligned accesses. Use memcpy() instead so this code |
142 |
will not crash with SIGBUS on sparc. |
143 |
|
144 |
diff --git a/dev-lang/python/python-3.5.9.ebuild b/dev-lang/python/python-3.5.9.ebuild |
145 |
index c2ffba6..a7586dd 100644 |
146 |
--- a/dev-lang/python/python-3.5.9.ebuild |
147 |
+++ b/dev-lang/python/python-3.5.9.ebuild |
148 |
@@ -8,12 +8,12 @@ inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs |
149 |
|
150 |
MY_P="Python-${PV}" |
151 |
PYVER=$(ver_cut 1-2) |
152 |
-PATCHSET_VERSION="3.5.4-0" |
153 |
+PATCHSET="python-gentoo-patches-3.5.9" |
154 |
|
155 |
DESCRIPTION="An interpreted, interactive, object-oriented programming language" |
156 |
HOMEPAGE="https://www.python.org/" |
157 |
SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz |
158 |
- https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" |
159 |
+ https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" |
160 |
S="${WORKDIR}/${MY_P}" |
161 |
|
162 |
LICENSE="PSF-2" |
163 |
@@ -62,13 +62,8 @@ src_prepare() { |
164 |
rm -fr Modules/_ctypes/libffi* || die |
165 |
rm -fr Modules/zlib || die |
166 |
|
167 |
- eapply -p0 "${WORKDIR}"/patches |
168 |
- |
169 |
local PATCHES=( |
170 |
- "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch" |
171 |
- "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch" |
172 |
- "${FILESDIR}/3.6-disable-nis.patch" |
173 |
- "${FILESDIR}/python-3.5.5-hash-unaligned.patch" |
174 |
+ "${WORKDIR}/${PATCHSET}" |
175 |
) |
176 |
|
177 |
default |