Update chat/gajim to 0.15.

pkgsrc changes:
---------------
- Add a patch to fix CVE-2012-2093, taken from upstream repository.
- s/py-amkCrypto/py-crypto (py-amkCrypto is not maintained anymore upstream)

upstream changes:
-----------------

Gajim 0.15 (18 March 2012)

* Plugin system
* Whiteboard (via a plugin)
* Message archiving
* Stream managment
* IBB
* Nested roster group
* Roster filtrering
* UPower support
* GPG support for windows
* Spell checking support for windows

Gajim 0.14.4 (22 July 2011)

* Fix translation issue
* other minor fixes

Gajim 0.14.3 (19 June 2011)

* Fix history viewer
* Fix closing roster window
* Prevent some erros with metacontacts

Gajim 0.14.2 (07 June 2011)

* Fix CPU usage when testing file transfer proxies
* Fix invalid XML char regex
* Fix subscription request window handling
* Fix URL display in chat message banner
* Other minor bugfixes

5 files changed, 105 insertions, 28 deletions

diff --git a/chat/gajim/Makefile b/chat/gajim/Makefile
index 32bf6cc923f..2d18b16f8a6 100644
--- a/chat/gajim/Makefile
+++ b/chat/gajim/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2012/04/08 19:08:45 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2012/04/17 20:57:09 gls Exp $
 #
 
-DISTNAME=	gajim-0.14.1
-PKGREVISION=	7
+DISTNAME=	gajim-0.15
 CATEGORIES=	chat python
-MASTER_SITES=	http://www.gajim.org/downloads/0.14/
+MASTER_SITES=	http://www.gajim.org/downloads/0.15/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	vsevolod@highsecure.ru
diff --git a/chat/gajim/PLIST b/chat/gajim/PLIST
index 10acffe8e15..a2bdf767434 100644
--- a/chat/gajim/PLIST
+++ b/chat/gajim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/12/24 00:02:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/04/17 20:57:09 gls Exp $
 bin/gajim
 bin/gajim-history-manager
 bin/gajim-remote
@@ -6,13 +6,6 @@ man/man1/gajim-history-manager.1
 man/man1/gajim-remote.1
 man/man1/gajim.1
 share/applications/gajim.desktop
-share/doc/gajim/AUTHORS
-share/doc/gajim/COPYING
-share/doc/gajim/ChangeLog
-share/doc/gajim/README
-share/doc/gajim/README.html
-share/doc/gajim/THANKS
-share/doc/gajim/THANKS.artists
 share/gajim/data/activities/default/doing_chores/buying_groceries.png
 share/gajim/data/activities/default/doing_chores/category.png
 share/gajim/data/activities/default/doing_chores/cleaning.png
@@ -279,7 +272,7 @@ share/gajim/data/gui/add_new_contact_window.ui
 share/gajim/data/gui/adhoc_commands_window.ui
 share/gajim/data/gui/advanced_configuration_window.ui
 share/gajim/data/gui/advanced_menuitem_menu.ui
-share/gajim/data/gui/advanced_notifications_window.ui
+share/gajim/data/gui/archiving_preferences_window.ui
 share/gajim/data/gui/atom_entry_window.ui
 share/gajim/data/gui/blocked_contacts_window.ui
 share/gajim/data/gui/change_activity_dialog.ui
@@ -306,6 +299,7 @@ share/gajim/data/gui/history_manager.ui
 share/gajim/data/gui/history_window.ui
 share/gajim/data/gui/input_dialog.ui
 share/gajim/data/gui/input_text_dialog.ui
+share/gajim/data/gui/item_archiving_preferences_window.ui
 share/gajim/data/gui/join_groupchat_window.ui
 share/gajim/data/gui/manage_bookmarks_window.ui
 share/gajim/data/gui/manage_pep_services_window.ui
@@ -313,6 +307,7 @@ share/gajim/data/gui/manage_proxies_window.ui
 share/gajim/data/gui/manage_sounds_window.ui
 share/gajim/data/gui/message_window.ui
 share/gajim/data/gui/passphrase_dialog.ui
+share/gajim/data/gui/plugins_window.ui
 share/gajim/data/gui/popup_notification_window.ui
 share/gajim/data/gui/preferences_window.ui
 share/gajim/data/gui/privacy_list_window.ui
