Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (1e796a4b6de9d08dbf5cff451537ac0062035a8d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (1e796a4b6de9d08dbf5cff451537ac0062035a8d)
  • Date: Mon, 2 Oct 2023 23:46:32 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

devel/python3/DETAILS | 4
devel/python3/HISTORY | 4
devel/python3/PREPARE | 1
devel/python3/patches-3.12/0001-Fix-build-against-LibreSSL.patch | 84
++++++++++
devel/python3/patches-3.12/disable-compileall.patch | 19 ++
devel/python3/patches-3.12/makefile.patch | 12 +
devel/python3/python.gpg |binary
7 files changed, 123 insertions(+), 1 deletion(-)

New commits:
commit 1e796a4b6de9d08dbf5cff451537ac0062035a8d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/python3: versions 3.12.0/3.11.6

diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index 3a32a52..8388e78 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -1,9 +1,11 @@
SPELL=python3
case "$PYTHON3_BRANCH" in
devel| \
+ 3.12)
+ VERSION=3.12.0 ;;
stable| \
3.11)
- VERSION=3.11.5 ;;
+ VERSION=3.11.6 ;;
3.10)
VERSION=3.10.13 ;;
3.9)
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index b6998e9..46b2276 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,7 @@
+2023-10-02 Pavel Vinogradov <public AT sorcemage.org>
+ * DETAILS, PREPARE, patches-3.11/*: versions 3.12.0/3.11.6
+ * python.gpg: added new key, A821E680E5FA6305, Thomas Wouters
<thomas AT xs4all.nl>
+
2023-08-24 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: versions 3.11.5/3.10.13/3.9.18/3.8.18, SECURITY_PATCH++,
(CVE-2023-40217)
diff --git a/devel/python3/PREPARE b/devel/python3/PREPARE
index 6f17290..c0b4023 100755
--- a/devel/python3/PREPARE
+++ b/devel/python3/PREPARE
@@ -2,6 +2,7 @@
prepare_select_branch \
stable \
devel \
+ 3.12 \
3.11 \
3.10 \
3.9 \
diff --git a/devel/python3/patches-3.12/0001-Fix-build-against-LibreSSL.patch
b/devel/python3/patches-3.12/0001-Fix-build-against-LibreSSL.patch
new file mode 100644
index 0000000..886919a
--- /dev/null
+++ b/devel/python3/patches-3.12/0001-Fix-build-against-LibreSSL.patch
@@ -0,0 +1,84 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Subject: Fix build against LibreSSL
+Date: Thu, 15 Sep 2022 22:10:54 +0200
+
+Based on patches from OpenBSD.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ Modules/_hashopenssl.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/Modules/_hashopenssl.c
++++ b/Modules/_hashopenssl.c
+@@ -45,11 +45,13 @@
+
+ #define MUNCH_SIZE INT_MAX
+
++#if !defined(LIBRESSL_VERSION_NUMBER)
+ #define PY_OPENSSL_HAS_SCRYPT 1
+ #define PY_OPENSSL_HAS_SHA3 1
+ #define PY_OPENSSL_HAS_SHAKE 1
+ #define PY_OPENSSL_HAS_BLAKE2 1
++#endif
+
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ #define PY_EVP_MD EVP_MD
+ #define PY_EVP_MD_fetch(algorithm, properties) EVP_MD_fetch(NULL,
algorithm, properties)
+@@ -119,6 +114,7 @@ static const py_hashentry_t py_hashes[] = {
+ PY_HASH_ENTRY(Py_hash_sha256, "SHA256", SN_sha256, NID_sha256),
+ PY_HASH_ENTRY(Py_hash_sha384, "SHA384", SN_sha384, NID_sha384),
+ PY_HASH_ENTRY(Py_hash_sha512, "SHA512", SN_sha512, NID_sha512),
++#if !defined(LIBRESSL_VERSION_NUMBER)
+ /* truncated sha2 */
+ PY_HASH_ENTRY(Py_hash_sha512_224, "SHA512_224", SN_sha512_224,
NID_sha512_224),
+ PY_HASH_ENTRY(Py_hash_sha512_256, "SHA512_256", SN_sha512_256,
NID_sha512_256),
+@@ -133,6 +129,7 @@ static const py_hashentry_t py_hashes[] = {
+ /* blake2 digest */
+ PY_HASH_ENTRY(Py_hash_blake2s, "blake2s256", SN_blake2s256,
NID_blake2s256),
+ PY_HASH_ENTRY(Py_hash_blake2b, "blake2b512", SN_blake2b512,
NID_blake2b512),
++#endif
+ PY_HASH_ENTRY(NULL, NULL, NULL, 0),
+ };
+
+@@ -873,9 +870,12 @@ py_evp_fromname(PyObject *module, const char *digestna
+ goto exit;
+ }
+
++#if !defined(LIBRESSL_VERSION_NUMBER)
+ if ((EVP_MD_flags(digest) & EVP_MD_FLAG_XOF) == EVP_MD_FLAG_XOF) {
+ type = get_hashlib_state(module)->EVPXOFtype;
+- } else {
++ } else
++#endif
++ {
+ type = get_hashlib_state(module)->EVPtype;
+ }
+
+--- a/Modules/_ssl.c
++++ b/Modules/_ssl.c
+@@ -169,7 +169,11 @@ extern const SSL_METHOD *TLSv1_2_method(void);
+ * Based on Hynek's excellent blog post (update 2021-02-11)
+ * https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/
+ */
++ #if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <=
0x3050300fL)
++ #define PY_SSL_DEFAULT_CIPHER_STRING
"ECDH+AESGCM:ECDH+CHACHA20:ECDH+AES:DHE+AES:!aNULL:!eNULL:!aDSS:!SHA1:!AESCCM"
++ #else
+ #define PY_SSL_DEFAULT_CIPHER_STRING
"@SECLEVEL=2:ECDH+AESGCM:ECDH+CHACHA20:ECDH+AES:DHE+AES:!aNULL:!eNULL:!aDSS:!SHA1:!AESCCM"
++ #endif
+ #ifndef PY_SSL_MIN_PROTOCOL
+ #define PY_SSL_MIN_PROTOCOL TLS1_2_VERSION
+ #endif
+@@ -3579,6 +3579,10 @@ set_num_tickets(PySSLContext *self, PyObject *arg, voi
+ PyDoc_STRVAR(PySSLContext_num_tickets_doc,
+ "Control the number of TLSv1.3 session tickets");
+ #endif /* TLS1_3_VERSION */
++
++#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <=
0x3050300fL)
++static inline int SSL_CTX_get_security_level(const SSL_CTX *ctx) { return
1; }
++#endif
+
+ static PyObject *
+ get_security_level(PySSLContext *self, void *c)
diff --git a/devel/python3/patches-3.12/disable-compileall.patch
b/devel/python3/patches-3.12/disable-compileall.patch
new file mode 100644
index 0000000..e87d5fa
--- /dev/null
+++ b/devel/python3/patches-3.12/disable-compileall.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -2305,15 +2305,6 @@ libinstall: all $(srcdir)/Modules/xxmodule.c
+ $(DESTDIR)$(LIBDEST); \
+ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+ @ # Build PYC files for the 3 optimization levels (0, 1, 2)
+- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+- -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST) -f \
+- -x
'bad_coding|badsyntax|site-packages|test/test_lib2to3/data' \
+- $(DESTDIR)$(LIBDEST)
+- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+- -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages
-f \
+- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver
$(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
diff --git a/devel/python3/patches-3.12/makefile.patch
b/devel/python3/patches-3.12/makefile.patch
new file mode 100644
index 0000000..2ca587b
--- /dev/null
+++ b/devel/python3/patches-3.12/makefile.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -961,7 +961,7 @@ regen-re: $(BUILDPYTHON)
+ $(RUNSHARED) ./$(BUILDPYTHON)
$(srcdir)/Tools/scripts/generate_re_casefix.py $(srcdir)/Lib/re/_casefix.py
+
+ Programs/_testembed: Programs/_testembed.o $(LINK_PYTHON_DEPS)
+- $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@
Programs/_testembed.o $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS)
++ $(CC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o
$(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS)
+
+ ############################################################################
+ # "Bootstrap Python" used to run deepfreeze.py
diff --git a/devel/python3/python.gpg b/devel/python3/python.gpg
index 9e669a9..8534143 100644
Binary files a/devel/python3/python.gpg and b/devel/python3/python.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (1e796a4b6de9d08dbf5cff451537ac0062035a8d), Pavel Vinogradov, 10/02/2023

Archive powered by MHonArc 2.6.24.

Top of Page