Wed Aug 1 15:23:46 2012 UTC ()
update to 2.10.6
change: fix for buffer overflow in MXit protocol (CVE-2012-3374)


(drochner)
diff -r1.43 -r1.44 pkgsrc/chat/libpurple/Makefile
diff -r1.38 -r1.39 pkgsrc/chat/libpurple/Makefile.common
diff -r1.35 -r1.36 pkgsrc/chat/libpurple/distinfo
diff -r1.20 -r1.21 pkgsrc/chat/libpurple/options.mk

cvs diff -r1.43 -r1.44 pkgsrc/chat/libpurple/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/Makefile 2012/06/14 07:43:40 1.43
+++ pkgsrc/chat/libpurple/Makefile 2012/08/01 15:23:45 1.44
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.43 2012/06/14 07:43:40 sbd Exp $ 1# $NetBSD: Makefile,v 1.44 2012/08/01 15:23:45 drochner Exp $
2 2
3PKGNAME= libpurple-${PIDGIN_VERSION} 3PKGNAME= libpurple-${PIDGIN_VERSION}
4PKGREVISION= 1 
5 4
6COMMENT= Multi-protocol Instant Messaging client backend 5COMMENT= Multi-protocol Instant Messaging client backend
7 6
8PKG_DESTDIR_SUPPORT= user-destdir 7PKG_DESTDIR_SUPPORT= user-destdir
9 8
10.include "../../chat/libpurple/Makefile.common" 9.include "../../chat/libpurple/Makefile.common"
11 10
12USE_TOOLS+= msgfmt intltool 11USE_TOOLS+= msgfmt intltool
13CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ 12CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
14MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ 13MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
15 14
16PKGCONFIG_OVERRIDE+= gaim.pc.in 15PKGCONFIG_OVERRIDE+= gaim.pc.in
17PKGCONFIG_OVERRIDE+= libpurple/purple.pc.in 16PKGCONFIG_OVERRIDE+= libpurple/purple.pc.in

cvs diff -r1.38 -r1.39 pkgsrc/chat/libpurple/Makefile.common (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/Makefile.common 2012/05/15 13:07:28 1.38
+++ pkgsrc/chat/libpurple/Makefile.common 2012/08/01 15:23:45 1.39
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1# $NetBSD: Makefile.common,v 1.38 2012/05/15 13:07:28 obache Exp $ 1# $NetBSD: Makefile.common,v 1.39 2012/08/01 15:23:45 drochner Exp $
2# 2#
3# used by chat/finch/Makefile 3# used by chat/finch/Makefile
4# used by chat/libpurple/Makefile 4# used by chat/libpurple/Makefile
5# used by chat/pidgin/Makefile 5# used by chat/pidgin/Makefile
6# used by chat/pidgin-sametime/Makefile 6# used by chat/pidgin-sametime/Makefile
7# used by chat/pidgin-silc/Makefile 7# used by chat/pidgin-silc/Makefile
8 8
9PIDGIN_VERSION= 2.10.4 9PIDGIN_VERSION= 2.10.6
10DISTNAME= pidgin-${PIDGIN_VERSION} 10DISTNAME= pidgin-${PIDGIN_VERSION}
11CATEGORIES= chat 11CATEGORIES= chat
12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/} 12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://www.pidgin.im/ 16HOMEPAGE= http://www.pidgin.im/
17LICENSE= gnu-gpl-v2 17LICENSE= gnu-gpl-v2
18 18
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
21USE_TOOLS+= pkg-config gmake 21USE_TOOLS+= pkg-config gmake
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23 23
24PATCHDIR= ${.CURDIR}/../../chat/libpurple/patches 24PATCHDIR= ${.CURDIR}/../../chat/libpurple/patches
25DISTINFO_FILE?= ${.CURDIR}/../../chat/libpurple/distinfo 25DISTINFO_FILE?= ${.CURDIR}/../../chat/libpurple/distinfo
26 26
27CONFIGURE_ARGS+= --disable-gevolution 27CONFIGURE_ARGS+= --disable-gevolution
28CONFIGURE_ARGS+= --disable-gtkui 28CONFIGURE_ARGS+= --disable-gtkui
29CONFIGURE_ARGS+= --disable-consoleui 29CONFIGURE_ARGS+= --disable-consoleui
30CONFIGURE_ARGS+= --disable-meanwhile 30CONFIGURE_ARGS+= --disable-meanwhile
31CONFIGURE_ARGS+= --disable-farsight 31CONFIGURE_ARGS+= --disable-farstream
32CONFIGURE_ARGS+= --disable-gstreamer 32CONFIGURE_ARGS+= --disable-gstreamer
33CONFIGURE_ARGS+= --disable-avahi 33CONFIGURE_ARGS+= --disable-avahi
34CONFIGURE_ARGS+= --disable-perl 34CONFIGURE_ARGS+= --disable-perl
35CONFIGURE_ARGS+= --disable-tcl 35CONFIGURE_ARGS+= --disable-tcl
36CONFIGURE_ARGS+= --disable-tk 36CONFIGURE_ARGS+= --disable-tk
37CONFIGURE_ARGS+= --disable-gnutls 37CONFIGURE_ARGS+= --disable-gnutls
38CONFIGURE_ARGS+= --disable-nss 38CONFIGURE_ARGS+= --disable-nss
39CONFIGURE_ARGS+= --disable-dbus 39CONFIGURE_ARGS+= --disable-dbus
40CONFIGURE_ARGS+= --disable-cyrus-sasl 40CONFIGURE_ARGS+= --disable-cyrus-sasl
41CONFIGURE_ARGS+= --disable-debug 41CONFIGURE_ARGS+= --disable-debug
42CONFIGURE_ARGS+= --disable-nm 42CONFIGURE_ARGS+= --disable-nm
43CONFIGURE_ARGS+= --disable-vv 43CONFIGURE_ARGS+= --disable-vv

