diff options
| author | Domen Kožar <domen@dev.si> | 2015-01-09 20:21:28 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-01-09 20:22:02 +0100 |
| commit | dbbd849ce847ea797eaf0110da5e695ad227fc63 (patch) | |
| tree | 1a8eca790a69f5b3097473c850abc21c0cd99f75 | |
| parent | 93b75f62848756764e9102cdd3fe93388afeb98a (diff) | |
| download | nixpkgs-dbbd849ce847ea797eaf0110da5e695ad227fc63.tar nixpkgs-dbbd849ce847ea797eaf0110da5e695ad227fc63.tar.gz nixpkgs-dbbd849ce847ea797eaf0110da5e695ad227fc63.tar.bz2 nixpkgs-dbbd849ce847ea797eaf0110da5e695ad227fc63.tar.lz nixpkgs-dbbd849ce847ea797eaf0110da5e695ad227fc63.tar.xz nixpkgs-dbbd849ce847ea797eaf0110da5e695ad227fc63.tar.zst nixpkgs-dbbd849ce847ea797eaf0110da5e695ad227fc63.zip | |
openssl: 1.0.1j -> 1.0.1k
(cherry picked from commit 70a7d4bd16454b8b27d404a109c615462cc4fa9e) Signed-off-by: Domen Kožar <domen@dev.si>
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/openssl/no-date-in-library.patch | 12 |
2 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 29656f7ef88..c78cd25e128 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.1j"; + name = "openssl-1.0.1k"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -19,8 +19,6 @@ let # cannot be overriden per-process. For security, the # environment variable is ignored for setuid binaries. ./cert-file.patch - # Remove the compilation time from the library - ./no-date-in-library.patch ] ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86") @@ -45,7 +43,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "1wzdaiix40lz0rsyf51qv0wiq4ywp29j5ni0xzl06vxsi63wlq0v"; + sha256 = "0754wzmzr90hiiqs5cy6g3cf8as75ljkhppgyirfg26hpapax7wg"; }; patches = patchesCross false; diff --git a/pkgs/development/libraries/openssl/no-date-in-library.patch b/pkgs/development/libraries/openssl/no-date-in-library.patch deleted file mode 100644 index 3eb501dfa02..00000000000 --- a/pkgs/development/libraries/openssl/no-date-in-library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur openssl-1.0.1f.orig/crypto/Makefile openssl-1.0.1f/crypto/Makefile ---- openssl-1.0.1f.orig/crypto/Makefile 2014-01-06 15:35:56.000000000 +0100 -+++ openssl-1.0.1f/crypto/Makefile 2014-04-09 13:05:28.071346204 +0200 -@@ -57,7 +57,7 @@ - echo ' /* auto-generated by crypto/Makefile for crypto/cversion.c */'; \ - echo ' #define CFLAGS "$(CC) $(CFLAG)"'; \ - echo ' #define PLATFORM "$(PLATFORM)"'; \ -- echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ -+ echo " #define DATE \"Thu Jan 1 00:00:01 UTC 1970\""; \ - echo '#endif' ) >buildinf.h - - x86cpuid.s: x86cpuid.pl perlasm/x86asm.pl |