* [Buildroot] [PATCH 1/1] package/python3: bump to version 3.11.1
@ 2022-12-10 21:24 James Hilliard
2022-12-11 8:56 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: James Hilliard @ 2022-12-10 21:24 UTC (permalink / raw)
To: buildroot; +Cc: James Hilliard, Thomas Petazzoni, Asaf Kahlon
Drop patch which is now upstream.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
...x-quadratic-time-idna-decoding.-GH-9.patch | 86 -------------------
package/python3/python3.hash | 2 +-
package/python3/python3.mk | 2 +-
3 files changed, 2 insertions(+), 88 deletions(-)
delete mode 100644 package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch
diff --git a/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch b/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch
deleted file mode 100644
index d281e7261d..0000000000
--- a/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 9bb8e18ca46fe66fa6802602f8a7228a24dd785f Mon Sep 17 00:00:00 2001
-From: "Miss Islington (bot)"
- <31488909+miss-islington@users.noreply.github.com>
-Date: Mon, 7 Nov 2022 19:23:16 -0800
-Subject: [PATCH] [3.11] gh-98433: Fix quadratic time idna decoding. (GH-99092)
- (GH-99222)
-
-There was an unnecessary quadratic loop in idna decoding. This restores
-the behavior to linear.
-
-(cherry picked from commit d315722564927c7202dd6e111dc79eaf14240b0d)
-
-(cherry picked from commit a6f6c3a3d6f2b580f2d87885c9b8a9350ad7bf15)
-
-Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
-Co-authored-by: Gregory P. Smith <greg@krypto.org>
-[Peter: drop NEWS.d/*]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Lib/encodings/idna.py | 32 +++++++++----------
- Lib/test/test_codecs.py | 6 ++++
- 2 files changed, 23 insertions(+), 17 deletions(-)
-
-diff --git a/Lib/encodings/idna.py b/Lib/encodings/idna.py
-index ea4058512f..bf98f51336 100644
---- a/Lib/encodings/idna.py
-+++ b/Lib/encodings/idna.py
-@@ -39,23 +39,21 @@ def nameprep(label):
-
- # Check bidi
- RandAL = [stringprep.in_table_d1(x) for x in label]
-- for c in RandAL:
-- if c:
-- # There is a RandAL char in the string. Must perform further
-- # tests:
-- # 1) The characters in section 5.8 MUST be prohibited.
-- # This is table C.8, which was already checked
-- # 2) If a string contains any RandALCat character, the string
-- # MUST NOT contain any LCat character.
-- if any(stringprep.in_table_d2(x) for x in label):
-- raise UnicodeError("Violation of BIDI requirement 2")
--
-- # 3) If a string contains any RandALCat character, a
-- # RandALCat character MUST be the first character of the
-- # string, and a RandALCat character MUST be the last
-- # character of the string.
-- if not RandAL[0] or not RandAL[-1]:
-- raise UnicodeError("Violation of BIDI requirement 3")
-+ if any(RandAL):
-+ # There is a RandAL char in the string. Must perform further
-+ # tests:
-+ # 1) The characters in section 5.8 MUST be prohibited.
-+ # This is table C.8, which was already checked
-+ # 2) If a string contains any RandALCat character, the string
-+ # MUST NOT contain any LCat character.
-+ if any(stringprep.in_table_d2(x) for x in label):
-+ raise UnicodeError("Violation of BIDI requirement 2")
-+ # 3) If a string contains any RandALCat character, a
-+ # RandALCat character MUST be the first character of the
-+ # string, and a RandALCat character MUST be the last
-+ # character of the string.
-+ if not RandAL[0] or not RandAL[-1]:
-+ raise UnicodeError("Violation of BIDI requirement 3")
-
- return label
-
-diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
-index 8edd5ac063..2407567261 100644
---- a/Lib/test/test_codecs.py
-+++ b/Lib/test/test_codecs.py
-@@ -1535,6 +1535,12 @@ def test_builtin_encode(self):
- self.assertEqual("pyth\xf6n.org".encode("idna"), b"xn--pythn-mua.org")
- self.assertEqual("pyth\xf6n.org.".encode("idna"), b"xn--pythn-mua.org.")
-
-+ def test_builtin_decode_length_limit(self):
-+ with self.assertRaisesRegex(UnicodeError, "too long"):
-+ (b"xn--016c"+b"a"*1100).decode("idna")
-+ with self.assertRaisesRegex(UnicodeError, "too long"):
-+ (b"xn--016c"+b"a"*70).decode("idna")
-+
- def test_stream(self):
- r = codecs.getreader("idna")(io.BytesIO(b"abc"))
- r.read(3)
---
-2.30.2
-
diff --git a/package/python3/python3.hash b/package/python3/python3.hash
index c4ee79305d..db78544bd0 100644
--- a/package/python3/python3.hash
+++ b/package/python3/python3.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3 Python-3.11.0.tar.xz
+sha256 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f Python-3.11.1.tar.xz
sha256 f03e17cd594c2085f66a454e695c7ebe5b4d3c0eff534f4f194abc2fd164621b LICENSE
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 123bc8ef88..219d135b3f 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -5,7 +5,7 @@
################################################################################
PYTHON3_VERSION_MAJOR = 3.11
-PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).0
+PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1
PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION)
PYTHON3_LICENSE = Python-2.0, others
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/python3: bump to version 3.11.1
2022-12-10 21:24 [Buildroot] [PATCH 1/1] package/python3: bump to version 3.11.1 James Hilliard
@ 2022-12-11 8:56 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2022-12-11 8:56 UTC (permalink / raw)
To: James Hilliard; +Cc: Asaf Kahlon, Thomas Petazzoni, buildroot
James, All,
On 2022-12-10 14:24 -0700, James Hilliard spake thusly:
> Drop patch which is now upstream.
>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[--SNIP--]
> diff --git a/package/python3/python3.hash b/package/python3/python3.hash
> index c4ee79305d..db78544bd0 100644
> --- a/package/python3/python3.hash
> +++ b/package/python3/python3.hash
> @@ -1,3 +1,3 @@
> # Locally computed
> -sha256 a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3 Python-3.11.0.tar.xz
> +sha256 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f Python-3.11.1.tar.xz
> sha256 f03e17cd594c2085f66a454e695c7ebe5b4d3c0eff534f4f194abc2fd164621b LICENSE
$ make python3-legal-info
>>> python3 3.11.1 Collecting legal info
ERROR: LICENSE has wrong sha256 hash:
ERROR: expected: f03e17cd594c2085f66a454e695c7ebe5b4d3c0eff534f4f194abc2fd164621b
ERROR: got : d4a223f033419313218c9b8444167e91e87a5bebdb43fb8490df441df5220a8b
ERROR: Incomplete download, or man-in-the-middle (MITM) attack
make[1]: *** [package/python3/python3.mk:251: python3-legal-info] Error 1
make: *** [Makefile:23: _all] Error 2
Applied to master, with the licensing hash updated, and the commit log
extended to explain why, thanks.
I also applied a lot of your recent ptython packages bumps, I won't
reply to each of them individually, though..
Thanks!
Regards,
Yann E. MORIN.
> diff --git a/package/python3/python3.mk b/package/python3/python3.mk
> index 123bc8ef88..219d135b3f 100644
> --- a/package/python3/python3.mk
> +++ b/package/python3/python3.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> PYTHON3_VERSION_MAJOR = 3.11
> -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).0
> +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1
> PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
> PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION)
> PYTHON3_LICENSE = Python-2.0, others
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-11 9:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-10 21:24 [Buildroot] [PATCH 1/1] package/python3: bump to version 3.11.1 James Hilliard
2022-12-11 8:56 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.