python3-m2crypto: upgrade 0.47.0 -> 0.48.0

0001-fix-swig-avoid-clang-GNUC-pragma-block-before-_lib.h.patch
removed since it's included in 0.48.0

Changelog:
=============
- doc: another move this time to Codeberg (and communication to
  Matrix)
- test(smime): parametrize test_write_pkcs7_der
- test(smime): fix test_signEncryptDecryptVerify
- fix(util): return bytes from passphrase callbacks
- fix(SSL.Checker): add IDN Chinese name
- test(ssl): add IDN certificate fixture coverage
- test(ssl): cover IDN hostname matching in Checker
- doc: update expected Name format in migration guide
- fix(smime): S/MIME signature verification for Outlook and Thunderbird
- fix(provider): handle OSSL_STORE_INFO_PUBKEY compat. for OpenSSL < 3.2
- fix: cast X509_dup in sk_X509_deep_copy to avoid type mismatch
- fix(smime): S/MIME signature verification for Outlook and Thunderbird
- fix(smime): remove obsolete Python pre-3.6 constructs
- ci: run on Codeberg with forgejo_runner
- doc: clarify the status of the project
- fix(provider): adjust the CI run on Gitea for the older OpenSSL on
  Debian
- fix(evp): narrow digest and BIO pointers for mypy
- fix(init): acommodate modern packaging API
- doc: IRC channel is on Libera, Ergo was a wrong idea
- fix(tests): remove duplicate definition of IS_DEBIAN in test_ssl
- fix(test_bio_ssl): fix TLS 1.3 deadlock and add socket timeouts
- fix(test_bio_ssl): replace sys.exit() with self.fail() to prevent test
  process crash
- ci: publish to PyPI with Sigstore attestations via Trusted Publishing
- fix(authcookie): handle CookieError from Python 3.13.12+
  (CVE-2026-0672)
- ci(leap): use setup.py bdist_wheel to bypass old pip PEP 517 wrapper
- fix(util): replace is_32bit with struct.calcsize and update tests
- ci: add FreeBSD SourceHut CI build script
- fix(swig): avoid clang GNUC pragma block before _lib.h
- fix(provider): don't abuse TemporaryDirectory to be mkdtemp, use that
  directly.
- fix(provider): gate provider APIs for OpenSSL 1.1.1
- feat(provider): add key generation and destruction methods
- docs(provider): add comprehensive documentation to Provider module
- fix(provider): better exception handling
- doc: add a simple AGENTS.md
- feat(engine): add availability check, lifecycle helpers, and safer
  cleanup
- doc(engine): Improve documentation and example of using Engine module

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Wang Mingyu
2026-05-27 17:47:40 +08:00
committed by Khem Raj
parent acd11d26bd
commit 559ec62e99
2 changed files with 2 additions and 52 deletions
@@ -1,49 +0,0 @@
From df210da932c2cab9d3a80ee88c70611d77824a15 Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@fujitsu.com>
Date: Wed, 18 Mar 2026 02:26:56 +0000
Subject: [PATCH] fix(swig): avoid clang GNUC pragma block before _lib.h
Clang defines __GNUC__, so the old guard emitted PRAGMA_* tokens before
they were defined, breaking builds on macOS/clang; move the block after
<_lib.h> and exclude clang while keeping the GCC<5 workaround.
Fixes: https://todo.sr.ht/~mcepl/m2crypto/392
Upstream-Status: Backport [git.sr.ht/~mcepl/m2crypto/commit/504ca8f438afb0f5041d2b5163e5f666a9a1b742.patch]
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
src/SWIG/_m2crypto.i | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/SWIG/_m2crypto.i b/src/SWIG/_m2crypto.i
index d89d355..5426446 100644
--- a/src/SWIG/_m2crypto.i
+++ b/src/SWIG/_m2crypto.i
@@ -43,15 +43,18 @@ typedef unsigned __int64 uint64_t;
%}
%{
-#if defined __GNUC__ && __GNUC__ < 5
-PRAGMA_IGNORE_UNUSED_LABEL
-PRAGMA_WARN_STRICT_PROTOTYPES
-#endif
-
#include <openssl/err.h>
#include <openssl/rand.h>
#include <_lib.h>
+/* _lib.h defines PRAGMA_* helpers; only needed for old GCC (clang defines
+ * __GNUC__ too, but doesn't need this workaround).
+ */
+#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ < 5)
+PRAGMA_IGNORE_UNUSED_LABEL
+PRAGMA_WARN_STRICT_PROTOTYPES
+#endif
+
#include "compile.h"
static PyObject *ssl_verify_cb_func;
--
2.43.0
@@ -4,10 +4,9 @@ HOMEPAGE = "https://gitlab.com/m2crypto/m2crypto"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSES/BSD-2-Clause.txt;md5=8099b0e569f862ece05740aef06c82a2"
SRC_URI[sha256sum] = "9256300be1e0412be802aa1f827e0ce7f94deb1099b8ccdcfd9867a7f0f975bf"
SRC_URI[sha256sum] = "178e290f558ddf0379aaefd34c0a8ddb21f21502594e588f928dda85f1ad202b"
SRC_URI += "file://0001-setup.py-Make-the-cmd-available.patch \
file://0001-fix-swig-avoid-clang-GNUC-pragma-block-before-_lib.h.patch"
SRC_URI += "file://0001-setup.py-Make-the-cmd-available.patch"
CVE_STATUS[CVE-2009-0127] = "disputed: upstream claims there is no bug"
CVE_STATUS[CVE-2020-25657] = "fixed-version: the used version (0.46.2) contains the fix already"