From 8c1d83187724c0637f48853f7edfdc4fc7488c45 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Mon, 13 Feb 2017 18:26:02 -0300
Subject: kdenetwork-kopete-16.12.2-2.parabola1{,.nonprism1}: fix CVE-2017-5593

---
 libre/kdenetwork-kopete/PKGBUILD | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'libre/kdenetwork-kopete/PKGBUILD')

diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD
index 603c778ed..9206a4956 100644
--- a/libre/kdenetwork-kopete/PKGBUILD
+++ b/libre/kdenetwork-kopete/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 288283 2017-02-09 11:21:12Z arojas $
+# $Id: PKGBUILD 288746 2017-02-12 14:20:09Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=kdenetwork-kopete
 pkgver=16.12.2
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 pkgdesc='Instant Messenger, without nonfree Skype support'
 url='http://kde.org/applications/internet/kopete/'
 arch=('i686' 'x86_64' 'armv7h')
@@ -17,15 +17,17 @@ conflicts=(${pkgname}-libre)
 depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'kdepimlibs4')
 makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer' 'libgadu' 'jsoncpp')
 optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig} kopete-mediastreamer2.14.patch)
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig} kopete-mediastreamer2.14.patch
+        CVE-2017-5593.patch::"https://cgit.kde.org/kopete.git/patch/?id=6243764c")
 sha1sums=('2db7a06b424edeb20571115b6d66f2f639562c56'
           'SKIP'
-          'b284ffb226cbcc0da6540ecd978d37287aa6eddb')
+          'b284ffb226cbcc0da6540ecd978d37287aa6eddb'
+          '1ce697b8fe41f86b56d31a16220319e8c1478c52')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org>
 
 prepare() {
   cd kopete-$pkgver
-  # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
+# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
   rm -rv protocols/skype
   sed 's/, Skype//' -i doc/index.docbook
   cd ..
@@ -34,6 +36,8 @@ prepare() {
 # Fix build with mediastreamer 2.14
   cd kopete-$pkgver
   patch -p1 -i ../kopete-mediastreamer2.14.patch
+# Fix CVE-2017-5593
+  patch -p1 -i ../CVE-2017-5593.patch
 }
 
 build() {
-- 
cgit v1.2.3