summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2008-07-11 07:39:20 +0000
committertnn <tnn@pkgsrc.org>2008-07-11 07:39:20 +0000
commit5908229cb6f0665515b7188bb137d79d97317396 (patch)
treed403a1dc100c936ae5c3abcf07bc46345e985e38 /chat
parentd8050943421ad4f255200936db4d8043edf7a13b (diff)
downloadpkgsrc-5908229cb6f0665515b7188bb137d79d97317396.tar.gz
Update pidgin and friends to 2.4.3. Done during pkgsrc freeze because of:
i) CVE-2008-2927 fix ii) the previous version was being rejected from the ICQ network. version 2.4.3 (07/01/2008): libpurple: * Yahoo! Japan now uses UTF-8, matching the behavior of official clients and restoring compatibility with the web messenger (Yusuke Odate) * Setting your buddy icon once again works for Yahoo! accounts. * Fixes in the Yahoo! protocol to prevent a double free, crashes on aliases, and alias functionality * Fix crashes in the bonjour protocol * Always use UTF-8 for Yahoo! (#5973) * Fix a crash when the given jabber id is invalid. * Make the IRC "unknown message" debugging messages UTF-8 safe. * Fix connecting to ICQ * Fix a memleak when handling jabber xforms. Pidgin: * Include the send button plugin in the win32 build * Various memory leak fixes
Diffstat (limited to 'chat')
-rw-r--r--chat/finch/Makefile3
-rw-r--r--chat/libpurple/Makefile.common4
-rw-r--r--chat/libpurple/distinfo10
-rw-r--r--chat/libpurple/patches/patch-aa20
-rw-r--r--chat/pidgin-sametime/Makefile5
-rw-r--r--chat/pidgin-silc/Makefile3
-rw-r--r--chat/pidgin-silc/distinfo10
-rw-r--r--chat/pidgin/Makefile4
8 files changed, 31 insertions, 28 deletions
diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index 31bbb305809..f7b5ba2d784 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/05/18 00:06:46 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2008/07/11 07:39:20 tnn Exp $
#
PKGNAME= finch-${PIDGIN_VERSION}
@@ -44,6 +44,7 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/doc/finch.1 \
${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q}/man1
+BUILDLINK_API_DEPENDS.libpurple+= libpurple-${PIDGIN_VERSION}{,nb*}
.include "../../chat/libpurple/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 8590abc754e..21239835c5d 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.17 2008/05/22 10:11:57 tnn Exp $
+# $NetBSD: Makefile.common,v 1.18 2008/07/11 07:39:20 tnn Exp $
#
# used by chat/finch/Makefile
# used by chat/libpurple/Makefile
# used by chat/pidgin/Makefile
-PIDGIN_VERSION= 2.4.2
+PIDGIN_VERSION= 2.4.3
DISTNAME= pidgin-${PIDGIN_VERSION}
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index d8183069035..3602bbc6f5f 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2008/05/17 22:56:17 tnn Exp $
+$NetBSD: distinfo,v 1.16 2008/07/11 07:39:20 tnn Exp $
-SHA1 (pidgin-2.4.2.tar.bz2) = 66c0aa58122f29c3a0262a555f05af46ca76fa77
-RMD160 (pidgin-2.4.2.tar.bz2) = 5609117af4cfd23bffdd4c071b5239750ad6bcfc
-Size (pidgin-2.4.2.tar.bz2) = 9376721 bytes
-SHA1 (patch-aa) = eb8f1bd893cbf21de47bd0671a45dc3fed9f3f63
+SHA1 (pidgin-2.4.3.tar.bz2) = c967ddda3cb4a8aecfb2566427e8cbd260f2c0de
+RMD160 (pidgin-2.4.3.tar.bz2) = c5fa8f3f9e52ffffcc829d08a8b822cd9cdf5368
+Size (pidgin-2.4.3.tar.bz2) = 9382967 bytes
+SHA1 (patch-aa) = a64f525462056178653e5b7548862773a1fdce32
SHA1 (patch-ab) = 5f1fc87cc258de372fbdf521aeb6822f50506090
SHA1 (patch-ae) = ff4f2d738656c6f23c423046f746b9ed2878c415
SHA1 (patch-ag) = fa71295e848f1b06f318f06fab8fcc90110c20a3
diff --git a/chat/libpurple/patches/patch-aa b/chat/libpurple/patches/patch-aa
index 955eb529094..3e95003438b 100644
--- a/chat/libpurple/patches/patch-aa
+++ b/chat/libpurple/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.8 2008/05/17 22:56:17 tnn Exp $
+$NetBSD: patch-aa,v 1.9 2008/07/11 07:39:20 tnn Exp $
---- configure.orig 2008-05-16 20:53:50.000000000 +0200
+--- configure.orig 2008-07-02 02:47:08.000000000 +0200
+++ configure
-@@ -20047,6 +20047,11 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
-
-
+@@ -20183,6 +20183,11 @@ echo "$as_me: error: GNU gettext tools n
+ { (exit 1); exit 1; }; }
+ fi
+INTLTOOL_EXTRACT=intltool-extract
+INTLTOOL_MERGE=intltool-merge
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/17 22:56:17 tnn Exp $
# Use the tools built into the package, not the ones that are installed.
INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-@@ -20117,6 +20122,7 @@ echo "$as_me: error: XML::Parser perl mo
+@@ -20253,6 +20258,7 @@ echo "$as_me: error: XML::Parser perl mo
{ (exit 1); exit 1; }; }
fi
fi
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/17 22:56:17 tnn Exp $
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-@@ -28293,7 +28299,7 @@ if test "${ac_cv_lib_panelw_update_panel
+@@ -28393,7 +28399,7 @@ if test "${ac_cv_lib_panelw_update_panel
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/17 22:56:17 tnn Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28349,7 +28355,7 @@ fi
+@@ -28449,7 +28455,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_panelw_update_panels" >&5
echo "${ECHO_T}$ac_cv_lib_panelw_update_panels" >&6; }
if test $ac_cv_lib_panelw_update_panels = yes; then
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/17 22:56:17 tnn Exp $
else
enable_consoleui=no
fi
-@@ -28647,7 +28653,7 @@ if test "${ac_cv_lib_panel_update_panels
+@@ -28747,7 +28753,7 @@ if test "${ac_cv_lib_panel_update_panels
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/17 22:56:17 tnn Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28703,7 +28709,7 @@ fi
+@@ -28803,7 +28809,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/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index 13a1a93c6a6..f3214d3e8cb 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/05/17 23:46:46 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2008/07/11 07:39:20 tnn Exp $
#
PKGNAME= pidgin-sametime-${PIDGIN_VERSION}
@@ -14,8 +14,9 @@ CONFIGURE_ARGS+= --enable-meanwhile
BUILD_DIRS= libpurple/protocols/sametime
-.include "../../chat/meanwhile/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libpurple+= libpurple-${PIDGIN_VERSION}{,nb*}
.include "../../chat/libpurple/buildlink3.mk"
+.include "../../chat/meanwhile/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index 6d1f3dfeb0a..b60d5687fa6 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/05/17 23:46:46 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/11 07:39:21 tnn Exp $
#
PKGNAME= pidgin-silc-${PIDGIN_VERSION}
@@ -42,6 +42,7 @@ SUBST_SED.linkage= -e 's/-lsilcclient -lsilc/-Wl,--whole-archive,libsilcclient.a
.endif
+BUILDLINK_API_DEPENDS.libpurple+= libpurple-${PIDGIN_VERSION}{,nb*}
.include "../../chat/libpurple/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/GConf/schemas.mk"
diff --git a/chat/pidgin-silc/distinfo b/chat/pidgin-silc/distinfo
index 07736959b33..939b7feaa98 100644
--- a/chat/pidgin-silc/distinfo
+++ b/chat/pidgin-silc/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.11 2008/05/17 23:46:46 tnn Exp $
+$NetBSD: distinfo,v 1.12 2008/07/11 07:39:21 tnn Exp $
-SHA1 (pidgin-2.4.2.tar.bz2) = 66c0aa58122f29c3a0262a555f05af46ca76fa77
-RMD160 (pidgin-2.4.2.tar.bz2) = 5609117af4cfd23bffdd4c071b5239750ad6bcfc
-Size (pidgin-2.4.2.tar.bz2) = 9376721 bytes
+SHA1 (pidgin-2.4.3.tar.bz2) = c967ddda3cb4a8aecfb2566427e8cbd260f2c0de
+RMD160 (pidgin-2.4.3.tar.bz2) = c5fa8f3f9e52ffffcc829d08a8b822cd9cdf5368
+Size (pidgin-2.4.3.tar.bz2) = 9382967 bytes
SHA1 (silc-toolkit-1.1.7.tar.gz) = a25918e83d5070ff75b7d6f296698dada76a92ca
RMD160 (silc-toolkit-1.1.7.tar.gz) = 783297f44d577d5ec7dcff7952996944e4b1d5c6
Size (silc-toolkit-1.1.7.tar.gz) = 2678989 bytes
-SHA1 (patch-aa) = eb8f1bd893cbf21de47bd0671a45dc3fed9f3f63
+SHA1 (patch-aa) = a64f525462056178653e5b7548862773a1fdce32
SHA1 (patch-ab) = 5f1fc87cc258de372fbdf521aeb6822f50506090
SHA1 (patch-ae) = ff4f2d738656c6f23c423046f746b9ed2878c415
SHA1 (patch-ag) = fa71295e848f1b06f318f06fab8fcc90110c20a3
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 2682d9cc13a..8a7f5701a30 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2008/05/30 12:29:00 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/07/11 07:39:20 tnn Exp $
#
PKGNAME= pidgin-${PIDGIN_VERSION}
-PKGREVISION= 1
COMMENT= Multi-protocol Instant Messaging client GTK frontend
PKG_DESTDIR_SUPPORT= user-destdir
@@ -38,6 +37,7 @@ post-install:
# XXX install pidgin.1 via doc/Makefile
+BUILDLINK_API_DEPENDS.libpurple+= libpurple-${PIDGIN_VERSION}{,nb*}
.include "../../chat/libpurple/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"