1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 01:51:24 +00:00
Commit graph

59 commits

Author SHA1 Message Date
Vladimír Čunát 062e2567c9 curl: minor update 7.35.0 -> 7.36.0, including CVE fixes 2014-05-03 11:30:53 +02:00
Vladimír Čunát befe6905e2 curl: update 7.33 -> .35, including two security fixes
CVE-2013-4545
CVE-2014-0015
2014-02-05 20:45:34 +01:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Domen Kožar f770739290 curl: 7.30.0 -> 7.33.0 (CVE-2013-4545) 2013-11-21 16:24:32 +01:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Jack Cummings e6f2ac65e2 Gratuitous Space Battles. Needs libcurl.so.3, so put an old version of that in, too 2013-10-19 14:45:03 +02:00
Jason \"Don\" O'Conal 613cf79237 esniper: fix build on darwin 2013-09-16 15:51:15 +02:00
Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Jaka Hudoklin 941055dae9 curl: Add support for c-ares, asynchronous dns resolver 2013-08-12 19:53:08 +02:00
James Cook af53fd451f curl: update to version 7.31.0 2013-06-28 07:04:07 +02:00
Vladimír Čunát 2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Petr Rockai 7abebbad4d curl: Optionally add support for GSSAPI (Kerberos).
@vcunat also did some configureFlags refactoring
2013-05-18 13:24:30 +02:00
Eelco Dolstra d44ffc5338 curl: Update to 7.30.0
CVE-2013-1944
2013-04-23 14:54:51 +02:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Shea Levy e2abed75ec Revert "Revert "curl: Update to version 7.29.0.""
This reverts commit ec4f56b347.

With the added patch, the curl segfault seems to be fixed.
2013-02-10 13:44:00 -05:00
Shea Levy ec4f56b347 Revert "curl: Update to version 7.29.0."
This reverts commit fd2cff9479.

nix's substituter fails with this curl, so revert it until that's fixed.
2013-02-10 11:37:14 -05:00
aszlig fd2cff9479 curl: Update to version 7.29.0.
This version contains a security fix for CVE-2013-0249, for details please have
a look at:

http://curl.haxx.se/docs/adv_20130206.html

Thanks to @roconnor for pointing this out.

I'm pushing this to stdenv-updates because I'm not quite sure if it will break
other things because 7.29.0 is now non-blocking by default. Plus the security
vulnerability only affects IMAP, POP3 and SMTP protocol support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

Cherry-picked into master, this won't change stdenv.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-02-08 18:27:52 -05:00
aszlig 8e08e9ccf0
curl: Update to version 7.29.0.
This version contains a security fix for CVE-2013-0249, for details please have
a look at:

http://curl.haxx.se/docs/adv_20130206.html

Thanks to @roconnor for pointing this out.

I'm pushing this to stdenv-updates because I'm not quite sure if it will break
other things because 7.29.0 is now non-blocking by default. Plus the security
vulnerability only affects IMAP, POP3 and SMTP protocol support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 09:03:22 +01:00
Eelco Dolstra 88b11196c1 Clean up redundant "if condition then true else false" 2012-12-28 19:57:47 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Peter Simons c0b393866f curl: update to version 7.28.0 2012-10-26 10:32:04 +02:00
Eelco Dolstra fcb1d64322 curl: Update to 7.27.0 2012-09-13 11:36:34 -04:00
Michael Fox 063a627493 Curl. Uprev to 2.26.0
Solves a hideous bug which affects lots of things including nix-env.
The question now is, how to rebuild everything that depends directly or indirectly on curl?

More about the underlying bug and its resolution here:
    http://comments.gmane.org/gmane.comp.web.curl.library/33285

Bug looks like this:

    curl google.com
    curl: (7) Failed to connect to 74.125.224.35: Invalid argument
2012-06-29 21:15:35 -07:00
Eelco Dolstra 3cf71dcfd1 * Curl is used during the bootstrap, so don't rely on pattern
substitution being efficient.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31792
2012-01-23 13:06:01 +00:00
Eelco Dolstra 4d95b41bc8 * curl updated to 7.22.0. Dropped the connect timeout patch because
it doesn't seem necessary anymore.

svn path=/nixpkgs/trunk/; revision=30243
2011-11-05 01:55:53 +00:00
Lluís Batlle i Rossell 221317ae7b Setting new bootstrap-tools for x86_64.
Allowing 'curl' build without some dependencies, if it is told not to build
with them.

