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

Merge pull request #13795 from grahamc/libotr

Browse Source 
libotr: upgrade v4, remove v3, and pidgin-otr for CVE-2016-2851
This commit is contained in:
Franz Pletz 2016-03-10 00:22:18 +01:00
commit 6fb3dbd3f3
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, libotr, pidgin, intltool } : { stdenv, fetchurl, libotr, pidgin, intltool } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pidgin-otr-4.0.1"; name = "pidgin-otr-4.0.2";
src = fetchurl { src = fetchurl {
url = "http://www.cypherpunks.ca/otr/${name}.tar.gz"; url = "http://www.cypherpunks.ca/otr/${name}.tar.gz";
sha256 = "02pkkf86fh5jvzsdn9y78impsgzj1n0p81kc2girvk3vq941yy0v"; sha256 = "1i5s9rrgbyss9rszq6c6y53hwqyw1k86s40cpsfx5ccl9bprxdgl";
}; };
postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";

11
pkgs/development/libraries/libotr/3.2.nix
View File

@ -1,11 +0,0 @@
{stdenv, fetchurl, libgcrypt}:
stdenv.mkDerivation {
name = "libotr-3.2.1";
src = fetchurl {
url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz;
sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq";
};
propagatedBuildInputs = [libgcrypt];
}

2
pkgs/top-level/all-packages.nix
View File

@ -7805,8 +7805,6 @@ let
libotr = callPackage ../development/libraries/libotr { }; libotr = callPackage ../development/libraries/libotr { };
libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };
libp11 = callPackage ../development/libraries/libp11 { }; libp11 = callPackage ../development/libraries/libp11 { };
libpar2 = callPackage ../development/libraries/libpar2 { }; libpar2 = callPackage ../development/libraries/libpar2 { };