Merge ~hectorcao/ubuntu/+source/paramiko:merge-lp2066061 into ubuntu/+source/paramiko:debian/sid

[Hector CAO]

[Marc Deslauriers (mdeslaur)]

Looks good. Could you just fix the spacing in the changelog? Some lines have too much indentation, and one of the lines is too long. So changing it to something like this would do:

+ - d/control: Demote python3-invoke from Recommends to Suggests as
+ the python-invoke package lacks unit test execution so is not suitable
+ for main inclusion
+ - debian/patches/disable_flaky_test.patch: disable flaky
+ test_sequence_numbers_reset_on_newkeys_when_strict test.

review: Needs Fixing

[Marc Deslauriers (mdeslaur)]

Oh, that broke. Basically the "t" in "the" should be underneath the "d" in "d/control", etc.

[Hector CAO (hectorcao)]

> Oh, that broke. Basically the "t" in "the" should be underneath the "d" in
> "d/control", etc.

Thanks @mdeslaur, fixed.

[Hector CAO (hectorcao)]

> Looks good. Could you just fix the spacing in the changelog? Some lines have
> too much indentation, and one of the lines is too long. So changing it to
> something like this would do:
>
> + - d/control: Demote python3-invoke from Recommends to Suggests as
> + the python-invoke package lacks unit test execution so is not
> suitable
> + for main inclusion
> + - debian/patches/disable_flaky_test.patch: disable flaky
> + test_sequence_numbers_reset_on_newkeys_when_strict test.

Thanks @mdeslaur, fixed.

[Marc Deslauriers (mdeslaur)]