@@ -885,6 +880,10 @@ share/gajim/icons/hicolor/48x48/actions/gajim-unsubscribed.png
 share/gajim/icons/hicolor/48x48/actions/gajim-warning.png
 share/gajim/icons/hicolor/64x64/apps/gajim.png
 share/gajim/icons/hicolor/scalable/apps/gajim.svg
+share/gajim/plugins/plugin_installer/__init__.py
+share/gajim/plugins/plugin_installer/config_dialog.ui
+share/gajim/plugins/plugin_installer/manifest.ini
+share/gajim/plugins/plugin_installer/plugin_installer.py
 share/gajim/src/adhoc_commands.py
 share/gajim/src/adhoc_commands.pyc
 share/gajim/src/adhoc_commands.pyo
@@ -903,9 +902,9 @@ share/gajim/src/chat_control.pyo
 share/gajim/src/command_system/__init__.py
 share/gajim/src/command_system/__init__.pyc
 share/gajim/src/command_system/__init__.pyo
-share/gajim/src/command_system/dispatching.py
-share/gajim/src/command_system/dispatching.pyc
-share/gajim/src/command_system/dispatching.pyo
+share/gajim/src/command_system/dispatcher.py
+share/gajim/src/command_system/dispatcher.pyc
+share/gajim/src/command_system/dispatcher.pyo
 share/gajim/src/command_system/errors.py
 share/gajim/src/command_system/errors.pyc
 share/gajim/src/command_system/errors.pyo
@@ -918,6 +917,9 @@ share/gajim/src/command_system/implementation/__init__.pyo
 share/gajim/src/command_system/implementation/custom.py
 share/gajim/src/command_system/implementation/custom.pyc
 share/gajim/src/command_system/implementation/custom.pyo
+share/gajim/src/command_system/implementation/execute.py
+share/gajim/src/command_system/implementation/execute.pyc
+share/gajim/src/command_system/implementation/execute.pyo
 share/gajim/src/command_system/implementation/hosts.py
 share/gajim/src/command_system/implementation/hosts.pyc
 share/gajim/src/command_system/implementation/hosts.pyo
@@ -930,12 +932,9 @@ share/gajim/src/command_system/implementation/standard.pyo
 share/gajim/src/command_system/mapping.py
 share/gajim/src/command_system/mapping.pyc
 share/gajim/src/command_system/mapping.pyo
-share/gajim/src/common/GnuPG.py
-share/gajim/src/common/GnuPG.pyc
-share/gajim/src/common/GnuPG.pyo
-share/gajim/src/common/GnuPGInterface.py
-share/gajim/src/common/GnuPGInterface.pyc
-share/gajim/src/common/GnuPGInterface.pyo
+share/gajim/src/command_system/tools.py
+share/gajim/src/command_system/tools.pyc
+share/gajim/src/command_system/tools.pyo
 share/gajim/src/common/__init__.py
 share/gajim/src/common/__init__.pyc
 share/gajim/src/common/__init__.pyo
@@ -948,6 +947,9 @@ share/gajim/src/common/atom.pyo
 share/gajim/src/common/caps_cache.py
 share/gajim/src/common/caps_cache.pyc
 share/gajim/src/common/caps_cache.pyo
+share/gajim/src/common/check_X509.py
+share/gajim/src/common/check_X509.pyc
+share/gajim/src/common/check_X509.pyo
 share/gajim/src/common/check_paths.py
 share/gajim/src/common/check_paths.pyc
 share/gajim/src/common/check_paths.pyo
@@ -966,6 +968,9 @@ share/gajim/src/common/connection.pyo
 share/gajim/src/common/connection_handlers.py
 share/gajim/src/common/connection_handlers.pyc
 share/gajim/src/common/connection_handlers.pyo
+share/gajim/src/common/connection_handlers_events.py
+share/gajim/src/common/connection_handlers_events.pyc
+share/gajim/src/common/connection_handlers_events.pyo
 share/gajim/src/common/contacts.py
 share/gajim/src/common/contacts.pyc
 share/gajim/src/common/contacts.pyo
