diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2014-02-11 11:55:59 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2014-02-11 12:32:47 +0100 |
| commit | 248161ffeb5ff1ceb61855c88b21a1ab547e1235 (patch) | |
| tree | 9c2a91c2e46a95d270bd9f13b7c125af9446ceb3 /pkgs/development/libraries/libotr | |
| parent | f2a7622a6d29e7f97d1153d3f4c9485e42c2a55d (diff) | |
Updating irssi_otr and libotr to the latest master versions.
According to their few additional commit logs, it's worth it.
I also set libotr to use the latest libgcrypt, related to a comment
in libotr commit. They talk about a libgcrypt fix that will have
more chances to be in the latest libgcrypt.
Diffstat (limited to 'pkgs/development/libraries/libotr')
| -rw-r--r-- | pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch | 29 | ||||
| -rw-r--r-- | pkgs/development/libraries/libotr/default.nix | 23 |
2 files changed, 9 insertions, 43 deletions
diff --git a/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch b/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch deleted file mode 100644 index 2b39d1fee9a4..000000000000 --- a/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dc5f05eb934ebd285e01febb9a4018512db702b1 Mon Sep 17 00:00:00 2001 -From: David Goulet <dgoulet@ev0ke.net> -Date: Sat, 19 Jan 2013 15:53:23 -0500 -Subject: [PATCH] Fix: pass opdata when sending message fragment - -The inject_message callback was missing the opdata when sending message -fragments. - -Signed-off-by: David Goulet <dgoulet@ev0ke.net> ---- - src/message.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/message.c b/src/message.c -index 7c39529..aa71df2 100644 ---- a/src/message.c -+++ b/src/message.c -@@ -441,7 +441,7 @@ fragment: - /* Fragment and send according to policy */ - if (!err && messagep && *messagep) { - if (context) { -- err = fragment_and_send(ops, NULL, context, *messagep, -+ err = fragment_and_send(ops, opdata, context, *messagep, - fragPolicy, messagep); - } - } --- -1.7.10.4 - diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index d737b8d9916e..560b807dbaf5 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -1,23 +1,18 @@ -{stdenv, fetchurl, libgcrypt}: +{stdenv, fetchgit, libgcrypt, autoconf, automake, libtool}: stdenv.mkDerivation rec { - name = "libotr-4.0.0"; - src = fetchurl { - urls = [ - "http://www.cypherpunks.ca/otr/${name}.tar.gz" - # The site is down at the time of updating to 4.0.0, so I add this url - http://ftp.de.debian.org/debian/pool/main/libo/libotr/libotr_4.0.0.orig.tar.gz - ]; - sha256 = "3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4"; + name = "libotr-20130821-git-f0f8a2"; + src = fetchgit { + url = "http://git.code.sf.net/p/otr/libotr"; + rev = "f0f8a2"; + sha256 = "08019r8bnk8f4yx6574jdz217p283ry7dmpqcad2d87yhkdmc3mm"; }; - # Crashes without it, still not accepted upstream. - # Discussed in https://github.com/cryptodotis/irssi-otr/issues/21 - patches = [ ./0001-Fix-pass-opdata-when-sending-message-fragment.patch ]; - NIX_LDFLAGS = "-lssp"; - propagatedBuildInputs = [ libgcrypt ]; + propagatedBuildInputs = [ libgcrypt autoconf automake libtool ]; + + preConfigure = "autoreconf -vfi"; meta = { homepage = "http://www.cypherpunks.ca/otr/"; |