ack, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 84ff552..aad1a0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+paramiko (3.4.0-1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes (LP: #2066061):
+      - d/control: Demote python3-invoke from Recommends to Suggests as
+        the python-invoke package lacks unit test execution so is not suitable
+        for main inclusion
+      - debian/patches/disable_flaky_test.patch: disable flaky
+        test_sequence_numbers_reset_on_newkeys_when_strict test.
+    Dropped changes:
+      - SECURITY UPDATE: Prefix truncation attack on BPP
+        - debian/patches/CVE-2023-48795-*.patch: implement strict key
+          exchange.
+        - CVE-2023-48795
+        Dropped because these patches are applied upstream
+      - debian/patches/remove_six.patch : removed because already upstreamed
+      - debian/patches/fix_test_on_armhf.patch : removed because not applicable
+        since the tests/test_transport.py has been changed upstreamed
+
+ -- Hector Cao <[e-mail]>  Fri, 17 May 2024 19:12:44 +0200
+
 paramiko (3.4.0-1) unstable; urgency=medium
 
   * Team upload
@@ -20,6 +40,38 @@ paramiko (2.12.0-3) unstable; urgency=medium
 
  -- Sandro Tosi <[e-mail]>  Wed, 28 Feb 2024 01:25:38 -0500
 
+paramiko (2.12.0-2ubuntu4) noble; urgency=medium
+
+  * debian/patches/fix_test_on_armhf.patch: fix test failing on armhf.
+  * debian/patches/disable_flaky_test.patch: disable flaky
+    test_sequence_numbers_reset_on_newkeys_when_strict test.
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 24 Jan 2024 09:18:51 -0500
+
+paramiko (2.12.0-2ubuntu3) noble; urgency=medium
+
+  * debian/patches/remove_six.patch: remove last use of six to fix FTBFS.
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 12 Jan 2024 10:11:46 -0500
+
+paramiko (2.12.0-2ubuntu2) noble; urgency=medium
+
+  * SECURITY UPDATE: Prefix truncation attack on BPP
+    - debian/patches/CVE-2023-48795-*.patch: implement strict key
+      exchange.
+    - CVE-2023-48795
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 11 Jan 2024 08:56:18 -0500
+
+paramiko (2.12.0-2ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    + d/control: Demote python3-invoke from Recommends to Suggests as
+      the python-invoke package lacks unit test execution so is not suitable
+      for main inclusion
+
+ -- Graham Inggs <[e-mail]>  Fri, 17 Feb 2023 09:35:50 +0000
+
 paramiko (2.12.0-2) unstable; urgency=medium
 
   * Run autopkgtests via autopkgtest-pkg-pybuild
@@ -38,6 +90,15 @@ paramiko (2.12.0-1) unstable; urgency=medium
 
  -- Sandro Tosi <[e-mail]>  Sat, 17 Dec 2022 14:09:43 -0500
 
+paramiko (2.10.4-1ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/control: Demote python3-invoke from Recommends to Suggests as
+      the python-invoke package lacks unit test execution so is not suitable
+      for main inclusion.
+
+ -- Benjamin Drung <[e-mail]>  Mon, 16 May 2022 17:12:00 +0200
+
 paramiko (2.10.4-1) unstable; urgency=medium
 
   * Team upload.
@@ -64,6 +125,40 @@ paramiko (2.10.3-1) unstable; urgency=medium
 
  -- Benjamin Drung <[e-mail]>  Tue, 12 Apr 2022 16:40:12 +0200
 
+paramiko (2.9.3-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release (LP: #1968730).
+    - Add support for SHA-2 variants of RSA key verification algorithms
+      to support openssh >= 8.8p1-1 (Closes: #1007168, LP: #1961979)
+  * Refresh patches.
+
+ -- Benjamin Drung <[e-mail]>  Tue, 12 Apr 2022 16:26:58 +0200
+
+paramiko (2.8.1-1ubuntu3) jammy; urgency=medium
+
+  * SECURITY UPDATE: race condition in write_private_key_file
+    - debian/patches/CVE-2022-24302.patch: create file with proper
+      permissions in paramiko/pkey.py, tests/test_pkey.py.
+    - CVE-2022-24302
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 24 Mar 2022 09:21:29 -0400
+
+paramiko (2.8.1-1ubuntu2) jammy; urgency=medium
+
+  * d/p/thread-setdaemon-deprecation.patch: patch out a deprecation warning
+    with Python 3.10 (LP: #1959095)
+
+ -- Simon Chopin <[e-mail]>  Wed, 26 Jan 2022 11:35:18 +0100
+
+paramiko (2.8.1-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/control: Demote python3-invoke from Recommends to Suggests as
+      the python-invoke package lacks unit test execution so is not suitable
+      for main inclusion.
+
+ -- James Page <[e-mail]>  Fri, 17 Dec 2021 10:35:06 +0000
+
 paramiko (2.8.1-1) unstable; urgency=medium
 
   * New upstream release
@@ -76,6 +171,15 @@ paramiko (2.8.1-1) unstable; urgency=medium
 
  -- Sandro Tosi <[e-mail]>  Sat, 11 Dec 2021 01:27:04 -0500
 
+paramiko (2.8.0-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/control: Demote python3-invoke from Recommends to Suggests as
+      the python-invoke package lacks unit test execution so is not suitable
+      for main inclusion.
+
+ -- James Page <[e-mail]>  Wed, 27 Oct 2021 16:18:44 +0100
+
 paramiko (2.8.0-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
@@ -95,6 +199,15 @@ paramiko (2.8.0-1) unstable; urgency=medium
 
  -- Sandro Tosi <[e-mail]>  Fri, 15 Oct 2021 13:33:52 -0400
 
+paramiko (2.7.2-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - d/control: Demote python3-invoke from Recommends to Suggests as
+      the python-invoke package lacks unit test execution so is not suitable
+      for main inclusion.
+
+ -- James Page <[e-mail]>  Thu, 29 Oct 2020 14:34:26 +0000
+
 paramiko (2.7.2-1) unstable; urgency=medium
 
   * Team upload.
@@ -106,6 +219,14 @@ paramiko (2.7.2-1) unstable; urgency=medium
 
  -- Tristan Seligmann <[e-mail]>  Wed, 02 Sep 2020 10:33:40 +0200
 
+paramiko (2.7.1-2ubuntu1) groovy; urgency=medium
+
+  * d/control: Demote python3-invoke from Recommends to Suggests as
+    the python-invoke package lacks unit test execution so is not suitable
+    for main inclusion (LP: #1892875).
+
+ -- James Page <[e-mail]>  Thu, 03 Sep 2020 09:40:05 +0100
+
 paramiko (2.7.1-2) unstable; urgency=medium
 
   * debian/rules
diff --git a/debian/control b/debian/control
index 856b088..15728fc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: paramiko
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Jeremy T. Bouse <[e-mail]>,
            Guido Guenther <[e-mail]>,
            Santiago Ruano Rincón <[e-mail]>,
@@ -49,8 +50,7 @@ Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
 Provides: ${python3:Provides},
-Recommends: python3-invoke,
-Suggests: python3-gssapi (>= 0.6.1),
+Suggests: python3-gssapi (>= 0.6.1), python3-invoke
 Description: Make ssh v2 connections (Python 3)
  "Paramiko" is a combination of the Esperanto words for "paranoid" and "friend".
  It's a module for Python 2.7/3.4+ that implements the SSH2 protocol for secure
diff --git a/debian/patches/disable_flaky_test.patch b/debian/patches/disable_flaky_test.patch
new file mode 100644
index 0000000..a815ed1
--- /dev/null
+++ b/debian/patches/disable_flaky_test.patch
@@ -0,0 +1,15 @@
+Description: disable flaky test
+Author: Marc Deslauriers <[e-mail]>
+
+--- a/tests/test_transport.py
++++ b/tests/test_transport.py
+@@ -1633,7 +1633,8 @@ class TestStrictKex:
+             ):
+                 pass  # kexinit happens at connect...
+ 
+-    def test_sequence_numbers_reset_on_newkeys_when_strict(self):
++    # This test is disabled as it is flaky
++    def disabled_test_sequence_numbers_reset_on_newkeys_when_strict(self):
+         with server(defer=True) as (tc, ts):
+             # When in strict mode, these should all be zero or close to it
+             # (post-kexinit, pre-auth).
diff --git a/debian/patches/series b/debian/patches/series
index 0e6becc..ee37bf0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 remove_pytest_relaxed.patch
 0001-Use-pytest-s-setup_method-in-pytest-8-the-nose-metho.patch
 0001-Fix-32-bit-ism-in-protocol-seqno-rollover-test-from-.patch
+disable_flaky_test.patch