public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mercurial] rawhide: Add mercurial_without_TLSv1_2.patch
@ 2026-06-30 19:10 Mads Kiilerich
  0 siblings, 0 replies; only message in thread
From: Mads Kiilerich @ 2026-06-30 19:10 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/mercurial
Branch : rawhide
Commit : 2e9b02abcbf7dda8fae92d9c5310a335d4b26ec3
Author : Mads Kiilerich <mads@kiilerich.com>
Date   : 2026-06-30T20:54:53+02:00
Stats  : +42/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/mercurial/c/2e9b02abcbf7dda8fae92d9c5310a335d4b26ec3?branch=rawhide

Log:
Add mercurial_without_TLSv1_2.patch

---
diff --git a/mercurial.spec b/mercurial.spec
index 5e19533..122d0ef 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -10,7 +10,7 @@
 Summary: A fast, lightweight Source Control Management system
 Name: mercurial
 Version: 7.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # Release: 1.rc1%%{?dist}
 
@@ -23,6 +23,7 @@ Source0: https://www.mercurial-scm.org/release/%{name}-%{upstreamversion}.tar.gz
 Source1: mercurial-site-start.el
 # Patch cargo metadata for dependency versions available in Fedora
 Patch0:  mercurial-rust-metadata.patch
+Patch1:  mercurial_without_TLSv1_2.patch
 
 BuildRequires: make
 BuildRequires: emacs-el
@@ -279,6 +280,10 @@ rm -rf %{buildroot}%{python3_sitearch}/mercurial/locale
 
 
 %changelog
+* Tue Jun 30 2026 Mads Kiilerich <mads@kiilerich.com> - 7.2.3-3
+- Drop Python 3.15 patch that apparently isn't necessary.
+- Add patch for Python 3.15 with OpenSSL 4.0 and no TLSv1.2
+
 * Mon Jun 29 2026 Mads Kiilerich <mads@kiilerich.com> - 7.2.3-2
 - Update patch that intended to fix a problem that couldn't be verified.
 

diff --git a/mercurial_without_TLSv1_2.patch b/mercurial_without_TLSv1_2.patch
new file mode 100644
index 0000000..d7462d7
--- /dev/null
+++ b/mercurial_without_TLSv1_2.patch
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User Mads Kiilerich <mads@kiilerich.com>
+# Date 1782843901 -7200
+#      Tue Jun 30 20:25:01 2026 +0200
+# Branch stable
+# Node ID dd1e25c4b06e214ae010342e1433ccbb698cb50b
+# Parent  9b96e7a25b0d3311f1f91d8acf4da0e3ce7e806d
+setup_py: support OpenSSL 4.0 without TLSv1.2 support
+
+On Fedora 45 with Python 3.15 and OpenSSL 4.0 with
+https://github.com/python/cpython/commit/3364e7e62fa24d0e19133fb0f90b1c24ef1110c5
+setup.py finds that ssl.HAS_TLSv1_2 no longer is True, and installation thus
+fails.
+
+sslutil.py has been checking ssl.HAS_TLSv1_3 for a long time, and that property
+has been around as long as HAS_TLSv1_2. Let's accept that one in setup.py too.
+
+Next step could be a cleanup for supported Python versions and let sslutil
+access the HAS_X attributes directly and drop the PROTOCOL_TLSvX attributes
+completely. That should be safe for all supported Python versions.
+
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -12,9 +12,9 @@ import sys
+ import sysconfig
+ import tempfile
+ 
+-if not ssl.HAS_TLSv1_2:
++if not ssl.HAS_TLSv1_2 and not ssl.HAS_TLSv1_3:
+     error = """
+-The `ssl` module does not advertise support for TLS 1.2.
++The `ssl` module does not advertise support for TLS 1.2 or later.
+ Please make sure that your Python installation was compiled against an OpenSSL
+ version enabling these features (likely this requires the OpenSSL version to
+ be at least 1.0.1).

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-30 19:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-30 19:10 [rpms/mercurial] rawhide: Add mercurial_without_TLSv1_2.patch Mads Kiilerich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox