summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaya <maya@pkgsrc.org>2017-09-25 12:09:24 +0000
committermaya <maya@pkgsrc.org>2017-09-25 12:09:24 +0000
commitd536d36a688c031a6456649d66512433a74bced8 (patch)
tree11a34738516cc6f05662fedf09361415b999a55e
parent8a17928d45c493d861eed96b97b12398f9faec46 (diff)
downloadpkgsrc-d536d36a688c031a6456649d66512433a74bced8.tar.gz
weechat: update to 1.9.1
Fixes CVE-2017-14727, CVE-2017-8073 version 1.9.1: a crash can happen in logger plugin when converting date/time specifiers in file mask. Two other bugs are fixed as well in buflist and relay plugins. version 1.9: - improve speed of nicklist bar item callback - add auto scroll of buflist bar with new option buflist.look.auto_scroll - add option buflist.format.name - add variables ${format_name}, ${current_buffer} and ${merged} in buflist - display a warning in buflist when the script buffers.pl is loaded - add server/channel pointers in trigger IRC callbacks - add API functions config_option_get_string and hdata_compare - fix bind of Space key version 1.8: - add option weechat.completion.nick_case_sensitive - add wilcard matching operator, cut of string and ternary operator in evaluation of expressions - add resize of window parents with /window resize [h/v]size - add plugin "buflist" (bar with list of buffers) - add arraylist and dynamic string functions in API - add option "open" in command /server - add signal "irc_server_lag_changed" and store the lag in the server buffer (local variable) - add aspell options to control delimiters in suggestions - add option "-include" in commands /allchan, /allpv and /allserv For a complete changelog, see: https://weechat.org/files/changelog/ChangeLog-1.9.1.html
-rw-r--r--chat/weechat/Makefile5
-rw-r--r--chat/weechat/distinfo14
-rw-r--r--chat/weechat/patches/patch-cmake_FindRuby_cmake.patch24
-rw-r--r--chat/weechat/patches/patch-src_gui_curses_gui-curses-main.c30
-rw-r--r--chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c41
5 files changed, 8 insertions, 106 deletions
diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index 50375437193..39856dbf1f8 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2017/08/24 20:03:07 adam Exp $
+# $NetBSD: Makefile,v 1.77 2017/09/25 12:09:24 maya Exp $
-DISTNAME= weechat-1.7.1
-PKGREVISION= 3
+DISTNAME= weechat-1.9.1
CATEGORIES= chat
MASTER_SITES= http://www.weechat.org/files/src/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index ac8e266ca3d..d4aaad2d8ee 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.42 2017/04/25 19:50:21 maya Exp $
+$NetBSD: distinfo,v 1.43 2017/09/25 12:09:24 maya Exp $
-SHA1 (weechat-1.7.1.tar.bz2) = 8bee96c1b62669d41cd660257fc0276c2acf84fa
-RMD160 (weechat-1.7.1.tar.bz2) = ec936db15cb2bdec72ebc87490638e4abf243421
-SHA512 (weechat-1.7.1.tar.bz2) = e38c43340909db33acd79fe5a1a3d311fac25daebcbdc59c3701812a4f4dafd57b0ea5e23673bfa938f3b2a3aef710b55c1fe6746b8888e4ef90bcd2d771010a
-Size (weechat-1.7.1.tar.bz2) = 2592005 bytes
+SHA1 (weechat-1.9.1.tar.bz2) = caebc05c4a8627625d2688534fbba624555e5a8e
+RMD160 (weechat-1.9.1.tar.bz2) = ea3e14d979c94fa5554f057ea210f0021abcb28d
+SHA512 (weechat-1.9.1.tar.bz2) = dd535845b61430be212c973deab745d5829ef46971c84118e14689073f3d83bcbc1d85856e3e5110b78efb6ee6ccf64201bb6b77573a295aa9dc7f5d1dab3d3e
+Size (weechat-1.9.1.tar.bz2) = 2658824 bytes
SHA1 (patch-ab) = 2a4583e0f5b0336e8c42ad9eb5a65bbec4730207
-SHA1 (patch-cmake_FindRuby_cmake.patch) = c9987559eca2240fddb03023092fa8d02ad25976
SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e
SHA1 (patch-src_gui_curses_CMakeLists_txt) = 28a1b3b9920cc130d0454a18b111d37b8090038b
-SHA1 (patch-src_gui_curses_gui-curses-main.c) = 928b4049177574277f8b250a4c3f6c76b6d48113
-SHA1 (patch-src_gui_curses_gui-curses-term_c) = 900af9a94e74f229b32031bfeced1b85ea3a0ccf
+#SHA1 (patch-src_gui_curses_gui-curses-term_c) = 900af9a94e74f229b32031bfeced1b85ea3a0ccf
SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4
diff --git a/chat/weechat/patches/patch-cmake_FindRuby_cmake.patch b/chat/weechat/patches/patch-cmake_FindRuby_cmake.patch
deleted file mode 100644
index 9cc58cead7a..00000000000
--- a/chat/weechat/patches/patch-cmake_FindRuby_cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-cmake_FindRuby_cmake.patch,v 1.3 2016/05/07 14:16:20 tonio Exp $
-
-Support pkgsrc ruby layout and additional versions.
-
---- cmake/FindRuby.cmake.orig 2016-05-01 10:50:12.000000000 +0000
-+++ cmake/FindRuby.cmake
-@@ -33,7 +33,7 @@ endif()
-
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND)
-- pkg_search_module(RUBY ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
-+ pkg_search_module(RUBY ruby-2.3.0 ruby-2.3 ruby-2.2.4 ruby-2.2 ruby-2.1.8 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
- endif()
-
- if(RUBY_FOUND)
-@@ -41,7 +41,7 @@ if(RUBY_FOUND)
- mark_as_advanced(RUBY_LIB)
- else()
- find_program(RUBY_EXECUTABLE
-- NAMES ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
-+ NAMES ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.4 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.8 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
- PATHS /usr/bin /usr/local/bin /usr/pkg/bin
- )
- if(RUBY_EXECUTABLE)
diff --git a/chat/weechat/patches/patch-src_gui_curses_gui-curses-main.c b/chat/weechat/patches/patch-src_gui_curses_gui-curses-main.c
deleted file mode 100644
index b49394e363d..00000000000
--- a/chat/weechat/patches/patch-src_gui_curses_gui-curses-main.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_gui_curses_gui-curses-main.c,v 1.1 2017/02/07 12:30:29 roy Exp $
-
-Upstream commit d6977490d0c91b3417a383dd3d1a844657c09f84
-
-core: fix delayed refresh when the signal SIGWINCH is received (terminal resized)
-
---- src/gui/curses/gui-curses-main.c.orig 2017-02-07 10:57:15.926377533 +0000
-+++ src/gui/curses/gui-curses-main.c
-@@ -451,10 +451,6 @@ gui_main_loop ()
- gui_color_pairs_auto_reset_pending = 1;
- }
-
-- gui_main_refreshs ();
-- if (gui_window_refresh_needed && !gui_window_bare_display)
-- gui_main_refreshs ();
--
- if (gui_signal_sigwinch_received)
- {
- (void) hook_signal_send ("signal_sigwinch",
-@@ -463,6 +459,10 @@ gui_main_loop ()
- gui_window_ask_refresh (2);
- }
-
-+ gui_main_refreshs ();
-+ if (gui_window_refresh_needed && !gui_window_bare_display)
-+ gui_main_refreshs ();
-+
- gui_color_pairs_auto_reset_pending = 0;
-
- /* execute fd hooks */
diff --git a/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c b/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c
deleted file mode 100644
index d75faba4dd3..00000000000
--- a/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-src_gui_curses_gui-curses-term_c,v 1.5 2015/08/01 19:10:15 tonio Exp $
-
-Include <ncurses/term.h>, not <ncursesw/term.h>.
-Check for HAVE_NCURSES_TERM_H, not for HAVE_NCURSES_CURSES_H.
-
-Workaround for build failure on early NetBSD 6.99.* and prerelease 6.0
-(PR 46492)
-
---- src/gui/curses/gui-curses-term.c.orig 2015-05-10 07:24:50.000000000 +0000
-+++ src/gui/curses/gui-curses-term.c
-@@ -23,15 +23,15 @@
- #include "config.h"
- #endif
-
--#ifdef HAVE_NCURSESW_CURSES_H
--#ifdef __sun
-+#ifdef HAVE_NCURSES_TERM_H
- #include <ncurses/term.h>
- #else
--#include <ncursesw/term.h>
--#endif /* __sun */
--#else
-+#ifdef __NetBSD__
-+/* workaround for build failure on early 6.99.* and prerelease 6.0 */
-+#include <sys/cdefs.h>
-+#endif
- #include <term.h>
--#endif /* HAVE_NCURSESW_CURSES_H */
-+#endif /* HAVE_NCURSESW_TERM_H */
-
-
- /*
-@@ -45,7 +45,7 @@
- void
- gui_term_set_eat_newline_glitch (int value)
- {
--#ifdef HAVE_EAT_NEWLINE_GLITCH
-+#if defined(HAVE_EAT_NEWLINE_GLITCH) && !defined(__NetBSD__)
- eat_newline_glitch = value;
- #else
- /* make C compiler happy */