Merge ~mylesjp/ubuntu/+source/python-eventlet:merge-lp2139641-resolute into ubuntu/+source/python-eventlet:debian/sid

[Myles Penner]

[Myles Penner (mylesjp)]

Package has build successfully in my OpenStack main testing PPA: https://launchpad.net/~mylesjp/+archive/ubuntu/gazpacho-test

Successful autopkgtest available at: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-mylesjp-gazpacho-test/resolute/arm64/p/python-eventlet/20260203_055657_7d85a@/log.gz

[Nick Rosbrook (enr0n)]

Thanks for working on this!

Did you happen to test whether that remaining patch is still necessary? If it is, I would expect Debian to have some version of it too by now.

And, through the comments on bug 2091540, which resulted in this patch being introduced, it sounds like this would ultimately be fixed in Python or elsewhere.

Besides that, one comment inline about the changelog, which you can ignore if we discover this remaining patch is no longer necessary, in which case we can just sync from Debian.

review: Needs Information

[Myles Penner (mylesjp)]

Hey Nick, I just rebuilt this package in my PPA[1] without that patch and it seems to work fine. It looks like it was resolved upstream. I re-ran the autopkgtests as well and they pass[2]. Since we are dropping the CVE patch, we longer have a delta from Debian. Can we now just do a straight sync? Should I update this MR to drop the Maintainer change as well as the openssl patch?

[1]https://launchpad.net/~mylesjp/+archive/ubuntu/gazpacho-test/+build/32237650
[2]https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-mylesjp-gazpacho-test/resolute/amd64/p/python-eventlet/20260206_183711_11c73@/log.gz

[Nick Rosbrook (enr0n)]

Thanks for confirming that! So we can just sync indeed.

You do not need to update the MP further, since I will just initiate a sync on my end, which basically force copies Debian's version over ours.

Thanks again.

Unmerged commits

ef580d3... by Myles Penner on 2026-02-03

d/changelog: Merge from Debian 0.40.3-2 (LP: #2139641)

Update maintainer field and add changelog entry for merge.

c26cd2b... by Myles Penner on 2026-02-02

d/p/openssl-3.4.0-compat.patch: OpenSSL >= 3.4.0 compatibility

Resolve test compatibility issues with newer versions of OpenSSL -
as the server is shutdown OpenSSL returns an [SYS] unknown error
which is handled differently and raised an SSLError exception.

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-eventlet/+bug/2091540

diff --git a/debian/changelog b/debian/changelog
index 48ee8d1..a07116f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+python-eventlet (0.40.3-2ubuntu1) resolute; urgency=medium
+
+  * Merge from Debian unstable (LP: #2139641).
+  * d/p/openssl-3.4.0-compat.patch: Refresh for new upstream. Add
+    ssl.SSLError to exception handling in test_ssl_close() for
+    OpenSSL >= 3.4.0 compatibility.
+  * Drop changes:
+    - d/p/CVE-2025-58068.patch: HTTP request smuggling fix.
+      [Fixed in 0.40.3-1]
+
+ -- Myles Penner <[e-mail]>  Mon, 02 Feb 2026 15:08:07 -0800
+
 python-eventlet (0.40.3-2) unstable; urgency=medium
 
   * Uploading to unstable.
diff --git a/debian/control b/debian/control
index 003e897..c619433 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: python-eventlet
 Section: python
 Priority: optional
-Maintainer: Debian OpenStack <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian OpenStack <[e-mail]>
 Uploaders:
  Thomas Goirand <[e-mail]>,
 Build-Depends:
diff --git a/debian/patches/openssl-3.4.0-compat.patch b/debian/patches/openssl-3.4.0-compat.patch
new file mode 100644
index 0000000..40d5085
--- /dev/null
+++ b/debian/patches/openssl-3.4.0-compat.patch
@@ -0,0 +1,19 @@
+Description: OpenSSL >= 3.4.0 compatibility
+ Resolve test compatibility issues with newer versions
+ of OpenSSL - as the server is shutdown OpenSSL returns
+ an [SYS] unknown error which is handled differently and
+ raised an SSLError exception.
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-eventlet/+bug/2091540
+Forwarded: no
+
+--- a/tests/ssl_test.py
++++ b/tests/ssl_test.py
+@@ -80,7 +80,7 @@
+             sock.recv(8192)
+             try:
+                 self.assertEqual(b'', sock.recv(8192))
+-            except (greenio.SSL.ZeroReturnError,
++            except (greenio.SSL.ZeroReturnError, ssl.SSLError,
+                     BrokenPipeError):
+                 pass
+
diff --git a/debian/patches/series b/debian/patches/series
index 3408c30..dffa5bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ neutralize-test_017_ssl_zeroreturnerror.patch
 install-all-files.patch
 fix-detecting-version.patch
 remove-python-3.13-classifier.patch
+openssl-3.4.0-compat.patch