Commit Graph

95 Commits

Author SHA1 Message Date
Peter Simons
5c276c4f68 openssl: update to version 1.0.1i
See https://www.openssl.org/news/secadv_20140806.txt for a long list of CVE numbers.
Fixes <https://github.com/NixOS/nixpkgs/issues/3485>.
2014-08-08 09:46:57 +02:00
Domen Kožar
15f092d7a7 openssl: 1.0.1g -> 1.0.1h
CVE-2014-0224
CVE-2014-0221
CVE-2014-0195
CVE-2014-0198
CVE-2010-5298
CVE-2014-3470
2014-06-05 14:32:11 +02:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Domen Kožar
1140f06e0f openssl: 1.0.1f -> 1.0.1g
CVE-2014-0160, CVE-2014-0076
2014-04-07 20:33:38 +02:00
aszlig
5e95800f26
openssl: Use Darwin patch for cross-builds too.
Might be better to have something like stdenv.isDarwinTarget, which can
be used to test for native Darwin _and_ cross-built Darwin as a target.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:47 +01:00
aszlig
30962765e0
openssl/cross: Fix build for Darwin.
This is just a minor fix, because when using "darwin64-x86_64-cc" for
config.openssl.system, the OpenSSL build scripts try to compile with
$prefix-cc, which is not available with the gcc-cross-wrapper.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:47 +01:00
Eelco Dolstra
340b6ab649 openssl: Update to 1.0.1f
CVE-2013-6449, CVE-2013-6450, CVE-2013-4353.
2014-01-07 09:40:35 +01:00
Danny Wilson
cf42601f92 Coreutils update and Illumos compatibility fixes.
- GNU Coreutils 8.21
- Add is64Bit checks to stdenv for Solaris.
- Fix OpenSSL Illumos build.
2013-02-28 20:04:01 +01:00
Peter Simons
e259e52a7d openssl: update to version 1.0.1e 2013-02-18 11:53:57 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
88f7000aa4 openssl: Fix building on Darwin
http://hydra.nixos.org/build/3491716
2012-12-18 18:03:26 +01:00
Eelco Dolstra
e5497ca043 openssl: Install config files in $out/etc/ssl in $out/ssl 2012-11-23 17:29:06 +01:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Peter Simons
02cd9a906e openssl: strip trailing whitespace 2012-10-23 18:36:02 +02:00
Peter Simons
8d469a5bbc openssl: update to version 1.0.1c 2012-10-23 18:35:51 +02:00
Lluís Batlle i Rossell
57b578189b Adding cryptodev-linux, and made openssl use it optionally.
I'm trying to get the CESA of the sheevaplug available to openssl.
2012-09-23 20:51:15 +02:00
Peter Simons
d5677fe6c7 stdenv-updates: merge updates from 'master' branch 2012-09-11 16:48:41 +02:00
Ludovic Courtès
04661ec850 openssl: fix GNU/kFreeBSD builds 2012-08-13 14:12:54 +02:00
Eelco Dolstra
ad943dbbe3 * OpenSSL 1.0.0j (CVE-2012-2333).
svn path=/nixpkgs/branches/stdenv-updates/; revision=34205
2012-05-21 23:31:28 +00:00
Eelco Dolstra
6c36eece34 * Remove the FreeBSD patch. It no longer applies and no longer seems needed.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34006
2012-05-07 19:56:14 +00:00
Eelco Dolstra
d0a1fe6b90 * Revert to the OpenSSL 1.0.0 series (though a newer version) because
1.0.1 doesn't build on FreeBSD and Darwin (due to our patches).

svn path=/nixpkgs/branches/stdenv-updates/; revision=34001
2012-05-07 01:08:33 +00:00
Eelco Dolstra
0ae007e26f * OpenSSL 1.0.1b (includes security fixes).
svn path=/nixpkgs/branches/stdenv-updates/; revision=33989
2012-05-05 15:00:10 +00:00
Florian Friesdorf
be815e7639 add an openssl mirror url as primary is currently down
svn path=/nixpkgs/branches/stdenv-updates/; revision=32578
2012-02-26 17:22:50 +00:00
Eelco Dolstra
91b19832c9 * Fix the Darwin patch for OpenSSL.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31791
2012-01-23 12:59:18 +00:00
Eelco Dolstra
22f3ff8f0d * OpenSSL updated to 1.0.0g.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31740
2012-01-20 16:41:11 +00:00
Yury G. Kudryashov
9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Lluís Batlle i Rossell
11f55d273b I found that instantiating xbursttools brought to the openssl evaluation
throwing an exception about an undefined platform.openssl.system.

