[Pkg-privacy-commits] [libotr] 151/225: Imported Debian patch 3.2.1-1+deb7u1

[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 d73497fc024b89338114458c1773484b9714bba8
Author: intrigeri <intrigeri at debian.org>
Date:   Sun Dec 22 11:35:06 2013 +0100

    Imported Debian patch 3.2.1-1+deb7u1
---
 debian/changelog                    |  7 +++++++
 debian/patches/disable_otr_v1.patch | 39 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 07e344d..0999152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libotr (3.2.1-1+deb7u1) stable; urgency=medium
+
+  * Non-maintainer upload with maintainer's agreement.
+  * Disable insecure OTRv1 protocol (Closes: #725779)
+
+ -- intrigeri <intrigeri at debian.org>  Sun, 22 Dec 2013 11:35:06 +0100
+
 libotr (3.2.1-1) unstable; urgency=high
 
   * Fix potential buffer overflow in base64 routines (Closes: #684121)
diff --git a/debian/patches/disable_otr_v1.patch b/debian/patches/disable_otr_v1.patch
new file mode 100644
index 0000000..554f21e
--- /dev/null
+++ b/debian/patches/disable_otr_v1.patch
@@ -0,0 +1,39 @@
+Author: Rob Smits <rdfsmits at cs.uwaterloo.ca>
+Date: Sun Jun 3 22:38:05 2012 -0400
+Subject: Disable OTRv1 protocol.
+Origin: http://sourceforge.net/p/otr/libotr/ci/7ffba65fa42052795523924279bc94e7c80fb0f7/
+Bug: http://bugs.debian.org/725779
+Forwarded: not-needed
+Reviewed-by: intrigeri <intrigeri at debian.org>
+Last-Update: Sun Dec 22 11:30:00 2013 +0100
+Applied-Upstream: 4.0.0
+
+diff --git a/src/proto.h b/src/proto.h
+index d7b0ae6..e96e2f2 100644
+--- a/src/proto.h
++++ b/src/proto.h
+@@ -45,20 +45,17 @@ typedef unsigned int OtrlPolicy;
+ 
+ #define OTRL_POLICY_VERSION_MASK (OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2)
+ 
+-/* For v1 compatibility */
++/* Analogous to v1 policies */
+ #define OTRL_POLICY_NEVER			0x00
+ #define OTRL_POLICY_OPPORTUNISTIC \
+-	    ( OTRL_POLICY_ALLOW_V1 | \
+-	    OTRL_POLICY_ALLOW_V2 | \
++	    ( OTRL_POLICY_ALLOW_V2 | \
+ 	    OTRL_POLICY_SEND_WHITESPACE_TAG | \
+ 	    OTRL_POLICY_WHITESPACE_START_AKE | \
+ 	    OTRL_POLICY_ERROR_START_AKE )
+ #define OTRL_POLICY_MANUAL \
+-	    ( OTRL_POLICY_ALLOW_V1 | \
+-	    OTRL_POLICY_ALLOW_V2 )
++	    ( OTRL_POLICY_ALLOW_V2 )
+ #define OTRL_POLICY_ALWAYS \
+-	    ( OTRL_POLICY_ALLOW_V1 | \
+-	    OTRL_POLICY_ALLOW_V2 | \
++	    ( OTRL_POLICY_ALLOW_V2 | \
+ 	    OTRL_POLICY_REQUIRE_ENCRYPTION | \
+ 	    OTRL_POLICY_WHITESPACE_START_AKE | \
+ 	    OTRL_POLICY_ERROR_START_AKE )
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..394b845
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_otr_v1.patch

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