cvs diff -r1.35 -r1.36 pkgsrc/chat/libpurple/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/distinfo 2012/05/15 13:07:28 1.35
+++ pkgsrc/chat/libpurple/distinfo 2012/08/01 15:23:46 1.36
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.35 2012/05/15 13:07:28 obache Exp $ 1$NetBSD: distinfo,v 1.36 2012/08/01 15:23:46 drochner Exp $
2 2
3SHA1 (pidgin-2.10.4.tar.bz2) = f9ce34e69f97bcd1bb216aefb6d687b5b47f0796 3SHA1 (pidgin-2.10.6.tar.bz2) = a0532e7ba2acd205d6a5a4e3624156a980fe3d43
4RMD160 (pidgin-2.10.4.tar.bz2) = 5193a7f5dbd122198d474bd7e11dc9bf307befb3 4RMD160 (pidgin-2.10.6.tar.bz2) = 507d64cb719129196c887953edef552db326e805
5Size (pidgin-2.10.4.tar.bz2) = 9970850 bytes 5Size (pidgin-2.10.6.tar.bz2) = 10007092 bytes
6SHA1 (patch-aa) = a41353bbcb742b4127a33b3026f87a79f406da29 6SHA1 (patch-aa) = a41353bbcb742b4127a33b3026f87a79f406da29
7SHA1 (patch-libpurple_protocols_gg_lib_libgadu.h) = 5756134e17ae2ce28d3555cd40354245e22a5bd6 7SHA1 (patch-libpurple_protocols_gg_lib_libgadu.h) = 5756134e17ae2ce28d3555cd40354245e22a5bd6

cvs diff -r1.20 -r1.21 pkgsrc/chat/libpurple/options.mk (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/options.mk 2012/04/25 16:27:50 1.20
+++ pkgsrc/chat/libpurple/options.mk 2012/08/01 15:23:46 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.20 2012/04/25 16:27:50 drochner Exp $ 1# $NetBSD: options.mk,v 1.21 2012/08/01 15:23:46 drochner Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple 3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple
4PKG_SUPPORTED_OPTIONS+= avahi dbus debug farsight gnome gnutls 4PKG_SUPPORTED_OPTIONS+= avahi dbus debug farsight gnome gnutls
5PKG_SUPPORTED_OPTIONS+= gstreamer perl sasl tcl 5PKG_SUPPORTED_OPTIONS+= gstreamer perl sasl tcl
6PKG_SUGGESTED_OPTIONS+= dbus farsight gnome gnutls gstreamer 6PKG_SUGGESTED_OPTIONS+= dbus farsight gnome gnutls gstreamer
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10PLIST_VARS+= avahi dbus gnome gnutls nss perl tcl 10PLIST_VARS+= avahi dbus gnome gnutls nss perl tcl
11 11
12.if !empty(PKG_OPTIONS:Mavahi) 12.if !empty(PKG_OPTIONS:Mavahi)
13PLIST.avahi= yes 13PLIST.avahi= yes
14CONFIGURE_ARGS+= --enable-avahi 14CONFIGURE_ARGS+= --enable-avahi
@@ -74,22 +74,22 @@ CONFIGURE_ARGS+= --enable-debug @@ -74,22 +74,22 @@ CONFIGURE_ARGS+= --enable-debug
74 74
75.if !empty(PKG_OPTIONS:Msasl) 75.if !empty(PKG_OPTIONS:Msasl)
76CONFIGURE_ARGS+= --enable-cyrus-sasl 76CONFIGURE_ARGS+= --enable-cyrus-sasl
77. include "../../security/cyrus-sasl/buildlink3.mk" 77. include "../../security/cyrus-sasl/buildlink3.mk"
78.endif 78.endif
79 79
80# voice/video support requires both farsight and gstreamer 80# voice/video support requires both farsight and gstreamer
81.if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer) 81.if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer)
82CONFIGURE_ARGS+= --enable-vv 82CONFIGURE_ARGS+= --enable-vv
83PLIST.vv= yes 83PLIST.vv= yes
84.endif 84.endif
85 85
86.if !empty(PKG_OPTIONS:Mfarsight) 86.if !empty(PKG_OPTIONS:Mfarsight)
87CONFIGURE_ARGS+= --enable-farsight 87CONFIGURE_ARGS+= --enable-farstream
88. include "../../multimedia/farsight2/buildlink3.mk" 88. include "../../multimedia/farsight2/buildlink3.mk"
89.endif 89.endif
90 90
91.if !empty(PKG_OPTIONS:Mgstreamer) 91.if !empty(PKG_OPTIONS:Mgstreamer)
92CONFIGURE_ARGS+= --enable-gstreamer 92CONFIGURE_ARGS+= --enable-gstreamer
93. include "../../multimedia/gstreamer0.10/buildlink3.mk" 93. include "../../multimedia/gstreamer0.10/buildlink3.mk"
94. include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 94. include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
95.endif 95.endif