Commit graph

263 commits

Author SHA1 Message Date
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
zowoq e8b747b3cd curl: 7.85.0 -> 7.86.0
https://curl.se/changes.html#7_86_0
2022-10-26 16:51:31 +10:00
Jonathan Ringer e0d8990938
c-ares: add cmake to default, c-aresMinimal: init 2022-10-13 13:01:20 -07:00
zowoq 0f64ae72ea curl: 7.84.0 -> 7.85.0
https://curl.se/changes.html#7_85_0
2022-09-03 16:08:22 +10:00
Vladimír Čunát ddfcb5ba68
Merge #180478: curl: fix build on certain platforms
...into staging
2022-07-20 20:26:37 +02:00
github-actions[bot] 8df1eb061a
Merge master into staging-next 2022-07-17 00:02:14 +00:00
Nick Cao 5bb4355ad4
curl: fix build on certain platforms 2022-07-07 17:49:05 +08:00
Artturi fb6816eae3
Merge pull request #178869 from Artturin/curlies 2022-07-06 17:30:45 +03:00
zowoq eb9d6edb5a curl: 7.83.1 -> 7.84.0
https://curl.se/changes.html#7_84_0
2022-07-05 09:16:03 +10:00
Sandro Jäckel 419dd6e12d
curl: remove `? null` 2022-07-01 22:06:42 +02:00
Artturin 47b58ff43e curl: put tests in tests.withCheck
curl is built many times during a stdenv rebuild

they are a bottleneck
2022-06-28 02:17:12 +03:00
Artturin 6bce3fc64e curl: use finalAttrs
allows using the correct package in passthru

remove unneeded replaceStrings in urls
2022-06-24 18:59:13 +03:00
Domen Kožar 7434c16611 nix: patch curl netrc regression
https://github.com/curl/curl/issues/8653
2022-06-09 01:28:26 +01:00
Robert Scott e9a0f109e5 curl: deduplicate definition of passthru.tests 2022-05-27 00:04:56 +01:00
Pavol Rusnak c571a647c1
curl: fix curl-gnutls build on darwin 2022-05-25 18:48:22 +02:00
Izorkin 6e8e1faabe
nixos/tests: add nginx-http3 test 2022-05-22 19:29:12 +03:00