[Pkg-privacy-commits] [libotr] 159/225: Imported Debian patch 4.0.0-2.1

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository libotr.

commit f790f312f271f122a069497a61f0a19b5a40ba1a
Author: Micah Anderson <micah at debian.org>
Date:   Sat Mar 9 13:14:12 2013 -0500

    Imported Debian patch 4.0.0-2.1
---
 debian/changelog                          |  7 +++++++
 debian/patches/message_fragment_fix.patch | 16 ++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 113c03c..59a0bc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libotr (4.0.0-2.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Add message_fragment_fix.patch (Closes: #698746)
+
+ -- Micah Anderson <micah at debian.org>  Sat, 09 Mar 2013 13:14:12 -0500
+
 libotr (4.0.0-2) unstable; urgency=low
 
   * Remove Conflicts with libotr2 (Closes: #689667)
diff --git a/debian/patches/message_fragment_fix.patch b/debian/patches/message_fragment_fix.patch
new file mode 100644
index 0000000..554e335
--- /dev/null
+++ b/debian/patches/message_fragment_fix.patch
@@ -0,0 +1,16 @@
+Pass opdata when sending message fragment
+
+The inject_message callback was missing the opdata when sending message
+fragments.
+
+--- 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);
+ 	    }
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0f5a01c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+message_fragment_fix.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git