Skip to Content.
Sympa Menu

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

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, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (1da5c932c0d632c4698fbf5a35003fef3276d73f)
  • Date: Sat, 8 Jun 2024 22:53:17 +0000

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

devel/python3/DETAILS | 3 -
devel/python3/HISTORY | 4 ++
devel/python3/patches-3.12/0001-Fix-build-against-LibreSSL.patch | 20
+++++-----
3 files changed, 16 insertions(+), 11 deletions(-)

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

devel/python3: version 3.12.4

diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index 33b183d..ac170b1 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -2,8 +2,7 @@
case "$PYTHON3_BRANCH" in
devel| \
3.12)
- PATCHLEVEL=1
- VERSION=3.12.3 ;;
+ VERSION=3.12.4 ;;
stable| \
3.11)
PATCHLEVEL=1
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 19fdb3f..e51a55c 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,7 @@
+2024-06-08 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 3.12.4
+ * patches-3.12/0001-Fix-build-against-LibreSSL.patch: updated for
3.12.4
+
2024-05-09 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: PATCHLEVEL++ [3.11, 3.12]
* patches-3.11/0001-Fix-build-against-LibreSSL.patch,
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
index 03ffa3c..bc139c7 100644
--- a/devel/python3/patches-3.12/0001-Fix-build-against-LibreSSL.patch
+++ b/devel/python3/patches-3.12/0001-Fix-build-against-LibreSSL.patch
@@ -17,36 +17,38 @@ Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>

--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
-@@ -45,11 +45,13 @@
+@@ -44,6 +44,7 @@

#define MUNCH_SIZE INT_MAX

+#if !defined(LIBRESSL_VERSION_NUMBER)
#define PY_OPENSSL_HAS_SCRYPT 1
+ #if defined(NID_sha3_224) && defined(NID_sha3_256) && defined(NID_sha3_384)
&& defined(NID_sha3_512)
#define PY_OPENSSL_HAS_SHA3 1
- #define PY_OPENSSL_HAS_SHAKE 1
+@@ -54,6 +55,7 @@
+ #if defined(NID_blake2s256) || defined(NID_blake2b512)
#define PY_OPENSSL_HAS_BLAKE2 1
+ #endif
+#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[] = {
+@@ -147,6 +149,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 */
+ #ifdef Py_hash_sha512_224
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),
+@@ -180,6 +183,7 @@ static const py_hashentry_t py_hashes[] = {
+ #endif
+ #ifdef Py_hash_blake2b
PY_HASH_ENTRY(Py_hash_blake2b, "blake2b512", SN_blake2b512,
NID_blake2b512),
+#endif
+ #endif
PY_HASH_ENTRY(NULL, NULL, NULL, 0),
};
-
@@ -873,9 +870,12 @@ py_evp_fromname(PyObject *module, const char *digestna
goto exit;
}


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (1da5c932c0d632c4698fbf5a35003fef3276d73f), Pavel Vinogradov, 06/08/2024

Archive powered by MHonArc 2.6.24.

Top of Page