pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/weechat Update chat/weechat to 0.3.4
details: https://anonhg.NetBSD.org/pkgsrc/rev/cf4f0cffa709
branches: trunk
changeset: 586086:cf4f0cffa709
user: tonio <tonio%pkgsrc.org@localhost>
date: Sat Mar 05 22:48:07 2011 +0000
description:
Update chat/weechat to 0.3.4
Fix for SA43543 and update kindly provided by gls@
This is a major release, with lot of bugs fixed and major new features.
Among the new features:
- 256 colors support, with unlimited number of nick colors
- irc proxy (relay plugin)
- redirection of IRC commands
- command /notify
- rmodifier plugin
- regular expressions for highlights
- color support for timestamp in chat buffer
- irc option to force color for some nicks
- share input line between buffers.
diffstat:
chat/weechat/Makefile | 6 +-
chat/weechat/PLIST | 6 +-
chat/weechat/distinfo | 21 +-
chat/weechat/patches/patch-aa | 4 +-
chat/weechat/patches/patch-ab | 4 +-
chat/weechat/patches/patch-ac | 6 +-
chat/weechat/patches/patch-ad | 6 +-
chat/weechat/patches/patch-src_core_wee-hook.c | 54 +
chat/weechat/patches/patch-src_core_wee-hook.h | 31 +
chat/weechat/patches/patch-src_core_wee-network.c | 15 +
chat/weechat/patches/patch-src_plugins_irc_irc-server.c | 405 ++++++++++
chat/weechat/patches/patch-src_plugins_rmodifier_rmodifier-config.h | 15 +
12 files changed, 551 insertions(+), 22 deletions(-)
diffs (truncated from 674 to 300 lines):
diff -r 957b73d19b3a -r cf4f0cffa709 chat/weechat/Makefile
--- a/chat/weechat/Makefile Sat Mar 05 21:19:58 2011 +0000
+++ b/chat/weechat/Makefile Sat Mar 05 22:48:07 2011 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/03/12 14:36:57 tonio Exp $
+# $NetBSD: Makefile,v 1.27 2011/03/05 22:48:07 tonio Exp $
#
-DISTNAME= weechat-0.3.1.1
+DISTNAME= weechat-0.3.4
CATEGORIES= chat
MASTER_SITES= http://www.weechat.org/files/src/
@@ -17,7 +17,7 @@
USE_TOOLS+= msgfmt
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-ruby --disable-aspell
+CONFIGURE_ARGS+= --disable-tcl --disable-aspell
MAKE_ENV+= INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q}
MAKE_ENV+= PREFIX=${DESTDIR:Q}${PREFIX:Q}
LIBS.SunOS+= -lnsl
diff -r 957b73d19b3a -r cf4f0cffa709 chat/weechat/PLIST
--- a/chat/weechat/PLIST Sat Mar 05 21:19:58 2011 +0000
+++ b/chat/weechat/PLIST Sat Mar 05 22:48:07 2011 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2010/03/12 14:36:57 tonio Exp $
+@comment $NetBSD: PLIST,v 1.14 2011/03/05 22:48:07 tonio Exp $
bin/weechat-curses
include/weechat/weechat-plugin.h
lib/pkgconfig/weechat.pc
@@ -8,9 +8,12 @@
${PLIST.ruby}lib/weechat/plugins/ruby.la
${PLIST.charset}lib/weechat/plugins/charset.la
lib/weechat/plugins/alias.la
+lib/weechat/plugins/charset.la
lib/weechat/plugins/fifo.la
lib/weechat/plugins/irc.la
lib/weechat/plugins/logger.la
+lib/weechat/plugins/relay.la
+lib/weechat/plugins/rmodifier.la
lib/weechat/plugins/xfer.la
share/locale/cs/LC_MESSAGES/weechat.mo
share/locale/de/LC_MESSAGES/weechat.mo
@@ -19,4 +22,5 @@
share/locale/hu/LC_MESSAGES/weechat.mo
share/locale/it/LC_MESSAGES/weechat.mo
share/locale/pl/LC_MESSAGES/weechat.mo
+share/locale/pt_BR/LC_MESSAGES/weechat.mo
share/locale/ru/LC_MESSAGES/weechat.mo
diff -r 957b73d19b3a -r cf4f0cffa709 chat/weechat/distinfo
--- a/chat/weechat/distinfo Sat Mar 05 21:19:58 2011 +0000
+++ b/chat/weechat/distinfo Sat Mar 05 22:48:07 2011 +0000
@@ -1,9 +1,14 @@
-$NetBSD: distinfo,v 1.17 2010/03/12 14:36:57 tonio Exp $
+$NetBSD: distinfo,v 1.18 2011/03/05 22:48:07 tonio Exp $
-SHA1 (weechat-0.3.1.1.tar.gz) = bc4f5dffeff91feb430aec5ee25e308796b68936
-RMD160 (weechat-0.3.1.1.tar.gz) = d9a183ccbb76d9b98ca1435f59f936a8de0e2591
-Size (weechat-0.3.1.1.tar.gz) = 2263262 bytes
-SHA1 (patch-aa) = 5bfba8832834898030fb1612adee83c8a7d1e708
-SHA1 (patch-ab) = 14264c459810e7300b5adedd0ff98e749dad3f2d
-SHA1 (patch-ac) = 1f713c92e58898fd0ef3169fe9f815265cfea2e9
-SHA1 (patch-ad) = 5b9dcc4605660f2f6da9c0e3bc9e6e1b9a26bb24
+SHA1 (weechat-0.3.4.tar.gz) = 5a956aed4b3ba1fbadeac4435a4ec0eac499ffda
+RMD160 (weechat-0.3.4.tar.gz) = dbd70a2dc05e53e0c23cd3b865af7f98d8b21dbf
+Size (weechat-0.3.4.tar.gz) = 2786555 bytes
+SHA1 (patch-aa) = 5374a1a4ff08262d67f992d82e693041eeee4e27
+SHA1 (patch-ab) = 841780d694951b0c7164690481698d14948826cf
+SHA1 (patch-ac) = 3404adfb03e405ed0de30ec91b9f8d01b93a1847
+SHA1 (patch-ad) = 3a619a93d396fc5e6ed62d93ea3a44455b297208
+SHA1 (patch-src_core_wee-hook.c) = 8875ab65e4eb2f37950e16f503f62eb00031062b
+SHA1 (patch-src_core_wee-hook.h) = 643dd8ec271f4632f631ece55cd46f9964100fad
+SHA1 (patch-src_core_wee-network.c) = dcba7c9c2814ebd65efdc80db6d7955e88dd66b3
+SHA1 (patch-src_plugins_irc_irc-server.c) = 2ba285bee488f5fdfea98c6b17ceddbb8b11c1cb
+SHA1 (patch-src_plugins_rmodifier_rmodifier-config.h) = e5e733d52ad1c6a56c981069710738420bd1c8af
diff -r 957b73d19b3a -r cf4f0cffa709 chat/weechat/patches/patch-aa
--- a/chat/weechat/patches/patch-aa Sat Mar 05 21:19:58 2011 +0000
+++ b/chat/weechat/patches/patch-aa Sat Mar 05 22:48:07 2011 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2006/10/02 17:45:49 tonio Exp $
+$NetBSD: patch-aa,v 1.4 2011/03/05 22:48:07 tonio Exp $
---- po/Makefile.in.in.orig 2006-10-01 10:00:26.000000000 +0200
+--- po/Makefile.in.in.orig 2007-10-31 17:28:48.000000000 +0000
+++ po/Makefile.in.in
@@ -30,7 +30,7 @@ gettextsrcdir = $(datadir)/gettext/po
diff -r 957b73d19b3a -r cf4f0cffa709 chat/weechat/patches/patch-ab
--- a/chat/weechat/patches/patch-ab Sat Mar 05 21:19:58 2011 +0000
+++ b/chat/weechat/patches/patch-ab Sat Mar 05 22:48:07 2011 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2008/12/18 20:27:47 ahoka Exp $
+$NetBSD: patch-ab,v 1.6 2011/03/05 22:48:07 tonio Exp $
---- src/gui/curses/gui-curses.h.orig 2008-12-18 21:17:01.000000000 +0100
+--- src/gui/curses/gui-curses.h.orig 2011-01-01 13:52:16.000000000 +0000
+++ src/gui/curses/gui-curses.h
@@ -21,6 +21,8 @@
#define __WEECHAT_GUI_CURSES_H 1
diff -r 957b73d19b3a -r cf4f0cffa709 chat/weechat/patches/patch-ac
--- a/chat/weechat/patches/patch-ac Sat Mar 05 21:19:58 2011 +0000
+++ b/chat/weechat/patches/patch-ac Sat Mar 05 22:48:07 2011 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2009/11/03 22:22:31 tonio Exp $
+$NetBSD: patch-ac,v 1.5 2011/03/05 22:48:07 tonio Exp $
Make sure to honor destdir
---- src/plugins/Makefile.in.orig 2009-09-06 10:10:04.000000000 +0200
+--- src/plugins/Makefile.in.orig 2011-01-16 08:17:23.000000000 +0000
+++ src/plugins/Makefile.in
-@@ -749,8 +749,8 @@ uninstall-am:
+@@ -759,8 +759,8 @@ uninstall-am:
# install plugin header
install-data-hook:
diff -r 957b73d19b3a -r cf4f0cffa709 chat/weechat/patches/patch-ad
--- a/chat/weechat/patches/patch-ad Sat Mar 05 21:19:58 2011 +0000
+++ b/chat/weechat/patches/patch-ad Sat Mar 05 22:48:07 2011 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.3 2010/03/12 14:36:57 tonio Exp $
+$NetBSD: patch-ad,v 1.4 2011/03/05 22:48:07 tonio Exp $
Solaris build
---- src/gui/curses/gui-curses-window.c.orig 2010-01-27 09:59:01.000000000 +0000
+--- src/gui/curses/gui-curses-window.c.orig 2011-01-01 13:52:16.000000000 +0000
+++ src/gui/curses/gui-curses-window.c
-@@ -27,6 +27,8 @@
+@@ -29,6 +29,8 @@
#include <string.h>
#include <stdarg.h>
#include <libgen.h>
diff -r 957b73d19b3a -r cf4f0cffa709 chat/weechat/patches/patch-src_core_wee-hook.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/weechat/patches/patch-src_core_wee-hook.c Sat Mar 05 22:48:07 2011 +0000
@@ -0,0 +1,54 @@
+$NetBSD: patch-src_core_wee-hook.c,v 1.1 2011/03/05 22:48:07 tonio Exp $
+
+Fix for http://secunia.com/advisories/43543/
+
+--- src/core/wee-hook.c.orig 2011-01-02 18:05:16.000000000 +0000
++++ src/core/wee-hook.c
+@@ -1700,6 +1700,38 @@ hook_connect (struct t_weechat_plugin *p
+ }
+
+ /*
++ * hook_connect_gnutls_verify_certificates: verify server certificate
++ */
++
++#ifdef HAVE_GNUTLS
++int
++hook_connect_gnutls_verify_certificates (gnutls_session_t tls_session)
++{
++ struct t_hook *ptr_hook;
++ int rc;
++
++ rc = -1;
++ ptr_hook = weechat_hooks[HOOK_TYPE_CONNECT];
++ while (ptr_hook)
++ {
++ /* looking for the right hook using to the gnutls session pointer */
++ if (!ptr_hook->deleted
++ && HOOK_CONNECT(ptr_hook, gnutls_sess)
++ && (*(HOOK_CONNECT(ptr_hook, gnutls_sess)) == tls_session))
++ {
++ rc = (int) (HOOK_CONNECT(ptr_hook, gnutls_cb))
++ (ptr_hook->callback_data, tls_session, NULL, 0,
++ NULL, 0, NULL, GNUTLS_CB_MODE_VERIFY);
++ break;
++ }
++ ptr_hook = ptr_hook->next_hook;
++ }
++
++ return rc;
++}
++#endif
++
++/*
+ * hook_connect_gnutls_set_certificates: set gnutls
+ */
+
+@@ -1725,7 +1757,7 @@ hook_connect_gnutls_set_certificates (gn
+ {
+ rc = (int) (HOOK_CONNECT(ptr_hook, gnutls_cb))
+ (ptr_hook->callback_data, tls_session, req_ca, nreq,
+- pk_algos, pk_algos_len, answer);
++ pk_algos, pk_algos_len, answer, GNUTLS_CB_MODE_SETCERT);
+ break;
+ }
+ ptr_hook = ptr_hook->next_hook;
diff -r 957b73d19b3a -r cf4f0cffa709 chat/weechat/patches/patch-src_core_wee-hook.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/weechat/patches/patch-src_core_wee-hook.h Sat Mar 05 22:48:07 2011 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_core_wee-hook.h,v 1.1 2011/03/05 22:48:07 tonio Exp $
+
+Fix for http://secunia.com/advisories/43543/
+
+--- src/core/wee-hook.h.orig 2011-01-01 13:48:19.000000000 +0000
++++ src/core/wee-hook.h
+@@ -202,10 +202,15 @@ typedef int (t_hook_callback_connect)(vo
+ const char *ip_address);
+
+ #ifdef HAVE_GNUTLS
++enum t_gnutls_cb_mode {
++ GNUTLS_CB_MODE_SETCERT,
++ GNUTLS_CB_MODE_VERIFY
++};
+ typedef int (gnutls_callback_t)(void *data, gnutls_session_t tls_session,
+ const gnutls_datum_t *req_ca, int nreq,
+ const gnutls_pk_algorithm_t *pk_algos,
+- int pk_algos_len, gnutls_retr_st *answer);
++ int pk_algos_len, gnutls_retr_st *answer,
++ enum t_gnutls_cb_mode cbmode);
+ #endif
+
+ struct t_hook_connect
+@@ -416,6 +421,7 @@ extern int hook_connect_gnutls_set_certi
+ const gnutls_pk_algorithm_t *pk_algos,
+ int pk_algos_len,
+ gnutls_retr_st *answer);
++extern int hook_connect_gnutls_verify_certificates (gnutls_session_t tls_session);
+ #endif
+ extern struct t_hook *hook_print (struct t_weechat_plugin *plugin,
+ struct t_gui_buffer *buffer,
diff -r 957b73d19b3a -r cf4f0cffa709 chat/weechat/patches/patch-src_core_wee-network.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/weechat/patches/patch-src_core_wee-network.c Sat Mar 05 22:48:07 2011 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_wee-network.c,v 1.1 2011/03/05 22:48:07 tonio Exp $
+
+Fix for http://secunia.com/advisories/43543/
+
+--- src/core/wee-network.c.orig 2011-01-01 13:48:17.000000000 +0000
++++ src/core/wee-network.c
+@@ -94,6 +94,8 @@ network_init ()
+ }
+ free (ca_path);
+ }
++ gnutls_certificate_set_verify_function (gnutls_xcred,
++ &hook_connect_gnutls_verify_certificates);
+ gnutls_certificate_client_set_retrieve_function (gnutls_xcred,
+ &hook_connect_gnutls_set_certificates);
+ network_init_ok = 1;
diff -r 957b73d19b3a -r cf4f0cffa709 chat/weechat/patches/patch-src_plugins_irc_irc-server.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/weechat/patches/patch-src_plugins_irc_irc-server.c Sat Mar 05 22:48:07 2011 +0000
@@ -0,0 +1,405 @@
+$NetBSD: patch-src_plugins_irc_irc-server.c,v 1.1 2011/03/05 22:48:07 tonio Exp $
+
+Fix for http://secunia.com/advisories/43543/
+
+--- src/plugins/irc/irc-server.c.orig 2011-01-07 15:26:49.000000000 +0000
++++ src/plugins/irc/irc-server.c
+@@ -2797,6 +2797,10 @@ irc_server_create_buffer (struct t_irc_s
+ }
+
+ #ifdef HAVE_GNUTLS
++enum t_gnutls_cb_mode {
++ GNUTLS_CB_MODE_SETCERT,
++ GNUTLS_CB_MODE_VERIFY
++};
+ /*
+ * irc_server_gnutls_callback: gnutls callback called during handshake
+ *
+@@ -2805,7 +2809,8 @@ int
+ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
+ const gnutls_datum_t *req_ca, int nreq,
+ const gnutls_pk_algorithm_t *pk_algos,
+- int pk_algos_len, gnutls_retr_st *answer)
++ int pk_algos_len, gnutls_retr_st *answer,
++ enum t_gnutls_cb_mode cbmode)
+ {
+ struct t_irc_server *server;
+ gnutls_retr_st tls_struct;
+@@ -2837,207 +2842,212 @@ irc_server_gnutls_callback (void *data,
+ hostname = server->current_address;
+ hostname_match = 0;
+
+- weechat_printf (server->buffer,
+- _("gnutls: connected using %d-bit Diffie-Hellman shared "
+- "secret exchange"),
+- IRC_SERVER_OPTION_INTEGER (server,
+- IRC_SERVER_OPTION_SSL_DHKEY_SIZE));
+- if (gnutls_certificate_verify_peers2 (tls_session, &status) < 0)
++ if (cbmode == GNUTLS_CB_MODE_VERIFY)
+ {
+ weechat_printf (server->buffer,
+- _("%sgnutls: error while checking peer's certificate"),
+- weechat_prefix ("error"));
+- rc = -1;
+- }
+- else
+- {
+- /* some checks */
+- if (status & GNUTLS_CERT_INVALID)
++ _("gnutls: connected using %d-bit Diffie-Hellman shared "
++ "secret exchange"),
Home |
Main Index |
Thread Index |
Old Index