Pullup ticket 494 - requested by Lubomir Sedlacik

security fix for gaim

Revisions pulled up:
- pkgsrc/chat/gaim/Makefile		1.85
- pkgsrc/chat/gaim/PLIST		1.39
- pkgsrc/chat/gaim/buildlink3.mk	1.5
- pkgsrc/chat/gaim/distinfo		1.64

    Module Name:    pkgsrc
    Committed By:   salo
    Date:           Thu May 12 10:32:18 UTC 2005

    Modified Files:
            pkgsrc/chat/gaim: Makefile PLIST buildlink3.mk distinfo

    Log Message:
    Update to version 1.3.0

    Changes:
    - Fixes for two remotely exploitable crash bugs.  See
      http://gaim.sourceforge.net/security/ for more information.
    - Removed parts of the font selection dialog that were not respected
    - Fix being invited to a multi user chat on MSN
    - Multiple SILC accounts should work now (Pekka Riikonen)
    - Fix times on jabber chat backlogs
    - Fix gevolution plugin to compile with e-d-s 1.0 or 1.2
    - Fix gevolution plugin to remember buddy name when someone added you
      and you then add them
    - Formatting in jabber chats works
    - Fix to prevent MSN disconnecting if you change status while
    - connecting
    - Change to correctly handle adding jabber buddies on ejabberd servers

    Mostly from MAINTAINER via PR pkg/30204

4 files changed, 11 insertions, 9 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index a8f5bcd43d6..527a6645869 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.81.2.1 2005/04/06 03:51:05 snj Exp $
+# $NetBSD: Makefile,v 1.81.2.2 2005/05/12 22:41:26 snj Exp $
 
-DISTNAME=	gaim-1.2.1
+DISTNAME=	gaim-1.3.0
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index c83f5d499ad..78de871c55d 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37.2.1 2005/04/06 03:51:05 snj Exp $
+@comment $NetBSD: PLIST,v 1.37.2.2 2005/05/12 22:41:26 snj Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim/account.h
@@ -104,6 +104,7 @@ man/man1/gaim-remote.1
 man/man1/gaim.1
 share/applications/gaim.desktop
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gaim.mo
@@ -121,6 +122,7 @@ ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ka/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
diff --git a/chat/gaim/buildlink3.mk b/chat/gaim/buildlink3.mk
index c83c3852066..4483c5a3be0 100644
--- a/chat/gaim/buildlink3.mk
+++ b/chat/gaim/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3.2.1 2005/04/06 03:51:06 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.3.2.2 2005/05/12 22:41:27 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.2.1
+BUILDLINK_RECOMMENDED.gaim+=	gaim>=1.3.0
 BUILDLINK_PKGSRCDIR.gaim?=	../../chat/gaim
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gaim$$/ \
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 9cc93a92e6d..c58362e0266 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.61.2.1 2005/04/06 03:51:06 snj Exp $
+$NetBSD: distinfo,v 1.61.2.2 2005/05/12 22:41:27 snj Exp $
 
-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 (gaim-1.3.0.tar.bz2) = 3051a64f3a72ae2e606064d3e955f82a712b626a
+RMD160 (gaim-1.3.0.tar.bz2) = 52ba57154c67971690e5dae9ddfee249cf539b1b
+Size (gaim-1.3.0.tar.bz2) = 5355123 bytes
 SHA1 (patch-aa) = 555c394dbb4cd9ef4fea621d30ce72baae309067
 SHA1 (patch-ad) = 21ffc478343793ce065c75a24ed0cf58b0677359