Skip to Content.
Sympa Menu

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

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 (3df40d4b8a3de740445c3d5077ee4eb0f7efee24)
  • Date: Thu, 15 Sep 2022 23:13:15 +0000

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

python-pypi/python-cryptography/BUILD | 2
python-pypi/python-cryptography/DEPENDS | 8 -
python-pypi/python-cryptography/DETAILS | 4
python-pypi/python-cryptography/HISTORY | 8 +
python-pypi/python-cryptography/PRE_BUILD | 4
python-pypi/python-cryptography/libressl332.patch | 143
----------------------
6 files changed, 12 insertions(+), 157 deletions(-)

New commits:
commit 3df40d4b8a3de740445c3d5077ee4eb0f7efee24
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

python-pypi/python-cryptography: version 38.0.1

diff --git a/python-pypi/python-cryptography/BUILD
b/python-pypi/python-cryptography/BUILD
deleted file mode 100755
index da64be9..0000000
--- a/python-pypi/python-cryptography/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-export CRYPTOGRAPHY_DONT_BUILD_RUST=1 &&
-default_build_python3
diff --git a/python-pypi/python-cryptography/DEPENDS
b/python-pypi/python-cryptography/DEPENDS
index 6c30ddb..152f250 100755
--- a/python-pypi/python-cryptography/DEPENDS
+++ b/python-pypi/python-cryptography/DEPENDS
@@ -5,8 +5,6 @@ depends SSL &&
depends SETUPTOOLS &&
depends cffi &&
depends pyasn1 &&
-depends pip
-
-# Future versions may require these
-#depends rust &&
-#depends setuptools-rust
+depends pip &&
+depends rust &&
+depends setuptools-rust
diff --git a/python-pypi/python-cryptography/DETAILS
b/python-pypi/python-cryptography/DETAILS
index 78bcbc7..47d239c 100755
--- a/python-pypi/python-cryptography/DETAILS
+++ b/python-pypi/python-cryptography/DETAILS
@@ -1,7 +1,7 @@
SPELL=python-cryptography
SPELLX=cryptography
- VERSION=3.4.8
-
SOURCE_HASH=sha512:b0d64a573b488af3e453fc1885bbafb65f8a2260e81cf64830f981589afca0bd7be052a5f5b8ed83dd78d9638da37c680f3705cbf2d47d5b28fb5a5454f1cea5
+ VERSION=38.0.1
+
SOURCE_HASH=sha512:a0e9eb645888a74e01377c0ed79427d066a50d10a9b628828195e82b7ee44ff59866f3659f2028541856bba818340c404e00061645c2676bc63f8ece42fd511e
SECURITY_PATCH=1
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=https://pypi.io/packages/source/c/$SPELLX/$SOURCE
diff --git a/python-pypi/python-cryptography/HISTORY
b/python-pypi/python-cryptography/HISTORY
index 5f38701..5f83f76 100644
--- a/python-pypi/python-cryptography/HISTORY
+++ b/python-pypi/python-cryptography/HISTORY
@@ -1,5 +1,11 @@
+2022-09-15 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 38.0.1
+ * DEPENDS: uncommented rust and setuptools-rust
+ * BUILD: removed, default python build is fine
+ * PRE_BUILD, libressl332.patch: removed
+
2022-05-29 Florian Franzmann <bwlf AT bandrate.org>
- * DEPENDS: depend on pip
+ * DEPENDS: depend on pip

