Update debian/

debian/changelog

@@ -1,11 +1,126 @@
-curl (8.5.0-2.1~1.gbpecf5952a8) UNRELEASED; urgency=medium
+curl (8.7.1-5.1~1.gbpecf5952a8) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @ecf5952a8 **
+  ** SNAPSHOT build @master **
 
-  * Add ECH patch
+  * Enable ECH
 
  -- Jochen Sprickerhof <[email protected]>  Wed, 18 Oct 2023 23:19:51 +0200
 
+curl (8.7.1-5) unstable; urgency=high
+
+  * d/p/content_encoding_brotli_and_others...patch: New patch to fix an
+    encoding regression. Thank you to Jeroen Ooms and the curl developers
+    (Daniel Stenberg and Stefan Eissing) for reporting and pointing out the
+    fix.
+
+ -- Samuel Henrique <[email protected]>  Mon, 29 Apr 2024 18:28:54 +0100
+
+curl (8.7.1-4) unstable; urgency=medium
+
+  * d/p/curl-8_7_1-h2-ngtcp2-write-error-handling.diff: New patch to address
+    git+http2 issue. Thanks to Stefan Eissing <[email protected]> for
+    doing the backport.
+
+ -- Samuel Henrique <[email protected]>  Sat, 27 Apr 2024 18:00:28 +0100
+
+curl (8.7.1-3) unstable; urgency=medium
+
+  [ Carlos Henrique Lima Melara ]
+  * d/p/fix-regression-in-curlinfo.patch: add patch from upstream, thanks to
+    Antonio Terceiro for reporting it (closes: #1069292)
+
+  [ Samuel Henrique ]
+  * d/libcurl3t64-gnutls.lintian-overrides: Drop unused override
+
+ -- Samuel Henrique <[email protected]>  Fri, 19 Apr 2024 19:06:23 +0100
+
+curl (8.7.1-2) unstable; urgency=medium
+
+  [ Carlos Henrique Lima Melara ]
+  * d/rules: fix sed substitution regex for curl-config
+  * d/rules: make a call to dpkg-buildflags in curl-config to get CFLAGS
+    (Closes: #1057138)
+  * d/control: suggests dpkg-dev for -dev packages so we get dpkg goodies
+  * d/libcurl4-doc.docs: list each markdown file to be installed
+  * d/make-manpages-reproducible.patch: import from upstream
+  * d/p/fix-regression-on-chunked-post.patch: add new patch from upstream
+
+  [ Sergio Durigan Junior ]
+  * d/p/openldap-create-ldap-URLs-correctly-for-IPv6-addresses.patch:
+    (Closes: #1053643)
+
+  [ Samuel Henrique ]
+  * d/rules: Run tests in parallel
+  * d/p/test1901...: New patch to confirm regression fix
+
+ -- Samuel Henrique <[email protected]>  Wed, 03 Apr 2024 18:59:41 +0100
+
+curl (8.7.1-1) unstable; urgency=medium
+
+  * New upstream version 8.7.1
+    - Fix CVE-2024-2004: Usage of disabled protocol
+    - Fix CVE-2024-2398: HTTP/2 push headers memory-leak
+  * d/patches: Drop patches present on this release
+
+ -- Samuel Henrique <[email protected]>  Wed, 27 Mar 2024 19:02:14 +0000
+
+curl (8.6.0-4) unstable; urgency=medium
+
+  [ Carlos Henrique Lima Melara ]
+  * d/libcurl*.links: use substitution variables instead of executable files
+
+  [ Simon McVittie ]
+  * d/control: Add a build-profile that disables LDAP support
+    (closes: #1066981)
+  * Temporarily disable LDAP support on 32-bit non-x86 (closes: #1066982)
+  * Temporarily disable build-time tests on 32-bit non-x86
+
+ -- Samuel Henrique <[email protected]>  Sat, 16 Mar 2024 17:17:57 +0000
+
+curl (8.6.0-3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix wrong X-Time64-Compat for libcurl4t64.  Closes: #1065315.
+
+ -- Steve Langasek <[email protected]>  Sat, 02 Mar 2024 18:43:58 +0000
+
+curl (8.6.0-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1061992
+
+ -- Steve Langasek <[email protected]>  Sat, 02 Mar 2024 07:11:53 +0000
+
+curl (8.6.0-3) unstable; urgency=medium
+
+  * d/p/vtls_revert_receive_max_buffer_add_test_case.patch: New patch to fix
+    tls regression (closes: #1063462)
+
+ -- Samuel Henrique <[email protected]>  Mon, 19 Feb 2024 22:16:17 +0000
+
+curl (8.6.0-2) unstable; urgency=medium
+
+  * d/p/sendf_ignore_response_body_to_head.patch: New upstream patch to fix a
+    compat issue (closes: #1063342)
+  * d/control: Switch from pkg-config to pkgconf
+
+ -- Samuel Henrique <[email protected]>  Tue, 06 Feb 2024 20:52:46 +0000
+
+curl (8.6.0-1) unstable; urgency=medium
+
+  [ Samuel Henrique ]
+  * New upstream version 8.6.0
+    - Fix CVE-2024-0853: OCSP verification bypass with TLS session reuse
+  * Drop upstream patches from 8.6.0
+  * Update approach for installing manpages
+  * d/copyright: Update copyright
+
+  [ Carlos Henrique Lima Melara ]
+  * d/control: exclude dependency on gnutls-bin for tests on ppc64el
+    (Closes: #1059952)
+
+ -- Samuel Henrique <[email protected]>  Wed, 31 Jan 2024 21:51:05 +0000
+
 curl (8.5.0-2) unstable; urgency=medium
 
   * d/p/openldap_fix_an_LDAP_crash.patch: New patch to fix ldap segfault

debian/control

@@ -5,7 +5,7 @@ Maintainer: Debian Curl Maintainers <[email protected]>
 Uploaders: Carlos Henrique Lima Melara <[email protected]>,
            Samuel Henrique <[email protected]>,
            Sergio Durigan Junior <[email protected]>
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  debhelper-compat (= 13),
  autoconf,
  automake,
@@ -16,7 +16,7 @@ Build-Depends:
  libgnutls28-dev,
  libidn2-dev,
  libkrb5-dev,
- libldap2-dev,
+ libldap2-dev [!armel !armhf !hppa !m68k !powerpc !sh4] <!pkg.curl.noldap>,
  libnghttp2-dev,
  libpsl-dev,
  librtmp-dev,
@@ -25,13 +25,13 @@ Build-Depends:
  libssl-dev,
  libtool,
  libzstd-dev,
- locales-all <!nocheck>,
- openssh-server <!nocheck>,
- python3:native <!nocheck>,
- python3-impacket <!nocheck>,
- gnutls-bin [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc ppc64 riscv64] <!nocheck>,
+ locales-all [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>,
+ openssh-server [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>,
+ python3:native [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>,
+ python3-impacket [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>,
+ gnutls-bin [!armel !armhf !hppa !m68k !powerpc !sh4 !ppc64el] <!nocheck>,
  quilt,
- stunnel4 <!nocheck>,
+ stunnel4 [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>,
  zlib1g-dev,
 Build-Conflicts: autoconf2.13, automake1.4
 Standards-Version: 4.6.2
@@ -42,7 +42,7 @@ Rules-Requires-Root: no
 
 Package: curl
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl4t64 (= ${binary:Version})
 Multi-Arch: foreign
 Description: command line tool for transferring data with URL syntax
  curl is a command line tool for transferring data with URL syntax, supporting
@@ -54,14 +54,17 @@ Description: command line tool for transferring data with URL syntax
  NTLM, Negotiate, kerberos...), file transfer resume, proxy tunneling and a
  busload of other useful tricks.
 
-Package: libcurl4
+Package: libcurl4t64
+Provides: ${t64:Provides}
+X-Time64-Compat: libcurl4
+Breaks: libcurl4 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: ca-certificates
 Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libcurl3
-Replaces: libcurl3
+Replaces: libcurl4, libcurl3
 Multi-Arch: same
 Description: easy-to-use client-side URL transfer library (OpenSSL flavour)
  libcurl is an easy-to-use client-side URL transfer library, supporting DICT,
@@ -79,7 +82,11 @@ Description: easy-to-use client-side URL transfer library (OpenSSL flavour)
  .
  SSL support is provided by OpenSSL.
 
-Package: libcurl3-gnutls
+Package: libcurl3t64-gnutls
+Provides: ${t64:Provides}
+X-Time64-Compat: libcurl3-gnutls
+Replaces: libcurl3-gnutls
+Breaks: libcurl3-gnutls (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,15 +118,16 @@ Provides: libcurl-dev,
  libcurl4-dev,
  libcurl3-dev
 Conflicts: libcurl4-gnutls-dev, libssl1.0-dev
-Depends: ${misc:Depends}, libcurl4 (= ${binary:Version})
-Suggests: libcurl4-doc,
+Depends: ${misc:Depends}, libcurl4t64 (= ${binary:Version})
+Suggests: dpkg-dev,
+ libcurl4-doc,
  libidn-dev,
  libkrb5-dev,
  libldap2-dev,
  librtmp-dev,
  libssh2-1-dev,
  libssl-dev,
- pkg-config,
+ pkgconf,
  zlib1g-dev
 Multi-Arch: same
 Description: development files and documentation for libcurl (OpenSSL flavour)
@@ -149,15 +157,16 @@ Provides: libcurl-dev,
  libcurl3-gnutls-dev,
  libcurl4-dev
 Conflicts: libcurl4-openssl-dev
-Depends: ${misc:Depends}, libcurl3-gnutls (= ${binary:Version})
-Suggests: libcurl4-doc,
+Depends: ${misc:Depends}, libcurl3t64-gnutls (= ${binary:Version})
+Suggests: dpkg-dev,
+ libcurl4-doc,
  libgnutls28-dev,
  libidn-dev,
  libkrb5-dev,
  libldap2-dev,
  librtmp-dev,
  libssh2-1-dev,
- pkg-config,
+ pkgconf,
  zlib1g-dev
 Multi-Arch: same
 Description: development files and documentation for libcurl (GnuTLS flavour)

debian/copyright

@@ -23,9 +23,10 @@ Copyright: 1999, Leon Breedt <[email protected]>
  2014-2011, Helmut Grohne <[email protected]>
  2022, Paul Gevers <[email protected]>
  2013, 2022, Salvatore Bonaccorso <[email protected]>
- 2022, Sergio Durigan Junior <[email protected]>
- 2021-2022, Samuel Henrique <[email protected]>
  2023 John Scott <[email protected]>
+ 2023-2024, Carlos Henrique Lima Melara <[email protected]>
+ 2022-2024, Sergio Durigan Junior <[email protected]>
+ 2021-2024, Samuel Henrique <[email protected]>
 License: curl
 
 Files: debian/tests/LDAP-bindata.c
@@ -91,7 +92,6 @@ License: ISC
 Files: compile
  depcomp
  missing
- test-driver
 Copyright: 1996-2021, Free Software Foundation, Inc.
 License: GPL-2+ with Autoconf-data exception
 
@@ -184,11 +184,6 @@ Files: tests/libtest/lib1908.c
 Copyright: 2013-2022, Linus Nielsen Feltzing, <[email protected]>
 License: curl
 
-Files: docs/libcurl/opts/CURLOPT_PREREQDATA.3
- docs/libcurl/opts/CURLOPT_PREREQFUNCTION.3
-Copyright: 2022, Max Dymond, <[email protected]>, et al.
-License: curl
-
 Files: lib/vtls/bearssl.c
  lib/vtls/bearssl.h
 Copyright: 2019-2022, Michael Forney, <[email protected]>

debian/curl.manpages

@@ -0,0 +1 @@
+usr/share/man/man1/curl.1

debian/libcurl3t64-gnutls.links

@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libcurl-gnutls.so.4 usr/lib/${DEB_HOST_MULTIARCH}/libcurl-gnutls.so.3

debian/libcurl3t64-gnutls.lintian-overrides

@@ -0,0 +1 @@
+libcurl3t64-gnutls: package-name-doesnt-match-sonames libcurl-gnutls4

debian/libcurl3-gnutls.symbols → debian/libcurl3t64-gnutls.symbols

@@ -1,4 +1,4 @@
-libcurl-gnutls.so.4 libcurl3-gnutls #MINVER#
+libcurl-gnutls.so.4 libcurl3t64-gnutls #MINVER#
 * Build-Depends-Package: libcurl4-gnutls-dev
  CURL_GNUTLS_3@CURL_GNUTLS_3 7.16.2
  HIDDEN@HIDDEN 7.16.2

debian/libcurl4-doc.docs

@@ -1,6 +1,53 @@
 README
-docs/*.md
+docs/ALTSVC.md
+docs/BINDINGS.md
+docs/BUFREF.md
+docs/BUG-BOUNTY.md
+docs/BUGS.md
+docs/CHECKSRC.md
+docs/CIPHERS.md
+docs/CLIENT-READERS.md
+docs/CLIENT-WRITERS.md
+docs/CODE_OF_CONDUCT.md
+docs/CODE_REVIEW.md
+docs/CODE_STYLE.md
+docs/CONNECTION-FILTERS.md
+docs/CONTRIBUTE.md
+docs/CURLDOWN.md
+docs/DEPRECATE.md
+docs/DISTROS.md
+docs/DYNBUF.md
+docs/EARLY-RELEASE.md
+docs/EXPERIMENTAL.md
 docs/FAQ
+docs/FEATURES.md
+docs/GOVERNANCE.md
+docs/HELP-US.md
+docs/HISTORY.md
+docs/HSTS.md
+docs/HTTP-COOKIES.md
+docs/HTTP2.md
+docs/HTTP3.md
+docs/HYPER.md
+docs/INTERNALS.md
 docs/KNOWN_BUGS
+docs/MQTT.md
+docs/NEW-PROTOCOL.md
+docs/PARALLEL-TRANSFERS.md
+docs/README.md
+docs/RELEASE-PROCEDURE.md
+docs/ROADMAP.md
+docs/RUSTLS.md
+docs/SECURITY-ADVISORY.md
+docs/SPONSORS.md
+docs/SSL-PROBLEMS.md
+docs/SSLCERTS.md
 docs/THANKS
 docs/TODO
+docs/TheArtOfHttpScripting.md
+docs/URL-SYNTAX.md
+docs/VERSIONS.md
+docs/VULN-DISCLOSURE-POLICY.md
+docs/WEBSOCKET.md
+docs/examples/README.md
+docs/libcurl/ABI.md

debian/libcurl4-doc.manpages

@@ -0,0 +1 @@
+usr/share/man/man3/*

debian/libcurl4-gnutls-dev.links

@@ -1,4 +1,2 @@
-#!/bin/sh
-
-echo /usr/lib/$DEB_HOST_MULTIARCH/libcurl-gnutls.a /usr/lib/$DEB_HOST_MULTIARCH/libcurl.a
-echo /usr/lib/$DEB_HOST_MULTIARCH/libcurl-gnutls.so /usr/lib/$DEB_HOST_MULTIARCH/libcurl.so
+usr/lib/${DEB_HOST_MULTIARCH}/libcurl-gnutls.a  usr/lib/${DEB_HOST_MULTIARCH}/libcurl.a
+usr/lib/${DEB_HOST_MULTIARCH}/libcurl-gnutls.so usr/lib/${DEB_HOST_MULTIARCH}/libcurl.so

debian/libcurl4t64.lintian-overrides

@@ -0,0 +1 @@
+libcurl4t64: package-name-doesnt-match-sonames libcurl4

debian/libcurl4.symbols → debian/libcurl4t64.symbols

@@ -1,4 +1,4 @@
-libcurl.so.4 libcurl4 #MINVER#
+libcurl.so.4 libcurl4t64 #MINVER#
 * Build-Depends-Package: libcurl4-openssl-dev
  CURL_OPENSSL_4@CURL_OPENSSL_4 7.16.2
  HIDDEN@HIDDEN 7.16.2

debian/not-installed

@@ -0,0 +1 @@
+usr/share/man/man1/mk-ca-bundle.1