Updating the make-bootstrap-tools for the latest gcc/glibc, removing the
dependency on klibc, and updating unpack-boostrap-tools for the latest
boostrap-tools to work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=23305
2010-08-21 12:50:49 +00:00
Peter Simons 0571d80df6 pkgs/tools/networking/curl: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=22997
2010-08-06 12:45:39 +00:00
Peter Simons 432ad9ceef pkgs/tools/networking/curl: assert that scpSupport is enabled only when libssh2 is available
svn path=/nixpkgs/trunk/; revision=22996
2010-08-06 12:45:11 +00:00
Yury G. Kudryashov 80108f291b Add optional scp support to curl
svn path=/nixpkgs/trunk/; revision=22976
2010-08-05 21:06:45 +00:00
Eelco Dolstra 113fa71b8c * curl updated to 7.21.0.
svn path=/nixpkgs/trunk/; revision=22629
2010-07-18 21:01:17 +00:00
Michael Raskin ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.
svn path=/nixpkgs/trunk/; revision=22529
2010-07-08 13:25:52 +00:00
Lluís Batlle i Rossell 49ba7bee3c Made curl cross-build properly with openssl support.
svn path=/nixpkgs/trunk/; revision=20452
2010-03-06 15:17:43 +00:00
Eelco Dolstra 9761d31dc9 * curl 7.19.7.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19573
2010-01-20 14:26:19 +00:00
Lluís Batlle i Rossell 4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Ludovic Courtès c4d720c3d1 Curl: Propagate Zlib and OpenSSL.
svn path=/nixpkgs/trunk/; revision=15381
2009-04-28 15:41:51 +00:00
Eelco Dolstra d574d882cc * curl 7.19.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14507
2009-03-11 15:16:17 +00:00
Eelco Dolstra c91168a600 * Bootstrap tools: build on x86_64-linux.
* Removed Perl from the bootstrap tools.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13827
2009-01-23 15:09:56 +00:00
Eelco Dolstra 581af921ea * Latest OpenSSL, Curl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13817
2009-01-21 14:11:22 +00:00
Eelco Dolstra fc5eebdf8b * Merged the stdenv branch
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
2008-06-13 11:46:39 +00:00
Eelco Dolstra e21b6b6ee5 * curl: build with OpenSSL (https) support by default.
* Some fetchurl-related refactoring.  The `realCurl' attribute is
  gone, `curl' is the real thing.  To prevent an infinite recursion in
  `fetchurl' (because it depends on curl and building curl needs
  fetchurl), curl and its dependencies (openssl, zlib, perl) use
  `fetchurlBoot', which is the fetchurl used by the previous bootstrap
  phase (e.g. the statically linked version of curl for
  stdenv-linux).  So as a result you can use https:// urls almost
  everywhere.

  There's also some hackery to prevent a different curl from being
  built in every stdenv-linux bootstrap phase (namely the
  stdenv.fetchurl attribute which allows fetchurl to be overriden
  everywhere).

svn path=/nixpkgs/trunk/; revision=11905
2008-05-27 07:49:55 +00:00
Eelco Dolstra 6aae26a1d8 * Curl 7.18.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11691
2008-04-23 09:30:09 +00:00
Eelco Dolstra 895f7c9ab4 * Curl 7.17.1.
* Added a patch to fix --retry in case of connection timeouts when
  --connect-timeout is used.  (--retry is still broken when
  --connect-timeout isn't used.)

svn path=/nixpkgs/trunk/; revision=9956
2007-12-19 18:39:59 +00:00
Eelco Dolstra c44f77bbdf * curl 7.16.2 (NIXPKGS-55). The CXXCPP patch doesn't seem to be
necessary anymore.

svn path=/nixpkgs/trunk/; revision=8742
2007-05-24 13:34:34 +00:00
Eelco Dolstra 7d5de08c1c * More simplification.
svn path=/nixpkgs/trunk/; revision=6838
2006-10-24 23:07:37 +00:00
Eelco Dolstra c6ecc900cf * Add more stuff to the bootstrap builder.
* Remove some redundant *Diet values in all-packages.nix.

svn path=/nixpkgs/trunk/; revision=6780
2006-10-19 21:36:51 +00:00
Eelco Dolstra 501ceef268 * A function `useDietLibC' that returns a modified stdenv that uses
dietlibc to produce small, statically linked binaries.  This stdenv
  also passes `-Os' to GCC automatically to optimise for size.  It
  also tries to prevent builders from linking against dynamic
  libraries (which dietlibc doesn't support).

* A function `addAttrsToDerivation' that returns a modified stdenv
  that always adds the specified attributes to the derivations that it
  produces.  Example (from curl):

    curlDiet =  import ../tools/networking/curl {
      inherit fetchurl zlib;
      stdenv = addAttrsToDerivation {
        CFLAGS = "-DHAVE_INET_NTOA_R_2_ARGS=1";
      } (useDietLibC stdenv);
    };

  (This is needed to get curl to build with dietlibc.  Also note the
  stacking of stdenv-modifying functions.)

* curl-diet: no longer necessary.

svn path=/nixpkgs/trunk/; revision=6761
2006-10-18 12:50:04 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Armijn Hemel 193edaab22 7.15.4 -> 7.15.5
svn path=/nixpkgs/trunk/; revision=6243
2006-08-25 21:01:42 +00:00
Armijn Hemel 809f592e0a new version of curl
svn path=/nixpkgs/trunk/; revision=5459
2006-06-17 11:51:46 +00:00
Roy van den Broek 9d27c94bda Pass the path to OpenSSL to the `--with-ssl' configure flag when building
with SSL support.


svn path=/nixpkgs/trunk/; revision=5144
2006-04-05 09:08:43 +00:00