2021-09-16 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.4.8
diff --git a/python-pypi/python-cryptography/PRE_BUILD
b/python-pypi/python-cryptography/PRE_BUILD
deleted file mode 100755
index 8068459..0000000
--- a/python-pypi/python-cryptography/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-patch -p1 < "${SPELL_DIRECTORY}/libressl332.patch"
diff --git a/python-pypi/python-cryptography/libressl332.patch
b/python-pypi/python-cryptography/libressl332.patch
deleted file mode 100644
index ccbc1aa..0000000
--- a/python-pypi/python-cryptography/libressl332.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-index e2b5a13235a..ab296343906 100644
---- a/src/_cffi_src/openssl/cryptography.py
-+++ b/src/_cffi_src/openssl/cryptography.py
-@@ -32,6 +32,13 @@
- #include <Winsock2.h>
- #endif
-
-+#if CRYPTOGRAPHY_IS_LIBRESSL
-+ #define CRYPTOGRAPHY_LIBRESSL_332_OR_GREATER \
-+ (LIBRESSL_VERSION_NUMBER >= 0x3030200f)
-+#else
-+#define CRYPTOGRAPHY_LIBRESSL_332_OR_GREATER (0)
-+#endif
-+
- #define CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER \
- (OPENSSL_VERSION_NUMBER >= 0x1010006f && !CRYPTOGRAPHY_IS_LIBRESSL)
-
-@@ -59,6 +66,8 @@
- static const int CRYPTOGRAPHY_NEEDS_OSRANDOM_ENGINE;
-
- static const int CRYPTOGRAPHY_IS_LIBRESSL;
-+
-+static const int CRYPTOGRAPHY_LIBRESSL_332_OR_GREATER;
- """
-
- FUNCTIONS = """
-diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
-index 11a7d63a961..23cbc5ff425 100644
---- a/src/_cffi_src/openssl/ssl.py
-+++ b/src/_cffi_src/openssl/ssl.py
-@@ -585,7 +585,7 @@
- static const long TLS_ST_OK = 0;
- #endif
-
--#if CRYPTOGRAPHY_IS_LIBRESSL
-+#if CRYPTOGRAPHY_IS_LIBRESSL && !CRYPTOGRAPHY_LIBRESSL_332_OR_GREATER
- static const long SSL_OP_NO_DTLSv1 = 0;
- static const long SSL_OP_NO_DTLSv1_2 = 0;
- long (*DTLS_set_link_mtu)(SSL *, long) = NULL;
-
-From ec2a1701a34a28783e2353befb9c5c057f65d782 Mon Sep 17 00:00:00 2001
-From: Charlie Li <git AT vishwin.info>
-Date: Mon, 19 Apr 2021 17:41:33 -0400
-Subject: [PATCH 2/4] Fix preprocessor guards for LibreSSL's SSL_OP_NO_DTLS*
-
-DTLS_set_link_mtu and DTLS_get_link_min_mtu are not part of 3.3.2
----
- src/_cffi_src/openssl/ssl.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
-index 23cbc5ff425..a0b1641454e 100644
---- a/src/_cffi_src/openssl/ssl.py
-+++ b/src/_cffi_src/openssl/ssl.py
-@@ -585,9 +585,11 @@
- static const long TLS_ST_OK = 0;
- #endif
-
--#if CRYPTOGRAPHY_IS_LIBRESSL && !CRYPTOGRAPHY_LIBRESSL_332_OR_GREATER
-+#if CRYPTOGRAPHY_IS_LIBRESSL
-+#if !CRYPTOGRAPHY_LIBRESSL_332_OR_GREATER
- static const long SSL_OP_NO_DTLSv1 = 0;
- static const long SSL_OP_NO_DTLSv1_2 = 0;
-+#endif
- long (*DTLS_set_link_mtu)(SSL *, long) = NULL;
- long (*DTLS_get_link_min_mtu)(SSL *) = NULL;
- #endif
-
-From 7d03d4477b4f06a3e1ec412afa0f2e4edb4e3893 Mon Sep 17 00:00:00 2001
-From: Charlie Li <git AT vishwin.info>
-Date: Mon, 19 Apr 2021 18:16:14 -0400
-Subject: [PATCH 3/4] Switch to LESS_THAN context for LibreSSL 3.3.2
-
-While here, fix indents
----
- src/_cffi_src/openssl/cryptography.py | 8 ++++----
- src/_cffi_src/openssl/ssl.py | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/_cffi_src/openssl/cryptography.py
b/src/_cffi_src/openssl/cryptography.py
-index ab296343906..0b468c8d719 100644
---- a/src/_cffi_src/openssl/cryptography.py
-+++ b/src/_cffi_src/openssl/cryptography.py
-@@ -33,10 +33,10 @@
- #endif
-
- #if CRYPTOGRAPHY_IS_LIBRESSL
-- #define CRYPTOGRAPHY_LIBRESSL_332_OR_GREATER \
-- (LIBRESSL_VERSION_NUMBER >= 0x3030200f)
-+#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_332 \
-+ (LIBRESSL_VERSION_NUMBER < 0x3030200f)
- #else
--#define CRYPTOGRAPHY_LIBRESSL_332_OR_GREATER (0)
-+#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_332 (0)
- #endif
-
- #define CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER \
-@@ -67,7 +67,7 @@
-
- static const int CRYPTOGRAPHY_IS_LIBRESSL;
-
--static const int CRYPTOGRAPHY_LIBRESSL_332_OR_GREATER;
-+static const int CRYPTOGRAPHY_LIBRESSL_LESS_THAN_332;
- """
-
- FUNCTIONS = """
-diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
-index a0b1641454e..081ef041fa3 100644
---- a/src/_cffi_src/openssl/ssl.py
-+++ b/src/_cffi_src/openssl/ssl.py
-@@ -586,7 +586,7 @@
- #endif
-
- #if CRYPTOGRAPHY_IS_LIBRESSL
--#if !CRYPTOGRAPHY_LIBRESSL_332_OR_GREATER
-+#if CRYPTOGRAPHY_LIBRESSL_LESS_THAN_332
- static const long SSL_OP_NO_DTLSv1 = 0;
- static const long SSL_OP_NO_DTLSv1_2 = 0;
- #endif
-
-From 843ef2dbfff33ea3018b04d926ccd6d1b629ef87 Mon Sep 17 00:00:00 2001
-From: Charlie Li <git AT vishwin.info>
-Date: Mon, 19 Apr 2021 18:22:20 -0400
-Subject: [PATCH 4/4] Remove extra C variable declaration
-
-The variable is not actually used from Python
----
- src/_cffi_src/openssl/cryptography.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/_cffi_src/openssl/cryptography.py
b/src/_cffi_src/openssl/cryptography.py
-index 0b468c8d719..b9c7a793b3b 100644
---- a/src/_cffi_src/openssl/cryptography.py
-+++ b/src/_cffi_src/openssl/cryptography.py
-@@ -66,8 +66,6 @@
- static const int CRYPTOGRAPHY_NEEDS_OSRANDOM_ENGINE;
-
- static const int CRYPTOGRAPHY_IS_LIBRESSL;
--
--static const int CRYPTOGRAPHY_LIBRESSL_LESS_THAN_332;
- """
-
- FUNCTIONS = """



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3df40d4b8a3de740445c3d5077ee4eb0f7efee24), Pavel Vinogradov, 09/15/2022

Archive powered by MHonArc 2.6.24.

Top of Page