3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

78 commits

Author SHA1 Message Date
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
Ludovic Courtès 04661ec850 openssl: fix GNU/kFreeBSD builds 2012-08-13 14:12:54 +02: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
Eelco Dolstra 07afe31016 * Doh, we already had OpenSSL 1.0.0. Use the updated Darwin patch.
svn path=/nixpkgs/branches/x-updates/; revision=22722
2010-07-23 15:05:20 +00:00
Eelco Dolstra 7d963c8bb3 * By default, OpenSSL on 64-bit platforms now installs libraries in
$out/lib64, which is not what we want.

svn path=/nixpkgs/branches/x-updates/; revision=22661
2010-07-19 10:27:46 +00:00
Eelco Dolstra d06a183365 * OpenSSL updated to 1.0.0a.
svn path=/nixpkgs/branches/x-updates/; revision=22639
2010-07-18 21:54:14 +00:00
Michael Raskin 7c5e566c5c Cleaned up the unspecified-extra-argument calls where there is no way to access extra arguments. Tarball and full instantiation checks passed.
svn path=/nixpkgs/trunk/; revision=22539
2010-07-08 19:22:50 +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
Rob Vermaas 69bfabd328 re-enabled darwin patch, gcc-darwin does not support -arch flag
svn path=/nixpkgs/trunk/; revision=21412
2010-04-29 08:19:13 +00:00
Lluís Batlle i Rossell e5ce3e5c8c Revert "OpenSSL-1.0.0" changes, due to the new API breaking too much packages, which still have
not released new versions compatible with openssl 1.0.0

I downgraded to 0.9.8n, that also has the security hole fix.

svn path=/nixpkgs/trunk/; revision=21408
2010-04-28 15:01:06 +00:00
Lluís Batlle i Rossell 6b8de64183 Revert "Install libraries to $out/lib instead of $out/lib64"
This reverts commit 50429b2b63a3ad540e8fcd96be0cdaac46a27da2.

svn path=/nixpkgs/trunk/; revision=21407
2010-04-28 15:01:02 +00:00
Yury G. Kudryashov d5601ee60e Install libraries to $out/lib instead of $out/lib64
This should fix a lot of builds

svn path=/nixpkgs/trunk/; revision=21393
2010-04-28 08:40:12 +00:00
Yury G. Kudryashov 375900a6e7 Add comment, use the patch for darwin
svn path=/nixpkgs/trunk/; revision=21354
2010-04-27 19:05:43 +00:00
Yury G. Kudryashov d2b3e548a1 OpenSSL-1.0.0
Big rebuild (though not stdenv-update). Security update, do not revert, please.

svn path=/nixpkgs/trunk/; revision=21352
2010-04-27 18:39:00 +00:00
Lluís Batlle i Rossell 997723ec9b Trying to make nixUnstable cross-build.
It fails because it builds bin2c for the host system, instead of the build system.
I will wait for a fix upstream.

svn path=/nixpkgs/trunk/; revision=20445
2010-03-05 23:22:36 +00:00
Eelco Dolstra 8e885c0a52 * openssl 0.9.8l
svn path=/nixpkgs/branches/stdenv-updates/; revision=19570
2010-01-20 13:49:07 +00:00
Rob Vermaas d8800474f7 x86_64 darwin related changes
svn path=/nixpkgs/trunk/; revision=18665
2009-11-27 10:16:42 +00:00
Eelco Dolstra dd2aba46bf svn path=/nixpkgs/trunk/; revision=16445 2009-07-23 21:22:13 +00:00
Rob Vermaas c0fbe9b7a3 temporary reinstate patch for darwin openssl
svn path=/nixpkgs/trunk/; revision=16442
2009-07-23 19:14:00 +00:00
Eelco Dolstra d4fb6f3a53 * Comment out; not clear if we'll actually need this with a properly
built GCC.

svn path=/nixpkgs/trunk/; revision=16102
2009-06-30 15:19:32 +00:00