cryptopp: 5.6.2 -> 5.6.4

Fix CVE-2016-3995. #18856

Remove broken flag. #19040

cc #19009
This commit is contained in:
Franz Pletz
2016-09-29 23:40:38 +02:00
parent a34ec1517f
commit eb6a1c9238
4 changed files with 46 additions and 37 deletions
+13 -10
View File
@@ -1,16 +1,18 @@
{ fetchurl, stdenv, unzip }:
stdenv.mkDerivation rec {
name = "crypto++-5.6.2";
name = "crypto++-${version}";
majorVersion = "5.6";
version = "${majorVersion}.4";
src = fetchurl {
url = "mirror://sourceforge/cryptopp/cryptopp562.zip";
sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw";
url = "mirror://sourceforge/cryptopp/cryptopp564.zip";
sha256 = "1msar24a38rxzq0xgmjf09hzaw2lv6s48vnbbhfrf5awn1vh6hxy";
};
patches = with stdenv;
lib.optional (system != "i686-cygwin") ./dll.patch
++ lib.optional isDarwin ./GNUmakefile.patch;
++ lib.optional isDarwin ./GNUmakefile-darwin.patch;
buildInputs = [ unzip ];
@@ -30,14 +32,18 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
makeFlags = "PREFIX=$(out)";
buildFlags = "libcryptopp.so";
makeFlags = [ "PREFIX=$(out)" ];
buildFlags = [ "libcryptopp.so" ];
installFlags = [ "LDCONF=true" ];
doCheck = true;
checkPhase = "LD_LIBRARY_PATH=`pwd` make test";
# prefer -fPIC and .so to .a; cryptotest.exe seems superfluous
postInstall = ''rm "$out"/lib/*.a -r "$out/bin" '';
postInstall = ''
rm "$out"/lib/*.a -r "$out/bin"
ln -sf "$out"/lib/libcryptopp.so.${version} "$out"/lib/libcryptopp.so.${majorVersion}
'';
meta = with stdenv.lib; {
description = "Crypto++, a free C++ class library of cryptographic schemes";
@@ -45,8 +51,5 @@ stdenv.mkDerivation rec {
license = licenses.boost;
platforms = platforms.all;
maintainers = [ ];
# Marked as broken due to needing an update for security issues.
# See: https://github.com/NixOS/nixpkgs/issues/18856
broken = true;
};
}