Skip to Content.
Sympa Menu

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

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 (742ada5e87144a45d8b4cf6ce21aa4d09b46868b)
  • Date: Mon, 21 Jun 2021 18:17:59 +0000

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

crypto/libressl/DETAILS
| 1
crypto/libressl/HISTORY
| 5
crypto/libressl/PRE_BUILD
| 7 -

crypto/libressl/patches-3.3/fix-compatibility-with-pre-rfc-5280-certificates.patch
| 1
python-pypi/lektor/DETAILS
| 1
python-pypi/lektor/HISTORY
| 5

python-pypi/lektor/patches/0001-Replace-werkzeuz-s-rename-with-os.replace-enable-Wer.patch
| 58 ++++++++++
python-pypi/lektor/patches/0001-utils-Use-posix.rename-when-available.patch
| 48 --------
8 files changed, 76 insertions(+), 50 deletions(-)

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

libressl: patch 3.3 too with pre-RFC-5280 compatibility patch

commit 22433f7eb773c067508b3b085b13f1e4c5a27dfe
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lektor: Update patch for Werkzeug 2.x

diff --git a/crypto/libressl/DETAILS b/crypto/libressl/DETAILS
index 22c7cf9..bba8027 100755
--- a/crypto/libressl/DETAILS
+++ b/crypto/libressl/DETAILS
@@ -2,6 +2,7 @@
case "$LIBRESSL_BRANCH"
in devel|stable|3.3)
VERSION=3.3.3
+ PATCHLEVEL=1
SECURITY_PATCH=10
;; 3.2)
VERSION=3.2.5
diff --git a/crypto/libressl/HISTORY b/crypto/libressl/HISTORY
index 01be1dd..88b3828 100644
--- a/crypto/libressl/HISTORY
+++ b/crypto/libressl/HISTORY
@@ -1,3 +1,8 @@
+2021-06-21 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * patches-3.3/fix-compatibility-with-pre-rfc-5280-certificates.patch:
+ add pre-RFC-5280 compatibility patch for 3.3
+
2021-05-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: 3.3.3 is the first stable 3.3 release
* PRE_BUILD: dropped stable|devel override
diff --git a/crypto/libressl/PRE_BUILD b/crypto/libressl/PRE_BUILD
index 2d6e6a7..2e74305 100755
--- a/crypto/libressl/PRE_BUILD
+++ b/crypto/libressl/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-ver="$LIBRESSL_BRANCH" &&
+cd "$SOURCE_DIRECTORY" &&
+ver="$VERSION" &&
+case "$ver" in
+ (*.*.*) ver="${ver%.*}" ;;
+esac &&
apply_patch_dir "patches-$ver"
diff --git
a/crypto/libressl/patches-3.3/fix-compatibility-with-pre-rfc-5280-certificates.patch

b/crypto/libressl/patches-3.3/fix-compatibility-with-pre-rfc-5280-certificates.patch
new file mode 120000
index 0000000..890bdd2
--- /dev/null
+++
b/crypto/libressl/patches-3.3/fix-compatibility-with-pre-rfc-5280-certificates.patch
@@ -0,0 +1 @@
+../patches-3.2/fix-compatibility-with-pre-rfc-5280-certificates.patch
\ No newline at end of file
diff --git a/python-pypi/lektor/DETAILS b/python-pypi/lektor/DETAILS
index 3aa2dd9..da3673f 100755
--- a/python-pypi/lektor/DETAILS
+++ b/python-pypi/lektor/DETAILS
@@ -1,5 +1,6 @@
SPELL=lektor
VERSION=3.2.0
+ PATCHLEVEL=1
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/$SPELL/$SPELL/archive/refs/tags/$VERSION.tar.gz

SOURCE_HASH=sha512:c81914c7a2938132e3ad1d98ef436c57359c676af0f25d80ea691d69bbf8ee5b5f4273cefecac3103d16978c166a2e2f83dd8d31e24789596582d58b486c11ee
diff --git a/python-pypi/lektor/HISTORY b/python-pypi/lektor/HISTORY
index f3b299c..a49092e 100644
--- a/python-pypi/lektor/HISTORY
+++ b/python-pypi/lektor/HISTORY
@@ -1,3 +1,8 @@
+2021-05-30 Ismael Luceno <ismael AT sourcemage.org>
+ *
patches/0001-Replace-werkzeuz-s-rename-with-os.replace-enable-Wer.patch,
+ updated patch for Werkzeug 2.x
+ * DETAILS: PATCHLEVEL++
+
2021-05-27 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PRE_BUILD,
patches/0001-utils-Use-posix.rename-when-available.patch:
diff --git
a/python-pypi/lektor/patches/0001-Replace-werkzeuz-s-rename-with-os.replace-enable-Wer.patch

