Commit Graph

46 Commits

Author SHA1 Message Date
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
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Armijn Hemel
d2b1dc4a52 update curl to 7.15.1, fixes a security flaw. Merry X-mas :)
svn path=/nixpkgs/trunk/; revision=4432
2005-12-25 00:25:17 +00:00
Eelco Dolstra
94fe7734fa * Glibc 2.3.6.
* GCC 3.4.5.
* Updated several other stdenv packages.
* Modified the builders of several packages to use the generic
  builder.

svn path=/nixpkgs/trunk/; revision=4336
2005-12-06 00:12:45 +00:00
Eelco Dolstra
a450978f26 * Glibc updated to 2.3.5.
* GCC 3.4.4 and 3.3.6.
* Other stdenv packages updated.

svn path=/nixpkgs/trunk/; revision=3188
2005-06-17 10:30:13 +00:00
Armijn Hemel
d6702d185a patch for curl
svn path=/nixpkgs/branches/nixos-pkgs/; revision=1844
2004-12-09 13:02:44 +00:00
Armijn Hemel
f063d8c4db - add mktemp
- disable tiger, strategoxt, they don't work and give errors
- ftp.nl.kernel.org seems to have some problems, replaced with ftp.de.kernel.org
should be put back eventually

svn path=/nixpkgs/trunk/; revision=1215
2004-08-03 15:41:08 +00:00
Eelco Dolstra
04c272508c * Fix brokenness due to automatic transformations.
svn path=/nixpkgs/trunk/; revision=878
2004-03-30 12:37:17 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra
5941f66f0e * The stdenv setup script now defines a generic builder that allows
builders for typical Autoconf-style to be much shorten, e.g.,

    . $stdenv/setup
    genericBuild

  The generic builder does lots of stuff automatically:

  - Unpacks source archives specified by $src or $srcs (it knows about
    gzip, bzip2, tar, zip, and unpacked source trees).
  - Determines the source tree.
  - Applies patches specified by $patches.
  - Fixes libtool not to search for libraries in /lib etc.
  - Runs `configure'.
  - Runs `make'.
  - Runs `make install'.
  - Strips debug information from static libraries.
  - Writes nested log information (in the format accepted by
    `log2xml').

  There are also lots of hooks and variables to customise the generic
  builder.  See `stdenv/generic/docs.txt'.

* Adapted the base packages (i.e., the ones used by stdenv) to use the
  generic builder.

* We now use `curl' instead of `wget' to download files in `fetchurl'.

* Neither `curl' nor `wget' are part of stdenv.  We shouldn't
  encourage people to download stuff in builders (impure!).

* Updated some packages.

* `buildinputs' is now `buildInputs' (but the old name also works).

* `findInputs' in the setup script now prevents inputs from being
  processed multiple times (which could happen, e.g., if an input was
  a propagated input of several other inputs; this caused the size
  variables like $PATH to blow up exponentially in the worst case).

* Patched GNU Make to write nested log information in the format
  accepted by `log2xml'.  Also, prior to writing the build command,
  Make now writes a line `building X' to indicate what is being
  built.  This is unfortunately often obscured by the gigantic tool
  invocations in many Makefiles.  The actual build commands are marked
  `unimportant' so that they don't clutter pages generated by
  `log2html'.


svn path=/nixpkgs/trunk/; revision=845
2004-03-19 16:53:04 +00:00