Merge version 7.88.1-10+rpi1 and 8.2.1-2 to produce 8.2.1-2+rpi1

diff --cc debian/changelog
index 4b6a61c4408b1fd5df00bdc9cbf3a662e846bd5e,9700f6ecdbccb82a8a982d94a76bf7990f952c40..5bca777435181605407d0a7156988b230ef4da9b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,54 +1,61 @@@
- curl (7.88.1-10+rpi1) bookworm-staging; urgency=medium
++curl (8.2.1-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 7.88.1-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 20 May 2023 09:55:44 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 05 Jun 2023 04:33:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 01 Oct 2023 13:54:25 +0000
++
+ curl (8.2.1-2) unstable; urgency=medium
+ 
+   [ Andreas Hasenack ]
+   * Move ldap-test to a script and add retry logic
+ 
+   [ Samuel Henrique ]
+   * Build without nss, dropped by upstream in the next release
+   * d/p/gen_pl_escape_all_dashes.patch: New patch to fix manpage generation
+     (closes: #1043309, #1043339)
+ 
+  -- Samuel Henrique <samueloph@debian.org>  Fri, 25 Aug 2023 20:05:02 +0100
+ 
+ curl (8.2.1-1) unstable; urgency=medium
+ 
+   [ Samuel Henrique ]
+   * New upstream version 8.2.1
+ 
+   [ Sergio Durigan Junior ]
+   * d/p/{90_gnutls,99_nss}.patch:
+     Update GNUTls/NSS patches to unbreak tests/http/clients
+   * Drop unnecessary patches.
+     d/p/CVE-2023-27533.patch
+     d/p/CVE-2023-27534.patch
+     d/p/CVE-2023-27535.patch
+     d/p/CVE-2023-27536.patch
+     d/p/CVE-2023-27537.patch
+     d/p/CVE-2023-27538.patch
+     d/p/CVE-2023-28319.patch
+     d/p/CVE-2023-28320-1.patch
+     d/p/CVE-2023-28320.patch
+     d/p/CVE-2023-28321.patch
+     d/p/CVE-2023-28322.patch
+     d/p/CVE-2023-32001.patch
+     d/p/Use-OpenLDAP-specific-functionality.patch
+     d/p/fix-unix-domain-socket.patch
+ 
+  -- Sergio Durigan Junior <sergiodj@debian.org>  Thu, 03 Aug 2023 20:00:01 -0400
+ 
+ curl (7.88.1-11) unstable; urgency=medium
+ 
+   [ Carlos Henrique Lima Melara ]
+   * Fix CVE-2023-32001: TOCTOU race condition in Curl_fopen():
+     - Done by d/p/CVE-2023-32001.patch (Closes: #1041812).
+ 
+   [ John Scott ]
+   * LDAP backend: correct the usage of OpenLDAP-specific functionality being
+     disabled with an upstream patch (Closes: #1041964)
+     This corrects the improper fetching of binary attributes.
+   * debian/tests: add a DEP-8 test that getting binary LDAP attributes works now
+ 
+  -- Samuel Henrique <samueloph@debian.org>  Fri, 28 Jul 2023 21:11:25 +0100
  
  curl (7.88.1-10) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge