Update pidgin IM suite to version 2.2.1 during freeze to fix the DoS

vulnerability CVE-2007-4996:
"MSN nudges sent from unknown buddies can cause libpurple to crash"

Other changes:

libpurple:
* A few build issues on Solaris were fixed.
* Cancelling the password prompt for an account will no longer leave
  it in an ambiguous state.  (It will be disabled.)
* Fixed an erroneous size display for MSN file transfers. (galt)
* Fixed multiple memory leaks, particularly in XMPP and MySpace protocols
* Fixed remembering proxy preferences and status scores
* Gmail notifications are better tracked

Pidgin:
* Fixed keyboard tab reordering to move tabs one step instead of two.
* You should no longer lose proxy settings when Pidgin is restarted.
* Fixed detection of X11 when compiling

Finch:
* Pressing 'Insert' in the buddylist will bring up the 'Add Buddy'
dialog.

6 files changed, 32 insertions, 31 deletions

diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 3288486869d..29a9b310fbf 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.5 2007/09/15 14:55:01 tnn Exp $
+# $NetBSD: Makefile.common,v 1.6 2007/09/30 13:47:02 tnn Exp $
 #
 
-PIDGIN_VERSION=	2.2.0
+PIDGIN_VERSION=	2.2.1
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index bcec783a61e..2fe8576462f 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/09/15 14:55:02 tnn Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/09/30 13:47:02 tnn Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -116,6 +116,7 @@ share/locale/ka/LC_MESSAGES/pidgin.mo
 share/locale/kn/LC_MESSAGES/pidgin.mo
 share/locale/ko/LC_MESSAGES/pidgin.mo
 share/locale/ku/LC_MESSAGES/pidgin.mo
+share/locale/lo/LC_MESSAGES/pidgin.mo
 share/locale/lt/LC_MESSAGES/pidgin.mo
 share/locale/mk/LC_MESSAGES/pidgin.mo
 share/locale/my_MM/LC_MESSAGES/pidgin.mo
@@ -134,7 +135,7 @@ share/locale/sk/LC_MESSAGES/pidgin.mo
 share/locale/sl/LC_MESSAGES/pidgin.mo
 share/locale/sq/LC_MESSAGES/pidgin.mo
 share/locale/sr/LC_MESSAGES/pidgin.mo
-share/locale/sr@Latn/LC_MESSAGES/pidgin.mo
+share/locale/sr@latin/LC_MESSAGES/pidgin.mo
 share/locale/sv/LC_MESSAGES/pidgin.mo
 share/locale/ta/LC_MESSAGES/pidgin.mo
 share/locale/te/LC_MESSAGES/pidgin.mo
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index ae6c65fb802..b83c0f170a5 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2007/09/15 14:55:02 tnn Exp $
+$NetBSD: distinfo,v 1.9 2007/09/30 13:47:02 tnn Exp $
 
-SHA1 (pidgin-2.2.0.tar.bz2) = b6762d5d7865587bfe0d87f95285d60cd8c667a1
-RMD160 (pidgin-2.2.0.tar.bz2) = 7b99cee79cfcd3cd1536636f381830cc18d0b8f9
-Size (pidgin-2.2.0.tar.bz2) = 8101465 bytes
-SHA1 (patch-aa) = 39cabf6d8f4bf9519cd523519c8dd7851a0c72cd
+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 (patch-aa) = 3d3282be44c933d015c75b0785b4d5582c216383
 SHA1 (patch-ab) = 5f1fc87cc258de372fbdf521aeb6822f50506090
-SHA1 (patch-ae) = 82cc41e44609480f30062f922ca6001d57336862
+SHA1 (patch-ae) = ff4f2d738656c6f23c423046f746b9ed2878c415
 SHA1 (patch-af) = 665d5207afdc3ec9b627ac7cc7f99e75d4382877
-SHA1 (patch-ag) = 79a9e88be709f351dd25507b7c588891ff97d99f
+SHA1 (patch-ag) = fa71295e848f1b06f318f06fab8fcc90110c20a3
diff --git a/chat/libpurple/patches/patch-aa b/chat/libpurple/patches/patch-aa
index 240c1b5fa69..2f270565769 100644
--- a/chat/libpurple/patches/patch-aa
+++ b/chat/libpurple/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2007/09/15 14:55:02 tnn Exp $
+$NetBSD: patch-aa,v 1.7 2007/09/30 13:47:03 tnn Exp $
 
---- configure.orig	2007-09-14 09:31:39.000000000 +0200
+--- configure.orig	2007-09-29 18:40:51.000000000 +0200
 +++ configure
-@@ -20053,6 +20053,11 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -19940,6 +19940,11 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
  
  
  
@@ -14,15 +14,15 @@ $NetBSD: patch-aa,v 1.6 2007/09/15 14:55:02 tnn Exp $
  # Use the tools built into the package, not the ones that are installed.
  INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
  
-@@ -20123,6 +20128,7 @@ echo "$as_me: error: XML::Parser perl mo
-    { (exit 1); exit 1; }; }
-    fi
+@@ -20173,6 +20178,7 @@ else
+   { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
  fi
 +fi # pkgsrc
  
- # Substitute ALL_LINGUAS so we can use it in po/Makefile
  
-@@ -28428,7 +28434,7 @@ if test "${ac_cv_lib_panel_update_panels
+ 
+@@ -28484,7 +28490,7 @@ if test "${ac_cv_lib_panel_update_panels
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.6 2007/09/15 14:55:02 tnn Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28484,7 +28490,7 @@ fi
+@@ -28540,7 +28546,7 @@ fi
  { echo "$as_me:$LINENO: result: $ac_cv_lib_panel_update_panels" >&5
  echo "${ECHO_T}$ac_cv_lib_panel_update_panels" >&6; }
  if test $ac_cv_lib_panel_update_panels = yes; then
diff --git a/chat/libpurple/patches/patch-ae b/chat/libpurple/patches/patch-ae
index 1a6f9a993e1..7ecba8b150d 100644
--- a/chat/libpurple/patches/patch-ae
+++ b/chat/libpurple/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1.1.1 2007/07/28 12:10:45 gdt Exp $
+$NetBSD: patch-ae,v 1.2 2007/09/30 13:47:03 tnn Exp $
 
   man pages for pidgin or finch only in the respective packages
 
---- doc/Makefile.in.orig	2007-06-03 14:36:13.000000000 +0200
+--- doc/Makefile.in.orig	2007-09-29 18:40:53.000000000 +0200
 +++ doc/Makefile.in
-@@ -386,7 +386,8 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
+@@ -300,7 +300,8 @@ target_os = @target_os@
  target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -man_MANS = pidgin.1 finch.1
 +@ENABLE_GTK_TRUE@man_MANS = pidgin.1
 +@ENABLE_GNT_TRUE@man_MANS += finch.1
diff --git a/chat/libpurple/patches/patch-ag b/chat/libpurple/patches/patch-ag
index 9f630b461fd..03933300490 100644
--- a/chat/libpurple/patches/patch-ag
+++ b/chat/libpurple/patches/patch-ag
@@ -1,16 +1,16 @@
-$NetBSD: patch-ag,v 1.2 2007/09/15 14:55:02 tnn Exp $
+$NetBSD: patch-ag,v 1.3 2007/09/30 13:47:03 tnn Exp $
 
   The default rule has a broken syntax for some reason, when not using
   the intltool that comes bundled with pidgin.
 
---- libpurple/gconf/Makefile.in.orig	2007-09-15 15:41:50.000000000 +0200
+--- libpurple/gconf/Makefile.in.orig	2007-09-29 18:40:54.000000000 +0200
 +++ libpurple/gconf/Makefile.in
-@@ -593,7 +593,8 @@ uninstall-am: uninstall-info-am uninstal
- 	ps ps-am uninstall uninstall-am uninstall-info-am \
- 	uninstall-schemaDATA
+@@ -496,7 +496,8 @@ uninstall-am: uninstall-schemaDATA
+ 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ 	ps ps-am uninstall uninstall-am uninstall-schemaDATA
  
 -@INTLTOOL_SCHEMAS_RULE@
-+%.schemas:   %.schemas.in
++%.schemas:  %.schemas.in
 +	LC_ALL=C intltool-merge -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
  
  @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: