From b0db6da56a310d00621514fb597dc407982b03b8 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Wed, 1 Aug 2012 15:23:45 +0000
Subject: update to 2.10.6 change: fix for buffer overflow in MXit protocol
 (CVE-2012-3374)

---
 chat/libpurple/Makefile        | 3 +--
 chat/libpurple/Makefile.common | 6 +++---
 chat/libpurple/distinfo        | 8 ++++----
 chat/libpurple/options.mk      | 4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'chat')

diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index 776330661af..649c78910d4 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2012/06/14 07:43:40 sbd Exp $
+# $NetBSD: Makefile,v 1.44 2012/08/01 15:23:45 drochner Exp $
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
-PKGREVISION=	1
 
 COMMENT=	Multi-protocol Instant Messaging client backend
 
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 89f126c775a..5cc0f7162b3 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2012/05/15 13:07:28 obache Exp $
+# $NetBSD: Makefile.common,v 1.39 2012/08/01 15:23:45 drochner Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
@@ -6,7 +6,7 @@
 # used by chat/pidgin-sametime/Makefile
 # used by chat/pidgin-silc/Makefile
 
-PIDGIN_VERSION=	2.10.4
+PIDGIN_VERSION=	2.10.6
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--disable-gevolution
 CONFIGURE_ARGS+=	--disable-gtkui
 CONFIGURE_ARGS+=	--disable-consoleui
 CONFIGURE_ARGS+=	--disable-meanwhile
-CONFIGURE_ARGS+=	--disable-farsight
+CONFIGURE_ARGS+=	--disable-farstream
 CONFIGURE_ARGS+=	--disable-gstreamer
 CONFIGURE_ARGS+=	--disable-avahi
 CONFIGURE_ARGS+=	--disable-perl
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index ba441b22e20..786465b5ce9 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.35 2012/05/15 13:07:28 obache Exp $
+$NetBSD: distinfo,v 1.36 2012/08/01 15:23:46 drochner Exp $
 
-SHA1 (pidgin-2.10.4.tar.bz2) = f9ce34e69f97bcd1bb216aefb6d687b5b47f0796
-RMD160 (pidgin-2.10.4.tar.bz2) = 5193a7f5dbd122198d474bd7e11dc9bf307befb3
-Size (pidgin-2.10.4.tar.bz2) = 9970850 bytes
+SHA1 (pidgin-2.10.6.tar.bz2) = a0532e7ba2acd205d6a5a4e3624156a980fe3d43
+RMD160 (pidgin-2.10.6.tar.bz2) = 507d64cb719129196c887953edef552db326e805
+Size (pidgin-2.10.6.tar.bz2) = 10007092 bytes
 SHA1 (patch-aa) = a41353bbcb742b4127a33b3026f87a79f406da29
 SHA1 (patch-libpurple_protocols_gg_lib_libgadu.h) = 5756134e17ae2ce28d3555cd40354245e22a5bd6
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index ca550c2ca4d..1a8b242accc 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2012/04/25 16:27:50 drochner Exp $
+# $NetBSD: options.mk,v 1.21 2012/08/01 15:23:46 drochner Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libpurple
 PKG_SUPPORTED_OPTIONS+=		avahi dbus debug farsight gnome gnutls
@@ -84,7 +84,7 @@ PLIST.vv=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mfarsight)
-CONFIGURE_ARGS+=	--enable-farsight
+CONFIGURE_ARGS+=	--enable-farstream
 .  include "../../multimedia/farsight2/buildlink3.mk"
 .endif
 
-- 
cgit v1.2.3