curl.git
23 months agoMerge version 7.88.1-10+rpi1+deb12u4 and 7.88.1-10+deb12u5 to produce 7.88.1-10+rpi1... archive/raspbian/7.88.1-10+rpi1+deb12u5 raspbian/7.88.1-10+rpi1+deb12u5
Raspbian automatic forward porter [Sun, 24 Dec 2023 08:58:13 +0000 (08:58 +0000)]
Merge version 7.88.1-10+rpi1+deb12u4 and 7.88.1-10+deb12u5 to produce 7.88.1-10+rpi1+deb12u5

2 years agoMerge curl (7.88.1-10+deb12u5) import into refs/heads/workingbranch
Samuel Henrique [Sun, 10 Dec 2023 06:07:30 +0000 (06:07 +0000)]
Merge curl (7.88.1-10+deb12u5) import into refs/heads/workingbranch

2 years agoBuild with NSS.
Ramakrishnan Muthukrishnan [Sun, 10 Dec 2023 06:07:30 +0000 (06:07 +0000)]
Build with NSS.

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2015-08-12

Gbp-Pq: Name 99_nss.patch

2 years agoBuild with GnuTLS.
Ramakrishnan Muthukrishnan [Sun, 10 Dec 2023 06:07:30 +0000 (06:07 +0000)]
Build with GnuTLS.

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2018-05-23

Gbp-Pq: Name 90_gnutls.patch

2 years ago[PATCH] fopen: create short(er) temporary file name
Daniel Stenberg [Thu, 23 Nov 2023 07:23:17 +0000 (08:23 +0100)]
[PATCH] fopen: create short(er) temporary file name

Only using random letters in the name plus a ".tmp" extension. Not by
appending characters to the final file name.

Reported-by: Maksymilian Arciemowicz
Closes #12388

Backported by: Samuel Henrique <samueloph@debian.org>:
 * The function Curl_rand_alnum was renamed to Curl_rand_hex

Gbp-Pq: Name CVE-2023-46219.patch

2 years ago[PATCH] cookie: lowercase the domain names before PSL checks
Daniel Stenberg [Thu, 23 Nov 2023 07:15:47 +0000 (08:15 +0100)]
[PATCH] cookie: lowercase the domain names before PSL checks

Reported-by: Harry Sintonen
Closes #12387

Backported by: Samuel Henrique <samueloph@debian.org>:
 * Update signature of function "bad_domain"

Gbp-Pq: Name CVE-2023-46218.patch

2 years ago[PATCH] cookie: remove unnecessary struct fields
Daniel Stenberg [Thu, 14 Sep 2023 21:28:32 +0000 (23:28 +0200)]
[PATCH] cookie: remove unnecessary struct fields

Plus: reduce the hash table size from 256 to 63. It seems unlikely to
make much of a speed difference for most use cases but saves 1.5KB of
data per instance.

Closes #11862

Backported by: Samuel Henrique <samueloph@debian.org>

Gbp-Pq: Name CVE-2023-38546.patch

2 years ago[PATCH] socks: return error if hostname too long for remote resolve
Jay Satiro [Sat, 30 Sep 2023 07:40:02 +0000 (03:40 -0400)]
[PATCH] socks: return error if hostname too long for remote resolve

Prior to this change the state machine attempted to change the remote
resolve to a local resolve if the hostname was longer than 255
characters. Unfortunately that did not work as intended and caused a
security issue.

Name resolvers cannot resolve hostnames longer than 255 characters.

Bug: https://curl.se/docs/CVE-2023-38545.html

Backported by: Samuel Henrique <samueloph@debian.org>

Gbp-Pq: Name CVE-2023-38545.patch

2 years ago[PATCH] http: return error when receiving too large header set
Daniel Stenberg [Wed, 2 Aug 2023 21:34:48 +0000 (23:34 +0200)]
[PATCH] http: return error when receiving too large header set

To avoid abuse. The limit is set to 300 KB for the accumulated size of
all received HTTP headers for a single response. Incomplete research
suggests that Chrome uses a 256-300 KB limit, while Firefox allows up to
1MB.

Closes #11582

Backport to Debian by Carlos Henrique Lima Melara <charlesmelara@riseup.net>

Gbp-Pq: Name CVE-2023-38039.patch

2 years agoFix Autotools not enabling OpenLDAP-specific functionality
Alessandro Ghedini [Sun, 10 Dec 2023 06:07:30 +0000 (06:07 +0000)]
Fix Autotools not enabling OpenLDAP-specific functionality

Origin: upstream, https://github.com/curl/curl/commit/0ac6108856b9d500bc376d1d7e0b648d15499837.patch
Bug: https://github.com/curl/curl/issues/11372
Applied-Upstream: 8.2.0, https://github.com/curl/curl/commit/0ac6108856b9d500bc376d1d7e0b648d15499837
Reviewed-By: John Scott <jscott@posteo.net>
Last-Update: 2023-07-25

The non-OpenLDAP code paths are less tested, less featureful, less secure,
and omitted in the build system by accident. It has been discovered that this
also mitigates curl not being able to make LDIF output when attributes have
binary values.

Gbp-Pq: Name Use-OpenLDAP-specific-functionality.patch

2 years ago[PATCH] fopen: optimize
SaltyMilk [Mon, 10 Jul 2023 19:43:28 +0000 (21:43 +0200)]
[PATCH] fopen: optimize

Closes #11419

Gbp-Pq: Name CVE-2023-32001.patch

2 years ago[PATCH] lib: unify the upload/method handling
Daniel Stenberg [Tue, 25 Apr 2023 06:28:01 +0000 (08:28 +0200)]
[PATCH] lib: unify the upload/method handling

By making sure we set state.upload based on the set.method value and not
independently as set.upload, we reduce confusion and mixup risks, both
internally and externally.

Closes #11017

Gbp-Pq: Name CVE-2023-28322.patch

2 years ago[PATCH] hostcheck: fix host name wildcard checking
Daniel Stenberg [Mon, 24 Apr 2023 19:07:02 +0000 (21:07 +0200)]
[PATCH] hostcheck: fix host name wildcard checking

The leftmost "label" of the host name can now only match against single
'*'. Like the browsers have worked for a long time.

- extended unit test 1397 for this
- move some SOURCE variables from unit/Makefile.am to unit/Makefile.inc

Reported-by: Hiroki Kurosawa
Closes #11018

Backported to Debian by Samuel Henrique <samueloph@debian.org>

Gbp-Pq: Name CVE-2023-28321.patch

2 years ago[PATCH] hostip: include easy_lock.h before using GLOBAL_INIT_IS_THREADSAFE
Daniel Stenberg [Tue, 16 May 2023 21:40:42 +0000 (23:40 +0200)]
[PATCH] hostip: include easy_lock.h before using GLOBAL_INIT_IS_THREADSAFE

Since that header file is the only place that define can be defined.

Reported-by: Marc Deslauriers
Follow-up to 13718030ad4b3209

Closes #11121

Gbp-Pq: Name CVE-2023-28320-1.patch

2 years ago[PATCH] hostip: add locks around use of global buffer for alarm()
Harry Sintonen [Tue, 25 Apr 2023 07:22:26 +0000 (09:22 +0200)]
[PATCH] hostip: add locks around use of global buffer for alarm()

When building with the sync name resolver and timeout ability we now
require thread-safety to be present to enable it.

Closes #11030

Gbp-Pq: Name CVE-2023-28320.patch

2 years ago[PATCH] libssh2: free fingerprint better
Daniel Stenberg [Mon, 8 May 2023 12:33:54 +0000 (14:33 +0200)]
[PATCH] libssh2: free fingerprint better

Reported-by: Wei Chong Tan
Closes #11088

Gbp-Pq: Name CVE-2023-28319.patch

2 years ago[PATCH] CURLSHOPT_SHARE.3: HSTS sharing is not thread-safe
Daniel Stenberg [Thu, 9 Mar 2023 17:01:34 +0000 (18:01 +0100)]
[PATCH] CURLSHOPT_SHARE.3: HSTS sharing is not thread-safe

Reported-by: Hiroki Kurosawa
Closes #10732

Gbp-Pq: Name CVE-2023-27537.patch

2 years ago[PATCH] url: only reuse connections with same GSS delegation
Daniel Stenberg [Fri, 10 Mar 2023 08:22:43 +0000 (09:22 +0100)]
[PATCH] url: only reuse connections with same GSS delegation

Reported-by: Harry Sintonen
Closes #10731

Gbp-Pq: Name CVE-2023-27536.patch

2 years ago[PATCH] ftp: add more conditions for connection reuse
Daniel Stenberg [Thu, 9 Mar 2023 16:47:06 +0000 (17:47 +0100)]
[PATCH] ftp: add more conditions for connection reuse

Reported-by: Harry Sintonen
Closes #10730

Gbp-Pq: Name CVE-2023-27535.patch

2 years ago[PATCH] url: fix the SSH connection reuse check
Daniel Stenberg [Fri, 10 Mar 2023 07:22:51 +0000 (08:22 +0100)]
[PATCH] url: fix the SSH connection reuse check

Reported-by: Harry Sintonen
Closes #10735

Gbp-Pq: Name CVE-2023-27538.patch

2 years ago[PATCH] curl_path: create the new path with dynbuf
Daniel Stenberg [Thu, 9 Mar 2023 15:22:11 +0000 (16:22 +0100)]
[PATCH] curl_path: create the new path with dynbuf

Closes #10729

Gbp-Pq: Name CVE-2023-27534.patch

2 years ago[PATCH] telnet: only accept option arguments in ascii
Daniel Stenberg [Mon, 6 Mar 2023 11:07:33 +0000 (12:07 +0100)]
[PATCH] telnet: only accept option arguments in ascii

To avoid embedded telnet negotiation commands etc.

Reported-by: Harry Sintonen
Closes #10728

Backported to Debian by Samuel Henrique <samueloph@debian.org>

Gbp-Pq: Name CVE-2023-27533.patch

2 years ago[PATCH] Fixing unix domain socket use in https connects.
Stefan Eissing [Tue, 28 Feb 2023 09:07:21 +0000 (10:07 +0100)]
[PATCH] Fixing unix domain socket use in https connects.

- refs #10633, when h2/h3 eyeballing was involved, unix domain socket
  configurations were not honoured
- configuring --unix-socket will disable HTTP/3 as candidate for eyeballing
- combinatino of --unix-socket and --http3-only will fail during initialisation
- adding pytest test_11 to reproduce

Gbp-Pq: Name fix-unix-domain-socket.patch

2 years agoUse correct path when loading libnss{pem,ckbi}.so
Sergio Durigan Junior [Sun, 5 Mar 2023 17:00:03 +0000 (12:00 -0500)]
Use correct path when loading libnss{pem,ckbi}.so

Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726073

Gbp-Pq: Name Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch

2 years agoRemove curl's LDFLAGS from curl-config --static-libs
Simon McVittie [Tue, 22 Nov 2022 21:20:51 +0000 (21:20 +0000)]
Remove curl's LDFLAGS from curl-config --static-libs

On current Debian bookworm, the LDFLAGS consist of
-L/usr/lib/${triplet}/mit-krb5 originating from
`pkg-config --libs-only-L mit-krb5-gssapi` from krb5-multidev, plus
some linker options that are intended for curl itself rather than for
dependent packages. None of these are really desirable, and they create
divergence between architectures that would prevent libcurl-*-dev from
being Multi-Arch: same.

The -L flag is not really needed, for the same reason that -L@libdir@
isn't. curl Build-Depends on libkrb5-dev, which doesn't need a special
-L flag to find libgssapi_krb5, and the various libcurl-*-dev packages
have Suggests on libkrb5-dev rather than on krb5-multidev for static
linking.

The other options (currently `-Wl,-z-relro -Wl,-z,now`) are intended
for libcurl itself, and if dependent packages want those options then
they should set them from their own packaging.

Bug-Debian: https://bugs.debian.org/1024668
Forwarded: not-needed
Signed-off-by: Simon McVittie <smcv@collabora.com>
Gbp-Pq: Name Remove-curl-s-LDFLAGS-from-curl-config-static-libs.patch

2 years agoIn order to (partially) multi-arch-ify curl-config, remove all
Benjamin Moody [Sun, 10 Dec 2023 06:07:30 +0000 (06:07 +0000)]
In order to (partially) multi-arch-ify curl-config, remove all

Origin: vendor
Bug-Debian: http://bugs.debian.org/731998
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2017-01-10

mention of @includedir@ and @libdir@ from the script.  On Debian, the actual
header and library directories are architecture-dependent, but will always be
in the C compiler's default search path, so -I and -L options are not
necessary (and may be harmful in multi-arch environments.)

Gbp-Pq: Name 11_omit-directories-from-config.patch

2 years agobuild: Divide mit-krb5-gssapi link flags between LDFLAGS and LIBS
Simon McVittie [Tue, 22 Nov 2022 20:43:41 +0000 (20:43 +0000)]
build: Divide mit-krb5-gssapi link flags between LDFLAGS and LIBS

From the comments nearby about not having --libs-only-L, it looks as
though the intention was to apply a split like this to all dependency
libraries where possible, and the only reason it was not done for
Kerberos is that krb5-config doesn't have that feature and pkg-config
was originally not supported here. For example, zlib, libssh and librtmp
all have their flags from pkg-config split in this way.

Now that pkg-config is supported here, we can do the intended split.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Gbp-Pq: Name build-Divide-mit-krb5-gssapi-link-flags-between-LDFLAGS-a.patch

2 years agoEnable zsh completion generation
Alessandro Ghedini [Sun, 10 Dec 2023 06:07:30 +0000 (06:07 +0000)]
Enable zsh completion generation

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2016-08-03

Gbp-Pq: Name 08_enable-zsh.patch

2 years agoWork around libtool --as-needed reordering bug
Alessandro Ghedini [Sun, 10 Dec 2023 06:07:30 +0000 (06:07 +0000)]
Work around libtool --as-needed reordering bug

Origin: vendor
Bug-Debian: http://bugs.debian.org/347650
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2016-08-03

Gbp-Pq: Name 04_workaround_as_needed_bug.patch

2 years agocurl (7.88.1-10+deb12u5) bookworm-security; urgency=high
Samuel Henrique [Sun, 10 Dec 2023 06:07:30 +0000 (06:07 +0000)]
curl (7.88.1-10+deb12u5) bookworm-security; urgency=high

  * Add patches to fix CVE-2023-46218 and CVE-2023-46219
  * d/rules: set CURL_PATCHSTAMP to package's version, so it shows up in
    "--version" output

[dgit import unpatched curl 7.88.1-10+deb12u5]

2 years agoImport curl_7.88.1-10+deb12u5.debian.tar.xz
Samuel Henrique [Sun, 10 Dec 2023 06:07:30 +0000 (06:07 +0000)]
Import curl_7.88.1-10+deb12u5.debian.tar.xz

[dgit import tarball curl 7.88.1-10+deb12u5 curl_7.88.1-10+deb12u5.debian.tar.xz]

2 years agoMerge version 7.88.1-10+rpi1 and 7.88.1-10+deb12u4 to produce 7.88.1-10+rpi1+deb12u4 archive/raspbian/7.88.1-10+rpi1+deb12u4 raspbian/7.88.1-10+rpi1+deb12u4
Raspbian automatic forward porter [Thu, 12 Oct 2023 01:36:11 +0000 (02:36 +0100)]
Merge version 7.88.1-10+rpi1 and 7.88.1-10+deb12u4 to produce 7.88.1-10+rpi1+deb12u4

2 years agoMerge curl (7.88.1-10+deb12u4) import into refs/heads/workingbranch
Samuel Henrique [Thu, 5 Oct 2023 21:31:47 +0000 (22:31 +0100)]
Merge curl (7.88.1-10+deb12u4) import into refs/heads/workingbranch

2 years agoBuild with NSS.
Ramakrishnan Muthukrishnan [Thu, 5 Oct 2023 21:31:47 +0000 (22:31 +0100)]
Build with NSS.

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2015-08-12

Gbp-Pq: Name 99_nss.patch

2 years agoBuild with GnuTLS.
Ramakrishnan Muthukrishnan [Thu, 5 Oct 2023 21:31:47 +0000 (22:31 +0100)]
Build with GnuTLS.

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2018-05-23

Gbp-Pq: Name 90_gnutls.patch

2 years ago[PATCH] cookie: remove unnecessary struct fields
Daniel Stenberg [Thu, 14 Sep 2023 21:28:32 +0000 (23:28 +0200)]
[PATCH] cookie: remove unnecessary struct fields

Plus: reduce the hash table size from 256 to 63. It seems unlikely to
make much of a speed difference for most use cases but saves 1.5KB of
data per instance.

Closes #11862

Backported by: Samuel Henrique <samueloph@debian.org>

Gbp-Pq: Name CVE-2023-38546.patch

2 years ago[PATCH] socks: return error if hostname too long for remote resolve
Jay Satiro [Sat, 30 Sep 2023 07:40:02 +0000 (03:40 -0400)]
[PATCH] socks: return error if hostname too long for remote resolve

Prior to this change the state machine attempted to change the remote
resolve to a local resolve if the hostname was longer than 255
characters. Unfortunately that did not work as intended and caused a
security issue.

Name resolvers cannot resolve hostnames longer than 255 characters.

Bug: https://curl.se/docs/CVE-2023-38545.html

Backported by: Samuel Henrique <samueloph@debian.org>

Gbp-Pq: Name CVE-2023-38545.patch

2 years ago[PATCH] http: return error when receiving too large header set
Daniel Stenberg [Wed, 2 Aug 2023 21:34:48 +0000 (23:34 +0200)]
[PATCH] http: return error when receiving too large header set

To avoid abuse. The limit is set to 300 KB for the accumulated size of
all received HTTP headers for a single response. Incomplete research
suggests that Chrome uses a 256-300 KB limit, while Firefox allows up to
1MB.

Closes #11582

Backport to Debian by Carlos Henrique Lima Melara <charlesmelara@riseup.net>

Gbp-Pq: Name CVE-2023-38039.patch

2 years agoFix Autotools not enabling OpenLDAP-specific functionality
Alessandro Ghedini [Thu, 5 Oct 2023 21:31:47 +0000 (22:31 +0100)]
Fix Autotools not enabling OpenLDAP-specific functionality

Origin: upstream, https://github.com/curl/curl/commit/0ac6108856b9d500bc376d1d7e0b648d15499837.patch
Bug: https://github.com/curl/curl/issues/11372
Applied-Upstream: 8.2.0, https://github.com/curl/curl/commit/0ac6108856b9d500bc376d1d7e0b648d15499837
Reviewed-By: John Scott <jscott@posteo.net>
Last-Update: 2023-07-25

The non-OpenLDAP code paths are less tested, less featureful, less secure,
and omitted in the build system by accident. It has been discovered that this
also mitigates curl not being able to make LDIF output when attributes have
binary values.

Gbp-Pq: Name Use-OpenLDAP-specific-functionality.patch

2 years ago[PATCH] fopen: optimize
SaltyMilk [Mon, 10 Jul 2023 19:43:28 +0000 (21:43 +0200)]
[PATCH] fopen: optimize

Closes #11419

Gbp-Pq: Name CVE-2023-32001.patch

2 years ago[PATCH] lib: unify the upload/method handling
Daniel Stenberg [Tue, 25 Apr 2023 06:28:01 +0000 (08:28 +0200)]
[PATCH] lib: unify the upload/method handling

By making sure we set state.upload based on the set.method value and not
independently as set.upload, we reduce confusion and mixup risks, both
internally and externally.

Closes #11017

Gbp-Pq: Name CVE-2023-28322.patch

2 years ago[PATCH] hostcheck: fix host name wildcard checking
Daniel Stenberg [Mon, 24 Apr 2023 19:07:02 +0000 (21:07 +0200)]
[PATCH] hostcheck: fix host name wildcard checking

The leftmost "label" of the host name can now only match against single
'*'. Like the browsers have worked for a long time.

- extended unit test 1397 for this
- move some SOURCE variables from unit/Makefile.am to unit/Makefile.inc

Reported-by: Hiroki Kurosawa
Closes #11018

Backported to Debian by Samuel Henrique <samueloph@debian.org>

Gbp-Pq: Name CVE-2023-28321.patch

2 years ago[PATCH] hostip: include easy_lock.h before using GLOBAL_INIT_IS_THREADSAFE
Daniel Stenberg [Tue, 16 May 2023 21:40:42 +0000 (23:40 +0200)]
[PATCH] hostip: include easy_lock.h before using GLOBAL_INIT_IS_THREADSAFE

Since that header file is the only place that define can be defined.

Reported-by: Marc Deslauriers
Follow-up to 13718030ad4b3209

Closes #11121

Gbp-Pq: Name CVE-2023-28320-1.patch

2 years ago[PATCH] hostip: add locks around use of global buffer for alarm()
Harry Sintonen [Tue, 25 Apr 2023 07:22:26 +0000 (09:22 +0200)]
[PATCH] hostip: add locks around use of global buffer for alarm()

When building with the sync name resolver and timeout ability we now
require thread-safety to be present to enable it.

Closes #11030

Gbp-Pq: Name CVE-2023-28320.patch

2 years ago[PATCH] libssh2: free fingerprint better
Daniel Stenberg [Mon, 8 May 2023 12:33:54 +0000 (14:33 +0200)]
[PATCH] libssh2: free fingerprint better

Reported-by: Wei Chong Tan
Closes #11088

Gbp-Pq: Name CVE-2023-28319.patch

2 years ago[PATCH] CURLSHOPT_SHARE.3: HSTS sharing is not thread-safe
Daniel Stenberg [Thu, 9 Mar 2023 17:01:34 +0000 (18:01 +0100)]
[PATCH] CURLSHOPT_SHARE.3: HSTS sharing is not thread-safe

Reported-by: Hiroki Kurosawa
Closes #10732

Gbp-Pq: Name CVE-2023-27537.patch

2 years ago[PATCH] url: only reuse connections with same GSS delegation
Daniel Stenberg [Fri, 10 Mar 2023 08:22:43 +0000 (09:22 +0100)]
[PATCH] url: only reuse connections with same GSS delegation

Reported-by: Harry Sintonen
Closes #10731

Gbp-Pq: Name CVE-2023-27536.patch

2 years ago[PATCH] ftp: add more conditions for connection reuse
Daniel Stenberg [Thu, 9 Mar 2023 16:47:06 +0000 (17:47 +0100)]
[PATCH] ftp: add more conditions for connection reuse

Reported-by: Harry Sintonen
Closes #10730

Gbp-Pq: Name CVE-2023-27535.patch

2 years ago[PATCH] url: fix the SSH connection reuse check
Daniel Stenberg [Fri, 10 Mar 2023 07:22:51 +0000 (08:22 +0100)]
[PATCH] url: fix the SSH connection reuse check

Reported-by: Harry Sintonen
Closes #10735

Gbp-Pq: Name CVE-2023-27538.patch

2 years ago[PATCH] curl_path: create the new path with dynbuf
Daniel Stenberg [Thu, 9 Mar 2023 15:22:11 +0000 (16:22 +0100)]
[PATCH] curl_path: create the new path with dynbuf

Closes #10729

Gbp-Pq: Name CVE-2023-27534.patch

2 years ago[PATCH] telnet: only accept option arguments in ascii
Daniel Stenberg [Mon, 6 Mar 2023 11:07:33 +0000 (12:07 +0100)]
[PATCH] telnet: only accept option arguments in ascii

To avoid embedded telnet negotiation commands etc.

Reported-by: Harry Sintonen
Closes #10728

Backported to Debian by Samuel Henrique <samueloph@debian.org>

Gbp-Pq: Name CVE-2023-27533.patch

2 years ago[PATCH] Fixing unix domain socket use in https connects.
Stefan Eissing [Tue, 28 Feb 2023 09:07:21 +0000 (10:07 +0100)]
[PATCH] Fixing unix domain socket use in https connects.

- refs #10633, when h2/h3 eyeballing was involved, unix domain socket
  configurations were not honoured
- configuring --unix-socket will disable HTTP/3 as candidate for eyeballing
- combinatino of --unix-socket and --http3-only will fail during initialisation
- adding pytest test_11 to reproduce

Gbp-Pq: Name fix-unix-domain-socket.patch

2 years agoUse correct path when loading libnss{pem,ckbi}.so
Sergio Durigan Junior [Sun, 5 Mar 2023 17:00:03 +0000 (12:00 -0500)]
Use correct path when loading libnss{pem,ckbi}.so

Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726073

Gbp-Pq: Name Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch

2 years agoRemove curl's LDFLAGS from curl-config --static-libs
Simon McVittie [Tue, 22 Nov 2022 21:20:51 +0000 (21:20 +0000)]
Remove curl's LDFLAGS from curl-config --static-libs

On current Debian bookworm, the LDFLAGS consist of
-L/usr/lib/${triplet}/mit-krb5 originating from
`pkg-config --libs-only-L mit-krb5-gssapi` from krb5-multidev, plus
some linker options that are intended for curl itself rather than for
dependent packages. None of these are really desirable, and they create
divergence between architectures that would prevent libcurl-*-dev from
being Multi-Arch: same.

The -L flag is not really needed, for the same reason that -L@libdir@
isn't. curl Build-Depends on libkrb5-dev, which doesn't need a special
-L flag to find libgssapi_krb5, and the various libcurl-*-dev packages
have Suggests on libkrb5-dev rather than on krb5-multidev for static
linking.

The other options (currently `-Wl,-z-relro -Wl,-z,now`) are intended
for libcurl itself, and if dependent packages want those options then
they should set them from their own packaging.

Bug-Debian: https://bugs.debian.org/1024668
Forwarded: not-needed
Signed-off-by: Simon McVittie <smcv@collabora.com>
Gbp-Pq: Name Remove-curl-s-LDFLAGS-from-curl-config-static-libs.patch

2 years agoIn order to (partially) multi-arch-ify curl-config, remove all
Benjamin Moody [Thu, 5 Oct 2023 21:31:47 +0000 (22:31 +0100)]
In order to (partially) multi-arch-ify curl-config, remove all

Origin: vendor
Bug-Debian: http://bugs.debian.org/731998
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2017-01-10

mention of @includedir@ and @libdir@ from the script.  On Debian, the actual
header and library directories are architecture-dependent, but will always be
in the C compiler's default search path, so -I and -L options are not
necessary (and may be harmful in multi-arch environments.)

Gbp-Pq: Name 11_omit-directories-from-config.patch

2 years agobuild: Divide mit-krb5-gssapi link flags between LDFLAGS and LIBS
Simon McVittie [Tue, 22 Nov 2022 20:43:41 +0000 (20:43 +0000)]
build: Divide mit-krb5-gssapi link flags between LDFLAGS and LIBS

From the comments nearby about not having --libs-only-L, it looks as
though the intention was to apply a split like this to all dependency
libraries where possible, and the only reason it was not done for
Kerberos is that krb5-config doesn't have that feature and pkg-config
was originally not supported here. For example, zlib, libssh and librtmp
all have their flags from pkg-config split in this way.

Now that pkg-config is supported here, we can do the intended split.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Gbp-Pq: Name build-Divide-mit-krb5-gssapi-link-flags-between-LDFLAGS-a.patch

2 years agoEnable zsh completion generation
Alessandro Ghedini [Thu, 5 Oct 2023 21:31:47 +0000 (22:31 +0100)]
Enable zsh completion generation

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2016-08-03

Gbp-Pq: Name 08_enable-zsh.patch

2 years agoWork around libtool --as-needed reordering bug
Alessandro Ghedini [Thu, 5 Oct 2023 21:31:47 +0000 (22:31 +0100)]
Work around libtool --as-needed reordering bug

Origin: vendor
Bug-Debian: http://bugs.debian.org/347650
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2016-08-03

Gbp-Pq: Name 04_workaround_as_needed_bug.patch

2 years agocurl (7.88.1-10+deb12u4) bookworm-security; urgency=high
Samuel Henrique [Thu, 5 Oct 2023 21:31:47 +0000 (22:31 +0100)]
curl (7.88.1-10+deb12u4) bookworm-security; urgency=high

  * Add patches to fix CVE-2023-38545 and CVE-2023-38546

[dgit import unpatched curl 7.88.1-10+deb12u4]

2 years agoImport curl_7.88.1-10+deb12u4.debian.tar.xz
Samuel Henrique [Thu, 5 Oct 2023 21:31:47 +0000 (22:31 +0100)]
Import curl_7.88.1-10+deb12u4.debian.tar.xz

[dgit import tarball curl 7.88.1-10+deb12u4 curl_7.88.1-10+deb12u4.debian.tar.xz]

2 years agoMerge curl (7.88.1-10+deb12u3) import into refs/heads/workingbranch
Carlos Henrique Lima Melara [Fri, 15 Sep 2023 17:01:23 +0000 (18:01 +0100)]
Merge curl (7.88.1-10+deb12u3) import into refs/heads/workingbranch

2 years agoBuild with NSS.
Ramakrishnan Muthukrishnan [Fri, 15 Sep 2023 17:01:23 +0000 (18:01 +0100)]
Build with NSS.

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2015-08-12

Gbp-Pq: Name 99_nss.patch

2 years agoBuild with GnuTLS.
Ramakrishnan Muthukrishnan [Fri, 15 Sep 2023 17:01:23 +0000 (18:01 +0100)]
Build with GnuTLS.

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2018-05-23

Gbp-Pq: Name 90_gnutls.patch

2 years ago[PATCH] http: return error when receiving too large header set
Daniel Stenberg [Wed, 2 Aug 2023 21:34:48 +0000 (23:34 +0200)]
[PATCH] http: return error when receiving too large header set

To avoid abuse. The limit is set to 300 KB for the accumulated size of
all received HTTP headers for a single response. Incomplete research
suggests that Chrome uses a 256-300 KB limit, while Firefox allows up to
1MB.

Closes #11582

Backport to Debian by Carlos Henrique Lima Melara <charlesmelara@riseup.net>

Gbp-Pq: Name CVE-2023-38039.patch

2 years agoFix Autotools not enabling OpenLDAP-specific functionality
Alessandro Ghedini [Fri, 15 Sep 2023 17:01:23 +0000 (18:01 +0100)]
Fix Autotools not enabling OpenLDAP-specific functionality

Origin: upstream, https://github.com/curl/curl/commit/0ac6108856b9d500bc376d1d7e0b648d15499837.patch
Bug: https://github.com/curl/curl/issues/11372
Applied-Upstream: 8.2.0, https://github.com/curl/curl/commit/0ac6108856b9d500bc376d1d7e0b648d15499837
Reviewed-By: John Scott <jscott@posteo.net>
Last-Update: 2023-07-25

The non-OpenLDAP code paths are less tested, less featureful, less secure,
and omitted in the build system by accident. It has been discovered that this
also mitigates curl not being able to make LDIF output when attributes have
binary values.

Gbp-Pq: Name Use-OpenLDAP-specific-functionality.patch

2 years ago[PATCH] fopen: optimize
SaltyMilk [Mon, 10 Jul 2023 19:43:28 +0000 (21:43 +0200)]
[PATCH] fopen: optimize

Closes #11419

Gbp-Pq: Name CVE-2023-32001.patch

2 years ago[PATCH] lib: unify the upload/method handling
Daniel Stenberg [Tue, 25 Apr 2023 06:28:01 +0000 (08:28 +0200)]
[PATCH] lib: unify the upload/method handling

By making sure we set state.upload based on the set.method value and not
independently as set.upload, we reduce confusion and mixup risks, both
internally and externally.

Closes #11017

Gbp-Pq: Name CVE-2023-28322.patch

2 years ago[PATCH] hostcheck: fix host name wildcard checking
Daniel Stenberg [Mon, 24 Apr 2023 19:07:02 +0000 (21:07 +0200)]
[PATCH] hostcheck: fix host name wildcard checking

The leftmost "label" of the host name can now only match against single
'*'. Like the browsers have worked for a long time.

- extended unit test 1397 for this
- move some SOURCE variables from unit/Makefile.am to unit/Makefile.inc

Reported-by: Hiroki Kurosawa
Closes #11018

Backported to Debian by Samuel Henrique <samueloph@debian.org>

Gbp-Pq: Name CVE-2023-28321.patch

2 years ago[PATCH] hostip: include easy_lock.h before using GLOBAL_INIT_IS_THREADSAFE
Daniel Stenberg [Tue, 16 May 2023 21:40:42 +0000 (23:40 +0200)]
[PATCH] hostip: include easy_lock.h before using GLOBAL_INIT_IS_THREADSAFE

Since that header file is the only place that define can be defined.

Reported-by: Marc Deslauriers
Follow-up to 13718030ad4b3209

Closes #11121

Gbp-Pq: Name CVE-2023-28320-1.patch

2 years ago[PATCH] hostip: add locks around use of global buffer for alarm()
Harry Sintonen [Tue, 25 Apr 2023 07:22:26 +0000 (09:22 +0200)]
[PATCH] hostip: add locks around use of global buffer for alarm()

When building with the sync name resolver and timeout ability we now
require thread-safety to be present to enable it.

Closes #11030

Gbp-Pq: Name CVE-2023-28320.patch

2 years ago[PATCH] libssh2: free fingerprint better
Daniel Stenberg [Mon, 8 May 2023 12:33:54 +0000 (14:33 +0200)]
[PATCH] libssh2: free fingerprint better

Reported-by: Wei Chong Tan
Closes #11088

Gbp-Pq: Name CVE-2023-28319.patch

2 years ago[PATCH] CURLSHOPT_SHARE.3: HSTS sharing is not thread-safe
Daniel Stenberg [Thu, 9 Mar 2023 17:01:34 +0000 (18:01 +0100)]
[PATCH] CURLSHOPT_SHARE.3: HSTS sharing is not thread-safe

Reported-by: Hiroki Kurosawa
Closes #10732

Gbp-Pq: Name CVE-2023-27537.patch

2 years ago[PATCH] url: only reuse connections with same GSS delegation
Daniel Stenberg [Fri, 10 Mar 2023 08:22:43 +0000 (09:22 +0100)]
[PATCH] url: only reuse connections with same GSS delegation

Reported-by: Harry Sintonen
Closes #10731

Gbp-Pq: Name CVE-2023-27536.patch

2 years ago[PATCH] ftp: add more conditions for connection reuse
Daniel Stenberg [Thu, 9 Mar 2023 16:47:06 +0000 (17:47 +0100)]
[PATCH] ftp: add more conditions for connection reuse

Reported-by: Harry Sintonen
Closes #10730

Gbp-Pq: Name CVE-2023-27535.patch

2 years ago[PATCH] url: fix the SSH connection reuse check
Daniel Stenberg [Fri, 10 Mar 2023 07:22:51 +0000 (08:22 +0100)]
[PATCH] url: fix the SSH connection reuse check

Reported-by: Harry Sintonen
Closes #10735

Gbp-Pq: Name CVE-2023-27538.patch

2 years ago[PATCH] curl_path: create the new path with dynbuf
Daniel Stenberg [Thu, 9 Mar 2023 15:22:11 +0000 (16:22 +0100)]
[PATCH] curl_path: create the new path with dynbuf

Closes #10729

Gbp-Pq: Name CVE-2023-27534.patch

2 years ago[PATCH] telnet: only accept option arguments in ascii
Daniel Stenberg [Mon, 6 Mar 2023 11:07:33 +0000 (12:07 +0100)]
[PATCH] telnet: only accept option arguments in ascii

To avoid embedded telnet negotiation commands etc.

Reported-by: Harry Sintonen
Closes #10728

Backported to Debian by Samuel Henrique <samueloph@debian.org>

Gbp-Pq: Name CVE-2023-27533.patch

2 years ago[PATCH] Fixing unix domain socket use in https connects.
Stefan Eissing [Tue, 28 Feb 2023 09:07:21 +0000 (10:07 +0100)]
[PATCH] Fixing unix domain socket use in https connects.

- refs #10633, when h2/h3 eyeballing was involved, unix domain socket
  configurations were not honoured
- configuring --unix-socket will disable HTTP/3 as candidate for eyeballing
- combinatino of --unix-socket and --http3-only will fail during initialisation
- adding pytest test_11 to reproduce

Gbp-Pq: Name fix-unix-domain-socket.patch

2 years agoUse correct path when loading libnss{pem,ckbi}.so
Sergio Durigan Junior [Sun, 5 Mar 2023 17:00:03 +0000 (12:00 -0500)]
Use correct path when loading libnss{pem,ckbi}.so

Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726073

Gbp-Pq: Name Use-correct-path-when-loading-libnss-pem-ckbi-.so.patch

2 years agoRemove curl's LDFLAGS from curl-config --static-libs
Simon McVittie [Tue, 22 Nov 2022 21:20:51 +0000 (21:20 +0000)]
Remove curl's LDFLAGS from curl-config --static-libs

On current Debian bookworm, the LDFLAGS consist of
-L/usr/lib/${triplet}/mit-krb5 originating from
`pkg-config --libs-only-L mit-krb5-gssapi` from krb5-multidev, plus
some linker options that are intended for curl itself rather than for
dependent packages. None of these are really desirable, and they create
divergence between architectures that would prevent libcurl-*-dev from
being Multi-Arch: same.

The -L flag is not really needed, for the same reason that -L@libdir@
isn't. curl Build-Depends on libkrb5-dev, which doesn't need a special
-L flag to find libgssapi_krb5, and the various libcurl-*-dev packages
have Suggests on libkrb5-dev rather than on krb5-multidev for static
linking.

The other options (currently `-Wl,-z-relro -Wl,-z,now`) are intended
for libcurl itself, and if dependent packages want those options then
they should set them from their own packaging.

Bug-Debian: https://bugs.debian.org/1024668
Forwarded: not-needed
Signed-off-by: Simon McVittie <smcv@collabora.com>
Gbp-Pq: Name Remove-curl-s-LDFLAGS-from-curl-config-static-libs.patch

2 years agoIn order to (partially) multi-arch-ify curl-config, remove all
Benjamin Moody [Fri, 15 Sep 2023 17:01:23 +0000 (18:01 +0100)]
In order to (partially) multi-arch-ify curl-config, remove all

Origin: vendor
Bug-Debian: http://bugs.debian.org/731998
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2017-01-10

mention of @includedir@ and @libdir@ from the script.  On Debian, the actual
header and library directories are architecture-dependent, but will always be
in the C compiler's default search path, so -I and -L options are not
necessary (and may be harmful in multi-arch environments.)

Gbp-Pq: Name 11_omit-directories-from-config.patch

2 years agobuild: Divide mit-krb5-gssapi link flags between LDFLAGS and LIBS
Simon McVittie [Tue, 22 Nov 2022 20:43:41 +0000 (20:43 +0000)]
build: Divide mit-krb5-gssapi link flags between LDFLAGS and LIBS

From the comments nearby about not having --libs-only-L, it looks as
though the intention was to apply a split like this to all dependency
libraries where possible, and the only reason it was not done for
Kerberos is that krb5-config doesn't have that feature and pkg-config
was originally not supported here. For example, zlib, libssh and librtmp
all have their flags from pkg-config split in this way.

Now that pkg-config is supported here, we can do the intended split.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Gbp-Pq: Name build-Divide-mit-krb5-gssapi-link-flags-between-LDFLAGS-a.patch

2 years agoEnable zsh completion generation
Alessandro Ghedini [Fri, 15 Sep 2023 17:01:23 +0000 (18:01 +0100)]
Enable zsh completion generation

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2016-08-03

Gbp-Pq: Name 08_enable-zsh.patch

2 years agoWork around libtool --as-needed reordering bug
Alessandro Ghedini [Fri, 15 Sep 2023 17:01:23 +0000 (18:01 +0100)]
Work around libtool --as-needed reordering bug

Origin: vendor
Bug-Debian: http://bugs.debian.org/347650
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2016-08-03

Gbp-Pq: Name 04_workaround_as_needed_bug.patch

2 years agocurl (7.88.1-10+deb12u3) bookworm; urgency=medium
Carlos Henrique Lima Melara [Fri, 15 Sep 2023 17:01:23 +0000 (18:01 +0100)]
curl (7.88.1-10+deb12u3) bookworm; urgency=medium

  * Team upload.

  [ Andreas Hasenack ]
  * Move ldap-test to a script and add retry logic.

  [ Carlos Henrique Lima Melara ]
  * Fix CVE-2023-38039: HTTP headers eat all memory.
      - Done by debian/patches/CVE-2023-38039.patch.

[dgit import unpatched curl 7.88.1-10+deb12u3]

2 years agoImport curl_7.88.1-10+deb12u3.debian.tar.xz
Carlos Henrique Lima Melara [Fri, 15 Sep 2023 17:01:23 +0000 (18:01 +0100)]
Import curl_7.88.1-10+deb12u3.debian.tar.xz

[dgit import tarball curl 7.88.1-10+deb12u3 curl_7.88.1-10+deb12u3.debian.tar.xz]

2 years agoMerge curl (7.88.1-10+deb12u1) import into refs/heads/workingbranch
Carlos Henrique Lima Melara [Sun, 23 Jul 2023 21:43:52 +0000 (22:43 +0100)]
Merge curl (7.88.1-10+deb12u1) import into refs/heads/workingbranch

2 years agoBuild with NSS.
Ramakrishnan Muthukrishnan [Sun, 23 Jul 2023 21:43:52 +0000 (22:43 +0100)]
Build with NSS.

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2015-08-12

Gbp-Pq: Name 99_nss.patch

2 years agoBuild with GnuTLS.
Ramakrishnan Muthukrishnan [Sun, 23 Jul 2023 21:43:52 +0000 (22:43 +0100)]
Build with GnuTLS.

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2018-05-23

Gbp-Pq: Name 90_gnutls.patch

2 years ago[PATCH] fopen: optimize
SaltyMilk [Mon, 10 Jul 2023 19:43:28 +0000 (21:43 +0200)]
[PATCH] fopen: optimize

Closes #11419

Gbp-Pq: Name CVE-2023-32001.patch

2 years ago[PATCH] lib: unify the upload/method handling
Daniel Stenberg [Tue, 25 Apr 2023 06:28:01 +0000 (08:28 +0200)]
[PATCH] lib: unify the upload/method handling

By making sure we set state.upload based on the set.method value and not
independently as set.upload, we reduce confusion and mixup risks, both
internally and externally.

Closes #11017

Gbp-Pq: Name CVE-2023-28322.patch

2 years ago[PATCH] hostcheck: fix host name wildcard checking
Daniel Stenberg [Mon, 24 Apr 2023 19:07:02 +0000 (21:07 +0200)]
[PATCH] hostcheck: fix host name wildcard checking

The leftmost "label" of the host name can now only match against single
'*'. Like the browsers have worked for a long time.

- extended unit test 1397 for this
- move some SOURCE variables from unit/Makefile.am to unit/Makefile.inc

Reported-by: Hiroki Kurosawa
Closes #11018

Backported to Debian by Samuel Henrique <samueloph@debian.org>

Gbp-Pq: Name CVE-2023-28321.patch

2 years ago[PATCH] hostip: include easy_lock.h before using GLOBAL_INIT_IS_THREADSAFE
Daniel Stenberg [Tue, 16 May 2023 21:40:42 +0000 (23:40 +0200)]
[PATCH] hostip: include easy_lock.h before using GLOBAL_INIT_IS_THREADSAFE

Since that header file is the only place that define can be defined.

Reported-by: Marc Deslauriers
Follow-up to 13718030ad4b3209

Closes #11121

Gbp-Pq: Name CVE-2023-28320-1.patch

2 years ago[PATCH] hostip: add locks around use of global buffer for alarm()
Harry Sintonen [Tue, 25 Apr 2023 07:22:26 +0000 (09:22 +0200)]
[PATCH] hostip: add locks around use of global buffer for alarm()

When building with the sync name resolver and timeout ability we now
require thread-safety to be present to enable it.

Closes #11030

Gbp-Pq: Name CVE-2023-28320.patch

2 years ago[PATCH] libssh2: free fingerprint better
Daniel Stenberg [Mon, 8 May 2023 12:33:54 +0000 (14:33 +0200)]
[PATCH] libssh2: free fingerprint better

Reported-by: Wei Chong Tan
Closes #11088

Gbp-Pq: Name CVE-2023-28319.patch

2 years ago[PATCH] CURLSHOPT_SHARE.3: HSTS sharing is not thread-safe
Daniel Stenberg [Thu, 9 Mar 2023 17:01:34 +0000 (18:01 +0100)]
[PATCH] CURLSHOPT_SHARE.3: HSTS sharing is not thread-safe

Reported-by: Hiroki Kurosawa
Closes #10732

Gbp-Pq: Name CVE-2023-27537.patch

2 years ago[PATCH] url: only reuse connections with same GSS delegation
Daniel Stenberg [Fri, 10 Mar 2023 08:22:43 +0000 (09:22 +0100)]
[PATCH] url: only reuse connections with same GSS delegation

Reported-by: Harry Sintonen
Closes #10731

Gbp-Pq: Name CVE-2023-27536.patch

2 years ago[PATCH] ftp: add more conditions for connection reuse
Daniel Stenberg [Thu, 9 Mar 2023 16:47:06 +0000 (17:47 +0100)]
[PATCH] ftp: add more conditions for connection reuse

Reported-by: Harry Sintonen
Closes #10730

Gbp-Pq: Name CVE-2023-27535.patch

2 years ago[PATCH] url: fix the SSH connection reuse check
Daniel Stenberg [Fri, 10 Mar 2023 07:22:51 +0000 (08:22 +0100)]
[PATCH] url: fix the SSH connection reuse check

Reported-by: Harry Sintonen
Closes #10735

Gbp-Pq: Name CVE-2023-27538.patch

2 years ago[PATCH] curl_path: create the new path with dynbuf
Daniel Stenberg [Thu, 9 Mar 2023 15:22:11 +0000 (16:22 +0100)]
[PATCH] curl_path: create the new path with dynbuf

Closes #10729

Gbp-Pq: Name CVE-2023-27534.patch