Pullup ticket 372 - requested by Julio M. Merino Vidal

security fix for gaim

Patch provided by submitter.

version 1.1.4 (2/24/2005):
	* Fixed a bug where Yahoo! would lose messages (and any other packet
	  really)
	* Correctly show the time when incoming Gadu-Gadu messages were sent
	  (Carl-Daniel Hailfinger)
	* Fixed crashes with glib 2.6
	* Fixed MSN crash when conversations time out after the conversation
	  window was closed
	* Fixed an html parsing bug, CAN-2005-0208

version 1.1.3 (2/17/2005):
	* CHAP authentication support for SOCKS5 proxies (Malcolm Smith)
	* ICQ offline messages are sent using your specified character
	  set instead of Unicode (Magnus Hult)
	* MSN HTTP method works with proxies using authentication (Bastien
	  Durel)
	* Really fix the bug where buddies show as logged in for 49 thousand
	  days
	* Buddy pounces containing '&' are saved correctly
	* Improved MSN error handling when the servers are unavailable
	* More MSN bug fixes
	* Fix some leaks
	* Fix "Find" in the log viewer so that it finds in all logs
	* Smileys not appearing at the end of lines has been fixed
	* Closing conversation windows no longer cancels active file transfers
	  on MSN (Felipe Contreras)

version 1.1.2 (1/20/2005):
	* MSN 'HTTP Method' fixed (Felipe Contreras)
	* Better handling of MSN's Individuals group and buddy status updates
	  (Felipe Contreras)
	* Fix a crash inviting MSN user to a chat when they're already there
	* AIM SecurID login support
	* Fix configuration of Jabber chat rooms on some servers
	* More MSN bug fixes (Felipe Contreras)
	* Fix queue messages to Docklet when not globally away (Robert McQueen)
	* Fix some leaks
	* The Autopackage now builds both the mozilla-nss and the gnutls
	  ssl plugins, and requires at least one of those libraries.

version 1.1.1 (12/28/2004):
	* Allow SILC authentication via public key if your key is password
	  protected (Michele Baldessari)
	* More MSN bug fixes (Felipe Contreras)
	* Drag-and-drop to conversation window file transfers work again
	* Disable the delete button on pounces that aren't saved yet anyway
	  (Kevin Stange)

3 files changed, 9 insertions, 6 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 9f1c3e2ad12..13315fd99bf 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2004/12/10 02:51:46 dogcow Exp $
+# $NetBSD: Makefile,v 1.76.2.1 2005/03/19 15:11:07 salo Exp $
 
-DISTNAME=	gaim-1.1.0
+DISTNAME=	gaim-1.1.4
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index 04ade06b8d9..8b3e0d8e360 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2004/12/03 12:43:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.36.2.1 2005/03/19 15:11:07 salo Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim/account.h
@@ -123,6 +123,7 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/my_MM/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
@@ -132,10 +133,12 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index fd80d79d16d..07543abe0af 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.55 2004/12/03 12:43:24 adam Exp $
+$NetBSD: distinfo,v 1.55.2.1 2005/03/19 15:11:07 salo Exp $
 
-SHA1 (gaim-1.1.0.tar.bz2) = 378fefb19c7b9dcdd2df2a502460e14ea5a01a89
-Size (gaim-1.1.0.tar.bz2) = 4849702 bytes
+SHA1 (gaim-1.1.4.tar.bz2) = ef4061f2f7413b18c4ea59da10b9f0837df20054
+Size (gaim-1.1.4.tar.bz2) = 5195580 bytes
 SHA1 (patch-aa) = 80834ca5fdbc864e98c0179248e446bee24681c5
 SHA1 (patch-ac) = 9cb0f91f58a556f44de84819e9c15083f012abbc
 SHA1 (patch-ad) = e3c71479caeeebe287bcd063e5b8e470832a0c08