public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl: 1.0.1j -> 1.0.1k

Browse Source 
(cherry picked from commit 70a7d4bd16454b8b27d404a109c615462cc4fa9e)
Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
Domen Kožar 2015-01-09 20:21:28 +01:00
parent 93b75f6284
commit dbbd849ce8
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/openssl/default.nix
View File

@ -2,7 +2,7 @@
, withCryptodev ? false, cryptodevHeaders }: , withCryptodev ? false, cryptodevHeaders }:
let let
name = "openssl-1.0.1j"; name = "openssl-1.0.1k";
opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
(throw "openssl needs its platform name cross building" null) (throw "openssl needs its platform name cross building" null)
@ -19,8 +19,6 @@ let
# cannot be overriden per-process. For security, the # cannot be overriden per-process. For security, the
# environment variable is ignored for setuid binaries. # environment variable is ignored for setuid binaries.
./cert-file.patch ./cert-file.patch
# Remove the compilation time from the library
./no-date-in-library.patch
] ]
++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86") ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86")
@ -45,7 +43,7 @@ stdenv.mkDerivation {
"http://www.openssl.org/source/${name}.tar.gz" "http://www.openssl.org/source/${name}.tar.gz"
"http://openssl.linux-mirror.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz"
]; ];
sha256 = "1wzdaiix40lz0rsyf51qv0wiq4ywp29j5ni0xzl06vxsi63wlq0v"; sha256 = "0754wzmzr90hiiqs5cy6g3cf8as75ljkhppgyirfg26hpapax7wg";
}; };
patches = patchesCross false; patches = patchesCross false;

12
pkgs/development/libraries/openssl/no-date-in-library.patch
View File

@ -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