Tuomas Tynkkynen
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
obadz
ed01e0ca4f
openssl: fix merge conflict between b6dabe3 and 6e7ca92
2016-08-28 03:53:13 +01:00
obadz
3de6e5be50
Merge branch 'master' into staging
...
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Robin Gloster
b6dabe3df0
openssl_1_1_0: init at 1.1.0
2016-08-26 07:39:18 +00:00
Alexey Shmalko
6e7ca9272e
openssl: fix CVE-2016-2177
2016-08-23 03:41:03 +03:00
Peter Simons
8e462995ba
Bring my stdenv.lib.maintainers user name in line with my github nick.
2016-05-16 22:49:55 +02:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Nathan Zadoks
bdafc6df04
openssl: 1.0.1s -> 1.0.1t, 1.0.2g -> 1.0.2h
...
CVE-2016-2108, high severity: Memory corruption in the ASN.1 encoder
CVE-2016-2107, high severity: Padding oracle in AES-NI CBC MAC check
CVE-2016-2105, low severity: EVP_EncodeUpdate overflow
CVE-2016-2106, low severity: EVP_EncryptUpdate overflow
CVE-2016-2109, low severity: ASN.1 BIO excessive memory allocation
CVE-2016-2176, low severity: EBCDIC overread
2016-05-03 10:54:15 -04:00
Tuomas Tynkkynen
26f90102b8
openssl: fix indentation
2016-04-25 18:19:40 +03:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Eelco Dolstra
e0d17fdf10
openssl: Use 1.0.2 by default
...
Provided that not too much breaks, we should probably cherry-pick this
to 16.03, since the end of the 1.0.1 support window is a bit too close
to the expected lifetime of 16.0.3. @domenkozar
2016-03-01 15:25:53 +01:00
Eelco Dolstra
cdbd14a1a8
openssl: 1.0.1r -> 1.0.1s, 1.0.2f -> 1.0.2g
...
CVE-2016-0800
2016-03-01 15:18:57 +01:00
Eelco Dolstra
ef86e9506d
Untested fix for #13401
2016-02-24 14:01:20 +01:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Eelco Dolstra
917ca8920d
Move setting $SSL_CERT_FILE to stdenv
...
Doing it in an openssl setup hook only works if packages have openssl
as a build input - it doesn't work if they're using a program linked
against openssl.
2016-02-03 13:59:10 +01:00
Eelco Dolstra
cc2cec6300
openssl: Unify 1.0.1 and 1.0.2 expressions
2016-02-03 13:54:22 +01:00
Eelco Dolstra
788da6894f
openssl: Compile in /etc/ssl/certs/ca-certificates.crt
2016-02-03 13:45:05 +01:00
Guillaume Maudoux
9f358f809d
Configure a default trust store for openssl
2016-02-03 12:42:01 +01:00
Eelco Dolstra
2ecb6b4574
openssl: 1.0.1q -> 1.0.1r
...
CVE-2015-3197 (low severity)
2016-01-28 18:57:23 +01:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
codsl
fb3b9f5f8b
openssl: security update 1.0.1p -> 1.0.1q
...
Fixes CVE-2015-3194 and CVE-2015-3195.
Taken from #11469 .
2015-12-05 11:25:27 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Matthias C. M. Troffaes
1c0b060295
openssl: use prefixed windres and ranlib for cross build
2015-11-04 08:48:38 +00:00
Vladimír Čunát
9fbb83b467
openssl: fixup after merge
2015-10-03 16:28:39 +02:00
Vladimír Čunát
f361938b21
Merge staging into closure-size
...
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
William A. Kennington III
eae9889b82
openssl: Major bump 1.0.1 -> 1.0.2
2015-09-15 12:14:12 -07:00
Eelco Dolstra
e1f78bf677
More docs/manpages in separate outputs
2015-07-27 00:27:54 +02:00
Eelco Dolstra
9539db1ec3
openssl: Update to 1.0.1p
2015-07-09 15:15:52 +02:00
William A. Kennington III
507bb016cc
openssl: Clean up the cross compile arguments
...
Also add a check to make sure we don't depend on perl in the output
2015-06-20 14:30:18 -07:00
Peter Simons
b333a2cb19
openssl: remove some cruft
2015-06-16 14:19:25 +02:00
Eelco Dolstra
a4178b1b8a
openssl: Update to 1.0.1o
...
From https://www.openssl.org/news/openssl-1.0.1-notes.html :
"Fix HMAC ABI incompatibility"
2015-06-16 14:16:08 +02:00
Eelco Dolstra
415407bd93
openssl: Update to 1.0.1n
...
CVE-2015-4000, CVE-2015-1788, CVE-2015-1789, CVE-2015-1790, CVE-2015-1792, CVE-2015-1791, CVE-2014-8176
2015-06-11 18:32:13 +02:00
Eelco Dolstra
3aee39bb83
openssl: Fix removal of the ssl/misc scripts
...
This drops the dependency of $out on Perl.
(cherry picked from commit a5fb18473e
2015-06-01 11:01:57 +02:00
William A. Kennington III
afa5859716
openssl: Cleanup some old, untested patches
2015-05-29 16:08:27 -07:00
Marko Durkovic
3f6949c3ef
cygwin: openssl for x86_64
2015-05-28 10:53:35 +02:00
Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Eelco Dolstra
2fe351c7e3
openssl: Update to 1.0.1m
...
Fixes various "Moderate" / "Low" CVEs:
http://openssl.org/news/secadv_20150319.txt
2015-03-19 15:57:17 +01:00
Domen Kožar
1fb78f8994
openssl: 1.0.1k -> 1.0.1l
2015-02-27 12:59:59 +01:00
Domen Kožar
dbbd849ce8
openssl: 1.0.1j -> 1.0.1k
...
(cherry picked from commit 70a7d4bd16
2015-01-09 20:22:02 +01:00
Eelco Dolstra
09dc132e04
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Domen Kožar
c758ec756b
openssl: 1.0.1i -> 1.0.1j (CVE-2014-3513, CVE-2014-3567, CVE-2014-3568)
2014-10-15 16:12:23 +02:00
Alexander Kjeldaas
e431a3e0b5
openssl: make it deterministic
2014-09-13 15:05:27 +02:00
Vladimír Čunát
a70180ba73
mutiout: make it builtin
2014-08-30 08:27:43 +02:00
Vladimír Čunát
fb59f27a43
WIP: getting good
2014-08-27 01:14:09 +02:00
Vladimír Čunát
4dccb224c5
WIP2
2014-08-26 01:10:56 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Vladimír Čunát
d1ed0f44cd
Merge #2823 : better cygwin support, also add x86_64
...
Conflicts (easy):
pkgs/development/interpreters/perl/5.16/default.nix
2014-08-14 20:38:09 +02:00
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
