Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (ce72b3b1ebad01c7b03173c4aeb21706fe4951d7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (ce72b3b1ebad01c7b03173c4aeb21706fe4951d7)
  • Date: Thu, 9 May 2024 17:02:11 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

devel/python3/DETAILS | 2 +
devel/python3/HISTORY | 6 +++
devel/python3/patches-3.11/0001-Fix-build-against-LibreSSL.patch | 18
+++++++--
devel/python3/patches-3.12/0001-Fix-build-against-LibreSSL.patch | 19
++++++++--
python-pypi/pygit2/DEPENDS | 4 +-
python-pypi/pygit2/DETAILS | 4 +-
python-pypi/pygit2/HISTORY | 3 +
7 files changed, 47 insertions(+), 9 deletions(-)

New commits:
commit ce72b3b1ebad01c7b03173c4aeb21706fe4951d7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

pygit2 1.14.1

commit 10acaf68b5754abae6cc3f4a829261355572d431
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

python3: Update LibreSSL patch for Python 3.11.9 and 3.12.3

diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index 432618f..33b183d 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -2,9 +2,11 @@
case "$PYTHON3_BRANCH" in
devel| \
3.12)
+ PATCHLEVEL=1
VERSION=3.12.3 ;;
stable| \
3.11)
+ PATCHLEVEL=1
VERSION=3.11.9 ;;
3.10)
VERSION=3.10.14 ;;
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 3976545..19fdb3f 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,9 @@
+2024-05-09 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++ [3.11, 3.12]
+ * patches-3.11/0001-Fix-build-against-LibreSSL.patch,
+ patches-3.12/0001-Fix-build-against-LibreSSL.patch:
+ updated for 3.11.9, and 3.12.3 respectively.
+
2024-04-09 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.12.3, SECURITY_PATCH++, (CVE-2023-52425)

diff --git a/devel/python3/patches-3.11/0001-Fix-build-against-LibreSSL.patch
b/devel/python3/patches-3.11/0001-Fix-build-against-LibreSSL.patch
index 886919a..fceb355 100644
--- a/devel/python3/patches-3.11/0001-Fix-build-against-LibreSSL.patch
+++ b/devel/python3/patches-3.11/0001-Fix-build-against-LibreSSL.patch
@@ -5,11 +5,14 @@ Date: Thu, 15 Sep 2022 22:10:54 +0200

Based on patches from OpenBSD.

+Origin: OpenBSD
Upstream-Status: Inappropriate
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+
---
- Modules/_hashopenssl.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ Modules/_hashopenssl.c | 9 ++++++++-
+ Modules/_ssl.c | 10 +++++++++-
+ 2 files changed, 17 insertions(+), 2 deletions(-)

--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -82,3 +85,12 @@ Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>

static PyObject *
get_security_level(PySSLContext *self, void *c)
+@@ -4541,7 +4541,7 @@ set_sni_callback(PySSLContext *self, PyObject *arg, vo
+ return 0;
+ }
+
+-#if OPENSSL_VERSION_NUMBER < 0x30300000L
++#if OPENSSL_VERSION_NUMBER < 0x30300000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ static X509_OBJECT *x509_object_dup(const X509_OBJECT *obj)
+ {
+ int ok;
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 76b3617..03ffa3c 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
@@ -5,11 +5,15 @@ Date: Thu, 15 Sep 2022 22:10:54 +0200

Based on patches from OpenBSD.

+Origin: OpenBSD
Upstream-Status: Inappropriate
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+
---
- Modules/_hashopenssl.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ Modules/_hashopenssl.c | 9 ++++++++-
+ Modules/_ssl.c | 10 +++++++++-
+ configure | 2 ++
+ 3 files changed, 19 insertions(+), 2 deletions(-)

--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -82,6 +86,15 @@ Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>

static PyObject *
get_security_level(PySSLContext *self, void *c)
+@@ -4541,7 +4541,7 @@ set_sni_callback(PySSLContext *self, PyObject *arg, vo
+ return 0;
+ }
+
+-#if OPENSSL_VERSION_NUMBER < 0x30300000L
++#if OPENSSL_VERSION_NUMBER < 0x30300000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ static X509_OBJECT *x509_object_dup(const X509_OBJECT *obj)
+ {
+ int ok;
diff --git a/configure b/configure
index b6f90bc..c71b68a 100755
--- a/configure
diff --git a/python-pypi/pygit2/DEPENDS b/python-pypi/pygit2/DEPENDS
index 9d70637..828594b 100755
--- a/python-pypi/pygit2/DEPENDS
+++ b/python-pypi/pygit2/DEPENDS
@@ -1,5 +1,7 @@
. "$GRIMOIRE"/VDEPENDS &&
vdepends <<-!
- libgit2 >= 1.6.0
+ cffi >= 1.16.0
+ libgit2 >= 1.7.0
+ pycparser >= 2.22
python3
!
diff --git a/python-pypi/pygit2/DETAILS b/python-pypi/pygit2/DETAILS
index b641b9b..ba5a459 100755
--- a/python-pypi/pygit2/DETAILS
+++ b/python-pypi/pygit2/DETAILS
@@ -1,9 +1,9 @@
# Watch: https://github.com/libgit2/pygit2/tags /tags/v([0-9.]+)[.]tar[.]
SPELL=pygit2
- VERSION=1.12.0
+ VERSION=1.14.1
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/libgit2/$SPELL/archive/refs/tags/v$VERSION.tar.gz
-
SOURCE_HASH=sha512:8ea19d819fb3fa6a92171bc4df6721d2b7953f1ff50e82bb955a36d9af8ed3ec0dea76c0bea7ce0f342e76c0377f5050cd2ef25940fbace4f2dd32109bd3794c
+
SOURCE_HASH=sha512:7d48c60df5af47fe5f90661cec6d53e3b4adb5e14b4d605fc4634f38222b4053d59156a55814849b1cd0619b169c6d35bc387912695e54c18fdd2b57de7b561d
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="https://github.com/libgit2/pygit2";
LICENSE[0]="GPL-2.0-only"
diff --git a/python-pypi/pygit2/HISTORY b/python-pypi/pygit2/HISTORY
index 3e8d37d..877aab6 100644
--- a/python-pypi/pygit2/HISTORY
+++ b/python-pypi/pygit2/HISTORY
@@ -1,3 +1,6 @@
+2024-05-09 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.14.1
+
2023-04-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.12.0



  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (ce72b3b1ebad01c7b03173c4aeb21706fe4951d7), Ismael Luceno, 05/09/2024

Archive powered by MHonArc 2.6.24.

Top of Page