Pullup ticket #3971 - requested by tonio

chat/weechat: security update

Revisions pulled up:
- chat/weechat/Makefile                                         1.37 via patch
- chat/weechat/PLIST                                            1.16
- chat/weechat/distinfo                                         1.23
- chat/weechat/patches/patch-ad                                 deleted
- chat/weechat/patches/patch-src_plugins_script_script_repo_h   1.1

---
   Module Name:	pkgsrc
   Committed By:	tonio
   Date:		Sat Nov 24 11:16:07 UTC 2012

   Modified Files:
   	pkgsrc/chat/weechat: Makefile PLIST distinfo
   Added Files:
   	pkgsrc/chat/weechat/patches: patch-src_plugins_script_script_repo_h
   Removed Files:
   	pkgsrc/chat/weechat/patches: patch-ad

   Log Message:
   Update chat/weechat to 0.3.9.2

   Changes:
   Security:
   - CVE-2012-5854: Fix buffer overflow when decoding IRC colors in strings
   - CVE-2012-5534: Fix untrusted command for function hook_process could lead to
     execution of commands, because of shell expansions
   Among the new features:
   - add plugin "script" (replacement of weeget.py and script.pl)
   - add support of SSL in relay plugin
   - add color for offline nicks
   - add system resource limits for WeeChat process
   - add zoom on merged buffer (default key: alt+"x")
   - add "Day changed to" in logger backlog
   - add command line option "-r" (or "--run-command") to run command(s) after startup of WeeChat
   - add option "swap" for command /buffer
   - generate alternate IRC nicks dynamically (when all nicks are already in use)
   - fix rejoin of password protected IRC channels
   - fix freeze in irc and relay plugins with sockets
   - fix color of long lines (displayed on more than one line on screen) under FreeBSD
   - allow update for some variables of hdata
   - add japanese user's guide, scripting guide and tester's guide
   - many bugs fixed.

5 files changed, 26 insertions, 24 deletions

diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index b957d8d59bd..8ab560e3c80 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2012/09/23 10:47:46 obache Exp $
+# $NetBSD: Makefile,v 1.34.2.1 2012/11/26 23:24:42 tron Exp $
 
-DISTNAME=	weechat-0.3.8
-PKGREVISION=	1
+DISTNAME=	weechat-0.3.9.2
 CATEGORIES=	chat
 MASTER_SITES=	http://www.weechat.org/files/src/
 
@@ -29,4 +28,5 @@ LIBS.SunOS+=		-lnsl
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/weechat/PLIST b/chat/weechat/PLIST
index 5fc9302d0ac..694c6b9d6c8 100644
--- a/chat/weechat/PLIST
+++ b/chat/weechat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2012/05/28 22:55:05 tonio Exp $
+@comment $NetBSD: PLIST,v 1.15.4.1 2012/11/26 23:24:42 tron Exp $
 bin/weechat-curses
 include/weechat/weechat-plugin.h
 lib/pkgconfig/weechat.pc
@@ -14,6 +14,7 @@ lib/weechat/plugins/irc.la
 lib/weechat/plugins/logger.la
 lib/weechat/plugins/relay.la
 lib/weechat/plugins/rmodifier.la
+lib/weechat/plugins/script.la
 lib/weechat/plugins/xfer.la
 share/locale/cs/LC_MESSAGES/weechat.mo
 share/locale/de/LC_MESSAGES/weechat.mo
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index e39e9f4ee3f..d064962a517 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.22 2012/06/13 11:33:30 abs Exp $
+$NetBSD: distinfo,v 1.22.4.1 2012/11/26 23:24:42 tron Exp $
 
-SHA1 (weechat-0.3.8.tar.bz2) = 50387983f3aa20946a0b3d466acafa35f86411f5
-RMD160 (weechat-0.3.8.tar.bz2) = 48f7c0dd500551763fe19eaa7eef9a5990f870a9
-Size (weechat-0.3.8.tar.bz2) = 2488165 bytes
+SHA1 (weechat-0.3.9.2.tar.bz2) = 64147c88426c240d5d33c65755c729ed2c435aeb
+RMD160 (weechat-0.3.9.2.tar.bz2) = 9117e1d88b6e105cf3d5de189cdb7575f18ab980
+Size (weechat-0.3.9.2.tar.bz2) = 2721004 bytes
 SHA1 (patch-aa) = 86a3cfd780fb52d8dea92d5f9d72bb3ac2df91bf
 SHA1 (patch-ab) = d0fac0994602dfa0afde9fe14487f44f8cce25d6
 SHA1 (patch-ac) = e9fa664f040bd6549ddd8e860ec4568931bcab6b
-SHA1 (patch-ad) = 4f8140fc3d10a036ff10db402053c9744c350b2b
 SHA1 (patch-src_gui_curses_gui-curses-term_c) = 85d59b3bc4dc3bac8b972d19a20a35afbcd599c8
+SHA1 (patch-src_plugins_script_script_repo_h) = 041b5e284a3b4cd6998c7e93e3f24f8ccb04980a
diff --git a/chat/weechat/patches/patch-ad b/chat/weechat/patches/patch-ad
deleted file mode 100644
index d7717cd9f4a..00000000000
--- a/chat/weechat/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2012/05/28 22:55:05 tonio Exp $
-
-Solaris build
-
---- src/gui/curses/gui-curses-window.c.orig	2012-01-28 14:02:25.000000000 +0000
-+++ src/gui/curses/gui-curses-window.c
-@@ -31,6 +31,8 @@
- #include <ctype.h>
- #include <stdarg.h>
- #include <libgen.h>
-+#include <unistd.h>
-+#include <termios.h>
- #include <sys/ioctl.h>
- 
- #include "../../core/weechat.h"
diff --git a/chat/weechat/patches/patch-src_plugins_script_script_repo_h b/chat/weechat/patches/patch-src_plugins_script_script_repo_h
new file mode 100644
index 00000000000..2ec8fe02dec
--- /dev/null
+++ b/chat/weechat/patches/patch-src_plugins_script_script_repo_h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_plugins_script_script_repo_h,v 1.1.2.2 2012/11/26 23:24:42 tron Exp $
+
+script: fix compilation on OS X
+From weechat commit 485728a43fd7eff34893abc287495242379ab078
+
+--- src/plugins/script/script-repo.h.orig	2012-11-18 09:40:28.000000000 +0000
++++ src/plugins/script/script-repo.h
+@@ -57,7 +57,7 @@ struct t_script_repo
+ extern struct t_script_repo *scripts_repo;
+ extern struct t_script_repo *last_script_repo;
+ extern int script_repo_count, script_repo_count_displayed;
+-struct t_hashtable *script_repo_max_length_field;
++extern struct t_hashtable *script_repo_max_length_field;
+ extern char *script_repo_filter;
+ 
+ extern int script_repo_script_valid (struct t_script_repo *script);