pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat Update pidgin to 2.10.11.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b8e88e2bc3a9
branches:  trunk
changeset: 642909:b8e88e2bc3a9
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Dec 07 08:45:59 2014 +0000

description:
Update pidgin to 2.10.11.

version 2.10.11 (11/23/14):
        General:
        * Fix handling of Self-Signed SSL/TLS Certificates when using the NSS
          plugin (#16412)
        * Improve default cipher suites used with the NSS plugin (#16262)
        * Add NSS Preferences plugin which allows the SSL/TLS Versions and
          cipher suites to be configured (#8061)

        Gadu-Gadu:
        * Fix a bug that prevented plugin to load when compiled without GnuTLS.
          (mancha) (#16431)
        * Fix build for platforms without AF_LOCAL definition. (#16404)

        MSN:
        * Fix broken login due to server change (dx, TReKiE). (#16451, #16455)
        * Fail early when buddy list is unavailable instead of wasting bandwidth
          endlessly re-trying.

version 2.10.10 (10/22/14):
        General:
        * Check the basic constraints extension when validating SSL/TLS
          certificates. This fixes a security hole that allowed a malicious
          man-in-the-middle to impersonate an IM server or any other https
          endpoint. This affected both the NSS and GnuTLS plugins. (Discovered
          by an anonymous person and Jacob Appelbaum of the Tor Project, with
          thanks to Moxie Marlinspike for first publishing about this type of
          vulnerability. Thanks to Kai Engert for guidance and for some of the
          NSS changes) (CVE-2014-3694)
        * Allow and prefer TLS 1.2 and 1.1 when using the NSS plugin for SSL.
          (Elrond and Ashish Gupta) (#15909)

        libpurple3 compatibility:
        * Encrypted account passwords are preserved until the new one is set.
        * Fix loading Google Talk and Facebook XMPP accounts.

        Windows-Specific Changes:
        * Don't allow overwriting arbitrary files on the file system when the
          user installs a smiley theme via drag-and-drop. (Discovered by Yves
          Younan of Cisco Talos) (CVE-2014-3697)
        * Updates to dependencies:
                * NSS 3.17.1 and NSPR 4.10.7

        Finch:
        * Fix build against Python 3. (Ed Catmur) (#15969)

        Gadu-Gadu:
        * Updated internal libgadu to version 1.12.0.

        Groupwise:
        * Fix potential remote crash parsing server message that indicates that
          a large amount of memory should be allocated. (Discovered by Yves Younan
          and Richard Johnson of Cisco Talos) (CVE-2014-3696)

        IRC:
        * Fix a possible leak of unencrypted data when using /me command
          with OTR. (Thijs Alkemade) (#15750)

        MXit:
        * Fix potential remote crash parsing a malformed emoticon response.
          (Discovered by Yves Younan and Richard Johnson of Cisco Talos)
          (CVE-2014-3695)

        XMPP:
        * Fix potential information leak where a malicious XMPP server and
          possibly even a malicious remote user could create a carefully crafted
          XMPP message that causes libpurple to send an XMPP message containing
          arbitrary memory. (Discovered and fixed by Thijs Alkemade and Paul
          Aurich) (CVE-2014-3698)
        * Fix Facebook XMPP roster quirks. (#15041, #15957)

        Yahoo:
        * Fix login when using the GnuTLS library for TLS connections. (#16172)

diffstat:

 chat/finch/Makefile                                               |  14 +-------
 chat/libpurple/Makefile                                           |  11 +-----
 chat/libpurple/Makefile.common                                    |  12 +++++-
 chat/libpurple/PLIST                                              |  16 +++++---
 chat/libpurple/distinfo                                           |  10 ++--
 chat/libpurple/options.mk                                         |   3 +-
 chat/libpurple/patches/patch-libpurple_protocols_gg_lib_libgadu.h |  14 -------
 chat/libpurple/patches/patch-libpurple_protocols_mxit_profile.c   |  18 ++++++++++
 chat/pidgin-sametime/Makefile                                     |   3 +-
 chat/pidgin-silc/Makefile                                         |   3 +-
 chat/pidgin/Makefile                                              |  13 +------
 chat/pidgin/PLIST                                                 |   3 +-
 12 files changed, 50 insertions(+), 70 deletions(-)

diffs (truncated from 309 to 300 lines):

diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/finch/Makefile
--- a/chat/finch/Makefile       Sun Dec 07 08:42:07 2014 +0000
+++ b/chat/finch/Makefile       Sun Dec 07 08:45:59 2014 +0000
@@ -1,25 +1,13 @@
-# $NetBSD: Makefile,v 1.59 2014/05/29 23:35:18 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2014/12/07 08:45:59 obache Exp $
 
 PKGNAME=       finch-${PIDGIN_VERSION}
-PKGREVISION=   1
 
 COMMENT=       Multi-protocol Instant Messaging client console frontend
 
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 2.10.8
-# finch/libgnt/gntwm.c needs
-# -       PyObject *pp = PySys_GetObject("path"), *dirobj = PyString_FromString(dir);
-# +       PyObject *pp = PySys_GetObject("path"), *dirobj = PyBytes_FromString(dir);
-
 .include               "../../chat/libpurple/Makefile.common"
 
 USE_TOOLS+=    intltool msgfmt perl
 
-PKGCONFIG_OVERRIDE+=   finch/finch.pc.in
-PKGCONFIG_OVERRIDE+=   finch/libgnt/gnt.pc.in
-PKGCONFIG_OVERRIDE+=   gaim.pc.in
-PKGCONFIG_OVERRIDE+=   libpurple/purple.pc.in
-PKGCONFIG_OVERRIDE+=   pidgin/pidgin.pc.in
-
 CONFIGURE_ARGS+=       --enable-consoleui
 CONFIGURE_ENV+=                ac_cv_path_pythonpath=
 
diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/libpurple/Makefile
--- a/chat/libpurple/Makefile   Sun Dec 07 08:42:07 2014 +0000
+++ b/chat/libpurple/Makefile   Sun Dec 07 08:45:59 2014 +0000
@@ -1,18 +1,12 @@
-# $NetBSD: Makefile,v 1.67 2014/05/29 23:35:18 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2014/12/07 08:45:59 obache Exp $
 
 PKGNAME=       libpurple-${PIDGIN_VERSION}
-PKGREVISION=   3
 
 COMMENT=       Multi-protocol Instant Messaging client backend
 
 .include               "../../chat/libpurple/Makefile.common"
 
 USE_TOOLS+=            msgfmt intltool
-CONFIGURE_ENV+=                GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
-MAKE_ENV+=             GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
-
-PKGCONFIG_OVERRIDE+=   gaim.pc.in
-PKGCONFIG_OVERRIDE+=   libpurple/purple.pc.in
 
 CPPFLAGS.SunOS+=       -D__SunOS
 
@@ -20,9 +14,6 @@
 
 BUILD_DIRS=    m4macros libpurple po share/ca-certs share/sounds
 
-## #post-build:
-## #   cp ${WRKSRC}/libpurple/gconf/purple.schemas ${WRKSRC}/purple.schemas
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/libpurple/Makefile.common
--- a/chat/libpurple/Makefile.common    Sun Dec 07 08:42:07 2014 +0000
+++ b/chat/libpurple/Makefile.common    Sun Dec 07 08:45:59 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2014/02/04 09:04:30 obache Exp $
+# $NetBSD: Makefile.common,v 1.43 2014/12/07 08:45:59 obache Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
@@ -6,7 +6,7 @@
 # used by chat/pidgin-sametime/Makefile
 # used by chat/pidgin-silc/Makefile
 
-PIDGIN_VERSION=        2.10.9
+PIDGIN_VERSION=        2.10.11
 DISTNAME=      pidgin-${PIDGIN_VERSION}
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pidgin/}
@@ -41,3 +41,11 @@
 CONFIGURE_ARGS+=       --disable-debug
 CONFIGURE_ARGS+=       --disable-nm
 CONFIGURE_ARGS+=       --disable-vv
+
+PKGCONFIG_OVERRIDE+=   finch/finch.pc.in
+PKGCONFIG_OVERRIDE+=   finch/libgnt/gnt.pc.in
+PKGCONFIG_OVERRIDE+=   gaim.pc.in
+PKGCONFIG_OVERRIDE+=   libpurple/data/purple.pc.in
+PKGCONFIG_OVERRIDE+=   libpurple/data/purple-2.pc.in
+PKGCONFIG_OVERRIDE+=   pidgin/data/pidgin.pc.in
+PKGCONFIG_OVERRIDE+=   pidgin/data/pidgin-2.pc.in
diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/libpurple/PLIST
--- a/chat/libpurple/PLIST      Sun Dec 07 08:42:07 2014 +0000
+++ b/chat/libpurple/PLIST      Sun Dec 07 08:45:59 2014 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2014/12/07 08:42:07 obache Exp $
+@comment $NetBSD: PLIST,v 1.30 2014/12/07 08:45:59 obache Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -91,6 +91,7 @@
 lib/purple-2/newline.la
 lib/purple-2/offlinemsg.la
 lib/purple-2/psychic.la
+${PLIST.nss}lib/purple-2/nss-prefs.la
 ${PLIST.gnutls}lib/purple-2/ssl-gnutls.la
 ${PLIST.nss}lib/purple-2/ssl-nss.la
 lib/purple-2/ssl.la
@@ -132,23 +133,23 @@
 share/locale/hi/LC_MESSAGES/pidgin.mo
 share/locale/hr/LC_MESSAGES/pidgin.mo
 share/locale/hu/LC_MESSAGES/pidgin.mo
-share/locale/hy/LC_MESSAGES/pidgin.mo
 share/locale/id/LC_MESSAGES/pidgin.mo
 share/locale/it/LC_MESSAGES/pidgin.mo
 share/locale/ja/LC_MESSAGES/pidgin.mo
 share/locale/ka/LC_MESSAGES/pidgin.mo
+share/locale/kk/LC_MESSAGES/pidgin.mo
 share/locale/km/LC_MESSAGES/pidgin.mo
 share/locale/kn/LC_MESSAGES/pidgin.mo
 share/locale/ko/LC_MESSAGES/pidgin.mo
 share/locale/ku/LC_MESSAGES/pidgin.mo
-share/locale/lo/LC_MESSAGES/pidgin.mo
+share/locale/ku_IQ/LC_MESSAGES/pidgin.mo
 share/locale/lt/LC_MESSAGES/pidgin.mo
+share/locale/lv/LC_MESSAGES/pidgin.mo
 share/locale/mai/LC_MESSAGES/pidgin.mo
 share/locale/mhr/LC_MESSAGES/pidgin.mo
 share/locale/mk/LC_MESSAGES/pidgin.mo
 share/locale/mn/LC_MESSAGES/pidgin.mo
 share/locale/mr/LC_MESSAGES/pidgin.mo
-share/locale/ms_MY/LC_MESSAGES/pidgin.mo
 share/locale/my_MM/LC_MESSAGES/pidgin.mo
 share/locale/nb/LC_MESSAGES/pidgin.mo
 share/locale/ne/LC_MESSAGES/pidgin.mo
@@ -175,6 +176,7 @@
 share/locale/te/LC_MESSAGES/pidgin.mo
 share/locale/th/LC_MESSAGES/pidgin.mo
 share/locale/tr/LC_MESSAGES/pidgin.mo
+share/locale/tt/LC_MESSAGES/pidgin.mo
 share/locale/uk/LC_MESSAGES/pidgin.mo
 share/locale/ur/LC_MESSAGES/pidgin.mo
 share/locale/vi/LC_MESSAGES/pidgin.mo
@@ -204,9 +206,9 @@
 share/purple/ca-certs/Thawte_Primary_Root_CA.pem
 share/purple/ca-certs/ValiCert_Class_2_VA.pem
 share/purple/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
-share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
-share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
-share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
+share/purple/ca-certs/VeriSign_Class_3_Primary_CA-G2.pem
+share/purple/ca-certs/VeriSign_Class_3_Primary_CA-G5-2.pem
+share/purple/ca-certs/VeriSign_Class_3_Primary_CA-G5.pem
 share/purple/ca-certs/VeriSign_International_Server_Class_3_CA.pem
 share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
 share/sounds/purple/alert.wav
diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/libpurple/distinfo
--- a/chat/libpurple/distinfo   Sun Dec 07 08:42:07 2014 +0000
+++ b/chat/libpurple/distinfo   Sun Dec 07 08:45:59 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.41 2014/02/04 09:04:30 obache Exp $
+$NetBSD: distinfo,v 1.42 2014/12/07 08:45:59 obache Exp $
 
-SHA1 (pidgin-2.10.9.tar.bz2) = f3de8fd94dba1f4c98d5402a02430f9f323e665a
-RMD160 (pidgin-2.10.9.tar.bz2) = 05d8e9593730ec576dec34007b45396454d8880d
-Size (pidgin-2.10.9.tar.bz2) = 10093423 bytes
+SHA1 (pidgin-2.10.11.tar.bz2) = 5e0062b81bdb01300804e12bc0b6a04a91984631
+RMD160 (pidgin-2.10.11.tar.bz2) = 93802d5884b5ffd0714cb91dbe31f4e311f17e6d
+Size (pidgin-2.10.11.tar.bz2) = 9458050 bytes
 SHA1 (patch-libpurple_plugins_perl_common_Makefile.PL.in) = 40326826000ed42e7570486f89f3196b58093d48
-SHA1 (patch-libpurple_protocols_gg_lib_libgadu.h) = 5756134e17ae2ce28d3555cd40354245e22a5bd6
+SHA1 (patch-libpurple_protocols_mxit_profile.c) = 8f6e74f3a04976743c433d8b4b3f7b0b117f8b69
diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/libpurple/options.mk
--- a/chat/libpurple/options.mk Sun Dec 07 08:42:07 2014 +0000
+++ b/chat/libpurple/options.mk Sun Dec 07 08:45:59 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.27 2014/12/07 08:42:07 obache Exp $
+# $NetBSD: options.mk,v 1.28 2014/12/07 08:45:59 obache Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.libpurple
 PKG_SUPPORTED_OPTIONS+=                avahi dbus debug farsight gnome gnutls
@@ -60,7 +60,6 @@
 .if !empty(PKG_OPTIONS:Mdbus)
 CONFIGURE_ARGS+=       --enable-dbus
 CONFIGURE_ARGS+=       --with-python=${PYTHONBIN}
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 2.10.8
 PLIST.dbus=            yes
 REPLACE_SH+=           libpurple/purple-send
 REPLACE_SH+=           libpurple/purple-send-async
diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/libpurple/patches/patch-libpurple_protocols_gg_lib_libgadu.h
--- a/chat/libpurple/patches/patch-libpurple_protocols_gg_lib_libgadu.h Sun Dec 07 08:42:07 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-libpurple_protocols_gg_lib_libgadu.h,v 1.1 2012/03/09 11:45:01 fhajny Exp $
-
-Make the SunOS condition a little more generic.
---- libpurple/protocols/gg/lib/libgadu.h.orig  2011-03-11 02:20:27.000000000 +0000
-+++ libpurple/protocols/gg/lib/libgadu.h
-@@ -117,7 +117,7 @@ typedef unsigned char   uint8_t;
- typedef unsigned short uint16_t;
- typedef unsigned int   uint32_t;
- 
--#if !defined(__CYGWIN__) && !defined(__SunOS) && !defined(_INCLUDE_HPUX_SOURCE)
-+#if !defined(__CYGWIN__) && !defined(__sun) && !defined(_INCLUDE_HPUX_SOURCE)
- #define __int8_t_defined
- typedef   signed char    int8_t;
- typedef   signed short  int16_t;
diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/libpurple/patches/patch-libpurple_protocols_mxit_profile.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/libpurple/patches/patch-libpurple_protocols_mxit_profile.c   Sun Dec 07 08:45:59 2014 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-libpurple_protocols_mxit_profile.c,v 1.1 2014/12/07 08:45:59 obache Exp $
+
+* prevent to overwrite _XOPEN_SOURCE setting, and 500 is good enough for
+  localtime_r(3).
+
+--- libpurple/protocols/mxit/profile.c.orig    2014-11-23 16:41:26.000000000 +0000
++++ libpurple/protocols/mxit/profile.c
+@@ -23,7 +23,9 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+  */
+ 
+-#define               _XOPEN_SOURCE
++#ifndef               _XOPEN_SOURCE
++#define               _XOPEN_SOURCE 500
++#endif
+ #include      <time.h>
+ 
+ #include      "internal.h"
diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/pidgin-sametime/Makefile
--- a/chat/pidgin-sametime/Makefile     Sun Dec 07 08:42:07 2014 +0000
+++ b/chat/pidgin-sametime/Makefile     Sun Dec 07 08:45:59 2014 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2014/05/29 23:35:19 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2014/12/07 08:45:59 obache Exp $
 
 PKGNAME=       pidgin-sametime-${PIDGIN_VERSION}
-PKGREVISION=   1
 
 COMMENT=       Lotus Sametime plugin for the Pidgin instant messenger
 
diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/pidgin-silc/Makefile
--- a/chat/pidgin-silc/Makefile Sun Dec 07 08:42:07 2014 +0000
+++ b/chat/pidgin-silc/Makefile Sun Dec 07 08:45:59 2014 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2014/05/29 23:35:19 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2014/12/07 08:45:59 obache Exp $
 
 PKGNAME=       pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION=   1
 
 COMMENT=       SILC plugin for the Pidgin instant messenger
 
diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/pidgin/Makefile
--- a/chat/pidgin/Makefile      Sun Dec 07 08:42:07 2014 +0000
+++ b/chat/pidgin/Makefile      Sun Dec 07 08:45:59 2014 +0000
@@ -1,17 +1,11 @@
-# $NetBSD: Makefile,v 1.62 2014/05/09 07:36:55 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2014/12/07 08:45:59 obache Exp $
 
-PKGREVISION=           1
 COMMENT=               Multi-protocol Instant Messaging client GTK frontend
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 2.10.8 (finch)
 
 .include               "../../chat/libpurple/Makefile.common"
 
 USE_TOOLS+=            msgfmt intltool
 
-PKGCONFIG_OVERRIDE+=   gaim.pc.in
-PKGCONFIG_OVERRIDE+=   libpurple/purple.pc.in
-PKGCONFIG_OVERRIDE+=   pidgin/pidgin.pc.in
-
 CONFIGURE_ARGS+=       --enable-gtkui
 
 BUILD_DIRS=            pidgin
@@ -26,14 +20,9 @@
        # XXX Find a cleaner way.
        ${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
          ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
-       cd ${WRKSRC} && ${BUILD_MAKE_CMD} pidgin.desktop
 
 INSTALL_DIRS=          pidgin doc
 
-post-install:
-       ${INSTALL_DATA} ${WRKSRC}/pidgin.desktop \
-         ${DESTDIR}${PREFIX}/share/applications
-
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff -r ffaa0f485964 -r b8e88e2bc3a9 chat/pidgin/PLIST
--- a/chat/pidgin/PLIST Sun Dec 07 08:42:07 2014 +0000
+++ b/chat/pidgin/PLIST Sun Dec 07 08:45:59 2014 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2012/04/04 13:20:06 obache Exp $
+@comment $NetBSD: PLIST,v 1.22 2014/12/07 08:45:59 obache Exp $
 bin/pidgin
 include/pidgin/gtkaccount.h



Home | Main Index | Thread Index | Old Index