Pullup ticket 2219 - requested by tnn

security update for libpurple/pidgin/finch

- pkgsrc/chat/finch/Makefile				1.9
- pkgsrc/chat/finch/PLIST				1.4
- pkgsrc/chat/libpurple/Makefile.common			1.7
- pkgsrc/chat/libpurple/PLIST				1.7
- pkgsrc/chat/libpurple/buildlink3.mk			1.4
- pkgsrc/chat/libpurple/distinfo			1.10
- pkgsrc/chat/pidgin/buildlink3.mk			1.4
- pkgsrc/chat/pidgin/distinfo				1.6

   Module Name:	pkgsrc
   Committed By:	tnn
   Date:		Sat Nov  3 15:59:18 UTC 2007

   Modified Files:
	   pkgsrc/chat/finch: Makefile PLIST
	   pkgsrc/chat/libpurple: Makefile.common PLIST buildlink3.mk
   distinfo pkgsrc/chat/pidgin: buildlink3.mk
	   pkgsrc/chat/pidgin-silc: distinfo

   Log Message:
   Update pidgin IM suite to 2.2.2 for the CVE-2007-4999 fix.
   (A remote user can cause a DoS by sending a message with invalid HTML.)

   version 2.2.2 (10/23/2007):
    http://developer.pidgin.im/query?status=closed&milestone=2.2.2
    NOTE: Due to the way this release was made, it is possible that
    bugs marked as fixed in 2.2.1 or 2.2.2 will not be fixed
    until the next release.
    * Various bug and memory leak fixes

8 files changed, 20 insertions, 17 deletions

diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index d31cd693860..8a571828b06 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/09/25 10:03:52 hira Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2007/11/04 14:25:32 ghen Exp $
 #
 
 PKGNAME=	finch-${PIDGIN_VERSION}
@@ -11,6 +11,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	msgfmt
 
+PKGCONFIG_OVERRIDE+=	finch/finch.pc.in
 PKGCONFIG_OVERRIDE+=	finch/libgnt/gnt.pc.in
 PKGCONFIG_OVERRIDE+=	gaim.pc.in
 PKGCONFIG_OVERRIDE+=	libpurple/purple.pc.in
diff --git a/chat/finch/PLIST b/chat/finch/PLIST
index 3a8c39c6fde..a6f1813cb92 100644
--- a/chat/finch/PLIST
+++ b/chat/finch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/09/15 14:55:01 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3.2.1 2007/11/04 14:25:33 ghen Exp $
 bin/finch
 include/finch/finch.h
 include/finch/gntaccount.h
@@ -50,6 +50,7 @@ lib/finch/gntlastlog.la
 lib/libgnt.la
 lib/gnt/s.la
 lib/gnt/irssi.la
+lib/pkgconfig/finch.pc
 lib/pkgconfig/gnt.pc
 man/man1/finch.1
 @dirrm include/finch
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 29a9b310fbf..d960f3839e3 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2007/09/30 13:47:02 tnn Exp $
+# $NetBSD: Makefile.common,v 1.6.2.1 2007/11/04 14:25:33 ghen Exp $
 #
 
-PIDGIN_VERSION=	2.2.1
+PIDGIN_VERSION=	2.2.2
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index 2fe8576462f..dff59a6d714 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/09/30 13:47:02 tnn Exp $
+@comment $NetBSD: PLIST,v 1.6.2.1 2007/11/04 14:25:33 ghen Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -149,6 +149,7 @@ share/locale/zh_HK/LC_MESSAGES/pidgin.mo
 share/locale/zh_TW/LC_MESSAGES/pidgin.mo
 share/purple/ca-certs/Equifax_Secure_CA.pem
 share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
+share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
 share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
 share/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
 share/sounds/purple/alert.wav
diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk
index dd650128514..254e8d2383e 100644
--- a/chat/libpurple/buildlink3.mk
+++ b/chat/libpurple/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/08/13 12:42:06 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3.2.1 2007/11/04 14:25:33 ghen Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPURPLE_BUILDLINK3_MK:=	${LIBPURPLE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libpurple
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpurple
 
 .if ${LIBPURPLE_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libpurple+=	libpurple>=2.1.0
+BUILDLINK_API_DEPENDS.libpurple+=	libpurple>=2.2.2
 BUILDLINK_PKGSRCDIR.libpurple?=	../../chat/libpurple
 .endif	# LIBPURPLE_BUILDLINK3_MK
 
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index b83c0f170a5..80400c0f6c4 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2007/09/30 13:47:02 tnn Exp $
+$NetBSD: distinfo,v 1.9.2.1 2007/11/04 14:25:33 ghen Exp $
 
-SHA1 (pidgin-2.2.1.tar.bz2) = 2dc920b156a2ba559108042ac2178f3bb8282e8e
-RMD160 (pidgin-2.2.1.tar.bz2) = 6fa217ad5d55ea8e5c5f06322528c5c06e3b8faa
-Size (pidgin-2.2.1.tar.bz2) = 8882043 bytes
+SHA1 (pidgin-2.2.2.tar.bz2) = ff955c3a2509d257c7fda1a48af6bdde439b0d8a
+RMD160 (pidgin-2.2.2.tar.bz2) = 1f067d84c1b8545ab1c4841c30fb3db2a3fac309
+Size (pidgin-2.2.2.tar.bz2) = 8901875 bytes
 SHA1 (patch-aa) = 3d3282be44c933d015c75b0785b4d5582c216383
 SHA1 (patch-ab) = 5f1fc87cc258de372fbdf521aeb6822f50506090
 SHA1 (patch-ae) = ff4f2d738656c6f23c423046f746b9ed2878c415
diff --git a/chat/pidgin-silc/distinfo b/chat/pidgin-silc/distinfo
index dd2beb3cbf0..671e5607371 100644
--- a/chat/pidgin-silc/distinfo
+++ b/chat/pidgin-silc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/09/30 13:47:03 tnn Exp $
+$NetBSD: distinfo,v 1.5.2.1 2007/11/04 14:25:34 ghen Exp $
 
-SHA1 (pidgin-2.2.1.tar.bz2) = 2dc920b156a2ba559108042ac2178f3bb8282e8e
-RMD160 (pidgin-2.2.1.tar.bz2) = 6fa217ad5d55ea8e5c5f06322528c5c06e3b8faa
-Size (pidgin-2.2.1.tar.bz2) = 8882043 bytes
+SHA1 (pidgin-2.2.2.tar.bz2) = ff955c3a2509d257c7fda1a48af6bdde439b0d8a
+RMD160 (pidgin-2.2.2.tar.bz2) = 1f067d84c1b8545ab1c4841c30fb3db2a3fac309
+Size (pidgin-2.2.2.tar.bz2) = 8901875 bytes
 SHA1 (silc-toolkit-1.1.2.tar.gz) = 7a68acc2e819d6f4f02bf28d02daf191d41693e4
 RMD160 (silc-toolkit-1.1.2.tar.gz) = e03045ae82679f9062e4e94e8fb131f1a9043a48
 Size (silc-toolkit-1.1.2.tar.gz) = 2678868 bytes
diff --git a/chat/pidgin/buildlink3.mk b/chat/pidgin/buildlink3.mk
index 15814f1e6ff..088f98fd442 100644
--- a/chat/pidgin/buildlink3.mk
+++ b/chat/pidgin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/08/04 14:01:38 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3.2.1 2007/11/04 14:25:33 ghen Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PIDGIN_BUILDLINK3_MK:=	${PIDGIN_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	pidgin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pidgin
 
 .if ${PIDGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.pidgin+=	pidgin>=2.0.1nb1
+BUILDLINK_API_DEPENDS.pidgin+=	pidgin>=2.2.2
 BUILDLINK_PKGSRCDIR.pidgin?=	../../chat/pidgin
 .endif	# PIDGIN_BUILDLINK3_MK