[arch-commits] Commit in profanity/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Monday, March 24, 2014 @ 22:36:31
  Author: bpiotrowski
Revision: 108211

upgpkg: profanity 0.4.0.rc1-2

enforce OTR spec v2

Added:
  profanity/trunk/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch
Modified:
  profanity/trunk/PKGBUILD

-------------------------------------------------------------+
 0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch |   32 ++++++++++
 PKGBUILD                                                    |    9 +-
 2 files changed, 38 insertions(+), 3 deletions(-)

Added: 0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch
===================================================================
--- 0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch	                        (rev 0)
+++ 0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch	2014-03-24 21:36:31 UTC (rev 108211)
@@ -0,0 +1,32 @@
+From 9815ef3b02dfc05ed2e2dbe40d017b91f4f4fa41 Mon Sep 17 00:00:00 2001
+From: James Booth <boothj5 at gmail.com>
+Date: Mon, 24 Mar 2014 21:02:10 +0000
+Subject: [PATCH] Change libotr 4.0.0 code to use only OTR spec v2
+
+---
+ src/otr/otrlibv4.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/otr/otrlibv4.c b/src/otr/otrlibv4.c
+index 80013af..01afa86 100644
+--- a/src/otr/otrlibv4.c
++++ b/src/otr/otrlibv4.c
+@@ -29,13 +29,13 @@
+ OtrlPolicy
+ otrlib_policy(void)
+ {
+-    return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2 | OTRL_POLICY_ALLOW_V3;
++    return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2;
+ }
+ 
+ char *
+ otrlib_start_query(void)
+ {
+-    return "?OTR?v23?";
++    return "?OTR?v2?";
+ }
+ 
+ static const char*
+-- 
+1.9.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-24 21:36:00 UTC (rev 108210)
+++ PKGBUILD	2014-03-24 21:36:31 UTC (rev 108211)
@@ -4,7 +4,7 @@
 
 pkgname=profanity
 pkgver=0.4.0.rc1
-pkgrel=1
+pkgrel=2
 pkgdesc='Console based XMPP client'
 arch=('i686' 'x86_64')
 url='http://www.profanity.im'
@@ -11,12 +11,15 @@
 license=('GPL3')
 depends=('curl' 'expat' 'glib2' 'libotr')
 makedepends=('doxygen' 'libstrophe')
-source=(https://github.com/boothj5/profanity/archive/$pkgver.tar.gz)
-md5sums=('1b96b279bced5896c223d088c99c0ca6')
+source=(https://github.com/boothj5/profanity/archive/$pkgver.tar.gz
+        0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch)
+md5sums=('1b96b279bced5896c223d088c99c0ca6'
+         'e957a737bb9d9f456f0b602815e6fe1e')
 
 prepare() {
   cd $pkgname-$pkgver
   sed -i '21s/development/release/' configure.ac
+  patch -p1 -i ../0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch
   autoreconf -fi
 }