From 6b4a70c67240097a669ba3660e2aebde7074e4ee Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 9 Mar 2016 15:38:35 -0600
Subject: [PATCH 1/2] libotr_3_2: remove, not updated since 2012, and unused.

---
 pkgs/development/libraries/libotr/3.2.nix | 11 -----------
 pkgs/top-level/all-packages.nix           |  2 --
 2 files changed, 13 deletions(-)
 delete mode 100644 pkgs/development/libraries/libotr/3.2.nix

diff --git a/pkgs/development/libraries/libotr/3.2.nix b/pkgs/development/libraries/libotr/3.2.nix
deleted file mode 100644
index 7dd6226a6981..000000000000
--- a/pkgs/development/libraries/libotr/3.2.nix
+++ /dev/null
@@ -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];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 011bfdd5459b..84fbd463fddf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7805,8 +7805,6 @@ let
 
   libotr = callPackage ../development/libraries/libotr { };
 
-  libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };
-
   libp11 = callPackage ../development/libraries/libp11 { };
 
   libpar2 = callPackage ../development/libraries/libpar2 { };

From b87ebf2b62490b9248b7c6685cfa6e02dd7e9fb9 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 9 Mar 2016 15:52:04 -0600
Subject: [PATCH 2/2] pidgin-otr: 4.0.1 -> 4.0.2 for CVE-2016-2851

---
 .../instant-messengers/pidgin-plugins/otr/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
index c6801105a84a..9f5c246ede63 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, libotr, pidgin, intltool } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-otr-4.0.1";
+  name = "pidgin-otr-4.0.2";
   src = fetchurl {
     url = "http://www.cypherpunks.ca/otr/${name}.tar.gz";
-    sha256 = "02pkkf86fh5jvzsdn9y78impsgzj1n0p81kc2girvk3vq941yy0v";
+    sha256 = "1i5s9rrgbyss9rszq6c6y53hwqyw1k86s40cpsfx5ccl9bprxdgl";
   };
 
   postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";