Pullup ticket 427 - requested by Lubomir Sedlacik

security fix for gaim

Revisions pulled up:
- pkgsrc/chat/gaim/Makefile		1.82, 1.83
- pkgsrc/chat/gaim/PLIST		1.38
- pkgsrc/chat/gaim/distinfo		1.62, 1.63
- pkgsrc/chat/gaim/buildlink3.mk	1.4


    Module Name:    pkgsrc
    Committed By:   jmmv
    Date:           Tue Mar 22 09:47:47 UTC 2005

    Modified Files:
            pkgsrc/chat/gaim: Makefile distinfo
    Added Files:
            pkgsrc/chat/gaim/patches: patch-ab

    Log Message:
    Update to 1.2.0.
    Patch provided by Matthew Luckie (maintainer) in PR pkg/29752.

    * Yahoo file receiving and buddy icon receiving work again.
    * Limit animated buddy icon frame rates to 10 frames per second
      (Nathan Conrad)
    * Fix a bug where portions of your account configuration would fail to be
      read correctly if you set a proxy user name or password containing invalid
      XML characters such as < and > (Bastien Durel)
    * Yahoo! privacy improvements (Bleeter)
----
    Module Name:    pkgsrc
    Committed By:   salo
    Date:           Tue Apr  5 09:50:06 UTC 2005

    Modified Files:
            pkgsrc/chat/gaim: Makefile PLIST distinfo
    Removed Files:
            pkgsrc/chat/gaim/patches: patch-ab

    Log Message:
    Update to version 1.2.1

    Security fixes for three DoS vulnerabilities:

     Remote DoS on receiving malformed HTML
     Remote DoS on receiving certain messages over IRC
     Jabber remote crash

    Changes:
    - URL escaping now works with UTF-8 text. This may break some old
      log files.
    - Revert to XOR auth for ICQ as the md5 is not fully functional
    - Fix bug with going away while in a jabber chat
    - MSN bug fixes (Felipe Contreras)
    - Escape things properly in IRC

    From MAINTAINER via PR pkg/29888
----
    Module Name:    pkgsrc
    Committed By:   salo
    Date:           Tue Apr  5 09:53:17 UTC 2005

    Modified Files:
            pkgsrc/chat/gaim: buildlink3.mk

    Log Message:
    Bump BUILDLINK_RECOMMENDED.

4 files changed, 11 insertions, 11 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index b94a99e45df..a8f5bcd43d6 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.81 2005/03/18 18:56:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.81.2.1 2005/04/06 03:51:05 snj Exp $
 
-DISTNAME=	gaim-1.1.4
-PKGREVISION=	1
+DISTNAME=	gaim-1.2.1
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index b2596a5a70c..c83f5d499ad 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2005/01/04 09:02:39 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.37.2.1 2005/04/06 03:51:05 snj Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim/account.h
@@ -113,6 +113,7 @@ ${PKGLOCALEDIR}/locale/en_AU/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gaim.mo
@@ -124,8 +125,8 @@ ${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/nb/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
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gaim.mo
diff --git a/chat/gaim/buildlink3.mk b/chat/gaim/buildlink3.mk
index 0949cc4b077..c83c3852066 100644
--- a/chat/gaim/buildlink3.mk
+++ b/chat/gaim/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/03/16 17:46:55 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.3.2.1 2005/04/06 03:51:06 snj Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAIM_BUILDLINK3_MK:=	${GAIM_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gaim
 
 .if !empty(GAIM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gaim+=	gaim>=1.1.2
-BUILDLINK_RECOMMENDED.gaim+=	gaim>=1.1.2
+BUILDLINK_RECOMMENDED.gaim+=	gaim>=1.2.1
 BUILDLINK_PKGSRCDIR.gaim?=	../../chat/gaim
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gaim$$/ \
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 2ac2bef47af..9cc93a92e6d 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.61 2005/03/18 18:56:04 jmmv Exp $
+$NetBSD: distinfo,v 1.61.2.1 2005/04/06 03:51:06 snj Exp $
 
-SHA1 (gaim-1.1.4.tar.bz2) = ef4061f2f7413b18c4ea59da10b9f0837df20054
-RMD160 (gaim-1.1.4.tar.bz2) = eb254b2d63108cd65c5237bea922900a4ba72fbf
-Size (gaim-1.1.4.tar.bz2) = 5195580 bytes
+SHA1 (gaim-1.2.1.tar.bz2) = d5279ab3e9bb9d34272d48a9536c801d0f9d1441
+RMD160 (gaim-1.2.1.tar.bz2) = 34e4d3727a19b749ee74b3658d9e81956bb8ed75
+Size (gaim-1.2.1.tar.bz2) = 5223019 bytes
 SHA1 (patch-aa) = 555c394dbb4cd9ef4fea621d30ce72baae309067
 SHA1 (patch-ad) = 21ffc478343793ce065c75a24ed0cf58b0677359