That was introduced by r31330, which made openssl for the build system to
evaluate the platform.openssl.system, that should only be needed for the host
system.

I also revert supplying openssl.system for xbursttools.


svn path=/nixpkgs/trunk/; revision=31379
2012-01-06 21:31:29 +00:00
Yury G. Kudryashov
10fd822319 Fix typo
Introduced while merging trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=31339
2012-01-06 09:41:22 +00:00
Yury G. Kudryashov
900c6e18cd svn merge ^/nixpkgs/trunk
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00
Ludovic Courtès
3d0f767b91 OpenSSL: Fix compilation on GNU/Hurd.
svn path=/nixpkgs/trunk/; revision=31330
2012-01-05 23:46:17 +00:00
Eelco Dolstra
ca73b1fb33 * Resolve a collision between OpenSSL and man-pages
(in ‘share/man/man3/err.3’).

svn path=/nixpkgs/trunk/; revision=31296
2012-01-04 19:48:08 +00:00
Yury G. Kudryashov
2bca92e32d Merge trunk
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Lluís Batlle i Rossell
2833652d5a Moving openssl 1.0.0e.nix to default.nix, as Eelco suggests. The 1.0.0e expression was moremaintained.
When I updated openssl, I didn't know there was such a file.


svn path=/nixpkgs/trunk/; revision=31233
2012-01-03 14:31:11 +00:00
Lluís Batlle i Rossell
709ae01f34 Updating openssl.
svn path=/nixpkgs/trunk/; revision=31215
2012-01-02 18:18:04 +00:00
Eelco Dolstra
eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Ludovic Courtès
dd4841e833 OpenSSL: Fix compilation on x86_64-freebsd.
svn path=/nixpkgs/trunk/; revision=30642
2011-12-01 10:59:26 +00:00
Shea Levy
b597d8bfb6 openssl: Fix target settings when building for GNU/hurd
GNU/hurd cross-build succeeds now!

svn path=/nixpkgs/trunk/; revision=30452
2011-11-16 19:03:52 +00:00
Shea Levy
4231e7ba5e openssl: Fix hurd-x86 cross-build
Now the install phase fails.

svn path=/nixpkgs/trunk/; revision=30451
2011-11-16 18:33:12 +00:00
Eelco Dolstra
a839947b85 * Make OpenSSL 1.0.0e the default.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30233
2011-11-04 18:48:25 +00:00
Peter Simons
d709ef5d30 openssl: avoid the need for a recursive expression
svn path=/nixpkgs/trunk/; revision=29426
2011-09-21 18:48:04 +00:00
Peter Simons
6fcd493d5f openssl: added myself as a maintainer
svn path=/nixpkgs/trunk/; revision=29425
2011-09-21 18:45:52 +00:00
Eelco Dolstra
d924bbb775 * openssl: per Nixpkgs convention, don't install static libraries when
building dynamic libraries.

svn path=/nixpkgs/branches/x-updates/; revision=25856
2011-02-09 15:27:34 +00:00
Eelco Dolstra
bafc1b5cb8 * While we're at it, bump OpenSSL to 1.0.0d (with a fix for
CVE-2011-0014).

svn path=/nixpkgs/branches/x-updates/; revision=25827
2011-02-09 11:02:24 +00:00
Lluís Batlle i Rossell
2d3cf91094 Updating openssl according to a security advisory in their web page.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25039
2010-12-08 21:36:03 +00:00
Lluís Batlle i Rossell
d7b494a2f4 Updating from trunk to get a security fix on openssl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24759
2010-11-18 20:00:39 +00:00
Lluís Batlle i Rossell
3f05ed581f Making fossil cross-build (it works for the nanonote).
Removing some perl scripts from the openssl cross-built derivation, to avoid depending on it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23128
2010-08-11 20:08:29 +00:00
Lluís Batlle i Rossell
d5097ad3d3 Breaking dependencies on the cross-built gcc through the gcc-cross-wrapper.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23073
2010-08-09 21:37:31 +00:00
Lluís Batlle i Rossell
4b42d5f7a9 Fixing the openssl 1.0.0 cross build
svn path=/nixpkgs/trunk/; revision=22910
2010-08-02 22:10:42 +00:00
Eelco Dolstra
4a6eb1183e * On x86_64-darwin, "./config" misdetects the system as
"darwin-i386-cc" (http://hydra.nixos.org/build/498076).  So specify
  the system type explicitly.

svn path=/nixpkgs/branches/x-updates/; revision=22726
2010-07-25 09:09:32 +00:00
Eelco Dolstra
3587a2f78e * Doh.
svn path=/nixpkgs/branches/x-updates/; revision=22723
2010-07-23 15:36:35 +00:00