public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: sergesanspaille <sguelton@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/offlineimap] rawhide: Fix rhbz#2537264
Date: Mon, 21 Sep 2026 09:43:56 GMT	[thread overview]
Message-ID: <178998383629.1.9079576678421721721.rpms-offlineimap-854e976382d5@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/offlineimap
Branch : rawhide
Commit : 854e976382d51676d8ba1ebbbeef69ac9019e57d
Author : sergesanspaille <sguelton@redhat.com>
Date   : 2026-09-21T10:49:48+02:00
Stats  : +63/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/offlineimap/c/854e976382d51676d8ba1ebbbeef69ac9019e57d?branch=rawhide

Log:
Fix rhbz#2537264

---
diff --git a/0001-PATCH-Compatibility-layer-for-Python-3.15.patch b/0001-PATCH-Compatibility-layer-for-Python-3.15.patch
new file mode 100644
index 0000000..705c1e7
--- /dev/null
+++ b/0001-PATCH-Compatibility-layer-for-Python-3.15.patch
@@ -0,0 +1,58 @@
+From 067718a0b56fa41b4a007eda76a60ae544798111 Mon Sep 17 00:00:00 2001
+From: serge-sans-paille <sergesanspaille@free.fr>
+Date: Sun, 20 Sep 2026 20:53:55 +0200
+Subject: [PATCH] [PATCH] Compatibility layer for Python 3.15
+
+See https://github.com/python/cpython/pull/152714 for the details.
+---
+ imaplib2/imaplib2.py  | 6 +++---
+ imaplib2/imaplib2.py3 | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/imaplib2/imaplib2.py b/imaplib2/imaplib2.py
+index 1fd47d2..a1f8183 100755
+--- a/imaplib2/imaplib2.py
++++ b/imaplib2/imaplib2.py
+@@ -513,14 +513,14 @@ class IMAP4(object):
+             TLS_MAP = {}
+             if hasattr(ssl, "PROTOCOL_TLSv1_2"):
+                 TLS_MAP[TLS_SECURE] = {
+-                    "tls1_2": ssl.PROTOCOL_TLSv1_2,
+-                    "tls1_1": ssl.PROTOCOL_TLSv1_1,
++                    "tls1_2": ssl.PROTOCOL_TLS_CLIENT,
++                    "tls1_1": ssl.PROTOCOL_TLS_CLIENT,
+                 }
+             else:
+                 TLS_MAP[TLS_SECURE] = {}
+             TLS_MAP[TLS_NO_SSL] = TLS_MAP[TLS_SECURE].copy()
+             TLS_MAP[TLS_NO_SSL].update({
+-                "tls1": ssl.PROTOCOL_TLSv1,
++                "tls1": ssl.PROTOCOL_TLS,
+             })
+             TLS_MAP[TLS_COMPAT] = TLS_MAP[TLS_NO_SSL].copy()
+             TLS_MAP[TLS_COMPAT].update({
+diff --git a/imaplib2/imaplib2.py3 b/imaplib2/imaplib2.py3
+index 9de6702..077b2a4 100755
+--- a/imaplib2/imaplib2.py3
++++ b/imaplib2/imaplib2.py3
+@@ -468,7 +468,7 @@ class IMAP4(object):
+                 TLS_MAP[TLS_SECURE] = {}
+             TLS_MAP[TLS_NO_SSL] = TLS_MAP[TLS_SECURE].copy()
+             TLS_MAP[TLS_NO_SSL].update({
+-                "tls1": ssl.PROTOCOL_TLSv1,
++                "tls1": ssl.PROTOCOL_TLS,
+             })
+             TLS_MAP[TLS_COMPAT] = TLS_MAP[TLS_NO_SSL].copy()
+             TLS_MAP[TLS_COMPAT].update({
+@@ -477,7 +477,7 @@ class IMAP4(object):
+             })
+             if hasattr(ssl, "PROTOCOL_SSLv3"):          # Might not be available.
+                 TLS_MAP[TLS_COMPAT].update({
+-                    "ssl3": ssl.PROTOCOL_SSLv3
++                    "ssl3": ssl.PROTOCOL_SSLv23
+                 })
+ 
+             if self.ca_certs is not None:
+-- 
+2.54.0
+

diff --git a/offlineimap.spec b/offlineimap.spec
index 3af18c0..6701f60 100644
--- a/offlineimap.spec
+++ b/offlineimap.spec
@@ -1,4 +1,4 @@
-%global baserelease 1
+%global baserelease 2
 
 #%%global commit 1e7ef9e7e6952f5d29ef0f5c25fd062798de55f3
 #%%global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -28,6 +28,7 @@ Patch3:         0003-PATCH-Sphinx-doc-compat.patch
 Patch201:       https://github.com/jazzband/imaplib2/pull/4.patch
 Patch202:       https://github.com/jazzband/imaplib2/pull/6.patch
 Patch203:       https://github.com/jazzband/imaplib2/pull/15.patch
+Patch204:       0001-PATCH-Compatibility-layer-for-Python-3.15.patch
 
 BuildArch:      noarch
 
@@ -106,6 +107,9 @@ install -p docs/offlineimapui.7.gz %{buildroot}/%{_mandir}/man7/
 %{_mandir}/man7/%{name}ui.7*
 
 %changelog
+* Mon Sep 21 2025 Serge Guelton <sergesanspaille@free.fr> - 8.0.3-2
+- Fix rhbz#2537264
+
 * Sun Sep 20 2025 Serge Guelton <sergesanspaille@free.fr> - 8.0.3-1
 - Upstream release
 

                 reply	other threads:[~2026-09-21  9:43 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178998383629.1.9079576678421721721.rpms-offlineimap-854e976382d5@fedoraproject.org \
    --to=sguelton@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox