Commit Graph

278 Commits

Author SHA1 Message Date
Philip Taron
6c28c49df2
curl: remove with statements 2024-08-18 06:32:23 -07:00
github-actions[bot]
203fa1d4a2
Merge staging-next into staging 2024-08-02 00:02:35 +00:00
Sandro
83d2194d0e
Merge pull request #305391 from LeSuisse/rustls-ffi-0.13.0
rustls-ffi: 0.10.0 -> 0.13.0
2024-08-01 22:08:38 +02:00
Martin Weinelt
90e8307562
Merge pull request #329636 from mweinelt/curl-8.9.0
curl: 8.8.0 -> 8.9.0
2024-07-31 13:09:10 +02:00
Martin Weinelt
89b8ad6898
curl: 8.8.0 -> 8.9.0
https://curl.se/ch/8.9.0.html
https://curl.se/docs/CVE-2024-6197.html
https://curl.se/docs/CVE-2024-6874.html

Fixes: CVE-2024-6197, CVE-2024-6874
2024-07-24 13:31:42 +02:00
Thomas Gerbet
248ffcefe6 rustls-ffi: 0.10.0 -> 0.13.0
Switched to the recently introduced cargo-c build in order
to get pkg-config/.so config.

Changelog:
https://github.com/rustls/rustls-ffi/blob/v0.13.0/CHANGELOG.md
2024-07-08 18:56:24 +02:00
qubitnano
56e85096ef curl: fix ca certificates with gnutls 2024-06-16 11:25:32 -04:00
Alyssa Ross
3df6bb2c85
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/applications/blockchains/polkadot/default.nix
2024-06-09 22:47:12 +01:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Vladimír Čunát
8859736c9f
Merge #313698: curl: 8.7.1 -> 8.8.0
...into staging
2024-05-30 10:56:54 +02:00
Audrey Dutcher
846de80d1c various: Enable updateAutotoolsGnuConfigScriptsHook
Prior to August 2023, any config.guess generated by autoconf will
include a hardcoded /usr/bin/uname invocation for FreeBSD on any
architecture other than arm. This clearly doesn't work under nix.
We must then update or otherwise patch each old config.guess.
2024-05-27 11:09:28 -04:00
Alyssa Ross
437506429a
curl: 8.7.1 -> 8.8.0 2024-05-22 16:49:31 +02:00
Daniel McCarney
1ffbe2530e curl: backport unreleased curl 8.7 bugfix
Fixes errors observed with compression using curl 8.7.1 by backporting
the upstream fix. See linked issues for more information.
2024-04-24 16:47:23 -04:00
Thomas Gerbet
6ea5b5f2c5 rustls-ffi: temporarily drop passthru.tests.curl
It currently does not build but the situation is being handled upstream.
2024-04-07 18:08:45 +02:00
Thomas Gerbet
2e4e6618cb curl: 8.6.0 -> 8.7.1
Fixes CVE-2024-2466, CVE-2024-2398, CVE-2024-2379 and CVE-2024-2004.

Changes:
https://curl.se/changes.html#8_7_1
2024-04-02 11:51:57 +02:00
Alyssa Ross
817d20170d
curl.tests.static: init
We need static curl for nixStatic, so we should test that it builds
when changing curl.

This would have caught a regression introduced by
996b4ebc08 ("curl: build with public suffix list support").
2024-02-09 17:14:01 +01:00
Alyssa Ross
4ae0827699
pkgsStatic.curl: fix build
Link: https://github.com/NixOS/nixpkgs/pull/285295#issuecomment-1935911944
Fixes: 996b4ebc08 ("curl: build with public suffix list support")
2024-02-09 17:05:19 +01:00
Martin Weinelt
e6b37d5a61
curl: disable fetchpatch passthru test on darwin
`tests` seem to be something else on darwin, leading to an eval failure
on the instantiation of this test.

```
 … while evaluating the attribute 'tests.fetchpatch'

   at ./pkgs/tools/networking/curl/default.nix:182:7:

    181|       withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; });
    182|       fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; };
       |       ^
    183|       curlpp = useThisCurl curlpp;

 … while calling a functor (an attribute set with a '__functor' attribute)

   at ./pkgs/tools/networking/curl/default.nix:182:20:

    181|       withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; });
    182|       fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; };
       |                    ^
    183|       curlpp = useThisCurl curlpp;

 (stack trace truncated; use '--show-trace' to show the full trace)

 error: value is a function while a set was expected
```
2024-02-01 12:20:46 +01:00
Martin Weinelt
d4f4956702
curl: 8.5.0 -> 8.6.0
https://curl.se/changes.html#8_6_0
https://curl.se/docs/CVE-2024-0853.html

Fixes: CVE-2024-0853
2024-01-31 16:14:02 +01:00
Martin Weinelt
996b4ebc08
curl: build with public suffix list support
And make sure we pass `--without-libpsl` when it is disabled.

https://daniel.haxx.se/blog/2024/01/10/psl-in-curl/
2024-01-29 18:12:56 +01:00
Martin Weinelt
ead84fdd2b
Merge pull request #277429 from ajs124/feat/curl-ws
curl: add websocket support
2024-01-07 04:58:59 +01:00
Martin Weinelt
22922464c7
Merge pull request #272886 from r-ryantm/auto-update/curl
curl: 8.4.0 -> 8.5.0
2024-01-07 04:58:54 +01:00
annalee
84563fcd99
curl: fix ipv6 detection compile error in configure script 2023-12-30 09:44:28 +00:00
ajs124
6d432900e2 curl: add websocket support
disabled by default, enabled in curlFull
https://curl.se/docs/websocket.html
2023-12-28 23:24:45 +01:00
R. Ryantm
7be9f0f526 curl: 8.4.0 -> 8.5.0 2023-12-08 11:47:50 +00:00
Randy Eckenrode
028534b7d4
curl: propagate Darwin frameworks
`libcurl.la` and `curl-config --static-libs` both include the frameworks
curl needs to link, so propgate them in case dependents don’t include
those frameworks in their build inputs. This fixes building Nix and
probably other things (like netcdf).
2023-10-26 13:26:39 -04:00
Randy Eckenrode
84cf8e007f
curl: build with system frameworks
Unblocks staging-next and restores NAT64 support on Darwin.

Closes #260599
2023-10-13 18:51:06 -04:00
Weijia Wang
66681011bd Revert "curl: fixup build on darwin after update"
This reverts commit c2cce178fa.
2023-10-13 17:01:39 +02:00
Tobias Mayer
c2cce178fa
curl: fixup build on darwin after update
> checking for connect in libraries... cannot find connect
> configure: error: cannot find connect function in libraries.
2023-10-13 10:37:45 +02:00
Sophie Tauchert
9dd00ef189
curl: 8.3.0 -> 8.4.0 2023-10-11 08:43:02 +02:00
Yaya
a68ceade95 curl: 8.2.1 -> 8.3.0
- https://curl.se/changes.html#8_3_0
- https://curl.se/docs/CVE-2023-38039.html

Fixes CVE-2023-38039
2023-09-13 13:48:27 +00:00
Yaya
0d2fb00624 curl: Fix github src url 2023-09-13 13:48:27 +00:00
Vladimír Čunát
3a5c176f95
Merge branch 'master' into staging-next 2023-08-05 07:40:22 +02:00
n3oney
02d604cd68
treewide: add meta.mainProgram 2023-08-05 00:11:04 +02:00
Vladimír Čunát
b79effa1bd
curl: 8.2.0 -> 8.2.1
https://curl.se/changes.html#8_2_1
Also switch the source to .xz
2023-07-26 18:57:34 +02:00
Yaya
eb9357ac4b curl: 8.1.2 -> 8.2.0
https://curl.se/changes.html#8_2_0

Fixes CVE-2023-32001
2023-07-19 13:29:28 +00:00
Martin Weinelt
c57c018132
curl: 8.1.1 -> 8.1.2
https://curl.se/changes.html#8_1_2
2023-06-28 03:09:19 +02:00
Martin Weinelt
f6d2c6a131
curl: 8.0.1 -> 8.1.1
https://daniel.haxx.se/blog/2023/05/17/curl-8-1-0-http2-over-proxy/
https://curl.se/changes.html#8_1_0
https://curl.se/changes.html#8_1_1

https://www.openwall.com/lists/oss-security/2023/05/17/1
https://www.openwall.com/lists/oss-security/2023/05/17/2
https://www.openwall.com/lists/oss-security/2023/05/17/3
https://www.openwall.com/lists/oss-security/2023/05/17/4

Fixes: CVE-2023-28319, CVE-2023-28320, CVE-2023-28321, CVE-2023-28322
2023-05-25 00:25:31 +02:00
fetsorn
42bfc8668c curl: fix typo
"becuase" -> "because"
2023-05-08 20:00:55 +04:00
Thomas Gerbet
74207b79f0 curl: add support for Rustls backend
No functional changes for the other TLS backend but it is now possible
to build curl with `rustls-ffi`.

```
> ./result-bin/bin/curl --version
curl 8.0.1 (x86_64-pc-linux-gnu) libcurl/8.0.1 rustls-ffi/0.9.2/rustls/0.20.8 zlib/1.2.13 brotli/1.0.9 zstd/1.5.4 libidn2/2.3.2 libssh2/1.10.0 nghttp2/1.51.0
Release-Date: 2023-03-20
Protocols: dict file ftp ftps gopher gophers http https imap imaps mqtt pop3 pop3s rtsp scp sftp smtp smtps telnet tftp
Features: alt-svc AsynchDNS brotli GSS-API HSTS HTTP2 HTTPS-proxy IDN IPv6 Kerberos Largefile libz SPNEGO SSL threadsafe UnixSockets zstd
```
2023-04-02 12:00:30 +02:00
Vladimír Čunát
12dd95fbb1
Merge branch 'master' into staging-next 2023-03-24 09:07:41 +01:00
Stefan Frijters
6fce94a26c
curl: fix build without TLS
Fixes "configure: error: select TLS backend(s) or disable TLS with --without-ssl."
if all backends are switched off.
2023-03-23 22:26:50 +01:00
Artturi
603cae0768
curl: Fix passthru tests evaluation
The override would previously clear the version attribute, which
likely started happening after 41877098.

Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de>
2023-03-20 17:09:09 +01:00
Martin Weinelt
280f14490e
curl: 7.88.1 -> 8.0.1
https://curl.se/changes.html#8_0_0
https://daniel.haxx.se/blog/2023/03/20/curl-8-0-0-is-here/
https://daniel.haxx.se/blog/2023/03/20/curl-8-0-1-because-i-jinxed-it/

Fixes: CVE-2023-27533, CVE-2023-27534, CVE-2023-27535, CVE-2023-27536,
       CVE-2023-27537, CVE-2023-27538
2023-03-20 17:09:07 +01:00
zowoq
6da9d0f34a curl: 7.88.0 -> 7.88.1
https://curl.se/changes.html#7_88_1
2023-02-21 08:19:21 +10:00
Thomas Gerbet
74f6aaae4a curl: add patch for the HTTP/2 issue
See upstream issue https://github.com/curl/curl/issues/10525
2023-02-16 16:17:46 +01:00
github-actions[bot]
bf5abe92d4
Merge master into staging-next 2023-02-15 18:01:14 +00:00
sternenseemann
c5a0a5ac5e curl: add pkg-config metadata for libcurl.pc
I did not add the validatePkgConfig setup hook to curl, as I suspect it
may cause trouble when bootstrapping.
2023-02-15 13:52:15 +01:00
zowoq
8ea81a949a curl: 7.87.0 -> 7.88.0
https://curl.se/changes.html#7_88_0
2023-02-15 18:07:19 +10:00
Martin Weinelt
c44fb852ce
curl: 7.86.0 -> 7.87.0
https://daniel.haxx.se/blog/2022/12/21/curl-7-87-0/
https://curl.se/docs/CVE-2022-43551.html
https://curl.se/docs/CVE-2022-43552.html

Fixes: CVE-2022-43551, CVE-2022-43552
2022-12-21 23:15:10 +01:00