Date: Monday, March 24, 2014 @ 22:36:46 Author: bpiotrowski Revision: 108212
archrelease: copy trunk to community-i686, community-x86_64 Added: profanity/repos/community-i686/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch (from rev 108211, profanity/trunk/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch) profanity/repos/community-i686/PKGBUILD (from rev 108211, profanity/trunk/PKGBUILD) profanity/repos/community-x86_64/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch (from rev 108211, profanity/trunk/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch) profanity/repos/community-x86_64/PKGBUILD (from rev 108211, profanity/trunk/PKGBUILD) Deleted: profanity/repos/community-i686/PKGBUILD profanity/repos/community-x86_64/PKGBUILD ------------------------------------------------------------------------------+ /PKGBUILD | 68 ++++++++++ community-i686/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch | 32 ++++ community-i686/PKGBUILD | 31 ---- community-x86_64/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch | 32 ++++ community-x86_64/PKGBUILD | 31 ---- 5 files changed, 132 insertions(+), 62 deletions(-) Copied: profanity/repos/community-i686/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch (from rev 108211, profanity/trunk/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch) =================================================================== --- community-i686/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch (rev 0) +++ community-i686/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch 2014-03-24 21:36:46 UTC (rev 108212) @@ -0,0 +1,32 @@ +From 9815ef3b02dfc05ed2e2dbe40d017b91f4f4fa41 Mon Sep 17 00:00:00 2001 +From: James Booth <boot...@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 + Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-03-24 21:36:31 UTC (rev 108211) +++ community-i686/PKGBUILD 2014-03-24 21:36:46 UTC (rev 108212) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: jason ryan <jasonwr...@gmail.com> - -pkgname=profanity -pkgver=0.4.0.rc1 -pkgrel=1 -pkgdesc='Console based XMPP client' -arch=('i686' 'x86_64') -url='http://www.profanity.im' -license=('GPL3') -depends=('curl' 'expat' 'glib2' 'libotr') -makedepends=('doxygen' 'libstrophe') -source=(https://github.com/boothj5/profanity/archive/$pkgver.tar.gz) -md5sums=('1b96b279bced5896c223d088c99c0ca6') - -prepare() { - cd $pkgname-$pkgver - sed -i '21s/development/release/' configure.ac - autoreconf -fi -} - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - make -C $pkgname-$pkgver DESTDIR="$pkgdir" install -} Copied: profanity/repos/community-i686/PKGBUILD (from rev 108211, profanity/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-03-24 21:36:46 UTC (rev 108212) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: jason ryan <jasonwr...@gmail.com> + +pkgname=profanity +pkgver=0.4.0.rc1 +pkgrel=2 +pkgdesc='Console based XMPP client' +arch=('i686' 'x86_64') +url='http://www.profanity.im' +license=('GPL3') +depends=('curl' 'expat' 'glib2' 'libotr') +makedepends=('doxygen' 'libstrophe') +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 +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + make -C $pkgname-$pkgver DESTDIR="$pkgdir" install +} Copied: profanity/repos/community-x86_64/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch (from rev 108211, profanity/trunk/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch) =================================================================== --- community-x86_64/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch (rev 0) +++ community-x86_64/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch 2014-03-24 21:36:46 UTC (rev 108212) @@ -0,0 +1,32 @@ +From 9815ef3b02dfc05ed2e2dbe40d017b91f4f4fa41 Mon Sep 17 00:00:00 2001 +From: James Booth <boot...@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 + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2014-03-24 21:36:31 UTC (rev 108211) +++ community-x86_64/PKGBUILD 2014-03-24 21:36:46 UTC (rev 108212) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: jason ryan <jasonwr...@gmail.com> - -pkgname=profanity -pkgver=0.4.0.rc1 -pkgrel=1 -pkgdesc='Console based XMPP client' -arch=('i686' 'x86_64') -url='http://www.profanity.im' -license=('GPL3') -depends=('curl' 'expat' 'glib2' 'libotr') -makedepends=('doxygen' 'libstrophe') -source=(https://github.com/boothj5/profanity/archive/$pkgver.tar.gz) -md5sums=('1b96b279bced5896c223d088c99c0ca6') - -prepare() { - cd $pkgname-$pkgver - sed -i '21s/development/release/' configure.ac - autoreconf -fi -} - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - make -C $pkgname-$pkgver DESTDIR="$pkgdir" install -} Copied: profanity/repos/community-x86_64/PKGBUILD (from rev 108211, profanity/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-03-24 21:36:46 UTC (rev 108212) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: jason ryan <jasonwr...@gmail.com> + +pkgname=profanity +pkgver=0.4.0.rc1 +pkgrel=2 +pkgdesc='Console based XMPP client' +arch=('i686' 'x86_64') +url='http://www.profanity.im' +license=('GPL3') +depends=('curl' 'expat' 'glib2' 'libotr') +makedepends=('doxygen' 'libstrophe') +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 +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + make -C $pkgname-$pkgver DESTDIR="$pkgdir" install +}