@@ -981,6 +986,9 @@ share/gajim/src/common/dbus_support.pyo
 share/gajim/src/common/defs.py
 share/gajim/src/common/defs.pyc
 share/gajim/src/common/defs.pyo
+share/gajim/src/common/demandimport.py
+share/gajim/src/common/demandimport.pyc
+share/gajim/src/common/demandimport.pyo
 share/gajim/src/common/dh.py
 share/gajim/src/common/dh.pyc
 share/gajim/src/common/dh.pyo
@@ -999,6 +1007,12 @@ share/gajim/src/common/gajim.pyo
 share/gajim/src/common/ged.py
 share/gajim/src/common/ged.pyc
 share/gajim/src/common/ged.pyo
+share/gajim/src/common/gnupg.py
+share/gajim/src/common/gnupg.pyc
+share/gajim/src/common/gnupg.pyo
+share/gajim/src/common/gpg.py
+share/gajim/src/common/gpg.pyc
+share/gajim/src/common/gpg.pyo
 share/gajim/src/common/helpers.py
 share/gajim/src/common/helpers.pyc
 share/gajim/src/common/helpers.pyo
@@ -1038,9 +1052,15 @@ share/gajim/src/common/logger.pyo
 share/gajim/src/common/logging_helpers.py
 share/gajim/src/common/logging_helpers.pyc
 share/gajim/src/common/logging_helpers.pyo
+share/gajim/src/common/message_archiving.py
+share/gajim/src/common/message_archiving.pyc
+share/gajim/src/common/message_archiving.pyo
 share/gajim/src/common/multimedia_helpers.py
 share/gajim/src/common/multimedia_helpers.pyc
 share/gajim/src/common/multimedia_helpers.pyo
+share/gajim/src/common/nec.py
+share/gajim/src/common/nec.pyc
+share/gajim/src/common/nec.pyo
 share/gajim/src/common/optparser.py
 share/gajim/src/common/optparser.pyc
 share/gajim/src/common/optparser.pyo
@@ -1119,6 +1139,9 @@ share/gajim/src/common/xmpp/roster_nb.pyo
 share/gajim/src/common/xmpp/simplexml.py
 share/gajim/src/common/xmpp/simplexml.pyc
 share/gajim/src/common/xmpp/simplexml.pyo
+share/gajim/src/common/xmpp/smacks.py
+share/gajim/src/common/xmpp/smacks.pyc
+share/gajim/src/common/xmpp/smacks.pyo
 share/gajim/src/common/xmpp/stringprepare.py
 share/gajim/src/common/xmpp/stringprepare.pyc
 share/gajim/src/common/xmpp/stringprepare.pyo
@@ -1233,9 +1256,30 @@ share/gajim/src/network_manager_listener.pyo
 share/gajim/src/notify.py
 share/gajim/src/notify.pyc
 share/gajim/src/notify.pyo
+share/gajim/src/plugins/__init__.py
+share/gajim/src/plugins/__init__.pyc
+share/gajim/src/plugins/__init__.pyo
+share/gajim/src/plugins/gui.py
+share/gajim/src/plugins/gui.pyc
+share/gajim/src/plugins/gui.pyo
+share/gajim/src/plugins/helpers.py
+share/gajim/src/plugins/helpers.pyc
+share/gajim/src/plugins/helpers.pyo
+share/gajim/src/plugins/plugin.py
+share/gajim/src/plugins/plugin.pyc
+share/gajim/src/plugins/plugin.pyo
+share/gajim/src/plugins/pluginmanager.py
+share/gajim/src/plugins/pluginmanager.pyc
+share/gajim/src/plugins/pluginmanager.pyo
+share/gajim/src/plugins/plugins_i18n.py
+share/gajim/src/plugins/plugins_i18n.pyc
+share/gajim/src/plugins/plugins_i18n.pyo
 share/gajim/src/profile_window.py
 share/gajim/src/profile_window.pyc
 share/gajim/src/profile_window.pyo
+share/gajim/src/pycallgraph.py
+share/gajim/src/pycallgraph.pyc
+share/gajim/src/pycallgraph.pyo
 share/gajim/src/remote_control.py
 share/gajim/src/remote_control.pyc
 share/gajim/src/remote_control.pyo
@@ -1257,6 +1301,9 @@ share/gajim/src/statusicon.pyo
 share/gajim/src/tooltips.py
 share/gajim/src/tooltips.pyc
 share/gajim/src/tooltips.pyo
+share/gajim/src/upower_listener.py
+share/gajim/src/upower_listener.pyc
+share/gajim/src/upower_listener.pyo
 share/gajim/src/vcard.py
 share/gajim/src/vcard.pyc
 share/gajim/src/vcard.pyo
@@ -1294,3 +1341,4 @@ share/locale/sr@Latn/LC_MESSAGES/gajim.mo
 share/locale/sv/LC_MESSAGES/gajim.mo
 share/locale/uk/LC_MESSAGES/gajim.mo
 share/locale/zh_CN/LC_MESSAGES/gajim.mo
+share/locale/zh_TW/LC_MESSAGES/gajim.mo
diff --git a/chat/gajim/distinfo b/chat/gajim/distinfo
index 2890df481a0..79ba6a65cad 100644
--- a/chat/gajim/distinfo
+++ b/chat/gajim/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/12/24 00:02:28 wiz Exp $
+$NetBSD: distinfo,v 1.2 2012/04/17 20:57:09 gls Exp $
 
-SHA1 (gajim-0.14.1.tar.bz2) = d2fdf32ded4a5fb3c7a277a765f84a5453931f34
-RMD160 (gajim-0.14.1.tar.bz2) = 859cbd4a9f190adfc6b84c23ef03e3c3cab09d8d
-Size (gajim-0.14.1.tar.bz2) = 4144916 bytes
+SHA1 (gajim-0.15.tar.bz2) = 68934aa40090d21b2937df551373e454f5aa6bb6
+RMD160 (gajim-0.15.tar.bz2) = d16345dc19bfa94d657f531af63600809c6fdeb5
+Size (gajim-0.15.tar.bz2) = 4332305 bytes
+SHA1 (patch-src_common_latex.py) = 52f4764f881bc5ed26b8262ebd92e5fc1e80e1a4
diff --git a/chat/gajim/options.mk b/chat/gajim/options.mk
index 8f65b2ab577..e849e3851fa 100644
--- a/chat/gajim/options.mk
+++ b/chat/gajim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2011/05/14 14:28:07 obache Exp $
+# $NetBSD: options.mk,v 1.3 2012/04/17 20:57:09 gls Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gajim
 PKG_SUPPORTED_OPTIONS=	avahi gnome gnome-keyring ssl
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS=	ssl
 # ssl
 .if !empty(PKG_OPTIONS:Mssl)
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.9:../../security/py-OpenSSL
-DEPENDS+=	${PYPKGPREFIX}-amkCrypto-[0-9]*:../../security/py-amkCrypto
+DEPENDS+=	${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
 .endif
 
 # avahi
diff --git a/chat/gajim/patches/patch-src_common_latex.py b/chat/gajim/patches/patch-src_common_latex.py
new file mode 100644
index 00000000000..f61a59e3bcc
--- /dev/null
+++ b/chat/gajim/patches/patch-src_common_latex.py
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_common_latex.py,v 1.1 2012/04/17 20:57:09 gls Exp $
+
+CVE-2012-2093: improve temp file search when using latex to prevent overwriting files
+Taken from upstream repository: https://trac.gajim.org/changeset/13759/src/common/latex.py
+
+--- src/common/latex.py.orig	2012-03-18 11:25:56.000000000 +0000
++++ src/common/latex.py
+@@ -59,8 +59,19 @@ def check_blacklist(str_):
+ 
+ def get_tmpfile_name():
+     random.seed()
+-    int_ = random.randint(0, 100)
+-    return os.path.join(gettempdir(), 'gajimtex_' + int_.__str__())
++    while(nb < 100):
++        int_ = random.randint(0, 10000)
++        filename = os.path.join(gettempdir(), 'gajimtex_' + int_.__str__())
++        # Check if a file to not overwrite it
++        ok = True
++        extensions = ['.tex', '.log', '.aux', '.dvi']
++        for ext in extensions:
++            if os.path.exists(filename + ext):
++                ok = False
++                break
++        if ok:
++            return filename
++    return filename
+ 
+ def write_latex(filename, str_):
+     texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}'