From eb6a290f5ea52b1037569f8aa0bd2f9dbfa894d7 Mon Sep 17 00:00:00 2001
From: Domen Kožar <domen@dev.si>
Date: Fri, 7 Mar 2014 15:12:27 +0100
Subject: bittorrentSync: 1.2.82 -> 1.2.91

---
 .../networking/bittorrentsync/default.nix          |  6 +-
 pkgs/development/libraries/gnutls/2.12.nix         | 64 ----------------------
 2 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 pkgs/development/libraries/gnutls/2.12.nix

diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index 895ebd7911be..c6277da704e1 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -14,9 +14,9 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  version = "1.2.82";
-  sha256 = if stdenv.system == "x86_64-linux" then "0cqrscav57xwz7rag6wy06xw6z7ca97xailprgg6jdjv4pnc91ra"
-    else if stdenv.system == "i686-linux" then "1b9rnfk0wkhj1zybvfqwgd9dcqnxwdnp7m0vf6lhrgi75cydj7is"
+  version = "1.2.91";
+  sha256 = if stdenv.system == "x86_64-linux" then "1rx5mmk3ffkh6dbm0m33nyx6spsxqjw9djclcf9x9bs3zfyzgmnd"
+    else if stdenv.system == "i686-linux" then "1566mp01149gsb57dv87420w1vq2f3adp6g1c90xdxjxzd67yqpw"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
 in stdenv.mkDerivation {
diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix
deleted file mode 100644
index 4a1332a7f155..000000000000
--- a/pkgs/development/libraries/gnutls/2.12.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle
-, guileBindings, guile, pkgconfig, perl }:
-
-assert guileBindings -> guile != null;
-
-stdenv.mkDerivation rec {
-
-  name = "gnutls-2.12.23";
-
-  src = fetchurl { # missing on standard mirrors
-    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/${name}.tar.bz2";
-    sha256 = "1lkys703z4yxfgzarmgas5ccvn6m254w9wvm7s8v0zkj81z7m9nz";
-  };
-
-  patches = [(fetchurl {
-    url = "http://anonscm.debian.org/viewvc/pkg-gnutls/packages/gnutls26/trunk/"
-      + "debian/patches/21_sanitycheck.diff?revision=1777&view=co";
-    sha256 = "0k18a7q6irmgjzp647bd18zccjpsr82n2s9arpamnkakgnny4ks9";
-    name = "CVE-2013-2116.patch";
-  })];
-
-  configurePhase = ''
-    patchShebangs .
-
-    ./configure --prefix="$out"                                 \
-      --disable-dependency-tracking --enable-fast-install       \
-      --with-lzo --with-libtasn1-prefix="${libtasn1}"		\
-      --without-p11-kit                                         \
-      ${if guileBindings
-        then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""
-        else ""}
-  '';
-
-  buildInputs = [ zlib lzo libtasn1 pkgconfig perl ]
-    ++ stdenv.lib.optional guileBindings guile;
-
-  propagatedBuildInputs = [ nettle ];
-
-  doCheck = true;
-
-  meta = {
-    description = "The GNU Transport Layer Security Library";
-
-    longDescription = ''
-       GnuTLS is a project that aims to develop a library which
-       provides a secure layer, over a reliable transport
-       layer. Currently the GnuTLS library implements the proposed
-       standards by the IETF's TLS working group.
-
-       Quoting from the TLS protocol specification:
-
-       "The TLS protocol provides communications privacy over the
-       Internet. The protocol allows client/server applications to
-       communicate in a way that is designed to prevent eavesdropping,
-       tampering, or message forgery."
-    '';
-
-    homepage = http://www.gnu.org/software/gnutls/;
-    license = "LGPLv2.1+";
-
-    maintainers = [ ];
-    broken = true; # CVE-2014-0092
-  };
-}
-- 
cgit 1.4.1