b/python-pypi/lektor/patches/0001-Replace-werkzeuz-s-rename-with-os.replace-enable-Wer.patch
new file mode 100644
index 0000000..17dff01
--- /dev/null
+++
b/python-pypi/lektor/patches/0001-Replace-werkzeuz-s-rename-with-os.replace-enable-Wer.patch
@@ -0,0 +1,58 @@
+From 9428e56ae9f5429c186fd27dcb8a9bca202d26f9 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sun, 30 May 2021 14:30:56 +0200
+Subject: [PATCH] Replace werkzeuz's rename with os.replace; enable
+ Werkzeug 2.x
+
+This function has been always internal, and has been removed from
+Werkzeug 2.x.
+
+Python 3.3 provides os.replace, a cross-platform atomic rename function.
+
+If this is unavailable, on POSIX we can fall back to posix.rename.
+
+Ref: https://github.com/pallets/werkzeug/issues/1759
+Ref: https://bugs.python.org/issue8828
+Upstream-Status: Submitted [https://github.com/lektor/lektor/pull/911]
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ lektor/builder.py | 5 ++++-
+ lektor/utils.py | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/lektor/builder.py b/lektor/builder.py
+index 93572fd8f0dc..af9e6467ad16 100644
+--- a/lektor/builder.py
++++ b/lektor/builder.py
+@@ -11,7 +11,10 @@ from contextlib import contextmanager
+ from itertools import chain
+
+ import click
+-from werkzeug.posixemulation import rename
++try:
++ from os import replace as rename
++except ImportError:
++ from posix import rename
+
+ from lektor.build_programs import builtin_build_programs
+ from lektor.buildfailures import FailureController
+diff --git a/lektor/utils.py b/lektor/utils.py
+index 2402a0aded72..7565b8cc7354 100644
+--- a/lektor/utils.py
++++ b/lektor/utils.py
+@@ -25,8 +25,11 @@ from markupsafe import Markup
+ from slugify import slugify as _slugify
+ from werkzeug import urls
+ from werkzeug.http import http_date
+-from werkzeug.posixemulation import rename
+ from werkzeug.urls import url_parse
++try:
++ from os import replace as rename
++except ImportError:
++ from posix import rename
+
+
+ is_windows = os.name == "nt"
+--
+2.31.1
+
diff --git
a/python-pypi/lektor/patches/0001-utils-Use-posix.rename-when-available.patch
b/python-pypi/lektor/patches/0001-utils-Use-posix.rename-when-available.patch
deleted file mode 100644
index 3437081..0000000
---
a/python-pypi/lektor/patches/0001-utils-Use-posix.rename-when-available.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e4301e9b78000d622731c79afcb01d436a79c3c2 Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Tue, 25 May 2021 20:19:25 +0200
-Subject: [PATCH] utils: Use posix.rename when available
-
-Upstream-Status: Pending
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- lektor/builder.py | 5 ++++-
- lektor/utils.py | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/lektor/builder.py b/lektor/builder.py
-index 93572fd8f0dc..9004a9a02570 100644
---- a/lektor/builder.py
-+++ b/lektor/builder.py
-@@ -11,7 +11,10 @@ from contextlib import contextmanager
- from itertools import chain
-
- import click
--from werkzeug.posixemulation import rename
-+try:
-+ from posix import rename
-+except ImportError:
-+ from werkzeug.posixemulation import rename
-
- from lektor.build_programs import builtin_build_programs
- from lektor.buildfailures import FailureController
-diff --git a/lektor/utils.py b/lektor/utils.py
-index 2402a0aded72..c03c06eb4000 100644
---- a/lektor/utils.py
-+++ b/lektor/utils.py
-@@ -25,8 +25,11 @@ from markupsafe import Markup
- from slugify import slugify as _slugify
- from werkzeug import urls
- from werkzeug.http import http_date
--from werkzeug.posixemulation import rename
- from werkzeug.urls import url_parse
-+try:
-+ from posix import rename
-+except ImportError:
-+ from werkzeug.posixemulation import rename
-
-
- is_windows = os.name == "nt"
---
-2.31.1
-



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (742ada5e87144a45d8b4cf6ce21aa4d09b46868b), Ismael Luceno, 06/21/2021

Archive powered by MHonArc 2.6.24.

Top of Page