NetBSD Problem Report #42005

From www@NetBSD.org  Mon Sep  7 13:57:51 2009
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id B5D2263BCFB
	for <gnats-bugs@gnats.netbsd.org>; Mon,  7 Sep 2009 13:57:51 +0000 (UTC)
Message-Id: <20090907135751.7824E63BC1D@www.NetBSD.org>
Date: Mon,  7 Sep 2009 13:57:51 +0000 (UTC)
From: joachim.kuebart@gmx.net
Reply-To: joachim.kuebart@gmx.net
To: gnats-bugs@NetBSD.org
Subject: Update the Pidgin family of packages from 2.6.1 to 2.6.2
X-Send-Pr-Version: www-1.0

>Number:         42005
>Category:       pkg
>Synopsis:       Update the Pidgin family of packages from 2.6.1 to 2.6.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 07 14:00:01 +0000 2009
>Closed-Date:    Tue Dec 08 12:47:46 +0000 2009
>Last-Modified:  Tue Dec 08 12:50:02 +0000 2009
>Originator:     Joachim Kuebart
>Release:        NetBSD-current
>Organization:
>Environment:
NetBSD yacht 5.99.16 NetBSD 5.99.16 (YACHT) #0: Fri Sep  4 22:10:49 BST 2009  joki@yacht:/usr/obj/amd64/usr/src/sys/arch/amd64/compile/YACHT amd64

>Description:
Version 2.6.2 of the libpurple family of chat clients was released on Saturday, 5 September.


Upstream ChangLog:

    * libpurple
          o Fix --disable-avahi to actually disable it in configure, as opposed to just making the warning non-fatal.
          o Fix using GNOME proxy settings properly. (Erik van Pienbroek) 

    * IRC
          o Fix parsing of invalid TOPIC messages. (CVE-2009-2703) 

    * MSN
          o Sending custom smileys in chats is now supported.
          o Ink messages are now saved when using the HTML logger.
          o Fix a crash when receiving some handwritten messages.
          o Fix a crash when receiving certain SLP invite messages.
          o Chats with multiple people should no longer spontaneously disconnect. 

    * XMPP
          o Prompt the user before cancelling a presence subscription.
          o Escape status messages that have HTML entities in the Get Info dialog.
          o Fix connecting to XMPP domains with no SRV records from Pidgin on Windows.
          o Fix typing notifications with Pidgin 2.5.9 or earlier.
          o Fix connecting using BOSH and legacy authentication (XEP-0078).
          o Adding buddies of the form "romeo@…/Resource" are handled properly. In addition, it is no longer possible to add buddies of the form "room@…/User", where room@… is a MUC.
          o Don't crash when receiving "smileyfied" XHTML-IM from clients that don't support bits of binary (ie. when getting an empty <data/> in return)
          o Fix bug where SSL/TLS was not required even though the "require SSL/TLS" preference checked when connecting to servers that use the older iq-based authentication. (CVE-2009-3026) 

    * Yahoo!/Yahoo! JAPAN
          o Accounts now have "Use account proxy for SSL connections" option. This option force-overrides the account specific proxy settings for SSL connections only and instead uses the global proxy configuration. 

    * Finch
          o Properly detect libpanel on OpenBSD. (Brad Smith)
          o Remove IO watches in gnt_quit. (Tomasz Mon) 

    * Pidgin
          o Fix the auto-personize functionality in the Buddy List.
          o Set the window icon for the media window to an icon corresponding to the type of call (headphone or webcam).
          o Customized sound files are no longer reset whenever opening the Preferences dialog.
          o The buddy list should now immediately refresh upon changing the icon theme.


>How-To-Repeat:
Build any of chat/libpurple, chat/finch, chat/pidgin{,-silc,-sametime}.

>Fix:
The following patch updates the relevant packages:

Changes to the packages:

 o Update version number to 2.6.2 in chat/libpurple and update relevant
   distinfos.

 o Add --disable-tk and --disable-vv configure arguments.

 o Add --enable-avahi configure option if "avahi" is selected.

 o Remove "farsight" option from chat/libpurple. It is only needed
   in chat/pidgin.

 o Make existing "tcl" option for chat/libpurple actually work by
   passing --enable-tcl configure option, and include resulting
   tcl-library in PLIST.

 o Suggest option "gstreamer" for chat/finch to match chat/libpurple's
   suggested options because chat/finch fails to build unless this
   option matches.

 o Pass --enable-vv configure argument to enable voice/video support
   if "farsight" and "gstreamer" are selected in chat/pidgin.

Index: chat/finch/options.mk
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/chat/finch/options.mk,v
retrieving revision 1.3
diff -p -U8 -r1.3 options.mk
--- chat/finch/options.mk	18 May 2008 00:06:46 -0000	1.3
+++ chat/finch/options.mk	7 Sep 2009 13:44:09 -0000
@@ -1,13 +1,13 @@
 # $NetBSD: options.mk,v 1.3 2008/05/18 00:06:46 tnn Exp $

 PKG_OPTIONS_VAR=		PKG_OPTIONS.finch
 PKG_SUPPORTED_OPTIONS+=		gstreamer debug
-PKG_SUGGESTED_OPTIONS+=
+PKG_SUGGESTED_OPTIONS+=		gstreamer

 .include "../../mk/bsd.options.mk"

 .if !empty(PKG_OPTIONS:Mgstreamer)
 .  include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .endif

 .if !empty(PKG_OPTIONS:Mdebug)
Index: chat/libpurple/Makefile.common
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/Makefile.common,v
retrieving revision 1.29
diff -p -U8 -r1.29 Makefile.common
--- chat/libpurple/Makefile.common	6 Sep 2009 21:06:44 -0000	1.29
+++ chat/libpurple/Makefile.common	7 Sep 2009 13:44:09 -0000
@@ -1,17 +1,17 @@
 # $NetBSD: Makefile.common,v 1.29 2009/09/06 21:06:44 abs Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
 # used by chat/pidgin/Makefile
 # used by chat/pidgin-sametime/Makefile
 # used by chat/pidgin-silc/Makefile

-PIDGIN_VERSION=	2.6.1
+PIDGIN_VERSION=	2.6.2
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
 EXTRACT_SUFX=	.tar.bz2

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pidgin.im/

@@ -27,14 +27,16 @@ CONFIGURE_ARGS+=	--disable-gevolution
 CONFIGURE_ARGS+=	--disable-gtkui
 CONFIGURE_ARGS+=	--disable-consoleui
 CONFIGURE_ARGS+=	--disable-meanwhile
 CONFIGURE_ARGS+=	--disable-farsight
 CONFIGURE_ARGS+=	--disable-gstreamer
 CONFIGURE_ARGS+=	--disable-avahi
 CONFIGURE_ARGS+=	--disable-perl
 CONFIGURE_ARGS+=	--disable-tcl
+CONFIGURE_ARGS+=	--disable-tk
 CONFIGURE_ARGS+=	--disable-gnutls
 CONFIGURE_ARGS+=	--disable-nss
 CONFIGURE_ARGS+=	--disable-dbus
 CONFIGURE_ARGS+=	--disable-cyrus-sasl
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--disable-nm
+CONFIGURE_ARGS+=	--disable-vv
Index: chat/libpurple/PLIST
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/PLIST,v
retrieving revision 1.19
diff -p -U8 -r1.19 PLIST
--- chat/libpurple/PLIST	6 Sep 2009 21:06:44 -0000	1.19
+++ chat/libpurple/PLIST	7 Sep 2009 13:44:09 -0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.19 2009/09/06 21:06:44 abs Exp $
+@comment $NetBSD$
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
 include/libpurple/buddyicon.h
 include/libpurple/certificate.h
 include/libpurple/cipher.h
 include/libpurple/circbuffer.h
 include/libpurple/cmds.h
@@ -87,16 +87,17 @@ lib/purple-2/libzephyr.la
 lib/purple-2/log_reader.la
 lib/purple-2/newline.la
 lib/purple-2/offlinemsg.la
 lib/purple-2/psychic.la
 ${PLIST.gnutls}lib/purple-2/ssl-gnutls.la
 ${PLIST.nss}lib/purple-2/ssl-nss.la
 lib/purple-2/ssl.la
 lib/purple-2/statenotify.la
+${PLIST.tcl}lib/purple-2/tcl.la
 share/aclocal/purple.m4
 share/gconf/schemas/purple.schemas
 share/locale/af/LC_MESSAGES/pidgin.mo
 share/locale/am/LC_MESSAGES/pidgin.mo
 share/locale/ar/LC_MESSAGES/pidgin.mo
 share/locale/az/LC_MESSAGES/pidgin.mo
 share/locale/be@latin/LC_MESSAGES/pidgin.mo
 share/locale/bg/LC_MESSAGES/pidgin.mo
Index: chat/libpurple/distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/distinfo,v
retrieving revision 1.24
diff -p -U8 -r1.24 distinfo
--- chat/libpurple/distinfo	6 Sep 2009 21:06:44 -0000	1.24
+++ chat/libpurple/distinfo	7 Sep 2009 13:44:09 -0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.24 2009/09/06 21:06:44 abs Exp $
+$NetBSD$

-SHA1 (pidgin-2.6.1.tar.bz2) = f14b1a6d36f3fc168c0e0d5949046eedee56d724
-RMD160 (pidgin-2.6.1.tar.bz2) = f1682e2d37ca272bc10b0c7710e73fb4807749bf
-Size (pidgin-2.6.1.tar.bz2) = 8964827 bytes
-SHA1 (patch-aa) = 7a1ec6bc64226dff60eac4b4835fabf1daecb9b3
+SHA1 (pidgin-2.6.2.tar.bz2) = 730b9bfaf79045f13e5d8dd736b91726bb11d332
+RMD160 (pidgin-2.6.2.tar.bz2) = a070ebe07a40d650c173065e4c448034e096963b
+Size (pidgin-2.6.2.tar.bz2) = 9093010 bytes
Index: chat/libpurple/options.mk
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/options.mk,v
retrieving revision 1.11
diff -p -U8 -r1.11 options.mk
--- chat/libpurple/options.mk	6 Sep 2009 21:06:44 -0000	1.11
+++ chat/libpurple/options.mk	7 Sep 2009 13:44:09 -0000
@@ -1,21 +1,22 @@
 # $NetBSD: options.mk,v 1.11 2009/09/06 21:06:44 abs Exp $

 PKG_OPTIONS_VAR=		PKG_OPTIONS.libpurple
 PKG_SUPPORTED_OPTIONS+=		gnutls perl tcl debug dbus sasl avahi
-PKG_SUPPORTED_OPTIONS+=		farsight gstreamer
-PKG_SUGGESTED_OPTIONS+=		gnutls dbus avahi farsight gstreamer
+PKG_SUPPORTED_OPTIONS+=		gstreamer
+PKG_SUGGESTED_OPTIONS+=		gnutls dbus avahi gstreamer

 .include "../../mk/bsd.options.mk"

-PLIST_VARS+=		avahi dbus gnutls nss perl
+PLIST_VARS+=		avahi dbus gnutls nss perl tcl

 .if !empty(PKG_OPTIONS:Mavahi)
 PLIST.avahi=            yes
+CONFIGURE_ARGS+=	--enable-avahi
 .  include "../../net/avahi/buildlink3.mk"
 .endif

 .if !empty(PKG_OPTIONS:Mgnutls)
 PLIST.gnutls=		yes
 CONFIGURE_ARGS+=	--enable-gnutls
 CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
 CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
@@ -35,16 +36,18 @@ CONFIGURE_ARGS+= --with-nss-libs=${BUILD
 .if !empty(PKG_OPTIONS:Mperl)
 PLIST.perl=		yes
 CONFIGURE_ARGS+=	--enable-perl
 USE_TOOLS+=		perl:run
 .  include "../../lang/perl5/buildlink3.mk"
 .endif

 .if !empty(PKG_OPTIONS:Mtcl)
+PLIST.tcl=		yes
+CONFIGURE_ARGS+=	--enable-tcl
 CONFIGURE_ARGS+=	--with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib
 .  include "../../lang/tcl/buildlink3.mk"
 .endif

 .if !empty(PKG_OPTIONS:Mdbus)
 CONFIGURE_ARGS+=	--enable-dbus
 CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
 PLIST.dbus=		yes
@@ -62,17 +65,12 @@ REPLACE_PYTHON+=	libpurple/purple-url-ha
 CONFIGURE_ARGS+=	--enable-debug
 .endif

 .if !empty(PKG_OPTIONS:Msasl)
 CONFIGURE_ARGS+=	--enable-cyrus-sasl
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 .endif

-.if !empty(PKG_OPTIONS:Mfarsight)
-CONFIGURE_ARGS+=	--enable-farsight
-.  include "../../multimedia/farsight2/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mgstreamer)
 CONFIGURE_ARGS+=	--enable-gstreamer
 .  include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .endif
Index: chat/pidgin/PLIST
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/chat/pidgin/PLIST,v
retrieving revision 1.14
diff -p -U8 -r1.14 PLIST
--- chat/pidgin/PLIST	6 Sep 2009 21:06:45 -0000	1.14
+++ chat/pidgin/PLIST	7 Sep 2009 13:44:09 -0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.14 2009/09/06 21:06:45 abs Exp $
+@comment $NetBSD$
 bin/pidgin
 include/pidgin/eggtrayicon.h
 include/pidgin/gtkaccount.h
 include/pidgin/gtkblist-theme-loader.h
 include/pidgin/gtkblist-theme.h
 include/pidgin/gtkblist.h
 include/pidgin/gtkcelllayout.h
 include/pidgin/gtkcellrendererexpander.h
@@ -69,16 +69,17 @@ lib/pidgin/notify.la
 lib/pidgin/pidginrc.la
 lib/pidgin/relnot.la
 lib/pidgin/sendbutton.la
 lib/pidgin/spellchk.la
 lib/pidgin/themeedit.la
 lib/pidgin/ticker.la
 lib/pidgin/timestamp.la
 lib/pidgin/timestamp_format.la
+${PLIST.vv}lib/pidgin/vvconfig.la
 lib/pidgin/xmppconsole.la
 lib/pidgin/xmppdisco.la
 lib/pkgconfig/pidgin.pc
 share/applications/pidgin.desktop
 share/icons/hicolor/16x16/apps/pidgin.png
 share/icons/hicolor/22x22/apps/pidgin.png
 share/icons/hicolor/24x24/apps/pidgin.png
 share/icons/hicolor/32x32/apps/pidgin.png
@@ -569,23 +570,23 @@ share/pixmaps/pidgin/toolbar/16/insert-i
 share/pixmaps/pidgin/toolbar/16/insert-link.png
 share/pixmaps/pidgin/toolbar/16/insert.png
 share/pixmaps/pidgin/toolbar/16/message-new.png
 share/pixmaps/pidgin/toolbar/16/plugins.png
 share/pixmaps/pidgin/toolbar/16/send-file.png
 share/pixmaps/pidgin/toolbar/16/transfer.png
 share/pixmaps/pidgin/toolbar/16/unblock.png
 share/pixmaps/pidgin/toolbar/16/video-call.png
+share/pixmaps/pidgin/toolbar/22/audio-call.png
 share/pixmaps/pidgin/toolbar/22/select-avatar.png
 share/pixmaps/pidgin/toolbar/22/video-call.png
-share/pixmaps/pidgin/toolbar/22/voice-call.png
+share/pixmaps/pidgin/toolbar/32/audio-call.png
 share/pixmaps/pidgin/toolbar/32/video-call.png
-share/pixmaps/pidgin/toolbar/32/voice-call.png
+share/pixmaps/pidgin/toolbar/48/audio-call.png
 share/pixmaps/pidgin/toolbar/48/video-call.png
-share/pixmaps/pidgin/toolbar/48/voice-call.png
 share/pixmaps/pidgin/tray/16/available_4bit.ico
 share/pixmaps/pidgin/tray/16/away_4bit.ico
 share/pixmaps/pidgin/tray/16/busy_4bit.ico
 share/pixmaps/pidgin/tray/16/connecting_4bit.ico
 share/pixmaps/pidgin/tray/16/extended-away_4bit.ico
 share/pixmaps/pidgin/tray/16/invisible_4bit.ico
 share/pixmaps/pidgin/tray/16/message_4bit.ico
 share/pixmaps/pidgin/tray/16/offline_4bit.ico
Index: chat/pidgin/options.mk
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/chat/pidgin/options.mk,v
retrieving revision 1.7
diff -p -U8 -r1.7 options.mk
--- chat/pidgin/options.mk	6 Sep 2009 21:06:45 -0000	1.7
+++ chat/pidgin/options.mk	7 Sep 2009 13:44:09 -0000
@@ -1,25 +1,31 @@
 # $NetBSD: options.mk,v 1.7 2009/09/06 21:06:45 abs Exp $

 PKG_OPTIONS_VAR=		PKG_OPTIONS.pidgin
 PKG_SUPPORTED_OPTIONS+=		dbus debug farsight gstreamer gtkspell
 PKG_SUGGESTED_OPTIONS+=		gtkspell dbus farsight gstreamer

 .include "../../mk/bsd.options.mk"

-PLIST_VARS+=		dbus
+PLIST_VARS+=		dbus vv

 .if !empty(PKG_OPTIONS:Mdbus)
 CONFIGURE_ARGS+=	--enable-dbus
 PLIST.dbus=		yes
 .  include "../../sysutils/dbus/buildlink3.mk"
 .  include "../../sysutils/dbus-glib/buildlink3.mk"
 .endif

+# voice/video support requires both farsight and gstreamer
+.if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer)
+CONFIGURE_ARGS+=	--enable-vv
+PLIST.vv=		yes
+.endif
+
 .if !empty(PKG_OPTIONS:Mfarsight)
 CONFIGURE_ARGS+=	--enable-farsight
 .  include "../../multimedia/farsight2/buildlink3.mk"
 .endif

 .if !empty(PKG_OPTIONS:Mgtkspell)
 CONFIGURE_ARGS+=	--enable-gtkspell
 .  include "../../textproc/gtkspell/buildlink3.mk"
Index: chat/pidgin-silc/distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/chat/pidgin-silc/distinfo,v
retrieving revision 1.20
diff -p -U8 -r1.20 distinfo
--- chat/pidgin-silc/distinfo	6 Sep 2009 21:06:45 -0000	1.20
+++ chat/pidgin-silc/distinfo	7 Sep 2009 13:44:10 -0000
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.20 2009/09/06 21:06:45 abs Exp $

-SHA1 (pidgin-2.6.1.tar.bz2) = f14b1a6d36f3fc168c0e0d5949046eedee56d724
-RMD160 (pidgin-2.6.1.tar.bz2) = f1682e2d37ca272bc10b0c7710e73fb4807749bf
-Size (pidgin-2.6.1.tar.bz2) = 8964827 bytes
+SHA1 (pidgin-2.6.2.tar.bz2) = 730b9bfaf79045f13e5d8dd736b91726bb11d332
+RMD160 (pidgin-2.6.2.tar.bz2) = a070ebe07a40d650c173065e4c448034e096963b
+Size (pidgin-2.6.2.tar.bz2) = 9093010 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) = 1b1e34c7ecf91fb2ac8ddca3376b7803975420c0

>Release-Note:

>Audit-Trail:
From: Joachim Kuebart <joachim.kuebart@gmx.net>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/42005: Update the Pidgin family of packages from 2.6.1 to
 2.6.2
Date: Wed, 09 Sep 2009 10:25:49 +0100

 --=-xlWu/STR7kqVutbWe+Ms
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit

 Playing around with voice and video support in Pidgin, it turned out
 that libpurple does need the --enable-vv configure option as well as
 dependencies on farsight2 and gst-plugins0.10-base. So below is a new
 set of patches.

 Previously, the voice/video plugin was greyed out in the plugins menu,
 whereas now it can be selected and configured. The "audio call" option
 is still greyed out for me though.

 Note: chat/libpurple/patches/patch-aa isn't needed anymore!


 --=-xlWu/STR7kqVutbWe+Ms
 Content-Disposition: attachment; filename="pidgin-1.6.2.diff"
 Content-Type: text/x-patch; name="pidgin-1.6.2.diff"; charset="UTF-8"
 Content-Transfer-Encoding: 7bit

 Index: chat/finch/options.mk
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/finch/options.mk,v
 retrieving revision 1.3
 diff -p -U8 -r1.3 options.mk
 --- chat/finch/options.mk	18 May 2008 00:06:46 -0000	1.3
 +++ chat/finch/options.mk	9 Sep 2009 09:36:20 -0000
 @@ -1,13 +1,13 @@
  # $NetBSD: options.mk,v 1.3 2008/05/18 00:06:46 tnn Exp $

  PKG_OPTIONS_VAR=		PKG_OPTIONS.finch
  PKG_SUPPORTED_OPTIONS+=		gstreamer debug
 -PKG_SUGGESTED_OPTIONS+=
 +PKG_SUGGESTED_OPTIONS+=		gstreamer

  .include "../../mk/bsd.options.mk"

  .if !empty(PKG_OPTIONS:Mgstreamer)
  .  include "../../multimedia/gstreamer0.10/buildlink3.mk"
  .endif

  .if !empty(PKG_OPTIONS:Mdebug)
 Index: chat/libpurple/Makefile.common
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/Makefile.common,v
 retrieving revision 1.29
 diff -p -U8 -r1.29 Makefile.common
 --- chat/libpurple/Makefile.common	6 Sep 2009 21:06:44 -0000	1.29
 +++ chat/libpurple/Makefile.common	9 Sep 2009 09:36:20 -0000
 @@ -1,17 +1,17 @@
  # $NetBSD: Makefile.common,v 1.29 2009/09/06 21:06:44 abs Exp $
  #
  # used by chat/finch/Makefile
  # used by chat/libpurple/Makefile
  # used by chat/pidgin/Makefile
  # used by chat/pidgin-sametime/Makefile
  # used by chat/pidgin-silc/Makefile

 -PIDGIN_VERSION=	2.6.1
 +PIDGIN_VERSION=	2.6.2
  DISTNAME=	pidgin-${PIDGIN_VERSION}
  CATEGORIES=	chat
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
  EXTRACT_SUFX=	.tar.bz2

  MAINTAINER=	pkgsrc-users@NetBSD.org
  HOMEPAGE=	http://www.pidgin.im/

 @@ -27,14 +27,16 @@ CONFIGURE_ARGS+=	--disable-gevolution
  CONFIGURE_ARGS+=	--disable-gtkui
  CONFIGURE_ARGS+=	--disable-consoleui
  CONFIGURE_ARGS+=	--disable-meanwhile
  CONFIGURE_ARGS+=	--disable-farsight
  CONFIGURE_ARGS+=	--disable-gstreamer
  CONFIGURE_ARGS+=	--disable-avahi
  CONFIGURE_ARGS+=	--disable-perl
  CONFIGURE_ARGS+=	--disable-tcl
 +CONFIGURE_ARGS+=	--disable-tk
  CONFIGURE_ARGS+=	--disable-gnutls
  CONFIGURE_ARGS+=	--disable-nss
  CONFIGURE_ARGS+=	--disable-dbus
  CONFIGURE_ARGS+=	--disable-cyrus-sasl
  CONFIGURE_ARGS+=	--disable-debug
  CONFIGURE_ARGS+=	--disable-nm
 +CONFIGURE_ARGS+=	--disable-vv
 Index: chat/libpurple/PLIST
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/PLIST,v
 retrieving revision 1.19
 diff -p -U8 -r1.19 PLIST
 --- chat/libpurple/PLIST	6 Sep 2009 21:06:44 -0000	1.19
 +++ chat/libpurple/PLIST	9 Sep 2009 09:36:20 -0000
 @@ -1,9 +1,9 @@
 -@comment $NetBSD: PLIST,v 1.19 2009/09/06 21:06:44 abs Exp $
 +@comment $NetBSD$
  include/libpurple/account.h
  include/libpurple/accountopt.h
  include/libpurple/blist.h
  include/libpurple/buddyicon.h
  include/libpurple/certificate.h
  include/libpurple/cipher.h
  include/libpurple/circbuffer.h
  include/libpurple/cmds.h
 @@ -87,16 +87,17 @@ lib/purple-2/libzephyr.la
  lib/purple-2/log_reader.la
  lib/purple-2/newline.la
  lib/purple-2/offlinemsg.la
  lib/purple-2/psychic.la
  ${PLIST.gnutls}lib/purple-2/ssl-gnutls.la
  ${PLIST.nss}lib/purple-2/ssl-nss.la
  lib/purple-2/ssl.la
  lib/purple-2/statenotify.la
 +${PLIST.tcl}lib/purple-2/tcl.la
  share/aclocal/purple.m4
  share/gconf/schemas/purple.schemas
  share/locale/af/LC_MESSAGES/pidgin.mo
  share/locale/am/LC_MESSAGES/pidgin.mo
  share/locale/ar/LC_MESSAGES/pidgin.mo
  share/locale/az/LC_MESSAGES/pidgin.mo
  share/locale/be@latin/LC_MESSAGES/pidgin.mo
  share/locale/bg/LC_MESSAGES/pidgin.mo
 Index: chat/libpurple/distinfo
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/distinfo,v
 retrieving revision 1.24
 diff -p -U8 -r1.24 distinfo
 --- chat/libpurple/distinfo	6 Sep 2009 21:06:44 -0000	1.24
 +++ chat/libpurple/distinfo	9 Sep 2009 09:36:20 -0000
 @@ -1,6 +1,5 @@
 -$NetBSD: distinfo,v 1.24 2009/09/06 21:06:44 abs Exp $
 +$NetBSD$

 -SHA1 (pidgin-2.6.1.tar.bz2) = f14b1a6d36f3fc168c0e0d5949046eedee56d724
 -RMD160 (pidgin-2.6.1.tar.bz2) = f1682e2d37ca272bc10b0c7710e73fb4807749bf
 -Size (pidgin-2.6.1.tar.bz2) = 8964827 bytes
 -SHA1 (patch-aa) = 7a1ec6bc64226dff60eac4b4835fabf1daecb9b3
 +SHA1 (pidgin-2.6.2.tar.bz2) = 730b9bfaf79045f13e5d8dd736b91726bb11d332
 +RMD160 (pidgin-2.6.2.tar.bz2) = a070ebe07a40d650c173065e4c448034e096963b
 +Size (pidgin-2.6.2.tar.bz2) = 9093010 bytes
 Index: chat/libpurple/options.mk
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/options.mk,v
 retrieving revision 1.11
 diff -p -U8 -r1.11 options.mk
 --- chat/libpurple/options.mk	6 Sep 2009 21:06:44 -0000	1.11
 +++ chat/libpurple/options.mk	9 Sep 2009 09:36:20 -0000
 @@ -2,20 +2,21 @@

  PKG_OPTIONS_VAR=		PKG_OPTIONS.libpurple
  PKG_SUPPORTED_OPTIONS+=		gnutls perl tcl debug dbus sasl avahi
  PKG_SUPPORTED_OPTIONS+=		farsight gstreamer
  PKG_SUGGESTED_OPTIONS+=		gnutls dbus avahi farsight gstreamer

  .include "../../mk/bsd.options.mk"

 -PLIST_VARS+=		avahi dbus gnutls nss perl
 +PLIST_VARS+=		avahi dbus gnutls nss perl tcl

  .if !empty(PKG_OPTIONS:Mavahi)
  PLIST.avahi=            yes
 +CONFIGURE_ARGS+=	--enable-avahi
  .  include "../../net/avahi/buildlink3.mk"
  .endif

  .if !empty(PKG_OPTIONS:Mgnutls)
  PLIST.gnutls=		yes
  CONFIGURE_ARGS+=	--enable-gnutls
  CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
  CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
 @@ -35,16 +36,18 @@ CONFIGURE_ARGS+= --with-nss-libs=${BUILD
  .if !empty(PKG_OPTIONS:Mperl)
  PLIST.perl=		yes
  CONFIGURE_ARGS+=	--enable-perl
  USE_TOOLS+=		perl:run
  .  include "../../lang/perl5/buildlink3.mk"
  .endif

  .if !empty(PKG_OPTIONS:Mtcl)
 +PLIST.tcl=		yes
 +CONFIGURE_ARGS+=	--enable-tcl
  CONFIGURE_ARGS+=	--with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib
  .  include "../../lang/tcl/buildlink3.mk"
  .endif

  .if !empty(PKG_OPTIONS:Mdbus)
  CONFIGURE_ARGS+=	--enable-dbus
  CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
  PLIST.dbus=		yes
 @@ -62,17 +65,24 @@ REPLACE_PYTHON+=	libpurple/purple-url-ha
  CONFIGURE_ARGS+=	--enable-debug
  .endif

  .if !empty(PKG_OPTIONS:Msasl)
  CONFIGURE_ARGS+=	--enable-cyrus-sasl
  .  include "../../security/cyrus-sasl/buildlink3.mk"
  .endif

 +# voice/video support requires both farsight and gstreamer
 +.if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer)
 +CONFIGURE_ARGS+=	--enable-vv
 +PLIST.vv=		yes
 +.endif
 +
  .if !empty(PKG_OPTIONS:Mfarsight)
  CONFIGURE_ARGS+=	--enable-farsight
  .  include "../../multimedia/farsight2/buildlink3.mk"
  .endif

  .if !empty(PKG_OPTIONS:Mgstreamer)
  CONFIGURE_ARGS+=	--enable-gstreamer
  .  include "../../multimedia/gstreamer0.10/buildlink3.mk"
 +.  include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
  .endif
 Index: chat/pidgin/PLIST
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/pidgin/PLIST,v
 retrieving revision 1.14
 diff -p -U8 -r1.14 PLIST
 --- chat/pidgin/PLIST	6 Sep 2009 21:06:45 -0000	1.14
 +++ chat/pidgin/PLIST	9 Sep 2009 09:36:21 -0000
 @@ -1,9 +1,9 @@
 -@comment $NetBSD: PLIST,v 1.14 2009/09/06 21:06:45 abs Exp $
 +@comment $NetBSD$
  bin/pidgin
  include/pidgin/eggtrayicon.h
  include/pidgin/gtkaccount.h
  include/pidgin/gtkblist-theme-loader.h
  include/pidgin/gtkblist-theme.h
  include/pidgin/gtkblist.h
  include/pidgin/gtkcelllayout.h
  include/pidgin/gtkcellrendererexpander.h
 @@ -69,16 +69,17 @@ lib/pidgin/notify.la
  lib/pidgin/pidginrc.la
  lib/pidgin/relnot.la
  lib/pidgin/sendbutton.la
  lib/pidgin/spellchk.la
  lib/pidgin/themeedit.la
  lib/pidgin/ticker.la
  lib/pidgin/timestamp.la
  lib/pidgin/timestamp_format.la
 +${PLIST.vv}lib/pidgin/vvconfig.la
  lib/pidgin/xmppconsole.la
  lib/pidgin/xmppdisco.la
  lib/pkgconfig/pidgin.pc
  share/applications/pidgin.desktop
  share/icons/hicolor/16x16/apps/pidgin.png
  share/icons/hicolor/22x22/apps/pidgin.png
  share/icons/hicolor/24x24/apps/pidgin.png
  share/icons/hicolor/32x32/apps/pidgin.png
 @@ -569,23 +570,23 @@ share/pixmaps/pidgin/toolbar/16/insert-i
  share/pixmaps/pidgin/toolbar/16/insert-link.png
  share/pixmaps/pidgin/toolbar/16/insert.png
  share/pixmaps/pidgin/toolbar/16/message-new.png
  share/pixmaps/pidgin/toolbar/16/plugins.png
  share/pixmaps/pidgin/toolbar/16/send-file.png
  share/pixmaps/pidgin/toolbar/16/transfer.png
  share/pixmaps/pidgin/toolbar/16/unblock.png
  share/pixmaps/pidgin/toolbar/16/video-call.png
 +share/pixmaps/pidgin/toolbar/22/audio-call.png
  share/pixmaps/pidgin/toolbar/22/select-avatar.png
  share/pixmaps/pidgin/toolbar/22/video-call.png
 -share/pixmaps/pidgin/toolbar/22/voice-call.png
 +share/pixmaps/pidgin/toolbar/32/audio-call.png
  share/pixmaps/pidgin/toolbar/32/video-call.png
 -share/pixmaps/pidgin/toolbar/32/voice-call.png
 +share/pixmaps/pidgin/toolbar/48/audio-call.png
  share/pixmaps/pidgin/toolbar/48/video-call.png
 -share/pixmaps/pidgin/toolbar/48/voice-call.png
  share/pixmaps/pidgin/tray/16/available_4bit.ico
  share/pixmaps/pidgin/tray/16/away_4bit.ico
  share/pixmaps/pidgin/tray/16/busy_4bit.ico
  share/pixmaps/pidgin/tray/16/connecting_4bit.ico
  share/pixmaps/pidgin/tray/16/extended-away_4bit.ico
  share/pixmaps/pidgin/tray/16/invisible_4bit.ico
  share/pixmaps/pidgin/tray/16/message_4bit.ico
  share/pixmaps/pidgin/tray/16/offline_4bit.ico
 Index: chat/pidgin/options.mk
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/pidgin/options.mk,v
 retrieving revision 1.7
 diff -p -U8 -r1.7 options.mk
 --- chat/pidgin/options.mk	6 Sep 2009 21:06:45 -0000	1.7
 +++ chat/pidgin/options.mk	9 Sep 2009 09:36:21 -0000
 @@ -1,25 +1,31 @@
  # $NetBSD: options.mk,v 1.7 2009/09/06 21:06:45 abs Exp $

  PKG_OPTIONS_VAR=		PKG_OPTIONS.pidgin
  PKG_SUPPORTED_OPTIONS+=		dbus debug farsight gstreamer gtkspell
  PKG_SUGGESTED_OPTIONS+=		gtkspell dbus farsight gstreamer

  .include "../../mk/bsd.options.mk"

 -PLIST_VARS+=		dbus
 +PLIST_VARS+=		dbus vv

  .if !empty(PKG_OPTIONS:Mdbus)
  CONFIGURE_ARGS+=	--enable-dbus
  PLIST.dbus=		yes
  .  include "../../sysutils/dbus/buildlink3.mk"
  .  include "../../sysutils/dbus-glib/buildlink3.mk"
  .endif

 +# voice/video support requires both farsight and gstreamer
 +.if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer)
 +CONFIGURE_ARGS+=	--enable-vv
 +PLIST.vv=		yes
 +.endif
 +
  .if !empty(PKG_OPTIONS:Mfarsight)
  CONFIGURE_ARGS+=	--enable-farsight
  .  include "../../multimedia/farsight2/buildlink3.mk"
  .endif

  .if !empty(PKG_OPTIONS:Mgtkspell)
  CONFIGURE_ARGS+=	--enable-gtkspell
  .  include "../../textproc/gtkspell/buildlink3.mk"
 Index: chat/pidgin-silc/distinfo
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/pidgin-silc/distinfo,v
 retrieving revision 1.20
 diff -p -U8 -r1.20 distinfo
 --- chat/pidgin-silc/distinfo	6 Sep 2009 21:06:45 -0000	1.20
 +++ chat/pidgin-silc/distinfo	9 Sep 2009 09:36:21 -0000
 @@ -1,9 +1,9 @@
  $NetBSD: distinfo,v 1.20 2009/09/06 21:06:45 abs Exp $

 -SHA1 (pidgin-2.6.1.tar.bz2) = f14b1a6d36f3fc168c0e0d5949046eedee56d724
 -RMD160 (pidgin-2.6.1.tar.bz2) = f1682e2d37ca272bc10b0c7710e73fb4807749bf
 -Size (pidgin-2.6.1.tar.bz2) = 8964827 bytes
 +SHA1 (pidgin-2.6.2.tar.bz2) = 730b9bfaf79045f13e5d8dd736b91726bb11d332
 +RMD160 (pidgin-2.6.2.tar.bz2) = a070ebe07a40d650c173065e4c448034e096963b
 +Size (pidgin-2.6.2.tar.bz2) = 9093010 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) = 1b1e34c7ecf91fb2ac8ddca3376b7803975420c0

 --=-xlWu/STR7kqVutbWe+Ms--

State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Tue, 08 Dec 2009 12:47:46 +0000
State-Changed-Why:
Committed, thank you!


From: Thomas Klausner <wiz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/42005 CVS commit: pkgsrc/chat
Date: Tue, 8 Dec 2009 12:45:42 +0000

 Module Name:	pkgsrc
 Committed By:	wiz
 Date:		Tue Dec  8 12:45:42 UTC 2009

 Modified Files:
 	pkgsrc/chat/finch: options.mk
 	pkgsrc/chat/libpurple: Makefile.common PLIST buildlink3.mk distinfo
 	    options.mk
 	pkgsrc/chat/pidgin: PLIST options.mk
 	pkgsrc/chat/pidgin-silc: distinfo
 Removed Files:
 	pkgsrc/chat/libpurple/patches: patch-aa

 Log Message:
 Update to 2.6.2, based on patches provided by Joachim Kuebart in PR 42005.
 Additional changes:
 Fix farsight handling in libpurple.
 Set LICENSE.

 2.6.2 (09/05/2009):
 	Mark: Woo boy it's been a busy two weeks.  There was a lot of new code
 	in 2.6.0, and with new code comes new bugs.  The cadre of relentless
 	developers responsible for Pidgin have been hard at work, and I believe
 	they have fixed all the major bugs that cropped up.  My thanks to all
 	those names listed as Current Developers in Pidgin's 'About' window.

 	Elliott: Well now, just as Mark said, there was a lot of new stuff that
 	probably came up with tons of bugs.  So I can't say I wrote anything
 	super-awesome, but I definitely fixed quite a few of those itty-bitty
 	why-didn't-this-work-this-way sort of bugs.


 To generate a diff of this commit:
 cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/finch/options.mk
 cvs rdiff -u -r1.29 -r1.30 pkgsrc/chat/libpurple/Makefile.common
 cvs rdiff -u -r1.19 -r1.20 pkgsrc/chat/libpurple/PLIST
 cvs rdiff -u -r1.13 -r1.14 pkgsrc/chat/libpurple/buildlink3.mk
 cvs rdiff -u -r1.24 -r1.25 pkgsrc/chat/libpurple/distinfo
 cvs rdiff -u -r1.11 -r1.12 pkgsrc/chat/libpurple/options.mk
 cvs rdiff -u -r1.13 -r0 pkgsrc/chat/libpurple/patches/patch-aa
 cvs rdiff -u -r1.14 -r1.15 pkgsrc/chat/pidgin/PLIST
 cvs rdiff -u -r1.7 -r1.8 pkgsrc/chat/pidgin/options.mk
 cvs rdiff -u -r1.21 -r1.22 pkgsrc/chat/pidgin-silc/distinfo

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.